friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

- Remove TinyMCE mentions in themes

This commit is contained in:
Hypolite Petovan 2017-01-26 22:54:32 -05:00
parent 9d5384f107
commit 4ad6a7f073
25 changed files with 318 additions and 1199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
view/theme/frio/templates/event_head.tpl
View File

@ -72,51 +72,8 @@
var modparams = {{$modparams}} var modparams = {{$modparams}}
</script> </script>
{{if $editselect != 'none'}}
<script language="javascript" type="text/javascript"
src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
tinyMCE.init({
theme : "advanced",
mode : "textareas",
plugins : "bbcode,paste",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "center",
theme_advanced_blockformats : "blockquote,code",
theme_advanced_resizing : true,
gecko_spellcheck : true,
paste_text_sticky : true,
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
forced_root_block : 'div',
content_css: "{{$baseurl}}/view/custom_tinymce.css",
theme_advanced_path : false,
setup : function(ed) {
ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true;
});
}
});
$(document).ready(function() { $(document).ready(function() {
$('.comment-edit-bb').hide();
});
{{else}}
<script language="javascript" type="text/javascript">
{{/if}}
$(document).ready(function() {
{{if $editselect = 'none'}}
$("#comment-edit-text-desc").bbco_autocomplete('bbcode'); $("#comment-edit-text-desc").bbco_autocomplete('bbcode');
{{/if}}
}); });
</script> </script>

142
view/theme/frio/templates/jot-header.tpl
View File

@ -2,14 +2,12 @@
<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script> <script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
<script type="text/javascript"> <script type="text/javascript">
var editor=false; var editor = false;
var textlen = 0; var textlen = 0;
var plaintext = '{{$editselect}}';
function initEditor(cb){ function initEditor(callback) {
if (editor==false){ if (editor == false) {
$("#profile-jot-text-loading").show(); $("#profile-jot-text-loading").show();
if(plaintext == 'none') {
$("#profile-jot-text-loading").hide(); $("#profile-jot-text-loading").hide();
//$("#profile-jot-text").addClass("profile-jot-text-full").removeClass("profile-jot-text-empty"); //$("#profile-jot-text").addClass("profile-jot-text-full").removeClass("profile-jot-text-empty");
$("#jot-category").show(); $("#jot-category").show();
@ -17,119 +15,24 @@
$("#jot-profile-jot-wrapper").show(); $("#jot-profile-jot-wrapper").show();
$("#profile-jot-text").editor_autocomplete(baseurl+"/acl"); $("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
$("#profile-jot-text").bbco_autocomplete('bbcode'); $("#profile-jot-text").bbco_autocomplete('bbcode');
editor = true;
$("a#jot-perms-icon").colorbox({ $("a#jot-perms-icon").colorbox({
'inline' : true, 'inline' : true,
'transition' : 'elastic' 'transition' : 'elastic'
}); });
$(".jothidden").show(); $(".jothidden").show();
if (typeof cb!="undefined") cb();
$("#profile-jot-text").keyup(function(){ $("#profile-jot-text").keyup(function(){
var textlen = $(this).val().length; var textlen = $(this).val().length;
$('#character-counter').text(textlen); $('#character-counter').text(textlen);
}); });
return;
}
tinyMCE.init({
theme : "advanced",
mode : "specific_textareas",
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",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "center",
theme_advanced_blockformats : "blockquote,code",
theme_advanced_resizing : true,
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 : '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) {
if(cPopup !== null)
cPopup.onkey(e);
});
ed.onKeyUp.add(function(ed, e) {
var txt = tinyMCE.activeEditor.getContent();
match = txt.match(/@([^ \n]+)$/);
if(match!==null) {
if(cPopup === null) {
cPopup = new ACPopup(this,baseurl+"/acl");
}
if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
if(! cPopup.ready) cPopup = null;
}
else {
if(cPopup !== null) { cPopup.close(); cPopup = null; }
}
textlen = txt.length;
if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
$('#profile-jot-desc').html(ispublic);
}
else {
$('#profile-jot-desc').html('&nbsp;');
}
//Character count
if(textlen <= 140) {
$('#character-counter').removeClass('red');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('grey');
}
if((textlen > 140) && (textlen <= 420)) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('red');
$('#character-counter').addClass('orange');
}
if(textlen > 420) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('red');
}
$('#character-counter').text(textlen);
});
ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true;
$("#profile-jot-text-loading").hide();
$(".jothidden").show();
if (typeof cb!="undefined") cb();
});
}
});
editor = true; editor = true;
}
// setup acl popup if (typeof callback != "undefined") {
$("a#jot-perms-icon").colorbox({ callback();
'inline' : true,
'transition' : 'elastic'
});
} else {
if (typeof cb!="undefined") cb();
} }
} }
function enableOnUser(){ function enableOnUser(){
if (editor) return;
//$(this).val("");
initEditor(); initEditor();
} }
</script> </script>
@ -140,7 +43,7 @@
$(document).ready(function() { $(document).ready(function() {
/* enable tinymce on focus and click */ /* enable editor on focus and click */
$("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser); $("#profile-jot-text").click(enableOnUser);
@ -177,33 +80,6 @@
Dialog.doFileBrowser("main"); Dialog.doFileBrowser("main");
jotActive(); jotActive();
}); });
/**
var uploader = new window.AjaxUpload(
'wall-image-upload',
{ action: 'wall_upload/{{$nickname}}',
name: 'userfile',
onSubmit: function(file,ext) { $('#profile-rotator').show(); },
onComplete: function(file,response) {
addeditortext(response);
$('#profile-rotator').hide();
}
}
);
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) {
addeditortext(response);
$('#profile-rotator').hide();
}
}
);
}
**/
}); });
function deleteCheckedItems() { function deleteCheckedItems() {
@ -377,7 +253,6 @@
} }
function addeditortext(data) { function addeditortext(data) {
if(plaintext == 'none') {
// get the textfield // get the textfield
var textfield = document.getElementById("profile-jot-text"); var textfield = document.getElementById("profile-jot-text");
// check if the textfield does have the default-value // check if the textfield does have the default-value
@ -387,9 +262,6 @@
//insert the data as new value //insert the data as new value
textfield.value = currentText + data; textfield.value = currentText + data;
} }
else
tinyMCE.execCommand('mceInsertRawHTML',false,data);
}
{{$geotag}} {{$geotag}}

53
view/theme/frio/templates/msg-header.tpl
View File

@ -1,67 +1,14 @@
<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
var plaintext = '{{$editselect}}';
if(plaintext != 'none') {
tinyMCE.init({
theme : "advanced",
mode : "specific_textareas",
editor_selector: /(profile-jot-text|prvmail-text)/,
plugins : "bbcode,paste",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "center",
theme_advanced_blockformats : "blockquote,code",
theme_advanced_resizing : true,
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 : 'div',
convert_urls: false,
content_css: "{{$baseurl}}/view/custom_tinymce.css",
//Character count
theme_advanced_path : false,
setup : function(ed) {
ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true;
var editorId = ed.editorId;
var textarea = $('#'+editorId);
if (typeof(textarea.attr('tabindex')) != "undefined") {
$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
textarea.attr('tabindex', null);
}
});
}
});
}
else
$("#comment-edit-text-input").editor_autocomplete(baseurl+"/acl"); $("#comment-edit-text-input").editor_autocomplete(baseurl+"/acl");
</script> </script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
{{if $editselect = 'none'}}
$("#comment-edit-text-input").bbco_autocomplete('bbcode'); $("#comment-edit-text-input").bbco_autocomplete('bbcode');
{{/if}}
//var objDiv = document.getElementById("mail-conversation");
//objDiv.scrollTop = objDiv.scrollHeight;
$('#mail-conversation').perfectScrollbar(); $('#mail-conversation').perfectScrollbar();
$('#message-preview').perfectScrollbar(); $('#message-preview').perfectScrollbar();
$('#mail-conversation').scrollTop($('#mail-conversation')[0].scrollHeight); $('#mail-conversation').scrollTop($('#mail-conversation')[0].scrollHeight);
}); });
</script> </script>

3
view/theme/frio/theme.php
View File

@ -16,9 +16,6 @@ function frio_init(App $a) {
// disable the events module link in the profile tab // disable the events module link in the profile tab
$a->theme_events_in_profile = false; $a->theme_events_in_profile = false;
// Disallow the richtext editor
$a->theme_richtext_editor = false;
set_template_engine($a, 'smarty3'); set_template_engine($a, 'smarty3');
$baseurl = App::get_baseurl(); $baseurl = App::get_baseurl();

57
view/theme/frost-mobile/js/main.js
View File

@ -77,12 +77,8 @@
$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden"); $("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
$("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden"); $("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden");
input.val(val); input.val(val);
//console.log(id);
}); });
/* setup field_richtext */
/*setupFieldRichtext();*/
/* popup menus */ /* popup menus */
function close_last_popup_menu(e) { function close_last_popup_menu(e) {
@ -562,7 +558,6 @@
function preview_post() { function preview_post() {
$("#jot-preview").val("1"); $("#jot-preview").val("1");
$("#jot-preview-content").show(); $("#jot-preview-content").show();
tinyMCE.triggerSave();
$.post( $.post(
"item", "item",
$("#profile-jot-form").serialize(), $("#profile-jot-form").serialize(),
@ -650,58 +645,6 @@ function notifyMarkAll() {
}); });
} }
// code from http://www.tinymce.com/wiki.php/How-to_implement_a_custom_file_browser
function fcFileBrowser (field_name, url, type, win) {
/* TODO: If you work with sessions in PHP and your client doesn't accept cookies you might need to carry
the session name and session ID in the request string (can look like this: "?PHPSESSID=88p0n70s9dsknra96qhuk6etm5").
These lines of code extract the necessary parameters and add them back to the filebrowser URL again. */
var cmsURL = baseurl+"/fbrowser/"+type+"/";
tinyMCE.activeEditor.windowManager.open({
file : cmsURL,
title : 'File Browser',
width : 420, // Your dimensions may differ - toy around with them!
height : 400,
resizable : "yes",
inline : "yes", // This parameter only has an effect if you use the inlinepopups plugin!
close_previous : "no"
}, {
window : win,
input : field_name
});
return false;
}
function setupFieldRichtext(){
tinyMCE.init({
theme : "advanced",
mode : "specific_textareas",
editor_selector: "fieldRichtext",
plugins : "bbcode,paste, inlinepopups",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "center",
theme_advanced_blockformats : "blockquote,code",
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 : 'div',
convert_urls: false,
content_css: baseurl+"/view/custom_tinymce.css",
theme_advanced_path : false,
file_browser_callback : "fcFileBrowser",
});
}
/** /**
* sprintf in javascript * sprintf in javascript
* "{0} and {1}".format('zero','uno'); * "{0} and {1}".format('zero','uno');

210
view/theme/frost-mobile/js/theme.js
View File

@ -1,47 +1,9 @@
$(document).ready(function() { $(document).ready(function() {
/* enable tinymce on focus and click */ /* enable editor on focus and click */
$("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser); $("#profile-jot-text").click(enableOnUser);
/*$('html').click(function() { $("#nav-notifications-menu" ).hide(); });*/
/*$('.group-edit-icon').hover(
function() {
$(this).addClass('icon'); $(this).removeClass('iconspacer');},
function() {
$(this).removeClass('icon'); $(this).addClass('iconspacer');}
);
$('.sidebar-group-element').hover(
function() {
id = $(this).attr('id');
$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
function() {
id = $(this).attr('id');
$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
);
$('.savedsearchdrop').hover(
function() {
$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
function() {
$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
);
$('.savedsearchterm').hover(
function() {
id = $(this).attr('id');
$('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
function() {
id = $(this).attr('id');
$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
);*/
$('#event-share-checkbox').change(function() { $('#event-share-checkbox').change(function() {
if ($('#event-share-checkbox').is(':checked')) { if ($('#event-share-checkbox').is(':checked')) {
@ -273,29 +235,16 @@ function showEvent(eventid) {
);*/ );*/
} }
/* /*
* TinyMCE/Editor * Editor
*/ */
var editor = false;
var editor=false;
var textlen = 0; var textlen = 0;
var plaintext = 'none';//window.editSelect;
//var ispublic = window.isPublic;
function initEditor(cb){ function initEditor(callback){
if (editor==false){ if (editor == false) {
// $("#profile-jot-text-loading").show();
if(plaintext == 'none') {
// $("#profile-jot-text-loading").hide();
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$("#profile-jot-text").editor_autocomplete(baseurl+"/acl"); $("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
editor = true;
/* $("a#jot-perms-icon").colorbox({
'inline' : true,
'transition' : 'elastic'
});*/
$("a#jot-perms-icon, a#settings-default-perms-menu").click(function () { $("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
var parent = $("#profile-jot-acl-wrapper").parent(); var parent = $("#profile-jot-acl-wrapper").parent();
if (parent.css('display') == 'none') { if (parent.css('display') == 'none') {
@ -303,169 +252,32 @@ function initEditor(cb){
} else { } else {
parent.hide(); parent.hide();
} }
// $("#profile-jot-acl-wrapper").parent().toggle();
return false; return false;
}); });
$(".jothidden").show(); $(".jothidden").show();
if (typeof cb!="undefined") cb();
return;
}
/* tinyMCE.init({
theme : "advanced",
mode : "specific_textareas",
editor_selector: window.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",
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 : '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) {
if(cPopup !== null)
cPopup.onkey(e);
});
ed.onKeyUp.add(function(ed, e) {
var txt = tinyMCE.activeEditor.getContent();
match = txt.match(/@([^ \n]+)$/);
if(match!==null) {
if(cPopup === null) {
cPopup = new ACPopup(this,baseurl+"/acl");
}
if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
if(! cPopup.ready) cPopup = null;
}
else {
if(cPopup !== null) { cPopup.close(); cPopup = null; }
}
textlen = txt.length;
if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
$('#profile-jot-desc').html(ispublic);
}
else {
$('#profile-jot-desc').html('&nbsp;');
}
//Character count
if(textlen <= 140) {
$('#character-counter').removeClass('red');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('grey');
}
if((textlen > 140) && (textlen <= 420)) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('red');
$('#character-counter').addClass('orange');
}
if(textlen > 420) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('red');
}
$('#character-counter').text(textlen);
});
ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true;
$("#profile-jot-text-loading").hide();
$(".jothidden").show();
if (typeof cb!="undefined") cb();
});
}
});
editor = true; editor = true;
// setup acl popup }
$("a#jot-perms-icon").colorbox({ if (typeof callback != "undefined") {
'inline' : true, callback();
'transition' : 'elastic'
}); */
} else {
if (typeof cb!="undefined") cb();
} }
} }
function enableOnUser(){ function enableOnUser(){
if (editor) return; if (editor) {
return;
}
$(this).val(""); $(this).val("");
initEditor(); initEditor();
} }
/*function wallInitEditor() {
var plaintext = window.editSelect;
if(plaintext != 'none') {
tinyMCE.init({
theme : "advanced",
mode : "specific_textareas",
editor_selector: /(profile-jot-text|prvmail-text)/,
plugins : "bbcode,paste",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
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 : 'div',
convert_urls: false,
content_css: baseurl + "/view/custom_tinymce.css",
//Character count
theme_advanced_path : false,
setup : function(ed) {
ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true;
var editorId = ed.editorId;
var textarea = $('#'+editorId);
if (typeof(textarea.attr('tabindex')) != "undefined") {
$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
textarea.attr('tabindex', null);
}
});
}
});
}
else
$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
}*/
/* /*
* Jot * Jot
*/ */
function addeditortext(textElem, data) { function addeditortext(textElem, data) {
if(window.editSelect == 'none') {
var currentText = $(textElem).val(); var currentText = $(textElem).val();
$(textElem).val(currentText + data); $(textElem).val(currentText + data);
}
/* else
tinyMCE.execCommand('mceInsertRawHTML',false,data);*/
} }
function jotVideoURL() { function jotVideoURL() {

4
view/theme/frost-mobile/templates/jot-end.tpl
View File

@ -1,6 +1,4 @@
<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script> <script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
<script>if(typeof window.jotInit != 'undefined') initEditor();</script> <script language="javascript" type="text/javascript">if (typeof window.jotInit != 'undefined') initEditor();</script>

2
view/theme/frost-mobile/templates/jot-header.tpl
View File

@ -1,8 +1,6 @@
<script> <script>
var none = "none"; // ugly hack: {{$editselect}} shouldn't be a string if TinyMCE is enabled, but should if it isn't
window.editSelect = {{$editselect}};
window.isPublic = "{{$ispublic}}"; window.isPublic = "{{$ispublic}}";
window.nickname = "{{$nickname}}"; window.nickname = "{{$nickname}}";
window.linkURL = "{{$linkurl}}"; window.linkURL = "{{$linkurl}}";

2
view/theme/frost-mobile/templates/msg-header.tpl
View File

@ -1,9 +1,7 @@
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
window.nickname = "{{$nickname}}"; window.nickname = "{{$nickname}}";
window.linkURL = "{{$linkurl}}"; window.linkURL = "{{$linkurl}}";
var plaintext = "none";
window.jotId = "#prvmail-text"; window.jotId = "#prvmail-text";
window.imageUploadButton = 'prvmail-upload'; window.imageUploadButton = 'prvmail-upload';
window.autocompleteType = 'msg-header'; window.autocompleteType = 'msg-header';

6
view/theme/frost-mobile/templates/profed_head.tpl
View File

@ -1,6 +0,0 @@
<script language="javascript" type="text/javascript">
window.editSelect = "none";
</script>

3
view/theme/frost-mobile/templates/wallmsg-header.tpl
View File

@ -1,8 +1,5 @@
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
window.editSelect = "none";
window.jotId = "#prvmail-text"; window.jotId = "#prvmail-text";
window.imageUploadButton = 'prvmail-upload'; window.imageUploadButton = 'prvmail-upload';
</script> </script>

1
view/theme/frost/TODO
View File

@ -2,7 +2,6 @@ Home page edit pencil
Preview spacing Preview spacing
Photo album display Photo album display
Check TinyMCE optimization
"Profiles" page is wonky "Profiles" page is wonky
Settings, admin, photos upload don't look beautiful Settings, admin, photos upload don't look beautiful

56
view/theme/frost/js/main.js
View File

@ -80,9 +80,6 @@
//console.log(id); //console.log(id);
}); });
/* setup field_richtext */
//setupFieldRichtext();
/* popup menus */ /* popup menus */
function close_last_popup_menu(e) { function close_last_popup_menu(e) {
@ -578,7 +575,6 @@
function preview_post() { function preview_post() {
$("#jot-preview").val("1"); $("#jot-preview").val("1");
$("#jot-preview-content").show(); $("#jot-preview-content").show();
tinyMCE.triggerSave();
$.post( $.post(
"item", "item",
$("#profile-jot-form").serialize(), $("#profile-jot-form").serialize(),
@ -666,58 +662,6 @@ function notifyMarkAll() {
}); });
} }
// code from http://www.tinymce.com/wiki.php/How-to_implement_a_custom_file_browser
function fcFileBrowser (field_name, url, type, win) {
/* TODO: If you work with sessions in PHP and your client doesn't accept cookies you might need to carry
the session name and session ID in the request string (can look like this: "?PHPSESSID=88p0n70s9dsknra96qhuk6etm5").
These lines of code extract the necessary parameters and add them back to the filebrowser URL again. */
var cmsURL = baseurl+"/fbrowser/"+type+"/";
tinyMCE.activeEditor.windowManager.open({
file : cmsURL,
title : 'File Browser',
width : 420, // Your dimensions may differ - toy around with them!
height : 400,
resizable : "yes",
inline : "yes", // This parameter only has an effect if you use the inlinepopups plugin!
close_previous : "no"
}, {
window : win,
input : field_name
});
return false;
}
/*function setupFieldRichtext(){
tinyMCE.init({
theme : "advanced",
mode : "specific_textareas",
editor_selector: "fieldRichtext",
plugins : "bbcode,paste, inlinepopups",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "center",
theme_advanced_blockformats : "blockquote,code",
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 : 'div',
convert_urls: false,
content_css: baseurl+"/view/custom_tinymce.css",
theme_advanced_path : false,
file_browser_callback : "fcFileBrowser",
});
}*/
/** /**
* sprintf in javascript * sprintf in javascript
* "{0} and {1}".format('zero','uno'); * "{0} and {1}".format('zero','uno');

228
view/theme/frost/js/theme.js
View File

@ -17,7 +17,7 @@ $(document).ready(function() {
});*/ });*/
/* enable tinymce on focus and click */ /* enable editor on focus and click */
$("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser); $("#profile-jot-text").click(enableOnUser);
@ -476,254 +476,52 @@ function hideNavMenu(menuID) {
/* /*
* TinyMCE/Editor * Editor
*/ */
function InitMCEEditor(editorData) {
var tinyMCEInitConfig = {
theme : "advanced",
//mode : // SPECIFIC
//editor_selector: // SPECIFIC
//elements: // SPECIFIC
plugins : "bbcode,paste,autoresize,inlinepopups",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
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, // COUPLED WITH paste PLUGIN
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
//force_p_newlines : false,
//force_br_newlines : true,
forced_root_block : 'div',
//convert_urls: false, //SPECIFIC?
content_css: baseurl + "/view/custom_tinymce.css",
theme_advanced_path : false,
file_browser_callback : "fcFileBrowser",
//setup : // SPECIFIC
};
if(window.editSelect != 'none') {
$.extend(tinyMCEInitConfig, editorData);
tinyMCE.init(tinyMCEInitConfig);
}
else if(typeof editorData.plaintextFn == 'function') {
(editorData.plaintextFn)();
}
}
var editor = false; var editor = false;
var textlen = 0; var textlen = 0;
function initEditor(cb){ function initEditor(callback) {
if(editor==false) { if(editor == false) {
editor = true;
$("#profile-jot-text-loading").show(); $("#profile-jot-text-loading").show();
var editorData = {
mode : "specific_textareas",
editor_selector : "profile-jot-text",
auto_focus : "profile-jot-text",
//plugins : "bbcode,paste,autoresize,inlinepopups",
//paste_text_sticky : true,
convert_urls : false,
setup : function(ed) {
cPopup = null;
ed.onKeyDown.add(function(ed,e) {
if(cPopup !== null)
cPopup.onkey(e);
});
ed.onKeyUp.add(function(ed, e) {
var txt = tinyMCE.activeEditor.getContent();
match = txt.match(/@([^ \n]+)$/);
if(match!==null) {
if(cPopup === null) {
cPopup = new ACPopup(this,baseurl+"/acl");
}
if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
if(! cPopup.ready) cPopup = null;
}
else {
if(cPopup !== null) { cPopup.close(); cPopup = null; }
}
textlen = txt.length;
if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
$('#profile-jot-desc').html(window.isPublic);
}
else {
$('#profile-jot-desc').html('&nbsp;');
}
//Character count
if(textlen <= 140) {
$('#character-counter').removeClass('red');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('grey');
}
if((textlen > 140) && (textlen <= 420)) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('red');
$('#character-counter').addClass('orange');
}
if(textlen > 420) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('red');
}
$('#character-counter').text(textlen);
});
ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true;
$("#profile-jot-text-loading").hide();
$(".jothidden").show();
if (typeof cb!="undefined") cb();
});
},
plaintextFn : function() {
$("#profile-jot-text-loading").hide(); $("#profile-jot-text-loading").hide();
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$("#profile-jot-text").editor_autocomplete(baseurl+"/acl"); $("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
$(".jothidden").show(); $(".jothidden").show();
if (typeof cb!="undefined") cb();
}
};
InitMCEEditor(editorData);
// setup acl popup // setup acl popup
$("a#jot-perms-icon").colorbox({ $("a#jot-perms-icon").colorbox({
'inline' : true, 'inline' : true,
'transition' : 'elastic' 'transition' : 'elastic'
}); });
} else {
if (typeof cb!="undefined") cb(); editor = true;
}
if (typeof callback != "undefined") {
callback();
} }
} }
function enableOnUser(){ function enableOnUser() {
if (editor) return; if (editor) {
return;
}
$(this).val(""); $(this).val("");
initEditor(); initEditor();
} }
function msgInitEditor() { function msgInitEditor() {
var editorData = {
mode : "specific_textareas",
editor_selector : "prvmail-text",
//plugins : "bbcode,paste",
//paste_text_sticky : true,
convert_urls : false,
//theme_advanced_path : false,
setup : function(ed) {
cPopup = null;
ed.onKeyDown.add(function(ed,e) {
if(cPopup !== null)
cPopup.onkey(e);
});
ed.onKeyUp.add(function(ed, e) {
var txt = tinyMCE.activeEditor.getContent();
match = txt.match(/@([^ \n]+)$/);
if(match!==null) {
if(cPopup === null) {
cPopup = new ACPopup(this,baseurl+"/acl");
}
if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
if(! cPopup.ready) cPopup = null;
}
else {
if(cPopup !== null) { cPopup.close(); cPopup = null; }
}
textlen = txt.length;
if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
$('#profile-jot-desc').html(window.isPublic);
}
else {
$('#profile-jot-desc').html('&nbsp;');
}
});
ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true;
var editorId = ed.editorId;
var textarea = $('#'+editorId);
if (typeof(textarea.attr('tabindex')) != "undefined") {
$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
textarea.attr('tabindex', null);
}
});
},
plaintextFn : function() {
$("#prvmail-text").editor_autocomplete(baseurl+"/acl"); $("#prvmail-text").editor_autocomplete(baseurl+"/acl");
}
}
InitMCEEditor(editorData);
} }
function contactInitEditor() {
var editorData = {
mode : "exact",
elements : "contact-edit-info",
//plugins : "bbcode"
}
InitMCEEditor(editorData);
}
function eventInitEditor() {
var editorData = {
mode : "textareas",
//plugins : "bbcode,paste",
//paste_text_sticky : true,
//theme_advanced_path : false,
setup : function(ed) {
ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true;
});
}
}
InitMCEEditor(editorData);
}
function profInitEditor() {
var editorData = {
mode : "textareas",
//plugins : "bbcode,paste",
//paste_text_sticky : true,
//theme_advanced_path : false,
setup : function(ed) {
ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true;
});
}
}
InitMCEEditor(editorData);
}
/* /*
* Jot * Jot
*/ */
function addeditortext(textElem, data) { function addeditortext(textElem, data) {
if(window.editSelect == 'none') {
var currentText = $(textElem).val(); var currentText = $(textElem).val();
$(textElem).val(currentText + data); $(textElem).val(currentText + data);
}
else
tinyMCE.execCommand('mceInsertRawHTML',false,data);
} }
function jotVideoURL() { function jotVideoURL() {

3
view/theme/frost/templates/contact_end.tpl
View File

@ -1,3 +0,0 @@
<script language="javascript" type="text/javascript">contactInitEditor();</script>

5
view/theme/frost/templates/contact_head.tpl
View File

@ -1,5 +0,0 @@
<script language="javascript" type="text/javascript">
window.editSelect = "{{$editselect}}";
</script>

6
view/theme/frost/templates/end.tpl
View File

@ -2,12 +2,6 @@
<!--[if IE]> <!--[if IE]>
<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script> <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]--> <![endif]-->
{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>-->*}}
{{*<!--<script type="text/javascript">
tinyMCE.init({ mode : "none"});
</script>-->*}}
<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script> <script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/jquery.divgrow-1.3.1.f1.min.js" ></script> <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/jquery.divgrow-1.3.1.f1.min.js" ></script>

2
view/theme/frost/templates/event_end.tpl
View File

@ -2,5 +2,3 @@
<script type="text/javascript" src="{{$baseurl}}/library/moment/moment.min.js"></script> <script type="text/javascript" src="{{$baseurl}}/library/moment/moment.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/library/moment/locales.min.js"></script> <script type="text/javascript" src="{{$baseurl}}/library/moment/locales.min.js"></script>
<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script> <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
<script language="javascript" type="text/javascript">eventInitEditor();</script>

1
view/theme/frost/templates/event_head.tpl
View File

@ -3,7 +3,6 @@
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
window.aclType = 'event_head'; window.aclType = 'event_head';
window.editSelect = "{{$editselect}}";
window.eventModuleUrl = "{{$module_url}}"; window.eventModuleUrl = "{{$module_url}}";
window.eventModeParams = "{{$modparams}}" ; window.eventModeParams = "{{$modparams}}" ;
</script> </script>

1
view/theme/frost/templates/jot-header.tpl
View File

@ -1,7 +1,6 @@
<script> <script>
window.editSelect = "{{$editselect}}";
window.isPublic = "{{$ispublic}}"; window.isPublic = "{{$ispublic}}";
window.nickname = "{{$nickname}}"; window.nickname = "{{$nickname}}";
window.linkURL = "{{$linkurl}}"; window.linkURL = "{{$linkurl}}";

1
view/theme/frost/templates/msg-header.tpl
View File

@ -3,7 +3,6 @@
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
window.nickname = "{{$nickname}}"; window.nickname = "{{$nickname}}";
window.linkURL = "{{$linkurl}}"; window.linkURL = "{{$linkurl}}";
window.editSelect = "{{$editselect}}";
window.jotId = "#prvmail-text"; window.jotId = "#prvmail-text";
window.imageUploadButton = 'prvmail-upload'; window.imageUploadButton = 'prvmail-upload';
window.autocompleteType = 'msg-header'; window.autocompleteType = 'msg-header';

1
view/theme/frost/templates/profed_end.tpl
View File

@ -2,7 +2,6 @@
<script type="text/javascript" src="js/country.js" ></script> <script type="text/javascript" src="js/country.js" ></script>
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
profInitEditor();
Fill_Country('{{$country_name}}'); Fill_Country('{{$country_name}}');
Fill_States('{{$region}}'); Fill_States('{{$region}}');
</script> </script>

6
view/theme/frost/templates/profed_head.tpl
View File

@ -1,6 +0,0 @@
<script language="javascript" type="text/javascript">
window.editSelect = "{{$editselect}}";
</script>

1
view/theme/frost/templates/wallmsg-header.tpl
View File

@ -1,7 +1,6 @@
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
window.editSelect = "{{$editselect}}";
window.jotId = "#prvmail-text"; window.jotId = "#prvmail-text";
window.imageUploadButton = 'prvmail-upload'; window.imageUploadButton = 'prvmail-upload';
</script> </script>

128
view/theme/smoothly/templates/jot-header.tpl
View File

@ -2,20 +2,17 @@
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
var editor=false; var editor = false;
var textlen = 0; var textlen = 0;
var plaintext = '{{$editselect}}';
function initEditor(cb){ function initEditor(callback) {
if (editor==false){ if (editor == false){
$("#profile-jot-text-loading").show(); $("#profile-jot-text-loading").show();
if(plaintext == 'none') {
$("#profile-jot-text-loading").hide(); $("#profile-jot-text-loading").hide();
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$("#profile-jot-text").editor_autocomplete(baseurl+"/acl"); $("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
$("#profile-jot-text").bbco_autocomplete('bbcode'); $("#profile-jot-text").bbco_autocomplete('bbcode');
$(".jothidden").show(); $(".jothidden").show();
editor = true;
$("a#jot-perms-icon").colorbox({ $("a#jot-perms-icon").colorbox({
'inline' : true, 'inline' : true,
'transition' : 'elastic' 'transition' : 'elastic'
@ -34,118 +31,17 @@ function initEditor(cb){
$("#jot-preview-link").show(); $("#jot-preview-link").show();
{{/if}} {{/if}}
if (typeof cb!="undefined") cb();
return;
}
tinyMCE.init({
theme : "advanced",
mode : "specific_textareas",
editor_selector: /(profile-jot-text|prvmail-text)/,
plugins : "bbcode,paste,fullscreen,autoresize",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "center",
theme_advanced_blockformats : "blockquote,code",
//theme_advanced_resizing : true,
//theme_advanced_statusbar_location : "bottom",
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 : 'div',
convert_urls: false,
content_css: "{{$baseurl}}/view/custom_tinymce.css",
theme_advanced_path : false,
setup : function(ed) {
cPopup = null;
ed.onKeyDown.add(function(ed,e) {
if(cPopup !== null)
cPopup.onkey(e);
});
ed.onKeyUp.add(function(ed, e) {
var txt = tinyMCE.activeEditor.getContent();
match = txt.match(/@([^ \n]+)$/);
if(match!==null) {
if(cPopup === null) {
cPopup = new ACPopup(this,baseurl+"/acl");
}
if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
if(! cPopup.ready) cPopup = null;
}
else {
if(cPopup !== null) { cPopup.close(); cPopup = null; }
}
textlen = txt.length;
if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
$('#profile-jot-desc').html(ispublic);
}
else {
$('#profile-jot-desc').html('&nbsp;');
}
//Character count
if(textlen <= 140) {
$('#character-counter').removeClass('red');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('grey');
}
if((textlen > 140) && (textlen <= 420)) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('red');
$('#character-counter').addClass('orange');
}
if(textlen > 420) {
$('#character-counter').removeClass('grey');
$('#character-counter').removeClass('orange');
$('#character-counter').addClass('red');
}
$('#character-counter').text(textlen);
});
ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true;
$("#profile-jot-text-loading").hide();
$(".jothidden").show();
$("#profile-jot-submit-wrapper").show();
{{if $newpost}}
$("#profile-upload-wrapper").show();
$("#profile-attach-wrapper").show();
$("#profile-link-wrapper").show();
$("#profile-video-wrapper").show();
$("#profile-audio-wrapper").show();
$("#profile-location-wrapper").show();
$("#profile-nolocation-wrapper").show();
$("#profile-title-wrapper").show();
$("#profile-jot-plugin-wrapper").show();
$("#jot-preview-link").show();
{{/if}}
$("#character-counter").show();
if (typeof cb!="undefined") cb();
});
}
});
editor = true; editor = true;
// setup acl popup }
$("a#jot-perms-icon").colorbox({ if (typeof callback != "undefined") {
'inline' : true, callback();
'transition' : 'elastic'
});
} else {
if (typeof cb!="undefined") cb();
} }
} // initEditor } // initEditor
function enableOnUser(){ function enableOnUser(){
if (editor) return; if (editor) {
return;
}
$(this).val(""); $(this).val("");
initEditor(); initEditor();
} }
@ -160,7 +56,7 @@ function enableOnUser(){
$(document).ready(function() { $(document).ready(function() {
/* enable tinymce on focus and click */ /* enable editor on focus and click */
$("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser); $("#profile-jot-text").click(enableOnUser);
@ -362,13 +258,9 @@ function enableOnUser(){
} }
function addeditortext(data) { function addeditortext(data) {
if(plaintext == 'none') {
var currentText = $("#profile-jot-text").val(); var currentText = $("#profile-jot-text").val();
$("#profile-jot-text").val(currentText + data); $("#profile-jot-text").val(currentText + data);
} }
else
tinyMCE.execCommand('mceInsertRawHTML',false,data);
}
{{$geotag}} {{$geotag}}