Move admin forms to their appropriate places.

[Sone.git] / src / main / resources / templates / imageBrowser.html

diff --git a/src/main/resources/templates/imageBrowser.html b/src/main/resources/templates/imageBrowser.html
index 54f646f..e9b3c06 100644 (file)
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -67,7 +67,30 @@
                                <%/foreach>
                        </div>
 
+                       <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>
                                <div class="album image">
                                        <a href="imageBrowser.html?album=<% album.id|html>" title="<% album.title|html>">
                                                <%ifnull album.albumImage>
@@ -79,38 +102,30 @@
                                                <% album.title|html>
                                        </a>
                                </div>
+                               <%= false|store key=endRow>
+                               <%if loop.count|mod divisor=3 offset=1><%= true|store key=endRow><%/if>
+                               <%last><%= true|store key=endRow><%/last>
+                               <%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>
                                <div class="image">
                                        <a href="imageBrowser.html?image=<%image.id|html>"><% image|image-link max-width=200 max-height=150></a>
                                </div>
+                               <%= false|store key=endRow>
+                               <%if loop.count|mod divisor=3 offset=1><%= true|store key=endRow><%/if>
+                               <%last><%= true|store key=endRow><%/last>
+                               <%if endRow></div><%/if>
                        <%/foreach>
 
-                       <div id="description">
-                               <% album.description|html>
-                       </div>
-
                        <%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">
@@ -231,6 +246,7 @@
                        <h1><%= Page.ImageBrowser.Sone.Title|l10n|replace needle='{sone}' replacementKey=sone.niceName|html></h1>
 
                        <%foreach sone.albums album>
+                               <%if loop.count|mod divisor=3><div class="image-row"><%/if>
                                <div class="album image">
                                        <a href="imageBrowser.html?album=<% album.id|html>" title="<% album.title|html>">
                                                <%ifnull album.albumImage>
@@ -242,6 +258,10 @@
                                                <% album.title|html>
                                        </a>
                                </div>
+                               <%= false|store key=endRow>
+                               <%if loop.count|mod divisor=3 offset=1><%= true|store key=endRow><%/if>
+                               <%last><%= true|store key=endRow><%/last>
+                               <%if endRow></div><%/if>
                        <%/foreach>
 
                        <%if sone.local>