Merge branch 'next' into image-management

[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 fae4026..ca2014d 100644 (file)
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -1,5 +1,7 @@
 <%include include/head.html>
 
+       <div class="page-id hidden">image-browser</div>
+
        <h1><%= Page.ImageBrowser.Page.Title|l10n|html></h1>
 
        <%if albumRequested>
@@ -27,8 +29,32 @@
                                <%/foreach>
                        </div>
 
+                       <%foreach album.albums album>
+                               <div class="album">
+                                       <div class="name"><% album.name|html></div>
+                               </div>
+                       <%/foreach>
+
+                       <%include include/createAlbum.html>
+
+                       <div id="description">
+                               <% album.description|html>
+                       </div>
+
                <%/if>
 
+       <%elseif imageRequested>
+
+       <%else>
+
+               <%foreach currentSone.albums album>
+                       <div class="album">
+                               <div class="name"><% album.name|html></div>
+                       </div>
+               <%/foreach>
+
+               <%include include/createAlbum.html>
+
        <%/if>
 
 <%include include/tail.html>