Reduce whitespace pollution.

[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 bc1cb72..80fe9c5 100644 (file)
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -27,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>
@@ -50,9 +50,9 @@
                                <div class="album">
                                        <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>
@@ -60,13 +60,7 @@
 
                        <%foreach album.images image>
                                <div class="image">
-                                       <a href="imageBrowser.html?image=<%image.id|html>">
-                                               <%ifnull image.key>
-                                                       <img src="images/unknown-image-0.png" width="200" height="150" alt="<% image.title|html>" title="<% image.title|html>" />
-                                               <%else>
-                                                       <img src="images/unknown-image-0.png" width="200" height="150" alt="<% image.title|html>" title="<% image.title|html>" />
-                                               <%/if>
-                                       </a>
+                                       <a href="imageBrowser.html?image=<%image.id|html>"><% image|image-link max-width=200 max-height=150></a>
                                </div>
                        <%/foreach>
 
@@ -83,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>
@@ -98,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>