🔥 Remove links to trust functions

diff --git a/src/main/resources/i18n/sone.de.properties b/src/main/resources/i18n/sone.de.properties
index a3a95d6..dcc6354 100644 (file)
--- a/src/main/resources/i18n/sone.de.properties
+++ b/src/main/resources/i18n/sone.de.properties
@@ -364,9 +364,10 @@ View.Sone.Status.Downloading=Diese Sone wird gerade herunter geladen.
 View.Sone.Status.Inserting=Diese Sone wird gerade hoch geladen.
 
 View.SoneMenu.Link.AllAlbums=alle Alben
+View.SoneMenu.WebOfTrustLink=„Web of Trust“ Profil
 
 View.Post.UnknownAuthor=(unbekannt)
-View.Post.WebOfTrustLink=„Web of Trust“ Profil
+View.Post.WebOfTrustLink=WoT-Profil
 View.Post.Permalink=Nachrichtenlink
 View.Post.PermalinkAuthor=Autorenlink
 View.Post.Bookmarks.PostIsBookmarked=Nachricht ist ein Favorit, klicken, um Favoritenmarkierung zu entfernen

diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties
index a23730c..896b34f 100644 (file)
--- a/src/main/resources/i18n/sone.en.properties
+++ b/src/main/resources/i18n/sone.en.properties
@@ -366,9 +366,10 @@ View.Sone.Status.Downloading=This Sone is currently being downloaded.
 View.Sone.Status.Inserting=This Sone is currently being inserted.
 
 View.SoneMenu.Link.AllAlbums=all albums
+View.SoneMenu.WebOfTrustLink=web of trust profile
 
 View.Post.UnknownAuthor=(unknown)
-View.Post.WebOfTrustLink=web of trust profile
+View.Post.WebOfTrustLink=WoT Profile
 View.Post.Permalink=link post
 View.Post.PermalinkAuthor=link author
 View.Post.Bookmarks.PostIsBookmarked=Post is bookmarked, click to remove from bookmarks

diff --git a/src/main/resources/i18n/sone.es.properties b/src/main/resources/i18n/sone.es.properties
index 8a6e200..d880e16 100644 (file)
--- a/src/main/resources/i18n/sone.es.properties
+++ b/src/main/resources/i18n/sone.es.properties
@@ -364,6 +364,7 @@ View.Sone.Status.Downloading=Este Sone está siendo descargado.
 View.Sone.Status.Inserting=Este Sone está siendo insertado.
 
 View.SoneMenu.Link.AllAlbums=todos los albumes
+View.SoneMenu.WebOfTrustLink=perfil de web of trust
 
 View.Post.UnknownAuthor=(desconocido)
 View.Post.WebOfTrustLink=perfil de web of trust
@@ -477,4 +478,4 @@ Notification.Mention.Text=Has sido mencionado en las siguientes publicaciones:
 Notification.SoneIsInserting.Text=Tu Sone sone://{0} está siendo insertado.
 Notification.SoneIsInserted.Text=Tu Sone sone://{0} ha sido insertado en {1,number} {1,choice,0#segundos|1#segundo|1<segundos}.
 Notification.SoneInsertAborted.Text=Tu Sone sone://{0} no pudo ser insertado.
-# 55-61, 334–338
+# 55-61, 334–338, 370

diff --git a/src/main/resources/i18n/sone.fr.properties b/src/main/resources/i18n/sone.fr.properties
index 69ad716..809970f 100644 (file)
--- a/src/main/resources/i18n/sone.fr.properties
+++ b/src/main/resources/i18n/sone.fr.properties
@@ -364,6 +364,7 @@ View.Sone.Status.Downloading=Ce Sone est en train d'être téléchargé.
 View.Sone.Status.Inserting=Ce Sone est en train d'être inséré.
 
 View.SoneMenu.Link.AllAlbums=Tous les Albums
+View.SoneMenu.WebOfTrustLink=Profile web of trust
 
 View.Post.UnknownAuthor=(inconnu)
 View.Post.WebOfTrustLink=Profile web of trust
@@ -477,4 +478,4 @@ Notification.Mention.Text=Vous avez été mentionné dans les messages suivants:
 Notification.SoneIsInserting.Text=Votre Sone sone://{0} va maintenant être inséré.
 Notification.SoneIsInserted.Text=votre Sone sone://{0} a été inséré dans {1,number} {1,choice,0#seconds|1#second|1<seconds}.
 Notification.SoneInsertAborted.Text=Votre Sone sone://{0} ne peut pas être inséré.
-# 55-61, 334–338
+# 55-61, 334–338, 370

diff --git a/src/main/resources/i18n/sone.ja.properties b/src/main/resources/i18n/sone.ja.properties
index 166270b..41f43cd 100644 (file)
--- a/src/main/resources/i18n/sone.ja.properties
+++ b/src/main/resources/i18n/sone.ja.properties
@@ -364,6 +364,7 @@ View.Sone.Status.Downloading=このSoneは現在ダウンロード中です。
 View.Sone.Status.Inserting=このSoneは現在インサート中です。
 
 View.SoneMenu.Link.AllAlbums=全てのアルバム
+View.SoneMenu.WebOfTrustLink=Web of Trustプロフィール
 
 View.Post.UnknownAuthor=（不明）
 View.Post.WebOfTrustLink=Web of Trustプロフィール
@@ -477,4 +478,4 @@ Notification.Mention.Text=次の投稿でメンションされています:
 Notification.SoneIsInserting.Text=あなたのSone sone://{0}は現在インサート中です。
 Notification.SoneIsInserted.Text=あなたのSone sone://{0}は{1,number}{1,choice,0#秒|1#秒|1<秒}でインサートされました。
 Notification.SoneInsertAborted.Text=あなたのSone sone://{0}のインサートに失敗しました。
-# 55-51, 67, 107, 334–338, 471
+# 55-51, 67, 107, 334–338, 370, 472

diff --git a/src/main/resources/i18n/sone.no.properties b/src/main/resources/i18n/sone.no.properties
index d62d51c..69cf43f 100644 (file)
--- a/src/main/resources/i18n/sone.no.properties
+++ b/src/main/resources/i18n/sone.no.properties
@@ -364,6 +364,7 @@ View.Sone.Status.Downloading=Denne Sonen blir for øyeblikket lastet ned.
 View.Sone.Status.Inserting=Denne Sonen blir for øyeblikket innsatt.
 
 View.SoneMenu.Link.AllAlbums=alle album
+View.SoneMenu.WebOfTrustLink='web of trust'-profil
 
 View.Post.UnknownAuthor=(ukjent)
 View.Post.WebOfTrustLink='web of trust'-profil
@@ -477,4 +478,4 @@ Notification.Mention.Text=Du har blitt nevnt i følgende innlegg:
 Notification.SoneIsInserting.Text=Your Sone sone://{0} is now being inserted.
 Notification.SoneIsInserted.Text=Your Sone sone://{0} has been inserted in {1,number} {1,choice,0#seconds|1#second|1<seconds}.
 Notification.SoneInsertAborted.Text=Your Sone sone://{0} could not be inserted.
-# 55-61, 67, 107, 127-128, 315-317, 319-321, 334–338, 471, 477-479
+# 55-61, 67, 107, 127-128, 315-317, 319-321, 334–338, 370, 472, 478-480

diff --git a/src/main/resources/i18n/sone.pl.properties b/src/main/resources/i18n/sone.pl.properties
index 753932b..46fe4db 100644 (file)
--- a/src/main/resources/i18n/sone.pl.properties
+++ b/src/main/resources/i18n/sone.pl.properties
@@ -364,6 +364,7 @@ View.Sone.Status.Downloading=Ten Sone jest właśnie ściągany.
 View.Sone.Status.Inserting=Ten Sone jest właśnie ładowany.
 
 View.SoneMenu.Link.AllAlbums=wszystkie albumy
+View.SoneMenu.WebOfTrustLink=Profil sieci zaufania
 
 View.Post.UnknownAuthor=(nieznany)
 View.Post.WebOfTrustLink=Profil sieci zaufania
@@ -477,4 +478,4 @@ Notification.Mention.Text=Zostałeś oznaczony w następujących postach:
 Notification.SoneIsInserting.Text=Twoje Sone sone://{0} jest w tej chili wysyłane.
 Notification.SoneIsInserted.Text=Twoje sone://{0} zostało wysłane w {1,number} {1,choice,0#seconds|1#second|1<seconds}.
 Notification.SoneInsertAborted.Text=Twoje Sone sone://{0} nie mogło zostać wysłane.
-# 55-61, 334–338, 471
+# 55-61, 334–338, 370, 472

diff --git a/src/main/resources/i18n/sone.ru.properties b/src/main/resources/i18n/sone.ru.properties
index 5d1a108..dee0815 100644 (file)
--- a/src/main/resources/i18n/sone.ru.properties
+++ b/src/main/resources/i18n/sone.ru.properties
@@ -364,6 +364,7 @@ View.Sone.Status.Downloading=Этот Sone сейчас загружается.
 View.Sone.Status.Inserting=Этот Sone сейчас выгружается.
 
 View.SoneMenu.Link.AllAlbums=все альбомы
+View.SoneMenu.WebOfTrustLink=профиль web of trust
 
 View.Post.UnknownAuthor=(неизвестно)
 View.Post.WebOfTrustLink=профиль web of trust
@@ -477,4 +478,4 @@ Notification.Mention.Text=Вас упомянули в следующих соо
 Notification.SoneIsInserting.Text=Your Sone sone://{0} is now being inserted.
 Notification.SoneIsInserted.Text=Your Sone sone://{0} has been inserted in {1,number} {1,choice,0#seconds|1#second|1<seconds}.
 Notification.SoneInsertAborted.Text=Your Sone sone://{0} could not be inserted.
-# 55-61, 67, 107, 127-128, 315-317, 319-321, 334–338, 471, 477-479
+# 55-61, 67, 107, 127-128, 315-317, 319-321, 334–338, 370, 472, 478-480

diff --git a/src/main/resources/static/css/sone.css b/src/main/resources/static/css/sone.css
index 4151e00..26d74e4 100644 (file)
--- a/src/main/resources/static/css/sone.css
+++ b/src/main/resources/static/css/sone.css
@@ -391,7 +391,7 @@ textarea {
        color: #666;
 }
 
-#sone .post .delete, #sone .post .likes, #sone .post .like, #sone .post .unlike, #sone .post .trust, #sone .post .distrust, #sone .post .untrust {
+#sone .post .delete, #sone .post .likes, #sone .post .like, #sone .post .unlike, #sone .post .wot-link {
        display: inline;
        font: inherit;
        margin: 0px;
@@ -401,11 +401,11 @@ textarea {
        display: none;
 }
 
-#sone .post .like.hidden, #sone .post .unlike.hidden, #sone .post .trust.hidden, #sone .post .distrust.hidden, #sone .post .untrust.hidden, #sone .post .bookmark.hidden, #sone .post .unbookmark.hidden {
+#sone .post .like.hidden, #sone .post .unlike.hidden, #sone .post .bookmark.hidden, #sone .post .unbookmark.hidden {
        display: none;
 }
 
-#sone .post .delete button, #sone .post .like button, #sone .post .unlike button, #sone .post .trust button, #sone .post .distrust button, #sone .post .untrust button, #sone .post .bookmark button, #sone .post .unbookmark button {
+#sone .post .delete button, #sone .post .like button, #sone .post .unlike button, #sone .post .bookmark button, #sone .post .unbookmark button {
        border: 0px;
        background: none;
        padding: 0px;
@@ -419,11 +419,7 @@ textarea {
        font-weight: bold;
 }
 
-#sone .post .untrust button {
-       color: rgb(255, 0, 0);
-}
-
-#sone .post .delete button:hover, #sone .post .like button:hover, #sone .post .unlike button:hover, #sone .post .trust button:hover, #sone .post .distrust button:hover, #sone .post .untrust button:hover, #sone .post .bookmark button:hover, #sone .post .unbookmark button:hover {
+#sone .post .delete button:hover, #sone .post .like button:hover, #sone .post .unlike button:hover, #sone .post .bookmark button:hover, #sone .post .unbookmark button:hover {
        border: 0px;
        background: none;
        padding: 0px;

diff --git a/src/main/resources/templates/include/soneMenu.html b/src/main/resources/templates/include/soneMenu.html
index fa6dd02..a2b2532 100644 (file)
--- a/src/main/resources/templates/include/soneMenu.html
+++ b/src/main/resources/templates/include/soneMenu.html
@@ -12,7 +12,7 @@
                        <a class="author" href="viewSone.html?sone=<%sone.id|html>"><%sone.niceName|html></a>
                        (<%= View.Sone.Stats.Posts|l10n 0=sone.posts.size>, <%= View.Sone.Stats.Replies|l10n 0=sone.replies.size><%if ! sone.allImages.size|match value==0>, <%= View.Sone.Stats.Images|l10n 0=sone.allImages.size><%/if><%if core.debug>, <% sone.client|html><%/if>)
                </div>
-               <div><a href="/WebOfTrust/ShowIdentity?id=<%sone.id|html>">» <% =View.Post.WebOfTrustLink|l10n|html></a></div>
+               <div><a href="/WebOfTrust/ShowIdentity?id=<%sone.id|html>">» <% =View.SoneMenu.WebOfTrustLink|l10n|html></a></div>
                <%foreach sone.albums album>
                        <%first>
                                <div><a href="imageBrowser.html?sone=<% sone.id|html>">» <% =View.SoneMenu.Link.AllAlbums|l10n|html></a></div>

diff --git a/src/main/resources/templates/include/viewPost.html b/src/main/resources/templates/include/viewPost.html
index 7cdb924..be11195 100644 (file)
--- a/src/main/resources/templates/include/viewPost.html
+++ b/src/main/resources/templates/include/viewPost.html
@@ -93,30 +93,9 @@
                                        <input type="hidden" name="post" value="<% post.id|html>" />
                                        <button type="submit" value="1"><%= View.Post.UnlikeLink|l10n|html></button>
                                </form>
-                               <%if !post.sone.current>
-                                       <%ifnull !post.sone.trust>
-                                               <span class='separator'>·</span>
-                                               <form class="trust post-trust<%if post.sone.trust.assigned> hidden<%/if>" action="trust.html" method="post">
-                                                       <input type="hidden" name="formPassword" value="<% formPassword|html>" />
-                                                       <input type="hidden" name="returnPage" value="<% request.uri|html>" />
-                                                       <input type="hidden" name="sone" value="<% post.sone.id|html>" />
-                                                       <button type="submit" title="<%= View.Trust.Tooltip.Trust|l10n|html>">👍</button>
-                                               </form>
-                                               <form class="distrust post-distrust<%if post.sone.trust.assigned> hidden<%/if>" action="distrust.html" method="post">
-                                                       <input type="hidden" name="formPassword" value="<% formPassword|html>" />
-                                                       <input type="hidden" name="returnPage" value="<% request.uri|html>" />
-                                                       <input type="hidden" name="sone" value="<% post.sone.id|html>" />
-                                                       <button type="submit" title="<%= View.Trust.Tooltip.Distrust|l10n|html>">👎</button>
-                                               </form>
-                                               <form class="untrust post-untrust<%if !post.sone.trust.assigned> hidden<%/if>" action="untrust.html" method="post">
-                                                       <input type="hidden" name="formPassword" value="<% formPassword|html>" />
-                                                       <input type="hidden" name="returnPage" value="<% request.uri|html>" />
-                                                       <input type="hidden" name="sone" value="<% post.sone.id|html>" />
-                                                       <button type="submit" title="<%= View.Trust.Tooltip.Untrust|l10n|html>">✗</button>
-                                               </form>
-                                       <%/if>
-                               <%/if>
                        <%/if>
+                       <span class='separator'>·</span>
+                       <a class="wot-link" href="/WebOfTrust/ShowIdentity?id=<% post.sone.id|html>"><%= View.Post.WebOfTrustLink|l10n|html></a>
                        <%if post.sone.local>
                                <span class='separator'>·</span>
                                <form class="delete delete-post" action="deletePost.html" method="post">

diff --git a/src/main/resources/templates/include/viewReply.html b/src/main/resources/templates/include/viewReply.html
index 99c02e6..7462b2b 100644 (file)
--- a/src/main/resources/templates/include/viewReply.html
+++ b/src/main/resources/templates/include/viewReply.html
@@ -64,30 +64,9 @@
                                        <input type="hidden" name="reply" value="<% reply.id|html>" />
                                        <button type="submit" value="1"><%= View.Post.UnlikeLink|l10n|html></button>
                                </form>
-                               <%if !reply.sone.current>
-                                       <%ifnull !reply.sone.trust>
-                                               <span class='separator'>·</span>
-                                               <form class="trust reply-trust<%if reply.sone.trust.assigned> hidden<%/if>" action="trust.html" method="post">
-                                                       <input type="hidden" name="formPassword" value="<% formPassword|html>" />
-                                                       <input type="hidden" name="returnPage" value="<% request.uri|html>" />
-                                                       <input type="hidden" name="sone" value="<% reply.sone.id|html>" />
-                                                       <button type="submit" title="<%= View.Trust.Tooltip.Trust|l10n|html>">👍</button>
-                                               </form>
-                                               <form class="distrust reply-distrust<%if reply.sone.trust.assigned> hidden<%/if>" action="distrust.html" method="post">
-                                                       <input type="hidden" name="formPassword" value="<% formPassword|html>" />
-                                                       <input type="hidden" name="returnPage" value="<% request.uri|html>" />
-                                                       <input type="hidden" name="sone" value="<% reply.sone.id|html>" />
-                                                       <button type="submit" title="<%= View.Trust.Tooltip.Distrust|l10n|html>">👎</button>
-                                               </form>
-                                               <form class="untrust reply-untrust<%if !reply.sone.trust.assigned> hidden<%/if>" action="untrust.html" method="post">
-                                                       <input type="hidden" name="formPassword" value="<% formPassword|html>" />
-                                                       <input type="hidden" name="returnPage" value="<% request.uri|html>" />
-                                                       <input type="hidden" name="sone" value="<% reply.sone.id|html>" />
-                                                       <button type="submit" title="<%= View.Trust.Tooltip.Untrust|l10n|html>">✗</button>
-                                               </form>
-                                       <%/if>
-                               <%/if>
                        <%/if>
+                       <span class='separator'>·</span>
+                       <a class="wot-link" href="/WebOfTrust/ShowIdentity?id=<% reply.sone.id|html>"><%= View.Post.WebOfTrustLink|l10n|html></a>
                        <%if reply.sone.local>
                                <span class='separator'>·</span>
                                <form class="delete delete-reply" action="deleteReply.html" method="post">