X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2FimageBrowser.html;h=80fe9c597b68af286b5b42a69b4114d243de1406;hb=b7ba75c22f38f11fd547c6427c2876697572e32e;hp=e1f4aea24a77f22750f7d8690a2b9de788d89b14;hpb=7664f68b0010c691a8097231113d17d5281d8a96;p=Sone.git

diff --git a/src/main/resources/templates/imageBrowser.html b/src/main/resources/templates/imageBrowser.html
index e1f4aea..80fe9c5 100644
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -14,6 +14,7 @@
 					registerInputTextareaSwap(this, text, "description", true, true);
 				});
 			});
+			$("#create-album label").hide();
 		});
 
 	</script>
@@ -26,13 +27,13 @@
 
 			<p><%= Page.ImageBrowser.Album.Error.NotFound.Text|l10n|html></p>
 
-		<%elseifnull album.name>
+		<%elseifnull album.title>
 
 			<p><%= Page.ImageBrowser.Album.Error.NotFound.Text|l10n|html></p>
 
 		<%else>
 
-			<h1><%= Page.ImageBrowser.Album.Title|l10n|replace needle='{album}' replacementKey=album.name|html></h1>
+			<h1><%= Page.ImageBrowser.Album.Title|l10n|replace needle='{album}' replacementKey=album.title|html></h1>
 
 			<div class="backlinks">
 				<%foreach album.backlinks backlink backlinks>
@@ -47,15 +48,19 @@
 
 			<%foreach album.albums album>
 				<div class="album">
-					<div class="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.name|html>" title="<% album.name|html>" />
-							<%else><!-- TODO -->
-								<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.name|html>" title="<% album.name|html>" />
-							<%/if>
-						</a>
-					</div>
+					<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>
 
@@ -64,6 +69,7 @@
 			</div>
 
 			<%if album.sone.current>
+				<%include include/uploadImage.html>
 				<%include include/createAlbum.html>
 			<%/if>
 
@@ -71,6 +77,18 @@
 
 	<%elseif imageRequested>
 
+		<%ifnull image>
+
+		<%else>
+
+			<div class="image">
+				<a href="imageBrowser.html?image=<%image.id|html>">
+					<% image|image-link max-width=200 max-height=150>
+				</a>
+			</div>
+
+		<%/if>
+
 	<%elseif soneRequested>
 
 		<%ifnull sone>
@@ -86,9 +104,9 @@
 					<div class="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.name|html>" title="<% album.name|html>" />
+								<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.name|html>" title="<% album.name|html>" />
+								<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.title|html>" title="<% album.title|html>" />
 							<%/if>
 						</a>
 					</div>