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 2017-01-27 15:30:21 -05:00
commit c38a5e443d
438 changed files with 108865 additions and 144355 deletions

View file

@ -72,51 +72,8 @@
var modparams = {{$modparams}}
</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">
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() {
$('.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');
{{/if}}
});
</script>

View file

@ -34,8 +34,8 @@
{{* The buttons to change the month/weeks/days *}}
<div id="fc-fc-header-left" class="btn-group">
<button class="btn btn-eventnav" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-angle-up" aria-hidden="true"></i></i></button>
<button class="btn btn-eventnav btn-separator" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-angle-down" aria-hidden="true"></i></i></button>
<button class="btn btn-eventnav" onclick="changeView('prev', false);" title="{{$previous.1}}"><i class="fa fa-angle-up" aria-hidden="true"></i></i></button>
<button class="btn btn-eventnav btn-separator" onclick="changeView('next', false);" title="{{$next.1}}"><i class="fa fa-angle-down" aria-hidden="true"></i></i></button>
<button class="btn btn-eventnav btn-separator" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
</div>

View file

@ -1,6 +1,5 @@
<!--
This is the template used by mod/fbrowser.php when is called from plain text editor.
See also 'filebrowser.tpl'
This is the template used by mod/fbrowser.php
-->
<style>
#buglink_wrapper{display:none;} /* hide buglink. only in this page */

View file

@ -66,7 +66,6 @@
<script type="text/javascript" src="library/colorbox/jquery.colorbox-min.js"></script>
<script type="text/javascript" src="library/jgrowl/jquery.jgrowl_minimized.js"></script>
<script type="text/javascript" src="library/datetimepicker/jquery.datetimepicker.js"></script>
<script type="text/javascript" src="library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
<script type="text/javascript" src="library/perfect-scrollbar/perfect-scrollbar.jquery.min.js" ></script>
<script type="text/javascript" src="js/acl.js" ></script>
<script type="text/javascript" src="js/webtoolkit.base64.js" ></script>

View file

@ -2,134 +2,37 @@
<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
<script type="text/javascript">
var editor=false;
var editor = false;
var textlen = 0;
var plaintext = '{{$editselect}}';
function initEditor(cb){
if (editor==false){
function initEditor(callback) {
if (editor == false) {
$("#profile-jot-text-loading").show();
if(plaintext == 'none') {
$("#profile-jot-text-loading").hide();
//$("#profile-jot-text").addClass("profile-jot-text-full").removeClass("profile-jot-text-empty");
$("#jot-category").show();
$("#jot-category").addClass("jot-category-ex");
$("#jot-profile-jot-wrapper").show();
$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
$("#profile-jot-text").bbco_autocomplete('bbcode');
editor = true;
$("a#jot-perms-icon").colorbox({
'inline' : true,
'transition' : 'elastic'
});
$(".jothidden").show();
if (typeof cb!="undefined") cb();
$("#profile-jot-text").keyup(function(){
var textlen = $(this).val().length;
$('#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;
// setup acl popup
$("#profile-jot-text-loading").hide();
//$("#profile-jot-text").addClass("profile-jot-text-full").removeClass("profile-jot-text-empty");
$("#jot-category").show();
$("#jot-category").addClass("jot-category-ex");
$("#jot-profile-jot-wrapper").show();
$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
$("#profile-jot-text").bbco_autocomplete('bbcode');
$("a#jot-perms-icon").colorbox({
'inline' : true,
'transition' : 'elastic'
});
});
$(".jothidden").show();
$("#profile-jot-text").keyup(function(){
var textlen = $(this).val().length;
$('#character-counter').text(textlen);
});
} else {
if (typeof cb!="undefined") cb();
editor = true;
}
if (typeof callback != "undefined") {
callback();
}
}
function enableOnUser(){
if (editor) return;
//$(this).val("");
initEditor();
}
</script>
@ -140,7 +43,7 @@
$(document).ready(function() {
/* enable tinymce on focus and click */
/* enable editor on focus and click */
$("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser);
@ -177,33 +80,6 @@
Dialog.doFileBrowser("main");
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() {
@ -377,18 +253,14 @@
}
function addeditortext(data) {
if(plaintext == 'none') {
// get the textfield
var textfield = document.getElementById("profile-jot-text");
// check if the textfield does have the default-value
jotTextOpenUI(textfield);
// save already existent content
var currentText = $("#profile-jot-text").val();
//insert the data as new value
textfield.value = currentText + data;
}
else
tinyMCE.execCommand('mceInsertRawHTML',false,data);
// get the textfield
var textfield = document.getElementById("profile-jot-text");
// check if the textfield does have the default-value
jotTextOpenUI(textfield);
// save already existent content
var currentText = $("#profile-jot-text").val();
//insert the data as new value
textfield.value = currentText + data;
}
{{$geotag}}
@ -397,13 +269,18 @@
var modal = $('#jot-modal').modal();
jotcache = $("#jot-sections");
// Auto focus on the first enabled field in the modal
modal.on('shown.bs.modal', function (e) {
$('#jot-modal-content').find('select:not([disabled]), input:not([type=hidden]):not([disabled]), textarea:not([disabled])').first().focus();
})
modal
.find('#jot-modal-content')
.append(jotcache)
.modal.show;
}
// the following functions show/hide the specific jot content
// the following functions show/hide the specific jot content
// in dependence of the selected nav
function aclActive() {
$(".modal-body #profile-jot-wrapper, .modal-body #jot-preview-content, .modal-body #jot-fbrowser-wrapper").hide();

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">
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");
</script>
<script>
$(document).ready(function() {
{{if $editselect = 'none'}}
$("#comment-edit-text-input").bbco_autocomplete('bbcode');
{{/if}}
//var objDiv = document.getElementById("mail-conversation");
//objDiv.scrollTop = objDiv.scrollHeight;
$('#mail-conversation').perfectScrollbar();
$('#message-preview').perfectScrollbar();
$('#mail-conversation').scrollTop($('#mail-conversation')[0].scrollHeight);
});
</script>

View file

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

View file

@ -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"
}
@ -59,29 +59,25 @@
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");
$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
$("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden");
input.val(val);
//console.log(id);
});
/* setup field_richtext */
/*setupFieldRichtext();*/
/* popup menus */
function close_last_popup_menu(e) {
@ -126,20 +122,20 @@
$('html').click(function(e) {
close_last_popup_menu(e);
});
// fancyboxes
/*$("a.popupbox").colorbox({
'inline' : true,
'transition' : 'none'
});*/
/* 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();
@ -152,7 +148,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);
@ -160,7 +156,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);
@ -170,7 +166,7 @@
$('#mail-update-li').html(mail);
var eNotif = $(data).find('notif')
if (eNotif.children("note").length==0){
$("#nav-notifications-menu").html(notifications_empty);
} else {
@ -201,7 +197,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();
@ -211,11 +207,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') {
@ -241,8 +237,8 @@
}
}
});*/
});
function NavUpdate() {
@ -253,11 +249,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(); }
@ -267,19 +263,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
}
}
});
}) ;
}
@ -368,8 +364,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'));
@ -379,9 +375,9 @@
$(this).attr('src',$(this).attr('dst'));
});
}
prev = ident;
prev = ident;
});*/
$('.like-rotator').hide();
if(commentBusy) {
commentBusy = false;
@ -416,10 +412,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
@ -445,13 +441,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();
});
}
@ -504,8 +500,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) {
@ -521,28 +517,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;
}
@ -562,20 +558,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;
}
@ -585,36 +580,36 @@
stopped = false;
$('#pause').html('');
}
function bin2hex(s){
// Converts the binary representation of data to hex
//
// version: 812.316
// discuss at: http://phpjs.org/functions/bin2hex
// + original by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
// + bugfixed by: Onno Marsman
// + bugfixed by: Linuxworld
// * example 1: bin2hex('Kev');
// * returns 1: '4b6576'
// * example 2: bin2hex(String.fromCharCode(0x00));
// * returns 2: '00'
var v,i, f = 0, a = [];
s += '';
f = s.length;
for (i = 0; i<f; i++) {
a[i] = s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1");
}
return a.join('');
}
function bin2hex(s){
// Converts the binary representation of data to hex
//
// version: 812.316
// discuss at: http://phpjs.org/functions/bin2hex
// + original by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
// + bugfixed by: Onno Marsman
// + bugfixed by: Linuxworld
// * example 1: bin2hex('Kev');
// * returns 1: '4b6576'
// * example 2: bin2hex(String.fromCharCode(0x00));
// * returns 2: '00'
var v,i, f = 0, a = [];
s += '';
f = s.length;
for (i = 0; i<f; i++) {
a[i] = s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1");
}
return a.join('');
}
function groupChangeMember(gid, cid, sec_token) {
$('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');
});
}
@ -622,7 +617,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');
});
}
@ -650,61 +645,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;

View file

@ -1,6 +1,6 @@
$(document).ready(function() {
/* enable tinymce on focus and click */
/* enable editor on focus and click */
$("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser);
@ -28,7 +28,7 @@ $(document).ready(function() {
if (typeof window.AjaxUpload != "undefined") {
var uploader = new window.AjaxUpload(
window.imageUploadButton,
{ action: 'wall_upload/'+window.nickname+'?nomce=1',
{ action: 'wall_upload/' + window.nickname,
name: 'userfile',
onSubmit: function(file,ext) { $('#profile-rotator').show(); },
onComplete: function(file,response) {
@ -41,7 +41,7 @@ $(document).ready(function() {
if ($('#wall-file-upload').length) {
var file_uploader = new window.AjaxUpload(
'wall-file-upload',
{ action: 'wall_attach/'+window.nickname+'?nomce=1',
{ action: 'wall_attach/' + window.nickname,
name: 'userfile',
onSubmit: function(file,ext) { $('#profile-rotator').show(); },
onComplete: function(file,response) {
@ -218,46 +218,35 @@ function initCrop() {
function showEvent(eventid) {
}
/*
* TinyMCE/Editor
* Editor
*/
var editor=false;
var editor = false;
var textlen = 0;
var plaintext = 'none';//window.editSelect;
//var ispublic = window.isPublic;
function initEditor(cb) {
if (editor==false) {
if (plaintext == 'none') {
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
editor = true;
$("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
var parent = $("#profile-jot-acl-wrapper").parent();
if (parent.css('display') == 'none') {
parent.show();
} else {
parent.hide();
}
return false;
});
$(".jothidden").show();
if (typeof cb!="undefined") {
cb();
function initEditor(callback){
if (editor == false) {
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
$("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
var parent = $("#profile-jot-acl-wrapper").parent();
if (parent.css('display') == 'none') {
parent.show();
} else {
parent.hide();
}
return;
}
} else {
if (typeof cb!="undefined") cb();
return false;
});
$(".jothidden").show();
editor = true;
}
if (typeof callback != "undefined") {
callback();
}
}
function enableOnUser() {
function enableOnUser(){
if (editor) {
return;
}
@ -270,10 +259,8 @@ function enableOnUser() {
*/
function addeditortext(textElem, data) {
if (window.editSelect == 'none') {
var currentText = $(textElem).val();
$(textElem).val(currentText + data);
}
var currentText = $(textElem).val();
$(textElem).val(currentText + data);
}
function jotVideoURL() {
@ -424,7 +411,7 @@ function qCommentInsert(obj,id) {
$(obj).val("");
}
function insertFormatting(BBcode,id) {
function insertFormatting(BBcode, id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");

View file

@ -1,6 +1,4 @@
<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>

View file

@ -1,8 +1,6 @@
<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.nickname = "{{$nickname}}";
window.linkURL = "{{$linkurl}}";

View file

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

View file

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

View file

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

View file

@ -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

View file

@ -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;

View file

@ -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('&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").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('&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");
}
}
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() {

View file

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

View file

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

View file

@ -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>

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/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>

View file

@ -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>

View file

@ -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>

View file

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

View file

@ -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';

View file

@ -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>

View file

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

View file

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

View file

@ -2,150 +2,46 @@
<script language="javascript" type="text/javascript">
var editor=false;
var editor = false;
var textlen = 0;
var plaintext = '{{$editselect}}';
function initEditor(cb){
if (editor==false){
function initEditor(callback) {
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").editor_autocomplete(baseurl+"/acl");
$("#profile-jot-text").bbco_autocomplete('bbcode');
$(".jothidden").show();
editor = true;
$("a#jot-perms-icon").colorbox({
'inline' : true,
'transition' : 'elastic'
});
$("#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}}
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;
// setup acl popup
$("a#jot-perms-icon").colorbox({
$("#profile-jot-text-loading").hide();
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
$("#profile-jot-text").bbco_autocomplete('bbcode');
$(".jothidden").show();
$("a#jot-perms-icon").colorbox({
'inline' : true,
'transition' : 'elastic'
});
} else {
if (typeof cb!="undefined") cb();
});
$("#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}}
editor = true;
}
if (typeof callback != "undefined") {
callback();
}
} // initEditor
function enableOnUser(){
if (editor) return;
if (editor) {
return;
}
$(this).val("");
initEditor();
}
@ -159,8 +55,8 @@ function enableOnUser(){
var ispublic = '{{$ispublic}}';
$(document).ready(function() {
/* enable tinymce on focus and click */
/* enable editor on focus and click */
$("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser);
@ -172,7 +68,7 @@ function enableOnUser(){
onComplete: function(file,response) {
addeditortext(response);
$('#profile-rotator').hide();
}
}
}
);
@ -184,9 +80,9 @@ function enableOnUser(){
onComplete: function(file,response) {
addeditortext(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() {
@ -195,7 +91,7 @@ function enableOnUser(){
$('#jot-public').hide();
$('.profile-jot-net input').attr('disabled', 'disabled');
});
if(selstr == null) {
if(selstr == null) {
$('#jot-perms-icon').removeClass('lock').addClass('unlock');
$('#jot-public').show();
$('.profile-jot-net input').attr('disabled', false);
@ -220,7 +116,7 @@ function enableOnUser(){
else {
checkedstr = $(this).val();
}
}
}
});
$.post('item', { dropitems: checkedstr }, function(data) {
window.location.reload();
@ -320,11 +216,11 @@ function enableOnUser(){
}
}
}
function itemFiler(id) {
var bordercolor = $("input").css("border-color");
$.get('filer/', function(data){
$.colorbox({html:data});
$("#id_term").keypress(function(){
@ -333,7 +229,7 @@ function enableOnUser(){
$("#select_term").change(function(){
$("#id_term").css("border-color",bordercolor);
})
$("#filer_save").click(function(e){
e.preventDefault();
reply = $("#id_term").val();
@ -351,24 +247,20 @@ function enableOnUser(){
return false;
});
});
}
function jotClearLocation() {
$('#jot-coord').val('');
$('#profile-nolocation-wrapper').hide();
}
function addeditortext(data) {
if(plaintext == 'none') {
var currentText = $("#profile-jot-text").val();
$("#profile-jot-text").val(currentText + data);
}
else
tinyMCE.execCommand('mceInsertRawHTML',false,data);
}
function addeditortext(data) {
var currentText = $("#profile-jot-text").val();
$("#profile-jot-text").val(currentText + data);
}
{{$geotag}}