From: David ‘Bombe’ Roden Date: Sun, 2 Jan 2011 12:16:51 +0000 (+0100) Subject: Display trust control with only two buttons and no numbers. X-Git-Tag: 0.4^2~8^2~35 X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=da46b62663d50056ddfc5b39b5e8e62423f6c415;p=Sone.git Display trust control with only two buttons and no numbers. --- diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties index 5b07391..4353ac2 100644 --- a/src/main/resources/i18n/sone.en.properties +++ b/src/main/resources/i18n/sone.en.properties @@ -159,9 +159,9 @@ View.Post.Reply.DeleteLink=Delete View.Post.LikeLink=Like View.Post.UnlikeLink=Unlike -View.Trust.Label=Trust: -View.Trust.IncreaseTrustLink=↑ -View.Trust.DecreaseTrustLink=↓ +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… diff --git a/src/main/resources/static/css/sone.css b/src/main/resources/static/css/sone.css index c978bac..f1a89db 100644 --- a/src/main/resources/static/css/sone.css +++ b/src/main/resources/static/css/sone.css @@ -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; } @@ -177,19 +177,6 @@ textarea { min-height: 48px; } -#sone .trust { - font-size: 85%; - text-align: center; -} - -#sone .trust .explicit { - color: rgb(0, 128, 0); -} - -#sone .trust .implicit { - color: rgb(128, 128, 128); -} - #sone .post .author, #sone .post .recipient { display: inline; font-weight: bold; @@ -205,12 +192,17 @@ textarea { 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 .increase-trust, #sone .post .decrease-trust { +#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; @@ -220,11 +212,11 @@ textarea { 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 .increase-trust button, #sone .post .decrease-trust 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; @@ -233,7 +225,19 @@ textarea { margin: 0px; } -#sone .post .delete button:hover, #sone .post .like button:hover, #sone .post .unlike button:hover, #sone .post .increase-trust button:hover, #sone .post .decrease-trust button:hover { +#sone .post .trust button { + color: rgb(0, 128, 0); +} + +#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; @@ -241,28 +245,11 @@ textarea { 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; } -#sone .post .trust { - display: inline; -} - -#sone .post .trust:before { - content: ' · '; -} - -#sone .trust .explicit, #sone .trust .implicit { - font: inherit; - display: inline; -} - #sone .post .replies { clear: both; padding-top: 0.2ex; @@ -322,10 +309,6 @@ textarea { color: rgb(255, 172, 0); } -#sone .post .show-reply-form:before { - content: ' ‧ '; -} - #sone .post .create-reply { clear: both; background-color: #f0f0ff; diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js index 9aa0b82..d6e0964 100644 --- a/src/main/resources/static/javascript/sone.js +++ b/src/main/resources/static/javascript/sone.js @@ -68,6 +68,7 @@ function addCommentLink(postId, element, insertAfterThisElement) { return; } commentElement = (function(postId) { + separator = $(" · ").addClass("separator"); var commentElement = $("
Comment
").addClass("show-reply-form").click(function() { markPostAsKnown(getPostElement(this)); replyElement = $("#sone .post#" + postId + " .create-reply"); @@ -87,6 +88,7 @@ function addCommentLink(postId, element, insertAfterThisElement) { return commentElement; })(postId); $(insertAfterThisElement).after(commentElement.clone(true)); + $(insertAfterThisElement).after(separator); } var translations = {}; diff --git a/src/main/resources/templates/include/viewPost.html b/src/main/resources/templates/include/viewPost.html index 8667bac..afb1728 100644 --- a/src/main/resources/templates/include/viewPost.html +++ b/src/main/resources/templates/include/viewPost.html @@ -19,6 +19,7 @@
+ ·
↑
<%ifnull ! currentSone> <%/if> <%if !post.sone.current> -
- <%= View.Trust.Label|l10n|html> - <%if post.sone.trust.assigned> -
<% post.sone.trust.explicit>
- <%else> -
<% post.sone.trust.implicit><%if post.sone.trust.hasDistance> (<% post.sone.trust.distance>)<%/if>
- <%/if> - <%if !post.sone.trust.maximum> -
- - - - -
- <%/if> -
- - - - -
-
+ · +
+ + + + +
+
+ + + + +
+
+ + + + +
<%/if> <%if post.sone.current>
diff --git a/src/main/resources/templates/include/viewReply.html b/src/main/resources/templates/include/viewReply.html index a9b308e..398aed5 100644 --- a/src/main/resources/templates/include/viewReply.html +++ b/src/main/resources/templates/include/viewReply.html @@ -11,6 +11,7 @@
<% reply.time|date format="MMM d, yyyy, HH:mm:ss">
+ ·
↑
<%ifnull ! currentSone> @@ -29,28 +30,25 @@ <%/if> <%if !reply.sone.current> -
- <%= View.Trust.Label|l10n|html> - <%if reply.sone.trust.assigned> -
<% reply.sone.trust.explicit>
- <%else> -
<% reply.sone.trust.implicit><%if reply.sone.trust.hasDistance> (<% reply.sone.trust.distance>)<%/if>
- <%/if> - <%if !reply.sone.trust.maximum> -
- - - - -
- <%/if> -
- - - - -
-
+ · +
+ + + + +
+
+ + + + +
+
+ + + + +
<%/if> <%if reply.sone.current>