Merge https://github.com/friendica/red into zpull

1 files changed, 23 insertions, 18 deletions

diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 8d19ab317..ae0ccc8e8 100644..100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -1,9 +1,14 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 
 var editor=false;
 var textlen = 0;
-var plaintext = '$editselect';
+var plaintext = '{{$editselect}}';
 
 function initEditor(cb){
 	if (editor==false){
@@ -24,7 +29,7 @@ function initEditor(cb){
 		tinyMCE.init({
 			theme : "advanced",
 			mode : "specific_textareas",
-			editor_selector: $editselect,
+			editor_selector: {{$editselect}},
 			auto_focus: "profile-jot-text",
 			plugins : "bbcode,paste,autoresize, inlinepopups",
 			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
@@ -42,7 +47,7 @@ function initEditor(cb){
 			force_br_newlines : true,
 			forced_root_block : '',
 			convert_urls: false,
-			content_css: "$baseurl/view/custom_tinymce.css",
+			content_css: "{{$baseurl}}/view/custom_tinymce.css",
 			theme_advanced_path : false,
 			file_browser_callback : "fcFileBrowser",
 			setup : function(ed) {
@@ -104,9 +109,9 @@ function enableOnUser(){
 }
 
 </script>
-<script type="text/javascript" src="$baseurl/js/ajaxupload.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
 <script>
-	var ispublic = '$ispublic';
+	var ispublic = '{{$ispublic}}';
 
 	$(document).ready(function() {
 		
@@ -116,7 +121,7 @@ function enableOnUser(){
 
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
-			{ action: '$baseurl/wall_upload/$nickname',
+			{ action: '{{$baseurl}}/wall_upload/{{$nickname}}',
 				name: 'userfile',
 				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
 				onComplete: function(file,response) {
@@ -127,7 +132,7 @@ function enableOnUser(){
 		);
 		var file_uploader = new window.AjaxUpload(
 			'wall-file-upload',
-			{ action: '$baseurl/wall_attach/$nickname',
+			{ action: '{{$baseurl}}/wall_attach/{{$nickname}}',
 				name: 'userfile',
 				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
 				onComplete: function(file,response) {
@@ -159,11 +164,11 @@ function enableOnUser(){
 	}
 
 	function jotGetLink() {
-		reply = prompt("$linkurl");
+		reply = prompt("{{$linkurl}}");
 		if(reply && reply.length) {
 			reply = bin2hex(reply);
 			$('#profile-rotator').show();
-			$.get('$baseurl/parse_url?binurl=' + reply, function(data) {
+			$.get('{{$baseurl}}/parse_url?binurl=' + reply, function(data) {
 				addeditortext(data);
 				$('#profile-rotator').hide();
 			});
@@ -171,14 +176,14 @@ function enableOnUser(){
 	}
 
 	function jotVideoURL() {
-		reply = prompt("$vidurl");
+		reply = prompt("{{$vidurl}}");
 		if(reply && reply.length) {
 			addeditortext('[video]' + reply + '[/video]');
 		}
 	}
 
 	function jotAudioURL() {
-		reply = prompt("$audurl");
+		reply = prompt("{{$audurl}}");
 		if(reply && reply.length) {
 			addeditortext('[audio]' + reply + '[/audio]');
 		}
@@ -186,7 +191,7 @@ function enableOnUser(){
 
 
 	function jotGetLocation() {
-		reply = prompt("$whereareu", $('#jot-location').val());
+		reply = prompt("{{$whereareu}}", $('#jot-location').val());
 		if(reply && reply.length) {
 			$('#jot-location').val(reply);
 		}
@@ -196,7 +201,7 @@ function enableOnUser(){
 		if ($('#jot-popup').length != 0) $('#jot-popup').show();
 
 		$('#like-rotator-' + id).show();
-		$.get('$baseurl/share/' + id, function(data) {
+		$.get('{{$baseurl}}/share/' + id, function(data) {
 			if (!editor) $("#profile-jot-text").val("");
 			initEditor(function(){
 				addeditortext(data);
@@ -220,7 +225,7 @@ function enableOnUser(){
 		if(reply && reply.length) {
 			reply = bin2hex(reply);
 			$('#profile-rotator').show();
-			$.get('$baseurl/parse_url?binurl=' + reply, function(data) {
+			$.get('{{$baseurl}}/parse_url?binurl=' + reply, function(data) {
 				if (!editor) $("#profile-jot-text").val("");
 				initEditor(function(){
 					addeditortext(data);
@@ -231,7 +236,7 @@ function enableOnUser(){
 	}
 
 	function itemTag(id) {
-		reply = prompt("$term");
+		reply = prompt("{{$term}}");
 		if(reply && reply.length) {
 			reply = reply.replace('#','');
 			if(reply.length) {
@@ -239,7 +244,7 @@ function enableOnUser(){
 				commentBusy = true;
 				$('body').css('cursor', 'wait');
 
-				$.get('$baseurl/tagger/' + id + '?term=' + reply);
+				$.get('{{$baseurl}}/tagger/' + id + '?term=' + reply);
 				if(timer) clearTimeout(timer);
 				timer = setTimeout(NavUpdate,3000);
 				liking = 1;
@@ -266,7 +271,7 @@ function enableOnUser(){
 				if(reply && reply.length) {
 					commentBusy = true;
 					$('body').css('cursor', 'wait');
-					$.get('$baseurl/filer/' + id + '?term=' + reply, NavUpdate);
+					$.get('{{$baseurl}}/filer/' + id + '?term=' + reply, NavUpdate);
 //					if(timer) clearTimeout(timer);
 //					timer = setTimeout(NavUpdate,3000);
 					liking = 1;
@@ -294,7 +299,7 @@ function enableOnUser(){
 			tinyMCE.execCommand('mceInsertRawHTML',false,data);
 	}	
 
-	$geotag
+	{{$geotag}}
 
 </script>