From df70c2c9b62365c9b0feb8a482aef1ac626fabd6 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Thu, 2 Oct 2014 21:04:50 +0200
Subject: more work on photos

---
 view/theme/redbasic/css/style.css |  4 ++--
 view/tpl/photo_album.tpl          | 26 +++++++++++++++++++++++---
 view/tpl/photo_top.tpl            |  2 +-
 3 files changed, 26 insertions(+), 6 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 9bbf996d5..7df70e714 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -75,12 +75,12 @@ a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; }
 
 a.btn-default {
 	color: #333;
-
+	font-weight: normal;
 }
 
 a.btn-success {
 	color: #fff;
-font-weight: normal;
+	font-weight: normal;
 }
 
 input[type="text"],
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index b5ea14c14..d23f7e817 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,3 +1,23 @@
-<a href="{{$photolink}}" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}" rel="{{$rel}}">
-	<img src="{{$imgsrc}}" alt="{{if $desc}}{{$desc}}{{else}}{{$imgalt}}{{/if}}" title="{{$phototitle}}" id="photo-album-photo-{{$id}}" />
-</a>
+<div class="section-title-wrapper">
+	<div class="btn-group btn-group-xs pull-right">
+		{{if $edit}}
+		<a class="btn btn-default" href="{{$edit.1}}" title="{{$edit.0}}"><i class="icon-pencil"></i></a>
+		{{/if}}
+		<a class="btn btn-default" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
+		{{if $can_post}}
+		<a class="btn btn-xs btn-success" href="{{$upload.1}}"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</a>
+		{{/if}}
+	</div>
+	<h2>{{$album}}</h2>
+
+	<div class="clear"></div>
+</div>
+<div id="photo-album-contents">
+	{{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>
+<div id="page-spinner"></div>
diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl
index 4a106c30d..ee21e5cce 100755
--- a/view/tpl/photo_top.tpl
+++ b/view/tpl/photo_top.tpl
@@ -1,4 +1,4 @@
 <a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
-	<img src="{{$photo.src}}" alt="{{$photo.album.name}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" />
+	<img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{else}}{{$photo.alt}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" />
 </a>
 
-- 
cgit v1.2.3