Move album moving buttons to include file

diff --git a/src/main/resources/templates/include/browseAlbums.html b/src/main/resources/templates/include/browseAlbums.html
index 10de318..61eb665 100644 (file)
--- a/src/main/resources/templates/include/browseAlbums.html
+++ b/src/main/resources/templates/include/browseAlbums.html
@@ -17,31 +17,4 @@
                </div>
                <%include include/pagination.html pageParameter=="albumPage">
        <%/last>
-
-       <%if album.sone.local>
-               <form class="edit-album" action="editAlbum.html" method="post">
-                       <input type="hidden" name="formPassword" value="<%formPassword|html>" />
-                       <input type="hidden" name="returnPage" value="<%request.uri|html>" />
-                       <input type="hidden" name="album" value="<%album.id|html>" />
-
-                       <div class="move-buttons">
-                               <button <%if loop.first>class="hidden" <%/if>type="submit" name="moveLeft" value="true"><%= Page.ImageBrowser.Image.Button.MoveLeft|l10n|html></button>
-                               <button <%if loop.last>class="hidden" <%/if>type="submit" name="moveRight" value="true"><%= Page.ImageBrowser.Image.Button.MoveRight|l10n|html></button>
-                       </div>
-
-                       <div class="edit-data hidden">
-                               <div>
-                                       <input type="text" name="title" value="<%album.title|html>" />
-                               </div>
-                               <div>
-                                       <textarea name="description"><%album.description|html></textarea>
-                               </div>
-                               <div>
-                                       <button <%if loop.first>class="hidden" <%/if>type="submit" name="moveLeft" value="true"><%= Page.ImageBrowser.Image.Button.MoveLeft|l10n|html></button>
-                                       <button type="submit" name="submit"><%= Page.ImageBrowser.Album.Button.Save|l10n|html></button>
-                                       <button <%if loop.last>class="hidden" <%/if>type="submit" name="moveRight" value="true"><%= Page.ImageBrowser.Image.Button.MoveRight|l10n|html></button>
-                               </div>
-                       </div>
-               </form>
-       <%/if>
 <%/foreach>

diff --git a/src/main/resources/templates/include/viewAlbum.html b/src/main/resources/templates/include/viewAlbum.html
index fb2d7f0..bf9ea78 100644 (file)
--- a/src/main/resources/templates/include/viewAlbum.html
+++ b/src/main/resources/templates/include/viewAlbum.html
@@ -12,6 +12,17 @@
                <div class="link"><a href="album://<% album.id|html>">[<%= View.Album.Permalink|l10n|html>]</a></div>
                <div class="title"><a href="imageBrowser.html?album=<% album.id|html>"><% album.title|html></a></div>
                <div class="author"><% =View.Album.SizeAndAuthor|l10n 0=album.sone.niceName 1=album.images.size|html|replace needle=="[link]" replacement=='<a href="viewSone.html?sone=<sone-id>">'|replace needle=='[/link]' replacement=='</a>'|replace needle=='<sone-id>' replacement=album.sone.id></div>
+               <%if album.sone.local>
+                       <form class="edit-album" action="editAlbum.html" method="post">
+                               <input type="hidden" name="formPassword" value="<%formPassword|html>" />
+                               <input type="hidden" name="returnPage" value="<%request.uri|html>" />
+                               <input type="hidden" name="album" value="<%album.id|html>" />
+                               <div class="move-buttons">
+                                       <button <%if loop.first>class="hidden" <%/if>type="submit" name="moveLeft" value="true"><%= Page.ImageBrowser.Image.Button.MoveLeft|l10n|html></button>
+                                       <button <%if loop.last>class="hidden" <%/if>type="submit" name="moveRight" value="true"><%= Page.ImageBrowser.Image.Button.MoveRight|l10n|html></button>
+                               </div>
+                       </form>
+               <%/if>
                <div class="description"><% album.description|parse sone=album.sone|render></div>
        </div>
 </div>