diff --git a/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.js b/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.js deleted file mode 100644 index e57722d1b..000000000 --- a/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.js +++ /dev/null @@ -1,92 +0,0 @@ -/* -* Copyright (c) 2010 Simon Hibbard -* -* Permission is hereby granted, free of charge, to any person -* obtaining a copy of this software and associated documentation -* files (the "Software"), to deal in the Software without -* restriction, including without limitation the rights to use, -* copy, modify, merge, publish, distribute, sublicense, and/or sell -* copies of the Software, and to permit persons to whom the -* Software is furnished to do so, subject to the following -* conditions: - -* The above copyright notice and this permission notice shall be -* included in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -* OTHER DEALINGS IN THE SOFTWARE. -*/ - -/* -* Version: V1.3.1-f1 -* Release: 22-12-2010 -* Based on jQuery 1.4.2 -* -* 2012-10-29: Modified by Zach Prezkuta to allow dynamic full heights -*/ - -(function ($) { - var divgrowid = 0; - $.fn.divgrow = function (options) { - var options = $.extend({}, { initialHeight: 100, moreText: "+ Show More", lessText: "- Show Less", speed: 1000, showBrackets: true }, options); - - return this.each(function () { - divgrowid++; - - obj = $(this); - - //var fullHeight = obj.height() + 10; - - obj.css('height', options.initialHeight).css('overflow', 'hidden'); - if (options.showBrackets) { - obj.after('
[…]
'); - } - else { - obj.after(''); - } - $("a.divgrow-showmore").html(options.moreText); - - $("." + "divgrow-obj-" + divgrowid).toggle(function () { - //alert(obj.attr('class')); - // Set the height from the elements rel value - //var height = $(this).prevAll("div:first").attr('rel'); - - var fullHeight = $(this).prevAll("div:first")[0].scrollHeight + 10; - $(this).prevAll("div:first").animate({ height: fullHeight + "px" }, options.speed, function () { // Animation complete. - - // Hide the overlay text when expanded, change the link text - if (options.showBrackets) { - $(this).nextAll("p.divgrow-brackets:first").fadeOut(); - } - $(this).nextAll("a.divgrow-showmore:first").html(options.lessText); - - }); - - - }, function () { - - $(this).prevAll("div:first").stop(true, false).animate({ height: options.initialHeight }, options.speed, function () { // Animation complete. - - // show the overlay text while closed, change the link text - if (options.showBrackets) { - $(this).nextAll("p.divgrow-brackets:first").stop(true, false).fadeIn(); - } - $(this).nextAll("a.divgrow-showmore:first").stop(true, false).html(options.moreText); - - }); - }); - - }); - }; -})(jQuery); - - - - - diff --git a/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js b/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js deleted file mode 100644 index da7634ac9..000000000 --- a/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js +++ /dev/null @@ -1 +0,0 @@ -(function($){var divgrowid=0;$.fn.divgrow=function(options){var options=$.extend({},{initialHeight:100,moreText:"+ Show More",lessText:"- Show Less",speed:1e3,showBrackets:true},options);return this.each(function(){divgrowid++;obj=$(this);obj.css("height",options.initialHeight).css("overflow","hidden");if(options.showBrackets){obj.after('[…]
")}else{obj.after('")}$("a.divgrow-showmore").html(options.moreText);$("."+"divgrow-obj-"+divgrowid).toggle(function(){var fullHeight=$(this).prevAll("div:first")[0].scrollHeight+10;$(this).prevAll("div:first").animate({height:fullHeight+"px"},options.speed,function(){if(options.showBrackets){$(this).nextAll("p.divgrow-brackets:first").fadeOut()}$(this).nextAll("a.divgrow-showmore:first").html(options.lessText)})},function(){$(this).prevAll("div:first").stop(true,false).animate({height:options.initialHeight},options.speed,function(){if(options.showBrackets){$(this).nextAll("p.divgrow-brackets:first").stop(true,false).fadeIn()}$(this).nextAll("a.divgrow-showmore:first").stop(true,false).html(options.moreText)})})})}})(jQuery); \ No newline at end of file diff --git a/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.min.js b/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.min.js deleted file mode 100644 index fd08f7fa8..000000000 --- a/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.min.js +++ /dev/null @@ -1 +0,0 @@ -(function ($) { var divgrowid = 0; $.fn.divgrow = function (options) { var options = $.extend({}, { initialHeight: 100, moreText: "+ Show More", lessText: "- Show Less", speed: 1000, showBrackets: true }, options); return this.each(function () { divgrowid++; obj = $(this); var fullHeight = obj.height() + 10; obj.css('height', options.initialHeight).css('overflow', 'hidden'); if (options.showBrackets) { obj.after('[…]
') } else { obj.after('') } $("a.divgrow-showmore").html(options.moreText); $("." + "divgrow-obj-" + divgrowid).toggle(function () { $(this).prevAll("div:first").animate({ height: fullHeight + "px" }, options.speed, function () { if (options.showBrackets) { $(this).nextAll("p.divgrow-brackets:first").fadeOut() } $(this).nextAll("a.divgrow-showmore:first").html(options.lessText) }) }, function () { $(this).prevAll("div:first").stop(true, false).animate({ height: options.initialHeight }, options.speed, function () { if (options.showBrackets) { $(this).nextAll("p.divgrow-brackets:first").stop(true, false).fadeIn() } $(this).nextAll("a.divgrow-showmore:first").stop(true, false).html(options.moreText) }) }) }) } })(jQuery); \ No newline at end of file diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js index 1b63a489d..07d0c52b3 100644 --- a/view/theme/frost-mobile/js/main.js +++ b/view/theme/frost-mobile/js/main.js @@ -48,7 +48,7 @@ $(function() { $.ajaxSetup({cache: false}); - collapseHeight(); + //collapseHeight(); /* setup tooltips *//* $("a,.tt").each(function(){ @@ -402,12 +402,10 @@ elemName = elems + ' ' + elemName; } $(elemName).each(function() { - if($(this).height() > 350) { - $('html').height($('html').height()); - $(this).divgrow({ initialHeight: 300, showBrackets: false, speed: 0 }); - $(this).addClass('divmore'); - $('html').height('auto'); - } + $('html').height($('html').height()); + $(this).readmore({maxheight:350 , moreLink:'+ Show more', lessLink:'+ Show less'}); + $(this).addClass('divmore'); + $('html').height('auto'); }); } diff --git a/view/theme/frost-mobile/js/main.min.js b/view/theme/frost-mobile/js/main.min.js deleted file mode 100644 index eaf8a082d..000000000 --- a/view/theme/frost-mobile/js/main.min.js +++ /dev/null @@ -1 +0,0 @@ -function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($(listID).is(":visible")){$(listID).hide();$(listID+"-wrapper").show();alert($(listID+"-wrapper").attr("id"))}else{$(listID).show();$(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$(function(){$.ajaxSetup({cache:false});msie=$.browser.msie;collapseHeight();$(".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();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)});function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$(e.target).attr("rel")){last_popup_menu.hide();if(last_popup_menu.attr("id")=="nav-notifications-menu")$(".main-container").show();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$("img[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$($(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;if(menu.css("display")=="none"){$(this).parent().addClass("selected");menu.show();if(menu.attr("id")=="nav-notifications-menu")$(".main-container").hide();last_popup_menu=menu;last_popup_button=$(this).parent()}else{$(this).parent().removeClass("selected");menu.hide();if(menu.attr("id")=="nav-notifications-menu")$(".main-container").show();last_popup_menu=null;last_popup_button=null}return false});$("html").click(function(e){close_last_popup_menu(e)});var notifications_tpl=unescape($("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($("{2}
{3}
".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break;case"agendaDay":element.find(".fc-event-title").html("{1}{2}
{3}
".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break}}});var args=location.href.replace(baseurl,"").split("/");if(args.length>=4){$("#events-calendar").fullCalendar("gotoDate",args[2],args[3]-1)}var hash=location.hash.split("-");if(hash.length==2&&hash[0]=="#link")showEvent(hash[1])}});$(function(){$("nav").bind("nav-update",function(e,data){var elm=$("#pending-update");var register=$(data).find("register").text();if(register=="0"){register="";elm.hide()}else{elm.show()}elm.html(register)})});function homeRedirect(){$("html").fadeOut("slow",function(){window.location=baseurl+"/login"})}function initCrop(){function onEndCrop(coords,dimensions){$PR("x1").value=coords.x1;$PR("y1").value=coords.y1;$PR("x2").value=coords.x2;$PR("y2").value=coords.y2;$PR("width").value=dimensions.width;$PR("height").value=dimensions.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:true,onEndCrop:onEndCrop})})}function showEvent(eventid){}var editor=false;var textlen=0;var plaintext="none";function initEditor(cb){if(editor==false){if(plaintext=="none"){$("#profile-jot-text").css({height:200,color:"#000"});$("#profile-jot-text").contact_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();return}}else{if(typeof cb!="undefined")cb()}}function enableOnUser(){if(editor)return;$(this).val("");initEditor()}function addeditortext(textElem,data){if(window.editSelect=="none"){var currentText=$(textElem).val();$(textElem).val(currentText+data)}}function jotVideoURL(){reply=prompt(window.vidURL);if(reply&&reply.length){addeditortext("#profile-jot-text","[video]"+reply+"[/video]")}}function jotAudioURL(){reply=prompt(window.audURL);if(reply&&reply.length){addeditortext("#profile-jot-text","[audio]"+reply+"[/audio]")}}function jotGetLocation(){reply=prompt(window.whereAreU,$("#jot-location").val());if(reply&&reply.length){$("#jot-location").val(reply)}}function jotShare(id){if($("#jot-popup").length!=0)$("#jot-popup").show();$("#like-rotator-"+id).show();$.get("share/"+id,function(data){if(!editor)$("#profile-jot-text").val("");initEditor(function(){addeditortext("#profile-jot-text",data);$("#like-rotator-"+id).hide();$(window).scrollTop(0)})})}function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){reply=bin2hex(reply);$("#profile-rotator").show();$.get("parse_url?binurl="+reply,function(data){addeditortext(window.jotId,data);$("#profile-rotator").hide()})}}function jotClearLocation(){$("#jot-coord").val("");$("#profile-nolocation-wrapper").hide()}if(typeof window.geoTag==="function")window.geoTag();function confirmDelete(){return confirm(window.delItem)}function itemTag(id){reply=prompt(window.term);if(reply&&reply.length){reply=reply.replace("#","");if(reply.length){commentBusy=true;$("body").css("cursor","wait");$.get("tagger/"+id+"?term="+reply,NavUpdate);liking=1}}}function itemFiler(id){$.get("filer/",function(data){var promptText=$("#id_term_label",data).text();reply=prompt(promptText);if(reply&&reply.length){commentBusy=true;$("body").css("cursor","wait");$.get("filer/"+id+"?term="+reply,NavUpdate);liking=1}})}function commentOpen(obj,id){if(obj.value==window.commentEmptyText){obj.value="";$("#comment-edit-text-"+id).addClass("comment-edit-text-full");$("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");$("#mod-cmnt-wrap-"+id).show();openMenu("comment-edit-submit-wrapper-"+id)}}function commentClose(obj,id){if(obj.value==""){obj.value=window.commentEmptyText;$("#comment-edit-text-"+id).removeClass("comment-edit-text-full");$("#comment-edit-text-"+id).addClass("comment-edit-text-empty");$("#mod-cmnt-wrap-"+id).hide();closeMenu("comment-edit-submit-wrapper-"+id)}}function commentInsert(obj,id){var tmpStr=$("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$("#comment-edit-text-"+id).addClass("comment-edit-text-full");$("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$(obj).html();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$("#comment-edit-text-"+id).val(tmpStr+ins)}function qCommentInsert(obj,id){var tmpStr=$("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$("#comment-edit-text-"+id).addClass("comment-edit-text-full");$("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$(obj).val();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$("#comment-edit-text-"+id).val(tmpStr+ins);$(obj).val("")}function insertFormatting(comment,BBcode,id){var tmpStr=$("#comment-edit-text-"+id).val();if(tmpStr==comment){tmpStr="";$("#comment-edit-text-"+id).addClass("comment-edit-text-full");$("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id);$("#comment-edit-text-"+id).val(tmpStr)}textarea=document.getElementById("comment-edit-text-"+id);if(document.selection){textarea.focus();selected=document.selection.createRange();if(BBcode=="url"){selected.text="["+BBcode+"=http://]"+selected.text+"[/"+BBcode+"]"}else selected.text="["+BBcode+"]"+selected.text+"[/"+BBcode+"]"}else if(textarea.selectionStart||textarea.selectionStart=="0"){var start=textarea.selectionStart;var end=textarea.selectionEnd;if(BBcode=="url"){textarea.value=textarea.value.substring(0,start)+"["+BBcode+"=http://]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}else textarea.value=textarea.value.substring(0,start)+"["+BBcode+"]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}return true}function cmtBbOpen(id){$(".comment-edit-bb-"+id).show()}function cmtBbClose(id){$(".comment-edit-bb-"+id).hide()} \ No newline at end of file diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index 1621ef505..dc90c7623 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -1468,7 +1468,7 @@ input#dfrn-url { overflow: hidden; } -.divgrow-showmore { +.showmore { display: block; clear: both; text-align: center; diff --git a/view/theme/frost-mobile/templates/end.tpl b/view/theme/frost-mobile/templates/end.tpl index 331f8b5c2..38cd144b4 100644 --- a/view/theme/frost-mobile/templates/end.tpl +++ b/view/theme/frost-mobile/templates/end.tpl @@ -1,15 +1,9 @@ -{{**}} - + -{{**}} -{{**}}