From: David ‘Bombe’ Roden Date: Thu, 6 Jan 2011 06:56:28 +0000 (+0100) Subject: Merge branch 'next' into edit-wot-trust X-Git-Tag: 0.4^2~8^2~4 X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=02de134dcf3d4500ae02320aab2dae827d499fa1;hp=-c Merge branch 'next' into edit-wot-trust --- 02de134dcf3d4500ae02320aab2dae827d499fa1 diff --combined src/main/java/net/pterodactylus/sone/main/SonePlugin.java index 8182fa2,262d777..a809e8e --- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java +++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java @@@ -25,8 -25,8 +25,8 @@@ import java.util.logging.Logger import net.pterodactylus.sone.core.Core; import net.pterodactylus.sone.core.FreenetInterface; import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend; +import net.pterodactylus.sone.freenet.plugin.PluginConnector; import net.pterodactylus.sone.freenet.wot.IdentityManager; -import net.pterodactylus.sone.freenet.wot.PluginConnector; import net.pterodactylus.sone.freenet.wot.WebOfTrustConnector; import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.util.config.Configuration; @@@ -78,7 -78,7 +78,7 @@@ public class SonePlugin implements Fred } /** The version. */ - public static final Version VERSION = new Version(0, 3, 6, 2); + public static final Version VERSION = new Version(0, 3, 6, 3); /** The logger. */ private static final Logger logger = Logging.getLogger(SonePlugin.class); diff --combined src/main/resources/i18n/sone.en.properties index a4b2f7b,533a01b..686ba65 --- a/src/main/resources/i18n/sone.en.properties +++ b/src/main/resources/i18n/sone.en.properties @@@ -27,9 -27,6 +27,9 @@@ Page.Options.Page.Title=Option Page.Options.Page.Description=These options influence the runtime behaviour of the Sone plugin. Page.Options.Section.RuntimeOptions.Title=Runtime Behaviour Page.Options.Option.InsertionDelay.Description=The number of seconds the Sone inserter waits after a modification of a Sone before it is being inserted. +Page.Options.Section.TrustOptions.Title=Trust Settings +Page.Options.Option.PositiveTrust.Description=The amount of positive trust you want to assign to other Sones by clicking the checkmark below a post or reply. +Page.Options.Option.NegativeTrust.Description=The amount of trust you want to assign to other Sones by clicking the red X below a post or reply. This value should be negative. Page.Options.Section.RescueOptions.Title=Rescue Settings Page.Options.Option.SoneRescueMode.Description=Try to rescue your Sones at the next start of the Sone plugin. This will read your all your old Sones from Freenet and ignore any disappearing postings and replies. You have to unlock your local Sones after they have been restored and you have to manually disable the rescue mode once you are satisfied with what has been restored! Page.Options.Section.Cleaning.Title=Clean Up @@@ -124,12 -121,6 +124,12 @@@ Page.FollowSone.Title=Follow Sone - Son Page.UnfollowSone.Title=Unfollow Sone - Sone +Page.Trust.Title=Trust Sone - Sone + +Page.Distrust.Title=Distrust Sone - Sone + +Page.Untrust.Title=Untrust Sone - Sone + Page.NoPermission.Title=Unauthorized Access - Sone Page.NoPermission.Page.Title=Unauthorized Access Page.NoPermission.Text.NoPermission=You tried to do something that you do not have sufficient authorization for. Please refrain from such actions in the future or we will be forced to take counter-measures! @@@ -168,10 -159,6 +168,10 @@@ View.Post.Reply.DeleteLink=Delet View.Post.LikeLink=Like View.Post.UnlikeLink=Unlike +View.Trust.Tooltip.Trust=Trust this person +View.Trust.Tooltip.Distrust=Assign negative trust to this person +View.Trust.Tooltip.Untrust=Remove your trust assignment for this person + WebInterface.DefaultText.StatusUpdate=What’s on your mind? WebInterface.DefaultText.Message=Write a Message… WebInterface.DefaultText.Reply=Write a Reply… @@@ -194,6 -181,7 +194,7 @@@ Notification.FirstStart.Text=This seem Notification.Startup.Text=Sone is currently starting up. It may take a while to retrieve all identities and Sones from the web of trust. If you are missing some elements, please be patient, they will probably reappear very soon. Notification.ConfigNotRead.Text=The configuration file “sone.properties” could not be read, probably because it was not saved correctly. This can happen on versions prior to Sone 0.3.3 and there is nothing you can do about it. Notification.Button.Dismiss=Dismiss + Notification.NewSone.ShortText=New Sones have been discovered: Notification.NewSone.Text=New Sones have been discovered: Notification.NewPost.ShortText=New posts have been discovered. Notification.NewPost.Text=New posts have been discovered by the following Sones: diff --combined src/main/resources/static/css/sone.css index f1a89db,6a7eeac..d1f85a2 --- a/src/main/resources/static/css/sone.css +++ b/src/main/resources/static/css/sone.css @@@ -1,7 -1,7 +1,7 @@@ /* Sone Main CSS File */ /* first, override some fproxy rules. */ -#sone .post .reply div,#sone .post .time,#sone .post .delete,#sone .post .show-reply-form, input[type=text], textarea { +#sone div, #sone span, #sone .post .time,#sone .post .delete,#sone .post .show-reply-form, input[type=text], textarea { font: inherit; } @@@ -53,6 -53,22 +53,22 @@@ textarea color: rgb(255, 0, 0); } + #sone a.internet:before { + content: '⚠ '; + } + + #sone a.freenet:before { + content: '» '; + } + + #sone a.freenet-trusted { + color: rgb(0, 128, 0); + } + + #sone a.freenet-trusted:before { + content: '★ '; + } + #sone a img { border: none; } @@@ -192,52 -208,33 +208,52 @@@ font-size: 85%; } +#sone .separator { + font: inherit; + color: rgb(28, 131, 191); +} + #sone .post .time { display: inline; color: #666; } -#sone .post .delete, #sone .post .likes, #sone .post .like, #sone .post .unlike { +#sone .post .delete, #sone .post .likes, #sone .post .like, #sone .post .unlike, #sone .post .trust, #sone .post .distrust, #sone .post .untrust { display: inline; font: inherit; + margin: 0px; } #sone .post .likes.hidden { display: none; } -#sone .post .like.hidden, #sone .post .unlike.hidden { +#sone .post .like.hidden, #sone .post .unlike.hidden, #sone .post .trust.hidden, #sone .post .distrust.hidden, #sone .post .untrust.hidden { display: none; } -#sone .post .delete button, #sone .post .like button, #sone .post .unlike button { +#sone .post .delete button, #sone .post .like button, #sone .post .unlike button, #sone .post .trust button, #sone .post .distrust button, #sone .post .untrust button { border: 0px; background: none; padding: 0px; color: rgb(28, 131, 191); font: inherit; + margin: 0px; +} + +#sone .post .trust button { + color: rgb(0, 128, 0); } -#sone .post .delete button:hover, #sone .post .like button:hover, #sone .post .unlike button:hover { +#sone .post .distrust button { + color: rgb(255, 0, 0); +} + +#sone .post .untrust button { + color: rgb(64, 64, 64); +} + +#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 { border: 0px; background: none; padding: 0px; @@@ -245,6 -242,10 +261,6 @@@ cursor: pointer; } -#sone .post .delete:before, #sone .post .likes:before, #sone .post .like:before, #sone .post .unlike:before { - content: ' ‧ '; -} - #sone .post .likes span { font: inherit; color: green; @@@ -309,6 -310,10 +325,6 @@@ color: rgb(255, 172, 0); } -#sone .post .show-reply-form:before { - content: ' ‧ '; -} - #sone .post .create-reply { clear: both; background-color: #f0f0ff;