mirror of
https://git.sekbaer.de/Friendica/friendica.git
synced 2025-06-17 04:15:15 +02:00
Merge branch 'develop' into issue/#3062
* develop: (68 commits) Added documentation update to the translation update to the translations translation docs now contain basic usage of the Transifex client - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content - Remove misc TinyMCE mentions in docs and minifyjs - Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter - Remove TinyMCE mentions in themes - Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value Remove tinyMCE libraries limit the description of the meta tag to 160 characters in /mod/display Improved handling of non string values in the config Bugfix: Caching of non string cache values now works. Reformatted stuff, improved query Auto-focus first input field of modal when shown Use cache instead of config for storing last proc_run time Some added logging Bugfix for masses of php warnings Rearranged the logging Some changed logging ... # Conflicts: # view/theme/frost-mobile/js/theme.js # view/theme/frost/js/theme.js
This commit is contained in:
Hypolite Petovan
commit
c38a5e443d
438 changed files with 108865 additions and 144355 deletions
|
|
@ -2,7 +2,6 @@ Home page edit pencil
|
|||
Preview spacing
|
||||
Photo album display
|
||||
|
||||
Check TinyMCE optimization
|
||||
"Profiles" page is wonky
|
||||
Settings, admin, photos upload don't look beautiful
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
|
||||
function openClose(listID) {
|
||||
/* if(document.getElementById(theID).style.display == "block") {
|
||||
document.getElementById(theID).style.display = "none"
|
||||
/* if(document.getElementById(theID).style.display == "block") {
|
||||
document.getElementById(theID).style.display = "none"
|
||||
}
|
||||
else {
|
||||
document.getElementById(theID).style.display = "block"
|
||||
else {
|
||||
document.getElementById(theID).style.display = "block"
|
||||
}*/
|
||||
listID = "#" + listID.replace(/:/g, "\\:");
|
||||
listID = listID.replace(/\./g, "\\.");
|
||||
|
|
@ -21,11 +21,11 @@
|
|||
}
|
||||
|
||||
function openMenu(theID) {
|
||||
document.getElementById(theID).style.display = "block"
|
||||
document.getElementById(theID).style.display = "block"
|
||||
}
|
||||
|
||||
function closeMenu(theID) {
|
||||
document.getElementById(theID).style.display = "none"
|
||||
document.getElementById(theID).style.display = "none"
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
$.ajaxSetup({cache: false});
|
||||
|
||||
collapseHeight();
|
||||
|
||||
|
||||
/* setup tooltips *//*
|
||||
$("a,.tt").each(function(){
|
||||
var e = $(this);
|
||||
|
|
@ -59,18 +59,18 @@
|
|||
if (e.hasClass("ttright")) pos="right";
|
||||
e.tipTip({defaultPosition: pos, edgeOffset: 8});
|
||||
});*/
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/* setup onoff widgets */
|
||||
$(".onoff input").each(function(){
|
||||
val = $(this).val();
|
||||
id = $(this).attr("id");
|
||||
$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
|
||||
|
||||
|
||||
});
|
||||
$(".onoff > a").click(function(event){
|
||||
event.preventDefault();
|
||||
event.preventDefault();
|
||||
var input = $(this).siblings("input");
|
||||
var val = 1-input.val();
|
||||
var id = input.attr("id");
|
||||
|
|
@ -79,9 +79,6 @@
|
|||
input.val(val);
|
||||
//console.log(id);
|
||||
});
|
||||
|
||||
/* setup field_richtext */
|
||||
//setupFieldRichtext();
|
||||
|
||||
/* popup menus */
|
||||
function close_last_popup_menu(e) {
|
||||
|
|
@ -119,20 +116,20 @@
|
|||
$('html').click(function(e) {
|
||||
close_last_popup_menu(e);
|
||||
});
|
||||
|
||||
|
||||
// fancyboxes
|
||||
$("a.popupbox").colorbox({
|
||||
'inline' : true,
|
||||
'transition' : 'elastic'
|
||||
});
|
||||
|
||||
|
||||
|
||||
/* notifications template */
|
||||
var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
|
||||
var notifications_all = unescape($('<div>').append( $("#nav-notifications-see-all").clone() ).html()); //outerHtml hack
|
||||
var notifications_mark = unescape($('<div>').append( $("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack
|
||||
var notifications_empty = unescape($("#nav-notifications-menu").html());
|
||||
|
||||
|
||||
/* nav update event */
|
||||
$('nav').bind('nav-update', function(e,data){;
|
||||
var invalid = $(data).find('invalid').text();
|
||||
|
|
@ -145,7 +142,7 @@
|
|||
var home = $(data).find('home').text();
|
||||
if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
|
||||
$('#home-update').html(home);
|
||||
|
||||
|
||||
var intro = $(data).find('intro').text();
|
||||
if(intro == 0) { intro = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
|
||||
$('#intro-update').html(intro);
|
||||
|
|
@ -153,7 +150,7 @@
|
|||
var mail = $(data).find('mail').text();
|
||||
if(mail == 0) { mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
|
||||
$('#mail-update').html(mail);
|
||||
|
||||
|
||||
var intro = $(data).find('intro').text();
|
||||
if(intro == 0) { intro = ''; $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') }
|
||||
$('#intro-update-li').html(intro);
|
||||
|
|
@ -163,7 +160,7 @@
|
|||
$('#mail-update-li').html(mail);
|
||||
|
||||
var eNotif = $(data).find('notif')
|
||||
|
||||
|
||||
if (eNotif.children("note").length==0){
|
||||
$("#nav-notifications-menu").html(notifications_empty);
|
||||
} else {
|
||||
|
|
@ -194,7 +191,7 @@
|
|||
}
|
||||
if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
|
||||
$('#notify-update').html(notif);
|
||||
|
||||
|
||||
var eSysmsg = $(data).find('sysmsgs');
|
||||
eSysmsg.children("notice").each(function(){
|
||||
text = $(this).text();
|
||||
|
|
@ -204,11 +201,11 @@
|
|||
text = $(this).text();
|
||||
$.jGrowl(text, { sticky: false, theme: 'info', life: 1000 });
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
|
||||
|
||||
NavUpdate();
|
||||
|
||||
|
||||
NavUpdate();
|
||||
// Allow folks to stop the ajax page updates with the pause/break key
|
||||
$(document).keydown(function(event) {
|
||||
if(event.keyCode == '8') {
|
||||
|
|
@ -234,8 +231,8 @@
|
|||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
});
|
||||
|
||||
function NavUpdate() {
|
||||
|
|
@ -246,11 +243,11 @@
|
|||
$(data).find('result').each(function() {
|
||||
// send nav-update event
|
||||
$('nav').trigger('nav-update', this);
|
||||
|
||||
|
||||
|
||||
|
||||
// start live update
|
||||
|
||||
|
||||
|
||||
|
||||
if($('#live-network').length) { src = 'network'; liveUpdate(); }
|
||||
if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
|
||||
|
|
@ -260,19 +257,19 @@
|
|||
/*if($('#live-display').length) {
|
||||
if(liking) {
|
||||
liking = 0;
|
||||
window.location.href=window.location.href
|
||||
window.location.href=window.location.href
|
||||
}
|
||||
}*/
|
||||
if($('#live-photos').length) {
|
||||
if(liking) {
|
||||
liking = 0;
|
||||
window.location.href=window.location.href
|
||||
window.location.href=window.location.href
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
});
|
||||
}) ;
|
||||
}
|
||||
|
|
@ -382,8 +379,8 @@
|
|||
});
|
||||
$('#' + prev).after($(this));
|
||||
}
|
||||
else {
|
||||
$('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago'));
|
||||
else {
|
||||
$('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago'));
|
||||
if($('#' + ident + ' ' + '.comment-edit-text-empty').length)
|
||||
$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
|
||||
$('#' + ident + ' ' + '.hide-comments-total').replaceWith($(this).find('.hide-comments-total'));
|
||||
|
|
@ -393,9 +390,9 @@
|
|||
$(this).attr('src',$(this).attr('dst'));
|
||||
});
|
||||
}
|
||||
prev = ident;
|
||||
prev = ident;
|
||||
});*/
|
||||
|
||||
|
||||
$('.like-rotator').hide();
|
||||
if(commentBusy) {
|
||||
commentBusy = false;
|
||||
|
|
@ -403,7 +400,7 @@
|
|||
}
|
||||
/* autocomplete @nicknames */
|
||||
$(".comment-edit-form textarea").editor_autocomplete(baseurl+"/acl");
|
||||
|
||||
|
||||
collapseHeight();
|
||||
|
||||
// setup videos, since VideoJS won't take care of any loaded via AJAX
|
||||
|
|
@ -422,7 +419,7 @@
|
|||
$(this).divgrow({ initialHeight: 400, showBrackets: false, speed: 0 });
|
||||
$(this).addClass('divmore');
|
||||
$('html').height('auto');
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -434,10 +431,10 @@
|
|||
$(node).removeClass("drop").addClass("drophide");
|
||||
}*/
|
||||
|
||||
// Since our ajax calls are asynchronous, we will give a few
|
||||
// seconds for the first ajax call (setting like/dislike), then
|
||||
// Since our ajax calls are asynchronous, we will give a few
|
||||
// seconds for the first ajax call (setting like/dislike), then
|
||||
// run the updater to pick up any changes and display on the page.
|
||||
// The updater will turn any rotators off when it's done.
|
||||
// The updater will turn any rotators off when it's done.
|
||||
// This function will have returned long before any of these
|
||||
// events have completed and therefore there won't be any
|
||||
// visible feedback that anything changed without all this
|
||||
|
|
@ -461,13 +458,13 @@
|
|||
$('#star-' + ident).addClass('hidden');
|
||||
$('#unstar-' + ident).removeClass('hidden');
|
||||
}
|
||||
else {
|
||||
else {
|
||||
$('#starred-' + ident).addClass('unstarred');
|
||||
$('#starred-' + ident).removeClass('starred');
|
||||
$('#star-' + ident).removeClass('hidden');
|
||||
$('#unstar-' + ident).addClass('hidden');
|
||||
}
|
||||
// $('#like-rotator-' + ident).hide();
|
||||
// $('#like-rotator-' + ident).hide();
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -520,8 +517,8 @@
|
|||
commentBusy = true;
|
||||
$('body').css('cursor', 'wait');
|
||||
$("#comment-preview-inp-" + id).val("0");
|
||||
$.post(
|
||||
"item",
|
||||
$.post(
|
||||
"item",
|
||||
$("#comment-edit-form-" + id).serialize(),
|
||||
function(data) {
|
||||
if(data.success) {
|
||||
|
|
@ -537,28 +534,28 @@
|
|||
window.location.href=data.reload;
|
||||
}
|
||||
},
|
||||
"json"
|
||||
);
|
||||
return false;
|
||||
"json"
|
||||
);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
function preview_comment(id) {
|
||||
$("#comment-preview-inp-" + id).val("1");
|
||||
$("#comment-edit-preview-" + id).show();
|
||||
$.post(
|
||||
"item",
|
||||
$.post(
|
||||
"item",
|
||||
$("#comment-edit-form-" + id).serialize(),
|
||||
function(data) {
|
||||
if(data.preview) {
|
||||
|
||||
|
||||
$("#comment-edit-preview-" + id).html(data.preview);
|
||||
$("#comment-edit-preview-" + id + " a").click(function() { return false; });
|
||||
}
|
||||
},
|
||||
"json"
|
||||
);
|
||||
return true;
|
||||
"json"
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -578,20 +575,19 @@
|
|||
function preview_post() {
|
||||
$("#jot-preview").val("1");
|
||||
$("#jot-preview-content").show();
|
||||
tinyMCE.triggerSave();
|
||||
$.post(
|
||||
"item",
|
||||
$.post(
|
||||
"item",
|
||||
$("#profile-jot-form").serialize(),
|
||||
function(data) {
|
||||
if(data.preview) {
|
||||
if(data.preview) {
|
||||
$("#jot-preview-content").html(data.preview);
|
||||
$("#jot-preview-content" + " a").click(function() { return false; });
|
||||
}
|
||||
},
|
||||
"json"
|
||||
);
|
||||
"json"
|
||||
);
|
||||
$("#jot-preview").val("0");
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -630,7 +626,7 @@
|
|||
$('body .fakelink').css('cursor', 'wait');
|
||||
$.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) {
|
||||
$('#group-update-wrapper').html(data);
|
||||
$('body .fakelink').css('cursor', 'auto');
|
||||
$('body .fakelink').css('cursor', 'auto');
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -638,7 +634,7 @@
|
|||
$('body .fakelink').css('cursor', 'wait');
|
||||
$.get('profperm/' + gid + '/' + cid, function(data) {
|
||||
$('#prof-update-wrapper').html(data);
|
||||
$('body .fakelink').css('cursor', 'auto');
|
||||
$('body .fakelink').css('cursor', 'auto');
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -666,61 +662,9 @@ 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
|
||||
* "{0} and {1}".format('zero','uno');
|
||||
/**
|
||||
* sprintf in javascript
|
||||
* "{0} and {1}".format('zero','uno');
|
||||
**/
|
||||
String.prototype.format = function() {
|
||||
var formatted = this;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ $(document).ready(function() {
|
|||
'#system-menu-list-closing': false
|
||||
};
|
||||
|
||||
/* enable tinymce on focus and click */
|
||||
/* enable editor on focus and click */
|
||||
$("#profile-jot-text").focus(enableOnUser);
|
||||
$("#profile-jot-text").click(enableOnUser);
|
||||
|
||||
|
|
@ -384,249 +384,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 textlen = 0;
|
||||
|
||||
function initEditor(cb) {
|
||||
if (editor==false) {
|
||||
editor = true;
|
||||
function initEditor(callback) {
|
||||
if(editor == false) {
|
||||
$("#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(' ');
|
||||
}
|
||||
|
||||
//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").css({ 'height': 200, 'color': '#000' });
|
||||
$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
|
||||
$(".jothidden").show();
|
||||
if (typeof cb!="undefined") cb();
|
||||
}
|
||||
};
|
||||
InitMCEEditor(editorData);
|
||||
|
||||
$("#profile-jot-text-loading").hide();
|
||||
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
|
||||
$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
|
||||
$(".jothidden").show();
|
||||
// setup acl popup
|
||||
$("a#jot-perms-icon").colorbox({
|
||||
'inline' : true,
|
||||
'transition' : 'elastic'
|
||||
});
|
||||
} else {
|
||||
if (typeof cb!="undefined") cb();
|
||||
|
||||
editor = true;
|
||||
}
|
||||
if (typeof callback != "undefined") {
|
||||
callback();
|
||||
}
|
||||
}
|
||||
|
||||
function enableOnUser() {
|
||||
if (editor) return;
|
||||
if (editor) {
|
||||
return;
|
||||
}
|
||||
$(this).val("");
|
||||
initEditor();
|
||||
}
|
||||
|
||||
|
||||
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(' ');
|
||||
}
|
||||
});
|
||||
|
||||
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");
|
||||
}
|
||||
}
|
||||
InitMCEEditor(editorData);
|
||||
$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
|
||||
}
|
||||
|
||||
|
||||
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
|
||||
*/
|
||||
|
||||
function addeditortext(textElem, data) {
|
||||
if (window.editSelect == 'none') {
|
||||
var currentText = $(textElem).val();
|
||||
$(textElem).val(currentText + data);
|
||||
} else {
|
||||
tinyMCE.execCommand('mceInsertRawHTML',false,data);
|
||||
}
|
||||
var currentText = $(textElem).val();
|
||||
$(textElem).val(currentText + data);
|
||||
}
|
||||
|
||||
function jotVideoURL() {
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
|
||||
<script language="javascript" type="text/javascript">contactInitEditor();</script>
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
|
||||
<script language="javascript" type="text/javascript">
|
||||
window.editSelect = "{{$editselect}}";
|
||||
</script>
|
||||
|
||||
|
|
@ -2,12 +2,6 @@
|
|||
<!--[if IE]>
|
||||
<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
|
||||
<![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}}/view/theme/frost/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
|
||||
|
|
|
|||
|
|
@ -2,5 +2,3 @@
|
|||
<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 language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
|
||||
|
||||
<script language="javascript" type="text/javascript">eventInitEditor();</script>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
<script language="javascript" type="text/javascript">
|
||||
window.aclType = 'event_head';
|
||||
window.editSelect = "{{$editselect}}";
|
||||
window.eventModuleUrl = "{{$module_url}}";
|
||||
window.eventModeParams = "{{$modparams}}" ;
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -1,85 +0,0 @@
|
|||
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
|
||||
<style>
|
||||
.panel_wrapper div.current{.overflow: auto; height: auto!important; }
|
||||
.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
|
||||
.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
|
||||
.filebrowser ul{ list-style-type: none; padding:0px; }
|
||||
.filebrowser.folders a { display: block; padding: 0.3em }
|
||||
.filebrowser.folders a:hover { background-color: #f0f0ee; }
|
||||
.filebrowser.files.image { overflow: auto; height: auto; }
|
||||
.filebrowser.files.image img { height:100px;}
|
||||
.filebrowser.files.image li { display: block; padding: 5px; float: left; }
|
||||
.filebrowser.files.image span { display: none;}
|
||||
.filebrowser.files.file img { height:16px; vertical-align: bottom;}
|
||||
.filebrowser.files a { display: block; padding: 0.3em}
|
||||
.filebrowser.files a:hover { background-color: #f0f0ee; }
|
||||
.filebrowser a { text-decoration: none; }
|
||||
</style>
|
||||
<script>
|
||||
var FileBrowserDialogue = {
|
||||
init : function () {
|
||||
// Here goes your code for setting your custom things onLoad.
|
||||
},
|
||||
mySubmit : function (URL) {
|
||||
//var URL = document.my_form.my_field.value;
|
||||
var win = tinyMCEPopup.getWindowArg("window");
|
||||
|
||||
// insert information now
|
||||
win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
|
||||
|
||||
// are we an image browser
|
||||
if (typeof(win.ImageDialog) != "undefined") {
|
||||
// we are, so update image dimensions...
|
||||
if (win.ImageDialog.getImageData)
|
||||
win.ImageDialog.getImageData();
|
||||
|
||||
// ... and preview if necessary
|
||||
if (win.ImageDialog.showPreviewImage)
|
||||
win.ImageDialog.showPreviewImage(URL);
|
||||
}
|
||||
|
||||
// close popup window
|
||||
tinyMCEPopup.close();
|
||||
}
|
||||
}
|
||||
|
||||
tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div class="tabs">
|
||||
<ul >
|
||||
<li class="current"><span>FileBrowser</span></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="panel_wrapper">
|
||||
|
||||
<div id="general_panel" class="panel current">
|
||||
<div class="filebrowser path">
|
||||
{{foreach $path as $p}}<a href="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
|
||||
</div>
|
||||
<div class="filebrowser folders">
|
||||
<ul>
|
||||
{{foreach $folders as $f}}<li><a href="{{$f.0}}/">{{$f.1}}</a></li>{{/foreach}}
|
||||
</ul>
|
||||
</div>
|
||||
<div class="filebrowser files {{$type}}">
|
||||
<ul>
|
||||
{{foreach $files as $f}}
|
||||
<li><a href="#" onclick="FileBrowserDialogue.mySubmit('{{$f.0}}'); return false;"><img src="{{$f.2}}"><span>{{$f.1}}</span></a></li>
|
||||
{{/foreach}}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mceActionPanel">
|
||||
<input type="button" id="cancel" name="cancel" value="{{$cancel}}" onclick="tinyMCEPopup.close();" />
|
||||
</div>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
|
||||
|
||||
<script>
|
||||
window.editSelect = "{{$editselect}}";
|
||||
window.isPublic = "{{$ispublic}}";
|
||||
window.nickname = "{{$nickname}}";
|
||||
window.linkURL = "{{$linkurl}}";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
<script language="javascript" type="text/javascript">
|
||||
window.nickname = "{{$nickname}}";
|
||||
window.linkURL = "{{$linkurl}}";
|
||||
window.editSelect = "{{$editselect}}";
|
||||
window.jotId = "#prvmail-text";
|
||||
window.imageUploadButton = 'prvmail-upload';
|
||||
window.autocompleteType = 'msg-header';
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
<script type="text/javascript" src="js/country.js" ></script>
|
||||
|
||||
<script language="javascript" type="text/javascript">
|
||||
profInitEditor();
|
||||
Fill_Country('{{$country_name}}');
|
||||
Fill_States('{{$region}}');
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
|
||||
|
||||
<script language="javascript" type="text/javascript">
|
||||
window.editSelect = "{{$editselect}}";
|
||||
</script>
|
||||
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
|
||||
|
||||
<script language="javascript" type="text/javascript">
|
||||
window.editSelect = "{{$editselect}}";
|
||||
window.jotId = "#prvmail-text";
|
||||
window.imageUploadButton = 'prvmail-upload';
|
||||
</script>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue