X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2FviewSone.html;h=d80818a54c4319c2695ed625633e2a7895c9c9ca;hp=1054e0177f4f7368997bd3ea1e925351c81c18bd;hb=0df5e91852f737d760c5a9f54c5667309fbadcc2;hpb=fdeefab8d3ac40efdea56e9320d2b218871c6027

diff --git a/src/main/resources/templates/viewSone.html b/src/main/resources/templates/viewSone.html
index 1054e01..d80818a 100644
--- a/src/main/resources/templates/viewSone.html
+++ b/src/main/resources/templates/viewSone.html
@@ -7,13 +7,17 @@
 
 		<h1><%= Page.ViewSone.Page.TitleWithoutSone|l10n|html></h1>
 
-		<p><%= Page.ViewSone.NoSone.Description|l10n|insert needle="{sone}" key=sone.id|html></p>
+		<p><%= Page.ViewSone.NoSone.Description|l10n|replace needle="{sone}" replacementKey=soneId|html></p>
 
 	<%elseifnull sone.name>
 
 		<h1><%= Page.ViewSone.Page.TitleWithoutSone|l10n|html></h1>
 
 		<p><%= Page.ViewSone.UnknownSone.Description|l10n|html></p>
+		<p>
+			<%= Page.ViewSone.UnknownSone.LinkToWebOfTrust|l10n|html>
+			<a href="/WebOfTrust/ShowIdentity?id=<% sone.id|html>"><%= Page.ViewSone.Profile.Name.WoTLink|l10n|html></a>
+		</p>
 
 	<%else>
 
@@ -25,42 +29,80 @@
 
 			<div class="profile-field">
 				<div class="name"><%= Page.ViewSone.Profile.Label.Name|l10n|html></div>
-				<div class="value"><% sone.niceName|html></div>
+				<div class="value"><% sone.niceName|html> (<a href="/WebOfTrust/ShowIdentity?id=<% sone.id|html>"><%= Page.ViewSone.Profile.Name.WoTLink|l10n|html></a>)</div>
 			</div>
 
+			<%foreach sone.albums album>
+				<%first>
+					<div class="profile-field">
+						<div class="name"><%= Page.ViewSone.Profile.Label.Albums|l10n|html></div>
+						<div class="value">
+				<%/first>
+					<a href="imageBrowser.html?album=<%album.id|html>"><%album.title|html></a><%notlast>, <%/notlast>
+				<%last>
+						</div>
+					</div>
+				<%/last>
+			<%/foreach>
+
 			<%foreach sone.profile.fields field>
 				<div class="profile-field">
-					<div class="name"><% field.key|html></div>
-					<div class="value"><% field.value|html></div>
+					<div class="name"><% field.name|html></div>
+					<div class="value"><% field.value|parse></div>
 				</div>
 			<%/foreach>
 
-		<%if ! sone.current>
-			<p><%= Page.ViewSone.WriteAMessage|l10n|html></p>
-
-			<form action="createPost.html" id="post-message" method="post">
-				<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-				<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-				<input type="hidden" name="recipient" value="<% sone.id|html>" />
-				<input type="text" name="text" value="" />
-				<button type="submit"><%= Page.CreatePost.Button.Post|l10n|html></button>
-			</form>
+		<%ifnull ! currentSone>
+			<%if ! sone.current>
+				<p><%= Page.ViewSone.WriteAMessage|l10n|html></p>
+
+				<form action="createPost.html" id="post-message" method="post">
+					<input type="hidden" name="formPassword" value="<% formPassword|html>" />
+					<input type="hidden" name="returnPage" value="<% request.uri|html>" />
+					<input type="hidden" name="recipient" value="<% sone.id|html>" />
+					<label for="sender"><%= Page.Index.Label.Sender|l10n|html></label>
+					<div class="sender">
+						<select name="sender" title="<%= View.UpdateStatus.Text.ChooseSenderIdentity|l10n|html>">
+							<%foreach localSones localSone>
+								<option value="<% localSone.id|html>"<%if localSone.current> selected="selected"<%/if>><% localSone.niceName|html></option>
+							<%/foreach>
+						</select>
+					</div>
+					<div class="select-sender"><button type="button" title="<%= View.UpdateStatus.Text.ChooseSenderIdentity|l10n|html>">+</button></div><label for="text"><%= Page.Index.Label.Text|l10n|html></label>
+					<input type="text" name="text" value="" />
+					<button type="submit"><%= Page.CreatePost.Button.Post|l10n|html></button>
+				</form>
+			<%/if>
 		<%/if>
 
-		<h1><%= Page.ViewSone.PostList.Title|l10n|insert needle="{sone}" key=sone.niceName|html></h1>
-
-		<div id="posts">
-			<%getpage parameter=postPage>
-			<%paginate list=sone.posts pagesize=25>
-			<%= postPage|store key=pageParameter>
-			<%include include/pagination.html>
-			<%foreach pagination.items post>
-				<%include include/viewPost.html>
-			<%foreachelse>
-				<div><%= Page.ViewSone.PostList.Text.NoPostYet|l10n|html></div>
-			<%/foreach>
-			<%include include/pagination.html>
-		</div>
+		<h1><%= Page.ViewSone.PostList.Title|l10n|replace needle="{sone}" replacementKey=sone.niceName|html></h1>
+
+		<%foreach posts post>
+			<%first>
+				<div id="posts">
+					<%include include/pagination.html pagination=postPagination pageParameter==postPage paginationName==post-navigation>
+			<%/first>
+			<%include include/viewPost.html>
+			<%last>
+					<%include include/pagination.html pagination=postPagination pageParameter==postPage>
+				</div>
+			<%/last>
+		<%foreachelse>
+			<div><%= Page.ViewSone.PostList.Text.NoPostYet|l10n|html></div>
+		<%/foreach>
+
+		<%foreach repliedPosts post>
+			<%first>
+				<h2><%= Page.ViewSone.Replies.Title|l10n|html|replace needle="{sone}" replacementKey=sone.niceName></h2>
+				<div id="replied-posts">
+					<%include include/pagination.html pagination=repliedPostPagination pageParameter==repliedPostPage paginationName==reply-navigation>
+			<%/first>
+			<%include include/viewPost.html>
+			<%last>
+					<%include include/pagination.html pagination=repliedPostPagination pageParameter==repliedPostPage>
+				</div>
+			<%/last>
+		<%/foreach>
 
 	<%/if>