Insert a root album into all Sones to get rid of album manipulation in the Sone.

[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 a88c48f..da8d032 100644 (file)
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -373,7 +373,7 @@
                                </div>
                        <%/if>
 
-                       <%foreach album.images image|paginate pageSize=core.preferences.imagesPerPage page=request.page>
+                       <%foreach album.images image|paginate pageSize=core.preferences.imagesPerPage page=page>
                                <%first>
                                        <h2><%= Page.ImageBrowser.Header.Images|l10n|html></h2>
                                        <%include include/pagination.html pageParameter=="page">
@@ -420,8 +420,8 @@
                                <%last><%= true|store key==endRow><%/last>
                                <%if endRow>
                                        </div>
-                                       <%include include/pagination.html pageParameter=="page">
                                <%/if>
+                <%last><%include include/pagination.html pageParameter=="page"><%/last>
                        <%/foreach>
 
                        <%if album.sone.local>
@@ -582,7 +582,7 @@
                                <div class="backlink"><a href="imageBrowser.html?sone=<%sone.id|html>"><%sone.niceName|html></a></div>
                        </div>
 
-                       <%include include/browseAlbums.html albums=sone.albums>
+                       <%include include/browseAlbums.html albums=sone.rootAlbum.albums>
 
                        <%if sone.local>
                                <div class="show-create-album hidden toggle-link"><a class="small-link">» <%= View.CreateAlbum.Title|l10n|html></a></div>