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 f868394..ca2014d 100644 (file)
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -29,14 +29,30 @@
                                <%/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>