Fix pagination on album pages.

[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 06e9ccc..7752ffb 100644 (file)
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -373,8 +373,11 @@
                                </div>
                        <%/if>
 
-                       <%foreach album.images image>
-                               <%first><h2><%= Page.ImageBrowser.Header.Images|l10n|html></h2><%/first>
+                       <%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">
+                               <%/first>
                                <%if loop.count|mod divisor==3><div class="image-row"><%/if>
                                <div id="image-<% image.id|html>" class="image">
                                        <div class="image-id hidden"><% image.id|html></div>
@@ -415,12 +418,15 @@
                                <%= 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>
+                               <%if endRow>
+                                       </div>
+                                       <%include include/pagination.html pageParameter=="page">
+                               <%/if>
                        <%/foreach>
 
                        <%if album.sone.local>
-                               <div class="show-upload-image hidden toggle-link"><a class="small-link">» <%= View.UploadImage.Title|l10n|html></a></div>
-                               <div class="hide-upload-image hidden toggle-link"><a class="small-link">« <%= View.UploadImage.Title|l10n|html></a></div>
+                               <div class="clear show-upload-image hidden toggle-link"><a class="small-link">» <%= View.UploadImage.Title|l10n|html></a></div>
+                               <div class="clear hide-upload-image hidden toggle-link"><a class="small-link">« <%= View.UploadImage.Title|l10n|html></a></div>
                                <div class="upload-image">
                                        <%include include/uploadImage.html>
                                </div>
@@ -590,12 +596,12 @@
 
        <%elseif galleryRequested>
 
-               <%foreach albums album>
+               <%foreach albums album|paginate pageSize=core.preferences.imagesPerPage pageParameter=request.page pagination=albumPagination>
                        <%first>
                                <h2><%= Page.ImageBrowser.Header.Albums|l10n|html></h2>
                                <%include include/pagination.html pagination=albumPagination pageParameter=="page">
                        <%/first>
-                       <%if loop.count|mod divisor=3><div class="album-row"><%/if>
+                       <%if loop.count|mod divisor==3><div class="album-row"><%/if>
                        <div id="album-<% album.id|html>" class="album">
                                <div class="album-id hidden"><% album.id|html></div>
                                <div class="album-container">
@@ -618,8 +624,10 @@
                        <%last><%= true|store key==endRow><%/last>
                        <%if endRow>
                                </div>
-                               <%include include/pagination.html pagination=albumPagination pageParameter=="page">
                        <%/if>
+                       <%last>
+                               <%include include/pagination.html pagination=albumPagination pageParameter=="page">
+                       <%/last>
                <%/foreach>
 
        <%/if>