X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2FimageBrowser.html;h=da8d032301cbb3a9af1aee079e1ac68e7113605b;hp=7e62490ecc0e492d1e66616bc635a0301d900f5e;hb=c2e868714435ac7c75d77d1911d0dfb00393d051;hpb=e8bcd8344a08accda3a58e4eb52cc490f050d3c4

diff --git a/src/main/resources/templates/imageBrowser.html b/src/main/resources/templates/imageBrowser.html
index 7e62490..da8d032 100644
--- 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,7 +418,10 @@
 				<%= 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>
+				<%/if>
+                <%last><%include include/pagination.html pageParameter=="page"><%/last>
 			<%/foreach>
 
 			<%if album.sone.local>
@@ -576,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>
@@ -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>