From 2f6b4b0b17855b1d35f778a45456975b7fc5fdf0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Wed, 21 Sep 2011 21:09:07 +0200
Subject: [PATCH] Move admin forms to their appropriate places.

---
 src/main/resources/templates/imageBrowser.html | 41 +++++++++++++++-----------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/templates/imageBrowser.html b/src/main/resources/templates/imageBrowser.html
index a8f1e98..e9b3c06 100644
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -69,6 +69,25 @@
 
 			<p id="description"><% album.description|html></p>
 
+			<%if album.sone.local>
+				<h2><%= Page.ImageBrowser.Album.Edit.Title|l10n|html></h2>
+
+				<form id="edit-album" action="editAlbum.html" method="post">
+					<input type="hidden" name="formPassword" value="<%formPassword|html>" />
+					<input type="hidden" name="album" value="<%album.id|html>" />
+
+					<div>
+						<label for="title"><%= Page.ImageBrowser.Album.Label.Title|l10n|html></label>
+						<input type="text" name="title" value="<%album.title|html>" />
+					</div>
+					<div>
+						<label for="description"><%= Page.ImageBrowser.Album.Label.Description|l10n|html></label>
+						<textarea name="description"><%album.description|html></textarea>
+					</div>
+					<button type="submit"><%= Page.ImageBrowser.Album.Button.Save|l10n|html></button>
+				</form>
+			<%/if>
+
 			<%foreach album.albums album>
 				<%first><h2><%= Page.ImageBrowser.Header.Albums|l10n|html></h2><%/first>
 				<%if loop.count|mod divisor=3><div class="image-row"><%/if>
@@ -89,6 +108,10 @@
 				<%if endRow></div><%/if>
 			<%/foreach>
 
+			<%if album.sone.local>
+				<%include include/createAlbum.html>
+			<%/if>
+
 			<%foreach album.images image>
 				<%first><h2><%= Page.ImageBrowser.Header.Images|l10n|html></h2><%/first>
 				<%if loop.count|mod divisor=3><div class="image-row"><%/if>
@@ -103,24 +126,6 @@
 
 			<%if album.sone.local>
 				<%include include/uploadImage.html>
-				<%include include/createAlbum.html>
-
-				<h2><%= Page.ImageBrowser.Album.Edit.Title|l10n|html></h2>
-
-				<form id="edit-album" action="editAlbum.html" method="post">
-					<input type="hidden" name="formPassword" value="<%formPassword|html>" />
-					<input type="hidden" name="album" value="<%album.id|html>" />
-
-					<div>
-						<label for="title"><%= Page.ImageBrowser.Album.Label.Title|l10n|html></label>
-						<input type="text" name="title" value="<%album.title|html>" />
-					</div>
-					<div>
-						<label for="description"><%= Page.ImageBrowser.Album.Label.Description|l10n|html></label>
-						<textarea name="description"><%album.description|html></textarea>
-					</div>
-					<button type="submit"><%= Page.ImageBrowser.Album.Button.Save|l10n|html></button>
-				</form>
 
 				<%if album.empty>
 					<form id="delete-album" action="deleteAlbum.html" method="get">
-- 
2.7.4