projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Guava’s predicate instead of utils’ filter.
[Sone.git]
/
src
/
main
/
resources
/
templates
/
viewSone.html
diff --git
a/src/main/resources/templates/viewSone.html
b/src/main/resources/templates/viewSone.html
index
87cf400
..
4b88474
100644
(file)
--- a/
src/main/resources/templates/viewSone.html
+++ b/
src/main/resources/templates/viewSone.html
@@
-7,13
+7,20
@@
<h1><%= Page.ViewSone.Page.TitleWithoutSone|l10n|html></h1>
<h1><%= Page.ViewSone.Page.TitleWithoutSone|l10n|html></h1>
- <p><%= Page.ViewSone.NoSone.Description|l10n|replace needle="{sone}" replacementKey=sone.id|html></p>
+ <p>
+ <%= Page.ViewSone.NoSone.Description|l10n|replace needle=="{sone}" replacement=soneId|html>
+ <a href="/WebOfTrust/ShowIdentity?id=<% soneId|html>"><%= Page.ViewSone.Profile.Name.WoTLink|l10n|html></a>
+ </p>
<%elseifnull sone.name>
<h1><%= Page.ViewSone.Page.TitleWithoutSone|l10n|html></h1>
<p><%= Page.ViewSone.UnknownSone.Description|l10n|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>
<%else>
@@
-25,7
+32,7
@@
<div class="profile-field">
<div class="name"><%= Page.ViewSone.Profile.Label.Name|l10n|html></div>
<div class="profile-field">
<div class="name"><%= Page.ViewSone.Profile.Label.Name|l10n|html></div>
- <div class="value"><
a href="/WebOfTrust/ShowIdentity?id=<% sone.id|html>"><% sone.niceName|html></a>
</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>
</div>
<%foreach sone.albums album>
@@
-33,6
+40,7
@@
<div class="profile-field">
<div class="name"><%= Page.ViewSone.Profile.Label.Albums|l10n|html></div>
<div class="value">
<div class="profile-field">
<div class="name"><%= Page.ViewSone.Profile.Label.Albums|l10n|html></div>
<div class="value">
+ <a href="imageBrowser.html?sone=<% sone.id|html>"><% =Page.ViewSone.Profile.Albums.Text.All|l10n|html></a>,
<%/first>
<a href="imageBrowser.html?album=<%album.id|html>"><%album.title|html></a><%notlast>, <%/notlast>
<%last>
<%/first>
<a href="imageBrowser.html?album=<%album.id|html>"><%album.title|html></a><%notlast>, <%/notlast>
<%last>
@@
-44,7
+52,7
@@
<%foreach sone.profile.fields field>
<div class="profile-field">
<div class="name"><% field.name|html></div>
<%foreach sone.profile.fields field>
<div class="profile-field">
<div class="name"><% field.name|html></div>
- <div class="value"><% field.value|parse></div>
+ <div class="value"><% field.value|parse
sone=sone
></div>
</div>
<%/foreach>
</div>
<%/foreach>
@@
-71,12
+79,12
@@
<%/if>
<%/if>
<%/if>
<%/if>
- <h1><%= Page.ViewSone.PostList.Title|l10n|replace needle=
"{sone}" replacementKey
=sone.niceName|html></h1>
+ <h1><%= Page.ViewSone.PostList.Title|l10n|replace needle=
="{sone}" replacement
=sone.niceName|html></h1>
<%foreach posts post>
<%first>
<div id="posts">
<%foreach posts post>
<%first>
<div id="posts">
- <%include include/pagination.html pagination=postPagination pageParameter==postPage>
+ <%include include/pagination.html pagination=postPagination pageParameter==postPage
paginationName==post-navigation
>
<%/first>
<%include include/viewPost.html>
<%last>
<%/first>
<%include include/viewPost.html>
<%last>
@@
-89,9
+97,9
@@
<%foreach repliedPosts post>
<%first>
<%foreach repliedPosts post>
<%first>
- <h2><%= Page.ViewSone.Replies.Title|l10n|html></h2>
+ <h2><%= Page.ViewSone.Replies.Title|l10n|html
|replace needle=="{sone}" replacement=sone.niceName
></h2>
<div id="replied-posts">
<div id="replied-posts">
- <%include include/pagination.html pagination=repliedPostPagination pageParameter==repliedPostPage>
+ <%include include/pagination.html pagination=repliedPostPagination pageParameter==repliedPostPage
paginationName==reply-navigation
>
<%/first>
<%include include/viewPost.html>
<%last>
<%/first>
<%include include/viewPost.html>
<%last>