warn if msg is visible to all

4 files changed, 17 insertions, 6 deletions

diff --git a/boot.php b/boot.php
index c9760a99a..6926489ec 100644
--- a/boot.php
+++ b/boot.php
@@ -2,7 +2,7 @@
 
 set_time_limit(0);
 
-define ( 'FRIENDIKA_VERSION',      '2.1.965' );
+define ( 'FRIENDIKA_VERSION',      '2.1.966' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1054      );
 
diff --git a/include/conversation.php b/include/conversation.php
index 38816a7d7..1558a5c41 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -687,6 +687,7 @@ function status_editor($a,$x) {
 			'$baseurl' => $a->get_baseurl(),
 			'$geotag' => $geotag,
 			'$nickname' => $x['nickname'],
+			'$ispublic' => t('Visible to <strong>everybody</strong>'),
 			'$linkurl' => t('Please enter a link URL:'),
 			'$utubeurl' => t('Please enter a YouTube link:'),
 			'$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 0fdd30209..3b4c8c615 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -3,6 +3,7 @@
 <script language="javascript" type="text/javascript">
 
 var editor;
+var textlen = 0;
 
 tinyMCE.init({
 	theme : "advanced",
@@ -29,23 +30,29 @@ tinyMCE.init({
 	     //Character count
 		ed.onKeyUp.add(function(ed, e) {
 			var txt = tinyMCE.activeEditor.getContent();
-			var text = txt.length;
-			if(txt.length <= 140) {
+			textlen = txt.length;
+			if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+				$('#profile-jot-desc').html(ispublic);
+			}
+			else {
+				$('#profile-jot-desc').html('&nbsp;');
+			}	 
+			if(textlen <= 140) {
 				$('#character-counter').removeClass('red');
 				$('#character-counter').removeClass('orange');
 				$('#character-counter').addClass('grey');
 			}
-			if((txt.length > 140) && (txt .length <= 420)) {
+			if((textlen > 140) && (textlen <= 420)) {
 				$('#character-counter').removeClass('grey');
 				$('#character-counter').removeClass('red');
 				$('#character-counter').addClass('orange');
 			}
-			if(txt.length > 420) {
+			if(textlen > 420) {
 				$('#character-counter').removeClass('grey');
 				$('#character-counter').removeClass('orange');
 				$('#character-counter').addClass('red');
 			}
-			$('#character-counter').text(text);
+			$('#character-counter').text(textlen);
     	});
 
 		ed.onInit.add(function(ed) {
@@ -58,6 +65,7 @@ tinyMCE.init({
 </script>
 <script type="text/javascript" src="include/ajaxupload.js" ></script>
 <script>
+	var ispublic = '$ispublic';
 	$(document).ready(function() {
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index a23f72987..8ba548be8 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1895,9 +1895,11 @@ a.mail-list-link {
 #profile-jot-desc {
 	/*float: left;*/
 	width: 480px;
+	color: #FF0000;
 	margin-top: 10px;
 	margin-bottom: 10px;
 }
+
 #character-counter {
 	float: right;
 	font-size: 120%;