X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2FimageBrowser.html;h=e9b3c061a9ae6e909921af33af779c9797b815cb;hb=2f6b4b0b17855b1d35f778a45456975b7fc5fdf0;hp=6faea1122685d6b1746a27b652b1bcc9f5f7703f;hpb=bf6507766c997f89bb2415e837fc11ba01829433;p=Sone.git

diff --git a/src/main/resources/templates/imageBrowser.html b/src/main/resources/templates/imageBrowser.html
index 6faea11..e9b3c06 100644
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -54,7 +54,7 @@
 				</script>
 			<%/if>
 
-			<h1><%= Page.ImageBrowser.Album.Title|l10n|replace needle='{album}' replacementKey=album.title|html></h1>
+			<h1 class="backlink"><%= Page.ImageBrowser.Album.Title|l10n|replace needle='{album}' replacementKey=album.title|html></h1>
 
 			<div class="backlinks">
 				<%foreach album.backlinks backlink backlinks>
@@ -67,32 +67,9 @@
 				<%/foreach>
 			</div>
 
-			<%foreach album.albums album>
-				<div class="album image">
-					<a href="imageBrowser.html?album=<% album.id|html>">
-						<%ifnull album.image>
-							<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.title|html>" title="<% album.title|html>" />
-						<%else><!-- TODO -->
-							<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.title|html>" title="<% album.title|html>" />
-						<%/if>
-					</a>
-				</div>
-			<%/foreach>
-
-			<%foreach album.images image>
-				<div class="image">
-					<a href="imageBrowser.html?image=<%image.id|html>"><% image|image-link max-width=200 max-height=150></a>
-				</div>
-			<%/foreach>
-
-			<div id="description">
-				<% album.description|html>
-			</div>
-
-			<%if album.sone.current>
-				<%include include/uploadImage.html>
-				<%include include/createAlbum.html>
+			<p id="description"><% album.description|html></p>
 
+			<%if album.sone.local>
 				<h2><%= Page.ImageBrowser.Album.Edit.Title|l10n|html></h2>
 
 				<form id="edit-album" action="editAlbum.html" method="post">
@@ -109,6 +86,46 @@
 					</div>
 					<button type="submit"><%= Page.ImageBrowser.Album.Button.Save|l10n|html></button>
 				</form>
+			<%/if>
+
+			<%foreach album.albums album>
+				<%first><h2><%= Page.ImageBrowser.Header.Albums|l10n|html></h2><%/first>
+				<%if loop.count|mod divisor=3><div class="image-row"><%/if>
+				<div class="album image">
+					<a href="imageBrowser.html?album=<% album.id|html>" title="<% album.title|html>">
+						<%ifnull album.albumImage>
+							<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.title|html>" title="<% album.title|html>" />
+						<%else><!-- TODO -->
+							<% album.albumImage|image-link max-width=200 max-height=150 title==album.title>
+						<%/if>
+						<br/>
+						<% album.title|html>
+					</a>
+				</div>
+				<%= 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>
+			<%/foreach>
+
+			<%if album.sone.local>
+				<%include include/createAlbum.html>
+			<%/if>
+
+			<%foreach album.images image>
+				<%first><h2><%= Page.ImageBrowser.Header.Images|l10n|html></h2><%/first>
+				<%if loop.count|mod divisor=3><div class="image-row"><%/if>
+				<div class="image">
+					<a href="imageBrowser.html?image=<%image.id|html>"><% image|image-link max-width=200 max-height=150></a>
+				</div>
+				<%= 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>
+			<%/foreach>
+
+			<%if album.sone.local>
+				<%include include/uploadImage.html>
 
 				<%if album.empty>
 					<form id="delete-album" action="deleteAlbum.html" method="get">
@@ -123,7 +140,7 @@
 
 	<%elseif imageRequested>
 
-		<h1><%image.title|html></h1>
+		<h1 class="backlink"><%image.title|html></h1>
 
 		<div class="backlinks">
 			<%foreach image.album.backlinks backlink backlinks>
@@ -191,8 +208,7 @@
 
 				<h2><%= Page.ImageBrowser.Image.Delete.Title|l10n|html></h2>
 
-				<form id="delete-image" action="deleteImage.html" method="post">
-					<input type="hidden" name="formPassword" value="<%formPassword|html>" />
+				<form id="delete-image" action="deleteImage.html" method="get">
 					<input type="hidden" name="image" value="<%image.id|html>" />
 					<button type="submit"><%= Page.ImageBrowser.Image.Button.Delete|l10n|html></button>
 				</form>
@@ -230,18 +246,25 @@
 			<h1><%= Page.ImageBrowser.Sone.Title|l10n|replace needle='{sone}' replacementKey=sone.niceName|html></h1>
 
 			<%foreach sone.albums album>
+				<%if loop.count|mod divisor=3><div class="image-row"><%/if>
 				<div class="album image">
-					<a href="imageBrowser.html?album=<% album.id|html>">
-						<%ifnull album.image>
+					<a href="imageBrowser.html?album=<% album.id|html>" title="<% album.title|html>">
+						<%ifnull album.albumImage>
 							<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.title|html>" title="<% album.title|html>" />
 						<%else><!-- TODO -->
-							<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.title|html>" title="<% album.title|html>" />
+							<% album.albumImage|image-link max-width=200 max-height=150 title==album.title>
 						<%/if>
+						<br/>
+						<% album.title|html>
 					</a>
 				</div>
+				<%= 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>
 			<%/foreach>
 
-			<%if sone.current>
+			<%if sone.local>
 				<%include include/createAlbum.html>
 			<%/if>