From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 25 Jul 2015 14:57:31 +0000 (+0200)
Subject: Only show the album image
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=8ac7345a26e0bae678744987a6ac47b18ad69732;p=Sone.git

Only show the album image
---

diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties
index f8f3211..12927a5 100644
--- a/src/main/resources/i18n/sone.en.properties
+++ b/src/main/resources/i18n/sone.en.properties
@@ -370,7 +370,7 @@ View.Post.ShowSource=Toggle Parser
 View.Post.NotDownloaded=This post has not yet been downloaded, or it has been deleted.
 View.Post.ShowMore=show more
 View.Post.ShowLess=show less
-View.Post.LinkedAlbum.SizeAndAuthor={1,number} by {0}
+View.Post.LinkedAlbum.SizeAndAuthor={1,number} {1,choice,0#images|1#image|1<images} by [link]{0}[/link]
 
 View.UpdateStatus.Text.ChooseSenderIdentity=Choose the sender identity
 
diff --git a/src/main/resources/static/css/sone.css b/src/main/resources/static/css/sone.css
index b7ae3b7..8b588b8 100644
--- a/src/main/resources/static/css/sone.css
+++ b/src/main/resources/static/css/sone.css
@@ -355,6 +355,7 @@ textarea {
 
 #sone .post .linked-album {
 	display: table;
+	margin-top: 1ex;
 	border-collapse: collapse;
 }
 
@@ -392,8 +393,12 @@ textarea {
 }
 
 #sone .post .linked-image .about-image .title {
+	font-size: 110%;
 	font-weight: bold;
-	margin-bottom: 0.5ex;
+}
+
+#sone .post .linked-image .about-image .description {
+	margin-top: 0.5ex;
 }
 
 #sone .post .status-line {
diff --git a/src/main/resources/templates/include/viewPost.html b/src/main/resources/templates/include/viewPost.html
index 1b8d1ad..d150d4f 100644
--- a/src/main/resources/templates/include/viewPost.html
+++ b/src/main/resources/templates/include/viewPost.html
@@ -37,25 +37,20 @@
 			<%if !shortText|match value=parsedText><%if !raw><a class="shrink-post-text hidden"><%= View.Post.ShowLess|l10n|html></a><%/if><%/if>
 		</div>
 		<%foreach parts part>
-			<%if part.class.simpleName|match value==AlbumPart>
+			<%if part.class.simpleName|match value==AlbumPart><!-- ← this is so ugly. -->
 				<div class="linked-album">
-					<div class="album-header">
-						<div class="album-title"><% part.album.title|html></div>
-						<div class="album-author"><%= View.Post.LinkedAlbum.SizeAndAuthor|l10n 0=part.album.sone.niceName 1=part.album.images.size|html></div>
-					</div>
-					<%foreach part.album.images image>
-						<div class="linked-image">
-							<div class="image-left">
-								<div class="image">
-									<a href="imageBrowser.html?image=<%image.id|html>"><% image|image-link max-width==160 max-height==90 mode==enlarge title=image.title></a>
-								</div>
-							</div>
-							<div class="about-image">
-								<div class="title"><% image.title|html></div>
-								<div class="description"><% image.description|parse sone=post.sone|render></div>
+					<div class="linked-image">
+						<div class="image-left">
+							<div class="image">
+								<a href="imageBrowser.html?album=<% part.album.id|html>"><% part.album.albumImage|image-link max-width==160 max-height==90 mode==enlarge title=part.album.title></a>
 							</div>
 						</div>
-					<%/foreach>
+						<div class="about-image">
+							<div class="title"><% part.album.title|html></div>
+							<div><% =View.Post.LinkedAlbum.SizeAndAuthor|l10n 0=part.album.sone.niceName 1=part.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=part.album.sone.id></div>
+							<div class="description"><% part.album.description|parse sone=part.album.sone|render></div>
+						</div>
+					</div>
 				</div>
 			<%/if>
 		<%/foreach>