X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Fjot-header.tpl;h=77e5bc4bcd0fca73eddc65f7315465c11bc0922b;hb=9b93bd25218dc0b4a5e477c3a64d6f74a51a9d21;hp=eebaf803ac91a4cf021c4c9c87cfa57a158ebeb6;hpb=9acccb2b90ff5276c0cc84b3b006c7a393c53786;p=friendica.git

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index eebaf803ac..77e5bc4bcd 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,30 @@ 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 +66,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',
@@ -70,15 +79,29 @@ tinyMCE.init({
 				}				 
 			}
 		);
+		var file_uploader = new window.AjaxUpload(
+			'wall-file-upload',
+			{ action: 'wall_attach/$nickname',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					tinyMCE.execCommand('mceInsertRawHTML',false,response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+
 		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
 			var selstr;
 			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
 				selstr = $(this).text();
-				$('#profile-jot-perms img').attr('src', 'images/lock_icon.gif');
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-public').hide();
 				$('.profile-jot-net input').attr('disabled', 'disabled');
 			});
 			if(selstr == null) { 
-				$('#profile-jot-perms img').attr('src', 'images/unlock_icon.gif');
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
 				$('.profile-jot-net input').attr('disabled', false);
 			}
 
@@ -89,6 +112,7 @@ tinyMCE.init({
 	function jotGetLink() {
 		reply = prompt("$linkurl");
 		if(reply && reply.length) {
+			reply = bin2hex(reply);
 			$('#profile-rotator').show();
 			$.get('parse_url?url=' + reply, function(data) {
 				tinyMCE.execCommand('mceInsertRawHTML',false,data);