X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fresources%2Ftemplates%2Finclude%2FviewAlbum.html;h=bf9ea78e3b958e2a49655e2114283547ed1786e8;hb=0d68d165ed66e86fd57f09c8cfb744ccd64ed36a;hp=08219093106aa5d13c4e862c255e20323685a94e;hpb=4976669a17eb72bb7451edcf367c0956a40a8c2f;p=Sone.git

diff --git a/src/main/resources/templates/include/viewAlbum.html b/src/main/resources/templates/include/viewAlbum.html
index 0821909..bf9ea78 100644
--- a/src/main/resources/templates/include/viewAlbum.html
+++ b/src/main/resources/templates/include/viewAlbum.html
@@ -1,45 +1,28 @@
-<div id="album-<% album.id|html>" class="album">
-	<div class="album-id hidden"><% album.id|html></div>
-	<div class="album-container">
-		<a href="imageBrowser.html?album=<% album.id|html>" title="<% album.title|html>">
-			<%ifnull album.albumImage>
-			<img src="images/unknown-image-0.png" width="333" height="250" alt="<% album.title|html>" title="<% album.title|html>" style="position: relative; top: 0px; left: -41px;" />
-			<%else><!-- TODO -->
-			<div class="image-container">
-				<% album.albumImage|image-link class==album-image max-width==250 max-height==250 mode==enlarge title=album.title>
-			</div>
-			<div class="link-to-album"><a href="album://<% album.id|html>">[link album]</a></div>
+<div class="image-with-information">
+	<div class="image">
+		<a href="imageBrowser.html?album=<% album.id|html>">
+			<%ifnull album.images.random>
+				<img src="images/broken-album.png" width="160" height="120" title="<% album.title|html>" style="opacity: 0.25;"/>
+			<%else>
+				<% album.images.random|image-link max-width==160 max-height==120 mode==enlarge title=album.title>
 			<%/if>
 		</a>
 	</div>
-	<div class="show-data">
-		<div class="album-title"><% album.title|html> (<%= View.Sone.Stats.Images|l10n 0=album.images.size>)</div>
-		<div class="album-description"><% album.description|parse sone=album.sone|render></div>
+	<div class="information">
+		<div class="link"><a href="album://<% album.id|html>">[<%= View.Album.Permalink|l10n|html>]</a></div>
+		<div class="title"><a href="imageBrowser.html?album=<% album.id|html>"><% album.title|html></a></div>
+		<div class="author"><% =View.Album.SizeAndAuthor|l10n 0=album.sone.niceName 1=album.images.size|html|replace needle=="[link]" replacement=='<a href="viewSone.html?sone=<sone-id>">'|replace needle=='[/link]' replacement=='</a>'|replace needle=='<sone-id>' replacement=album.sone.id></div>
+		<%if album.sone.local>
+			<form class="edit-album" action="editAlbum.html" method="post">
+				<input type="hidden" name="formPassword" value="<%formPassword|html>" />
+				<input type="hidden" name="returnPage" value="<%request.uri|html>" />
+				<input type="hidden" name="album" value="<%album.id|html>" />
+				<div class="move-buttons">
+					<button <%if loop.first>class="hidden" <%/if>type="submit" name="moveLeft" value="true"><%= Page.ImageBrowser.Image.Button.MoveLeft|l10n|html></button>
+					<button <%if loop.last>class="hidden" <%/if>type="submit" name="moveRight" value="true"><%= Page.ImageBrowser.Image.Button.MoveRight|l10n|html></button>
+				</div>
+			</form>
+		<%/if>
+		<div class="description"><% album.description|parse sone=album.sone|render></div>
 	</div>
-	<%if album.sone.local>
-	<form class="edit-album" action="editAlbum.html" method="post">
-		<input type="hidden" name="formPassword" value="<%formPassword|html>" />
-		<input type="hidden" name="returnPage" value="<%request.uri|html>" />
-		<input type="hidden" name="album" value="<%album.id|html>" />
-
-		<div class="move-buttons">
-			<button <%if loop.first>class="hidden" <%/if>type="submit" name="moveLeft" value="true"><%= Page.ImageBrowser.Image.Button.MoveLeft|l10n|html></button>
-			<button <%if loop.last>class="hidden" <%/if>type="submit" name="moveRight" value="true"><%= Page.ImageBrowser.Image.Button.MoveRight|l10n|html></button>
-		</div>
-
-		<div class="edit-data hidden">
-			<div>
-				<input type="text" name="title" value="<%album.title|html>" />
-			</div>
-			<div>
-				<textarea name="description"><%album.description|html></textarea>
-			</div>
-			<div>
-				<button <%if loop.first>class="hidden" <%/if>type="submit" name="moveLeft" value="true"><%= Page.ImageBrowser.Image.Button.MoveLeft|l10n|html></button>
-				<button type="submit" name="submit"><%= Page.ImageBrowser.Album.Button.Save|l10n|html></button>
-				<button <%if loop.last>class="hidden" <%/if>type="submit" name="moveRight" value="true"><%= Page.ImageBrowser.Image.Button.MoveRight|l10n|html></button>
-			</div>
-		</div>
-	</form>
-	<%/if>
 </div>