some more work on photos - work in progress

6 files changed, 73 insertions, 84 deletions

diff --git a/mod/photos.php b/mod/photos.php
index 44a7ce0f0..c2d90184e 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -652,9 +652,10 @@ function photos_content(&$a) {
 			intval($a->pager['start']),
 			intval($a->pager['itemspage'])
 		);
-
-		$o .= '<h3>' . $album . '</h3>';
 		
+		$o .= '<div class="section-title-wrapper">';
+		$o .= '<h3>' . $album . '</h3>';
+		$o .= '<div class="section-title-submenu">';
 		if($cmd === 'edit') {		
 			if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
 				if($can_post) {
@@ -680,22 +681,24 @@ function photos_content(&$a) {
 		else {
 			if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
 				if($can_post) {
-					$o .= '<div id="album-edit-link"><a href="'. $a->get_baseurl() . '/photos/' 
-						. $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '/edit' . '">' 
-						. t('Edit Album') . '</a></div>';
+					$o .= '<a href="'. $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '/edit' . '">' . t('Edit Album') . '</a>';
  				}
 			}
 		}
 
 		if($_GET['order'] === 'posted')
-			$o .=  '<div class="photos-upload-link" ><a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '" >' . t('Show Newest First') . '</a></div>';
+			$o .=  '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '" >' . t('Show Newest First') . '</a>';
 		else
-			$o .= '<div class="photos-upload-link" ><a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '?f=&order=posted" >' . t('Show Oldest First') . '</a></div>';
-
+			$o .= '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '?f=&order=posted" >' . t('Show Oldest First') . '</a>';
 
+		/*
 		if($can_post) {
-			$o .= '<div class="photos-upload-link" ><a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/upload/' . bin2hex($album) . '" >' . t('Upload New Photos') . '</a></div>';
+			$o .= '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/upload/' . bin2hex($album) . '" >' . t('Upload New Photos') . '</<a>';
 		}
+		*/
+
+		$o .= '</div>'; // section-title-submenu
+		$o .= '</div>'; // section-title-wrapper
 
 		$ajaxout = '';
 
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index a382a42b3..5a7b82f50 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -1,37 +1,27 @@
 /* override some bootstrap settings */
 
-html {
-	font-size: 100%;
+h1, h2 {
+   font-size: 1.583em;
 }
 
-h1,
-.h1 {
-  font-size: 24px;
+h3, h4 {
+   font-size: 1.334em;
 }
 
-h2,
-.h2 {
-  font-size: 18px;
+h5, h6 {
+   font-size: 0.75rem;
 }
 
-h3,
-.h3 {
-  font-size: 16px;
+.wall-item-content h1,  .wall-item-content h2 {
+   font-size: 1.319em;
 }
 
-h4,
-.h4 {
-  font-size: 14px;
+.wall-item-title {
+   font-size: $font_size;
 }
 
-h5,
-.h5 {
-  font-size: 12px;
-}
-
-h6,
-.h6 {
-  font-size: 10px;
+.wall-item-title h3, .wall-item-content h3,  .wall-item-content h4 {
+   font-size: 1.112em;
 }
 
 /* nav overrides */
@@ -96,3 +86,8 @@ nav .navbar-collapse .navbar-right {
 code {
 	white-space: normal;
 }
+
+
+blockquote {
+	font-size: 1em;
+}
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 8bf5a9e97..bcd52cfee 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -9,7 +9,6 @@
 .widget h3 {
 	margin-left: -10px;
 	margin-top: 0px;
-	margin-bottom: 10px;
 }
 
 /* suggest */
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 4e662f1db..2cb2d917d 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -9,6 +9,7 @@
 /* generals */
 html {
 	height: 100%;
+	font-size: 100%;
 }
 
 body {
@@ -2206,10 +2207,6 @@ nav ul li {
 	max-height: 50px
 }
 
-nav .badge {
-	border-radius: $radiuspx;
-}
-
 nav .dropdown-menu {
 	font-size: $body_font_size;
 	border-top-right-radius: 0px;
@@ -2251,32 +2248,8 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 }
 
 /* bootstrap overrides */
-blockquote {
-	font-size: 1em;
-}
-
-h1, h2 {
-   font-size: 1.583em;
-}
-
-h3, h4 {
-   font-size: 1.334em;
-}
-
-h5, h6 {
-   font-size: 0.75rem; 
-}
-
-.wall-item-content h1,  .wall-item-content h2 {
-   font-size: 1.319em;
-}
-
-.wall-item-title {
-   font-size: $font_size;
-}
-
-.wall-item-title h3, .wall-item-content h3,  .wall-item-content h4 {
-   font-size: 1.112em;
+.badge {
+	border-radius: $radiuspx;
 }
 
 .dropdown-menu {
@@ -2448,6 +2421,26 @@ h5, h6 {
 	background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%);
 }
 
+.section-title-wrapper {
+	padding: 7px 10px;
+	background-color: $item_colour;
+	border-radius: $radiuspx;
+	margin-bottom: 10px;
+}
+
+.section-title-wrapper h3 {
+	margin-top: 0px;
+	margin-bottom: 0px;
+}
+
+.section-title-submenu {
+	margin-top: 10px;
+}
+
+.section-title-submenu a {
+	margin-right: 10px;
+}
+
 @media screen and (max-width: 767px) {
 	aside#region_1 {
 		background: rgba(0, 0, 0, .1);
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index 7ff4a8cc0..27f156c68 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -1,15 +1,16 @@
 <div id="side-bar-photos-albums" class="widget">
-<h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3>
-{{if $albums}}
-<ul>
-{{foreach $albums as $al}}
-{{if $al.text}}
-<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}</a> ({{$al.total}})</li>
-{{/if}}
-{{/foreach}}
-</ul>
-{{/if}}
-{{if $upload}}
-<div id="photo-albums-upload-link"><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></div>
-{{/if}}
+	<h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3>
+	{{if $albums}}
+	<ul class="nav nav-pills nav-stacked">
+		{{foreach $albums as $al}}
+		{{if $al.text}}
+		<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}<span class="badge pull-right">{{$al.total}}</span></a></li>
+		{{/if}}
+		{{/foreach}}
+
+	{{/if}}
+	{{if $upload}}
+		<li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li>
+	{{/if}}
+	</ul>
 </div>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index fce518cfe..b4094512c 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -1,13 +1,11 @@
-<h3>{{$title}}</h3>
-{{if $can_post}}
-<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
-{{/if}}
-
+<div class="section-title-wrapper">
+	<h3>{{$title}}</h3>
+</div>
 <div id="photo-album-contents">
-{{foreach $photos as $photo}}
-	{{include file="photo_top.tpl"}}
-{{/foreach}}
-<div id="page-end"></div>
+	{{foreach $photos as $photo}}
+		{{include file="photo_top.tpl"}}
+	{{/foreach}}
+	<div id="page-end"></div>
 </div>
 <div class="photos-end"></div>
 <script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>