X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Ftheme%2Fdispy%2Fjot-header.tpl;h=f4712f0bef181a84113c165b7ef4b3d73ea8f116;hb=ff8c1be987f06e40796c1fc540342a033746f750;hp=4c8f59d7969bd2348ebbacf1d3daa26da4f6f4e2;hpb=7b15f27ba48f5a1b0e24290379e2524796776803;p=friendica.git

diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 4c8f59d796..f4712f0bef 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -1,5 +1,5 @@
 <script type="text/javascript">
-var editor = false;
+var editor=false;
 var textlen = 0;
 var plaintext = '$editselect';
 
@@ -9,10 +9,11 @@ function initEditor(cb) {
 		if(plaintext == 'none') {
 			$("#profile-jot-text-loading").hide();
 			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
 			editor = true;
-			$("a#jot-perms-icon").fancybox({
-				'transitionIn' : 'elastic',
-				'transitionOut' : 'elastic'
+			$("a#jot-perms-icon").colorbox({
+				'inline' : true,
+				'transition' : 'elastic'
 			});
 			$(".jothidden").show();
 			if (typeof cb!="undefined") cb();
@@ -23,23 +24,25 @@ function initEditor(cb) {
 			mode : "specific_textareas",
 			editor_selector: $editselect,
 			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,fullscreen,autoresize",
-			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
+			plugins : "bbcode,paste,fullscreen,autoresize,inlinepopups,contextmenu,style",
+			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen,charmap",
 			theme_advanced_buttons2 : "",
 			theme_advanced_buttons3 : "",
 			theme_advanced_toolbar_location : "top",
 			theme_advanced_toolbar_align : "center",
 			theme_advanced_blockformats : "blockquote,code",
+			gecko_spellcheck : true,
 			paste_text_sticky : true,
 			entity_encoding : "raw",
 			add_unload_trigger : false,
 			remove_linebreaks : false,
-			force_p_newlines : false,
-			force_br_newlines : true,
-			forced_root_block : '',
+			//force_p_newlines : false,
+			//force_br_newlines : true,
+			forced_root_block : 'div',
 			convert_urls: false,
 			content_css: "$baseurl/view/custom_tinymce.css",
 			theme_advanced_path : false,
+			file_browser_callback : "fcFileBrowser",
 			setup : function(ed) {
 				cPopup = null;
 				ed.onKeyDown.add(function(ed,e) {
@@ -95,14 +98,13 @@ function initEditor(cb) {
 					$(".jothidden").show();
 					if (typeof cb!="undefined") cb();
 				});
-
 			}
 		});
 		editor = true;
 		// setup acl popup
-		$("a#jot-perms-icon").fancybox({
-			'transitionIn' : 'elastic',
-			'transitionOut' : 'elastic'
+		$("a#jot-perms-icon").colorbox({
+			'inline' : true,
+			'transition' : 'elastic'
 		}); 
 	} else {
 		if (typeof cb!="undefined") cb();
@@ -152,8 +154,6 @@ function enableOnUser(){
 				}				 
 			}
 		);
-
-
 	});
 
 	function deleteCheckedItems() {
@@ -264,15 +264,36 @@ function enableOnUser(){
 	}
 
 	function itemFiler(id) {
-		reply = prompt("$fileas");
-		if(reply && reply.length) {
-			commentBusy = true;
-			$('body').css('cursor', 'wait');
-			$.get('filer/' + id + '?term=' + reply);
-			if(timer) clearTimeout(timer);
-			timer = setTimeout(NavUpdate,3000);
-			liking = 1;
-		}
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.colorbox({html:data});
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.colorbox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
 	}
 
 	function jotClearLocation() {
@@ -321,6 +342,4 @@ function enableOnUser(){
 		});
 		$('#profile-jot-text').keyup();
 	}
-
 </script>
-