From d192bcad65852bb9225a368d1bf42b8918ae6022 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Mon, 27 Oct 2014 21:31:54 +0100
Subject: do not reload page for edit album and some minor cleanup

---
 view/tpl/photo_album.tpl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'view/tpl/photo_album.tpl')

diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 0c878b950..0a26fc367 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,7 +1,7 @@
 <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 $album_edit.1}}
+		<i class="icon-pencil btn btn-default" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper');"></i>
 		{{/if}}
 		<a class="btn btn-default" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
 		{{if $can_post}}
@@ -12,6 +12,7 @@
 
 	<div class="clear"></div>
 </div>
+{{$album_edit.1}}
 <div id="photo-album-contents" class="generic-content-wrapper">
 	{{foreach $photos as $photo}}
 		{{include file="photo_top.tpl"}}
-- 
cgit v1.2.3


From 5d151b988605bc5aedbef65b687a43dedbc574e9 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Fri, 31 Oct 2014 20:25:43 +0100
Subject: do not reload page for photo upload

---
 view/tpl/photo_album.tpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'view/tpl/photo_album.tpl')

diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 0a26fc367..2c0b8e5b9 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -5,13 +5,14 @@
 		{{/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>
+		<button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
 		{{/if}}
 	</div>
 	<h2>{{$album}}</h2>
 
 	<div class="clear"></div>
 </div>
+{{$upload_form}}
 {{$album_edit.1}}
 <div id="photo-album-contents" class="generic-content-wrapper">
 	{{foreach $photos as $photo}}
-- 
cgit v1.2.3


From 30281b161c6e3089a89c5035498bb72a72e66e4a Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Sat, 1 Nov 2014 20:30:13 +0100
Subject: close the eventual open tool if the other opens

---
 view/tpl/photo_album.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/tpl/photo_album.tpl')

diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 2c0b8e5b9..7b1566a15 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,11 +1,11 @@
 <div class="section-title-wrapper">
 	<div class="btn-group btn-group-xs pull-right">
 		{{if $album_edit.1}}
-		<i class="icon-pencil btn btn-default" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper');"></i>
+		<i class="icon-pencil btn btn-default" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
 		{{/if}}
 		<a class="btn btn-default" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
 		{{if $can_post}}
-		<button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
+		<button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
 		{{/if}}
 	</div>
 	<h2>{{$album}}</h2>
-- 
cgit v1.2.3


From dc5e05d3349bc493e4c1f33fb2561bb80ddd0c7f Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Sat, 1 Nov 2014 23:55:36 +0100
Subject: even more photos work

---
 view/tpl/photo_album.tpl | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'view/tpl/photo_album.tpl')

diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 7b1566a15..7175a62da 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,13 +1,16 @@
 <div class="section-title-wrapper">
-	<div class="btn-group btn-group-xs pull-right">
-		{{if $album_edit.1}}
-		<i class="icon-pencil btn btn-default" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
-		{{/if}}
-		<a class="btn btn-default" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
-		{{if $can_post}}
-		<button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
-		{{/if}}
+	<div class="pull-right">
+		<a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
+		<div class="btn-group btn-group-xs">
+			{{if $album_edit.1}}
+			<i class="icon-pencil btn btn-default" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
+			{{/if}}
+			{{if $can_post}}
+			<button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
+			{{/if}}
+		</div>
 	</div>
+
 	<h2>{{$album}}</h2>
 
 	<div class="clear"></div>
-- 
cgit v1.2.3


From 8cfe8a5f258b041b3a33f520125834a68afbea26 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Sun, 2 Nov 2014 19:36:28 +0100
Subject: css fixes

---
 view/tpl/photo_album.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'view/tpl/photo_album.tpl')

diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 7175a62da..5506b01f2 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,12 +1,12 @@
 <div class="section-title-wrapper">
 	<div class="pull-right">
 		<a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
-		<div class="btn-group btn-group-xs">
+		<div class="btn-group btn-group">
 			{{if $album_edit.1}}
-			<i class="icon-pencil btn btn-default" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
+			<i class="icon-pencil btn btn-default btn-xs" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
 			{{/if}}
 			{{if $can_post}}
-			<button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
+			<button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
 			{{/if}}
 		</div>
 	</div>
-- 
cgit v1.2.3