From 4ad6a7f073c14c58a0acec2d5354a16433043b57 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 26 Jan 2017 22:54:32 -0500 Subject: [PATCH] - Remove TinyMCE mentions in themes --- view/theme/frio/templates/event_head.tpl | 43 --- view/theme/frio/templates/jot-header.tpl | 184 ++--------- view/theme/frio/templates/msg-header.tpl | 53 ---- view/theme/frio/theme.php | 3 - view/theme/frost-mobile/js/main.js | 229 +++++--------- view/theme/frost-mobile/js/theme.js | 272 +++------------- view/theme/frost-mobile/templates/jot-end.tpl | 4 +- .../frost-mobile/templates/jot-header.tpl | 2 - .../frost-mobile/templates/msg-header.tpl | 2 - .../frost-mobile/templates/profed_head.tpl | 6 - .../frost-mobile/templates/wallmsg-header.tpl | 3 - view/theme/frost/TODO | 1 - view/theme/frost/js/main.js | 188 ++++------- view/theme/frost/js/theme.js | 296 +++--------------- view/theme/frost/templates/contact_end.tpl | 3 - view/theme/frost/templates/contact_head.tpl | 5 - view/theme/frost/templates/end.tpl | 6 - view/theme/frost/templates/event_end.tpl | 2 - view/theme/frost/templates/event_head.tpl | 1 - view/theme/frost/templates/jot-header.tpl | 1 - view/theme/frost/templates/msg-header.tpl | 1 - view/theme/frost/templates/profed_end.tpl | 1 - view/theme/frost/templates/profed_head.tpl | 6 - view/theme/frost/templates/wallmsg-header.tpl | 1 - view/theme/smoothly/templates/jot-header.tpl | 204 +++--------- 25 files changed, 318 insertions(+), 1199 deletions(-) diff --git a/view/theme/frio/templates/event_head.tpl b/view/theme/frio/templates/event_head.tpl index e836f226f2..4069b88774 100644 --- a/view/theme/frio/templates/event_head.tpl +++ b/view/theme/frio/templates/event_head.tpl @@ -72,51 +72,8 @@ var modparams = {{$modparams}} - -{{if $editselect != 'none'}} - diff --git a/view/theme/frio/templates/jot-header.tpl b/view/theme/frio/templates/jot-header.tpl index af9951528c..27fc608e7c 100644 --- a/view/theme/frio/templates/jot-header.tpl +++ b/view/theme/frio/templates/jot-header.tpl @@ -2,134 +2,37 @@ @@ -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}} diff --git a/view/theme/frio/templates/msg-header.tpl b/view/theme/frio/templates/msg-header.tpl index 8d648d89a4..2d927081d1 100644 --- a/view/theme/frio/templates/msg-header.tpl +++ b/view/theme/frio/templates/msg-header.tpl @@ -1,67 +1,14 @@ - - diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php index d8b10c4e3e..7584e0b379 100644 --- a/view/theme/frio/theme.php +++ b/view/theme/frio/theme.php @@ -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(); diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js index 3ec2421df2..b7b11ef1f0 100644 --- a/view/theme/frost-mobile/js/main.js +++ b/view/theme/frost-mobile/js/main.js @@ -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($('
').append( $("#nav-notifications-see-all").clone() ).html()); //outerHtml hack var notifications_mark = unescape($('
').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=5 && window.eventModeParams == 2) { @@ -209,11 +171,11 @@ $(document).ready(function() { } else if (args.length>=4 && window.eventModeParams == 1) { $("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1); } - + // show event popup var hash = location.hash.split("-") if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]); - } + } }); @@ -270,202 +232,52 @@ function showEvent(eventid) { function(data){ $.colorbox({html:data}); } - );*/ + );*/ } - - /* - * 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){ -// $("#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"); - editor = true; -/* $("a#jot-perms-icon").colorbox({ - 'inline' : true, - 'transition' : 'elastic' - });*/ - $("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(); - } -// $("#profile-jot-acl-wrapper").parent().toggle(); - return false; - }); - $(".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(' '); - } - - //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(); - }); +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 false; }); + $(".jothidden").show(); + editor = true; - // setup acl popup - $("a#jot-perms-icon").colorbox({ - 'inline' : true, - 'transition' : 'elastic' - }); */ - } else { - if (typeof cb!="undefined") cb(); + } + if (typeof callback != "undefined") { + callback(); } } function enableOnUser(){ - if (editor) return; + if (editor) { + return; + } $(this).val(""); 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 */ 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() { @@ -566,7 +378,7 @@ function confirmDelete() { return confirm(window.delItem); } else { checkedstr = $(this).val(); } - } + } }); $.post('item', { dropitems: checkedstr }, function(data) { window.location.reload(); @@ -591,7 +403,7 @@ function itemTag(id) { } function itemFiler(id) { - + $.get('filer/', function(data){ var promptText = $('#id_term_label', data).text(); @@ -609,7 +421,7 @@ function itemFiler(id) { }); /* var bordercolor = $("input").css("border-color"); - + $.get('filer/', function(data){ $.colorbox({html:data}); $("#id_term").keypress(function(){ @@ -618,7 +430,7 @@ function itemFiler(id) { $("#select_term").change(function(){ $("#id_term").css("border-color",bordercolor); }) - + $("#filer_save").click(function(e){ e.preventDefault(); reply = $("#id_term").val(); @@ -636,7 +448,7 @@ function itemFiler(id) { return false; }); }); -*/ +*/ } @@ -710,7 +522,7 @@ function qCommentInsert(obj,id) { function insertFormatting(comment,BBcode,id) { - + var tmpStr = $("#comment-edit-text-" + id).val(); if(tmpStr == comment) { tmpStr = ""; @@ -726,7 +538,7 @@ function insertFormatting(comment,BBcode,id) { selected = document.selection.createRange(); if (BBcode == "url"){ selected.text = "["+BBcode+"=http://]" + selected.text + "[/"+BBcode+"]"; - } else + } else selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]"; } else if (textarea.selectionStart || textarea.selectionStart == "0") { var start = textarea.selectionStart; diff --git a/view/theme/frost-mobile/templates/jot-end.tpl b/view/theme/frost-mobile/templates/jot-end.tpl index 7a7f27d45c..5a38b51ac6 100644 --- a/view/theme/frost-mobile/templates/jot-end.tpl +++ b/view/theme/frost-mobile/templates/jot-end.tpl @@ -1,6 +1,4 @@ - - - + diff --git a/view/theme/frost-mobile/templates/jot-header.tpl b/view/theme/frost-mobile/templates/jot-header.tpl index 1ba0ef8eeb..18e7f00058 100644 --- a/view/theme/frost-mobile/templates/jot-header.tpl +++ b/view/theme/frost-mobile/templates/jot-header.tpl @@ -1,8 +1,6 @@ - diff --git a/view/theme/frost-mobile/templates/wallmsg-header.tpl b/view/theme/frost-mobile/templates/wallmsg-header.tpl index 5d28b8e035..752085dbd0 100644 --- a/view/theme/frost-mobile/templates/wallmsg-header.tpl +++ b/view/theme/frost-mobile/templates/wallmsg-header.tpl @@ -1,8 +1,5 @@ - - diff --git a/view/theme/frost/TODO b/view/theme/frost/TODO index 1378e5d468..9c8908b83b 100644 --- a/view/theme/frost/TODO +++ b/view/theme/frost/TODO @@ -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 diff --git a/view/theme/frost/js/main.js b/view/theme/frost/js/main.js index 733064b30d..add248fc60 100644 --- a/view/theme/frost/js/main.js +++ b/view/theme/frost/js/main.js @@ -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($('
').append( $("#nav-notifications-see-all").clone() ).html()); //outerHtml hack var notifications_mark = unescape($('
').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; diff --git a/view/theme/frost/js/theme.js b/view/theme/frost/js/theme.js index 57124bce09..44dc700aba 100644 --- a/view/theme/frost/js/theme.js +++ b/view/theme/frost/js/theme.js @@ -12,12 +12,12 @@ $(document).ready(function() { '#system-menu-list-closing': false }; -/* $.ajaxSetup({ - cache: false +/* $.ajaxSetup({ + cache: false });*/ - /* enable tinymce on focus and click */ + /* enable editor on focus and click */ $("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").click(enableOnUser); @@ -72,7 +72,7 @@ $(document).ready(function() { $('#id_share').change(function() { - if ($('#id_share').is(':checked')) { + if ($('#id_share').is(':checked')) { $('#acl-wrapper').show(); } else { @@ -103,7 +103,7 @@ $(document).ready(function() { onComplete: function(file,response) { addeditortext(window.jotId, response); $('#profile-rotator').hide(); - } + } } ); @@ -116,7 +116,7 @@ $(document).ready(function() { onComplete: function(file,response) { addeditortext(window.jotId, response); $('#profile-rotator').hide(); - } + } } ); } @@ -139,7 +139,7 @@ $(document).ready(function() { $('#jot-perms-icon').removeClass('unlock').addClass('lock'); $('#jot-public').hide(); }); - if(selstr == null) { + if(selstr == null) { $('#jot-perms-icon').removeClass('lock').addClass('unlock'); $('#jot-public').show(); } @@ -154,7 +154,7 @@ $(document).ready(function() { left: 'prev,next today', center: 'title', right: 'month,agendaWeek,agendaDay' - }, + }, timeFormat: 'H(:mm)', eventClick: function(calEvent, jsEvent, view) { showEvent(calEvent.id); @@ -164,7 +164,7 @@ $(document).ready(function() { $('td.fc-day').dblclick(function() { window.location.href='/events/new?start='+$(this).data('date'); }); } }, - + eventRender: function(event, element, view) { //console.log(view.name); if (event.item['author-name']==null) return; @@ -197,9 +197,9 @@ $(document).ready(function() { break; } } - + }); - + // center on date var args=location.href.replace(baseurl,"").split("/"); if (args.length>=5 && window.eventModeParams == 2) { @@ -211,7 +211,7 @@ $(document).ready(function() { // show event popup var hash = location.hash.split("-") if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]); - } + } switch(window.autocompleteType) { @@ -300,7 +300,7 @@ $(function(){ $(function(){ - + $("#cnftheme").click(function(){ $.colorbox({ width: 800, @@ -318,16 +318,16 @@ $(function(){ data[$(this).attr('name')] = $(this).children(":selected").val(); }); console.log(":)", url, data); - + $.post(url, data, function(data) { if(timer) clearTimeout(timer); NavUpdate(); $.colorbox.close(); }) - + return false; }); - + } }); return false; @@ -359,7 +359,7 @@ function showEvent(eventid) { $.colorbox({html:data}); $.colorbox.resize(); } - ); + ); } function doEventPreview() { @@ -423,7 +423,7 @@ function getPageContent(url) { var pos = $('.main-container').position(); - $('.main-container').css('margin-left', pos.left); + $('.main-container').css('margin-left', pos.left); $('.main-content-container').hide(0, function () { $('.main-content-loading').show(0); }); @@ -449,7 +449,7 @@ function showNavMenu(menuID) { } else { window.navMenuTimeout[menuID + '-opening'] = true; - + window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () { $(menuID).slideDown('fast').show(); window.navMenuTimeout[menuID + '-opening'] = false; @@ -465,7 +465,7 @@ function hideNavMenu(menuID) { } else { window.navMenuTimeout[menuID + '-closing'] = true; - + window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () { $(menuID).slideUp('fast'); window.navMenuTimeout[menuID + '-closing'] = false; @@ -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 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; +function enableOnUser() { + 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() { @@ -867,7 +665,7 @@ function deleteCheckedItems(delID) { else { checkedstr = $(this).val(); } - } + } }); $.post('item', { dropitems: checkedstr }, function(data) { window.location.reload(); @@ -893,9 +691,9 @@ function itemTag(id) { } function itemFiler(id) { - + var bordercolor = $("input").css("border-color"); - + $.get('filer/', function(data){ $.colorbox({html:data}); $.colorbox.resize(); @@ -905,7 +703,7 @@ function itemFiler(id) { $("#select_term").change(function(){ $("#id_term").css("border-color",bordercolor); }) - + $("#filer_save").click(function(e){ e.preventDefault(); reply = $("#id_term").val(); @@ -923,7 +721,7 @@ function itemFiler(id) { return false; }); }); - + } @@ -932,7 +730,7 @@ function itemFiler(id) { */ function insertFormatting(comment,BBcode,id) { - + var tmpStr = $("#comment-edit-text-" + id).val(); if(tmpStr == comment) { tmpStr = ""; @@ -948,7 +746,7 @@ function insertFormatting(comment,BBcode,id) { selected = document.selection.createRange(); if (BBcode == "url"){ selected.text = "["+BBcode+"=http://]" + selected.text + "[/"+BBcode+"]"; - } else + } else selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]"; } else if (textarea.selectionStart || textarea.selectionStart == "0") { var start = textarea.selectionStart; diff --git a/view/theme/frost/templates/contact_end.tpl b/view/theme/frost/templates/contact_end.tpl index 03cef4bdd8..e69de29bb2 100644 --- a/view/theme/frost/templates/contact_end.tpl +++ b/view/theme/frost/templates/contact_end.tpl @@ -1,3 +0,0 @@ - - - diff --git a/view/theme/frost/templates/contact_head.tpl b/view/theme/frost/templates/contact_head.tpl index 77411431ac..e69de29bb2 100644 --- a/view/theme/frost/templates/contact_head.tpl +++ b/view/theme/frost/templates/contact_head.tpl @@ -1,5 +0,0 @@ - - - diff --git a/view/theme/frost/templates/end.tpl b/view/theme/frost/templates/end.tpl index 991ae7564b..b9768ba894 100644 --- a/view/theme/frost/templates/end.tpl +++ b/view/theme/frost/templates/end.tpl @@ -2,12 +2,6 @@ -{{**}} -{{**}} - - diff --git a/view/theme/frost/templates/event_end.tpl b/view/theme/frost/templates/event_end.tpl index be57b155a5..8bc2a5bd18 100644 --- a/view/theme/frost/templates/event_end.tpl +++ b/view/theme/frost/templates/event_end.tpl @@ -2,5 +2,3 @@ - - diff --git a/view/theme/frost/templates/event_head.tpl b/view/theme/frost/templates/event_head.tpl index 47efb56ae9..ccd88f6c86 100644 --- a/view/theme/frost/templates/event_head.tpl +++ b/view/theme/frost/templates/event_head.tpl @@ -3,7 +3,6 @@ diff --git a/view/theme/frost/templates/jot-header.tpl b/view/theme/frost/templates/jot-header.tpl index 2615ceb550..db8b08af0d 100644 --- a/view/theme/frost/templates/jot-header.tpl +++ b/view/theme/frost/templates/jot-header.tpl @@ -1,7 +1,6 @@ diff --git a/view/theme/frost/templates/profed_head.tpl b/view/theme/frost/templates/profed_head.tpl index 4c7b6c8da6..e69de29bb2 100644 --- a/view/theme/frost/templates/profed_head.tpl +++ b/view/theme/frost/templates/profed_head.tpl @@ -1,6 +0,0 @@ - - - - diff --git a/view/theme/frost/templates/wallmsg-header.tpl b/view/theme/frost/templates/wallmsg-header.tpl index 0949c3d3eb..3fbb568630 100644 --- a/view/theme/frost/templates/wallmsg-header.tpl +++ b/view/theme/frost/templates/wallmsg-header.tpl @@ -1,7 +1,6 @@ diff --git a/view/theme/smoothly/templates/jot-header.tpl b/view/theme/smoothly/templates/jot-header.tpl index 880764da00..eb8c13f217 100644 --- a/view/theme/smoothly/templates/jot-header.tpl +++ b/view/theme/smoothly/templates/jot-header.tpl @@ -2,150 +2,46 @@