From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 29 Mar 2011 17:37:27 +0000 (+0200)
Subject: Merge branch 'new-web-of-trust' into next
X-Git-Tag: 0.5.2^2~1
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=c3745c94d79e6fba53c95003287f539b79b2e749;hp=401a320e6952b63d31f73cff2f9400835a5af2d4

Merge branch 'new-web-of-trust' into next
---

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
index b6d68d3..1802f2d 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
@@ -42,7 +42,7 @@ public class WebOfTrustConnector implements ConnectorListener {
 	private static final Logger logger = Logging.getLogger(WebOfTrustConnector.class);
 
 	/** The name of the WoT plugin. */
-	private static final String WOT_PLUGIN_NAME = "plugins.WoT.WoT";
+	private static final String WOT_PLUGIN_NAME = "plugins.WebOfTrust.WebOfTrust";
 
 	/** A random connection identifier. */
 	private static final String PLUGIN_CONNECTION_IDENTIFIER = "Sone-WoT-Connector-" + Math.abs(Math.random());
diff --git a/src/main/resources/templates/include/createSone.html b/src/main/resources/templates/include/createSone.html
index 30ce0f7..c0df5c0 100644
--- a/src/main/resources/templates/include/createSone.html
+++ b/src/main/resources/templates/include/createSone.html
@@ -1,7 +1,7 @@
 <%if !identitiesWithoutSone.empty>
 	<h1><%= Page.Login.CreateSone.Title|l10n|html></h1>
 
-	<p><%= View.CreateSone.Text.WotIdentityRequired|l10n|html|replace needle="{link}" replacement='<a href="/WoT/">'|replace needle="{/link}" replacement='</a>'></p>
+	<p><%= View.CreateSone.Text.WotIdentityRequired|l10n|html|replace needle="{link}" replacement='<a href="/WebOfTrust/">'|replace needle="{/link}" replacement='</a>'></p>
 
 	<form id="create-sone" action="createSone.html" method="post">
 		<input type="hidden" name="formPassword" value="<% formPassword|html>" />
@@ -23,8 +23,8 @@
 	</form>
 <%else>
 	<%if !sones.empty>
-		<p><%= View.CreateSone.Text.NoNonSoneIdentities|l10n|html|replace needle="{link}" replacement='<a href="/WoT/OwnIdentities">'|replace needle="{/link}" replacement="</a>"></p>
+		<p><%= View.CreateSone.Text.NoNonSoneIdentities|l10n|html|replace needle="{link}" replacement='<a href="/WebOfTrust/OwnIdentities">'|replace needle="{/link}" replacement="</a>"></p>
 	<%else>
-		<p><%= View.CreateSone.Text.NoIdentities|l10n|html|replace needle="{link}" replacement='<a href="/WoT/OwnIdentities">'|replace needle="{/link}" replacement="</a>"></p>
+		<p><%= View.CreateSone.Text.NoIdentities|l10n|html|replace needle="{link}" replacement='<a href="/WebOfTrust/OwnIdentities">'|replace needle="{/link}" replacement="</a>"></p>
 	<%/if>
 <%/if>
diff --git a/src/main/resources/templates/include/head.html b/src/main/resources/templates/include/head.html
index a9fbb49..cd83600 100644
--- a/src/main/resources/templates/include/head.html
+++ b/src/main/resources/templates/include/head.html
@@ -36,7 +36,7 @@
 		<div id="profile" class="<%ifnull currentSone>offline<%else>online<%/if>">
 			<a class="picture" href="index.html">
 				<%ifnull !currentSone>
-					<img src="/WoT/GetIdenticon?identity=<% currentSone.id|html>&amp;width=80&amp;height=80" width="80" height="80" alt="Profile Avatar" />
+					<img src="/WebOfTrust/GetIdenticon?identity=<% currentSone.id|html>&amp;width=80&amp;height=80" width="80" height="80" alt="Profile Avatar" />
 				<%else>
 					<img src="images/sone.png" width="80" height="80" alt="Sone is offline" />
 				<%/if>
diff --git a/src/main/resources/templates/include/viewPost.html b/src/main/resources/templates/include/viewPost.html
index 3023566..676fa6a 100644
--- a/src/main/resources/templates/include/viewPost.html
+++ b/src/main/resources/templates/include/viewPost.html
@@ -3,7 +3,7 @@
 	<div class="post-time hidden"><% post.time|html></div>
 	<div class="post-author hidden"><% post.sone.id|html></div>
 	<div class="avatar">
-		<img src="/WoT/GetIdenticon?identity=<% post.sone.id|html>&amp;width=48&height=48" width="48" height="48" alt="Avatar Image" />
+		<img src="/WebOfTrust/GetIdenticon?identity=<% post.sone.id|html>&amp;width=48&height=48" width="48" height="48" alt="Avatar Image" />
 	</div>
 	<div class="inner-part">
 		<div>
diff --git a/src/main/resources/templates/include/viewReply.html b/src/main/resources/templates/include/viewReply.html
index cdb837c..e179e01 100644
--- a/src/main/resources/templates/include/viewReply.html
+++ b/src/main/resources/templates/include/viewReply.html
@@ -3,7 +3,7 @@
 	<div class="reply-time hidden"><% reply.time|html></div>
 	<div class="reply-author hidden"><% reply.sone.id|html></div>
 	<div class="avatar">
-		<img src="/WoT/GetIdenticon?identity=<% reply.sone.id|html>&amp;width=36&height=36" width="36" height="36" alt="Avatar Image" />
+		<img src="/WebOfTrust/GetIdenticon?identity=<% reply.sone.id|html>&amp;width=36&height=36" width="36" height="36" alt="Avatar Image" />
 	</div>
 	<div class="inner-part">
 		<div>
diff --git a/src/main/resources/templates/viewSone.html b/src/main/resources/templates/viewSone.html
index d2a8f6e..8df39e0 100644
--- a/src/main/resources/templates/viewSone.html
+++ b/src/main/resources/templates/viewSone.html
@@ -25,7 +25,7 @@
 
 			<div class="profile-field">
 				<div class="name"><%= Page.ViewSone.Profile.Label.Name|l10n|html></div>
-				<div class="value"><a href="/WoT/ShowIdentity?id=<% sone.id|html>"><% sone.niceName|html></a></div>
+				<div class="value"><a href="/WebOfTrust/ShowIdentity?id=<% sone.id|html>"><% sone.niceName|html></a></div>
 			</div>
 
 			<%foreach sone.profile.fields field>