From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 1 Jan 2011 23:57:17 +0000 (+0100)
Subject: Merge branch 'next' into edit-wot-trust
X-Git-Tag: 0.4^2~8^2~36
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=437147c8b5d4c6630b6ee9323f9778bb9c13e7f4;hp=-c

Merge branch 'next' into edit-wot-trust
---

437147c8b5d4c6630b6ee9323f9778bb9c13e7f4
diff --combined src/main/resources/i18n/sone.en.properties
index 66d8f5c,f8ce026..5b07391
--- a/src/main/resources/i18n/sone.en.properties
+++ b/src/main/resources/i18n/sone.en.properties
@@@ -159,10 -159,6 +159,10 @@@ View.Post.Reply.DeleteLink=Delet
  View.Post.LikeLink=Like
  View.Post.UnlikeLink=Unlike
  
 +View.Trust.Label=Trust:
 +View.Trust.IncreaseTrustLink=↑
 +View.Trust.DecreaseTrustLink=↓
 +
  WebInterface.DefaultText.StatusUpdate=What’s on your mind?
  WebInterface.DefaultText.Message=Write a Message…
  WebInterface.DefaultText.Reply=Write a Reply…
@@@ -180,12 -176,15 +180,15 @@@ WebInterface.SelectBox.Yes=Ye
  WebInterface.SelectBox.No=No
  WebInterface.ClickToShow.Replies=Click here to show hidden replies.
  
+ Notification.ClickHereToRead=Click here to read the full text of the notification.
  Notification.FirstStart.Text=This seems to be the first time you start Sone. To start, create a new Sone from a web of trust identity and start following other Sones.
  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.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:
+ Notification.NewReply.ShortText=New replies have been discovered.
  Notification.NewReply.Text=New replies have been discovered by the following Sones:
  Notification.SoneIsBeingRescued.Text=The following Sones are currently being rescued:
  Notification.SoneRescued.Text=The following Sones have been rescued:
diff --combined src/main/resources/static/css/sone.css
index 0ca86b0,00d9e36..c978bac
--- a/src/main/resources/static/css/sone.css
+++ b/src/main/resources/static/css/sone.css
@@@ -73,10 -73,6 +73,6 @@@ textarea 
  	float: right;
  }
  
- #sone #notification-area .notification > div {
- 	display: inline;
- }
- 
  #sone #notification-area .notification .post-count {
  	margin-left: 1ex;
  }
@@@ -181,19 -177,6 +177,19 @@@
  	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;
@@@ -214,10 -197,9 +210,10 @@@
  	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 .increase-trust, #sone .post .decrease-trust {
  	display: inline;
  	font: inherit;
 +	margin: 0px;
  }
  
  #sone .post .likes.hidden {
@@@ -228,16 -210,15 +224,16 @@@
  	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 .increase-trust button, #sone .post .decrease-trust button {
  	border: 0px;
  	background: none;
  	padding: 0px;
  	color: rgb(28, 131, 191);
  	font: inherit;
 +	margin: 0px;
  }
  
 -#sone .post .delete button:hover, #sone .post .like button:hover, #sone .post .unlike button:hover {
 +#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 {
  	border: 0px;
  	background: none;
  	padding: 0px;
@@@ -254,19 -235,6 +250,19 @@@
  	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;