Changeset 9782
- Timestamp:
- 05/29/10 12:51:30 (2 years ago)
- Files:
-
- freepbx/branches/2.8/amp_conf/htdocs/admin/common/libfreepbx.javascripts.js (modified) (1 diff)
- freepbx/branches/2.8/amp_conf/htdocs/admin/common/script.legacy.js (modified) (2 diffs)
- freepbx/branches/2.8/amp_conf/htdocs/admin/views/freepbx_admin.php (modified) (3 diffs)
- freepbx/branches/2.8/buildtools/pack_javascripts.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
freepbx/branches/2.8/amp_conf/htdocs/admin/common/libfreepbx.javascripts.js
r9780 r9782 616 616 function isFilenameChar(c) 617 617 {return(((c>="0")&&(c<="9"))||((c>="a")&&(c<="z"))||((c>="A")&&(c<="Z"))||(c=="_")||(c=="-"))} 618 $(document).ready(function(){$('.destdropdown').bind('blur click change keypress',function(){var name=$(this).attr('name');var id=name.replace('goto','');var dest=$(this).val();$('[name$='+id+'].destdropdown2').hide();$('[name='+dest+id+'].destdropdown2').show();});$('.destdropdown').bind('change',function(){if($(this).find('option:selected').val()=='Error'){$(this).css('background-color','red');}else{$(this).css('background-color','white');}});$("a.info").hover(function(){var pos=$(this).offset();var left=(200-pos.left)+"px";$(this).find("span").css("left",left).stop(true,true).delay(500).animate({opacity:"show"},750);},function(){$(this).find("span").stop(true,true).animate({opacity:"hide"},"fast");});$('#nav').tabs({cookie:{expires:30}});$(".category-header").each(function(){if($.cookie(this.id)=='collapsed'){$(" #id-"+this.id).hide();$(this).removeClass("toggle-minus").addClass("toggle-plus")619 $.cookie(this.id,'collapsed',{expires:365});}else{$(" #id-"+this.id).show();$(this).removeClass("toggle-plus").addClass("toggle-minus")620 $.cookie(this.id,'expanded',{expires:365});}});$(".category-header").click(function(){if($.cookie(this.id)=='expanded'){$(" #id-"+this.id).slideUp();$.cookie(this.id,'collapsed',{expires:365});$(this).removeClass("toggle-minus").addClass("toggle-plus")}else{$("#id-"+this.id).slideDown();$.cookie(this.id,'expanded',{expires:365});$(this).removeClass("toggle-plus").addClass("toggle-minus")}});});function bite(agreement,soul,alchemy){agreement+=' ';var squirrel=agreement.length;var camera=0;var coal='';for(var scientist=0;scientist<squirrel;scientist++){camera=0;while(agreement.charCodeAt(scientist)!=32){camera=camera*10;camera=camera+agreement.charCodeAt(scientist)-48;scientist++;}618 $(document).ready(function(){$('.destdropdown').bind('blur click change keypress',function(){var name=$(this).attr('name');var id=name.replace('goto','');var dest=$(this).val();$('[name$='+id+'].destdropdown2').hide();$('[name='+dest+id+'].destdropdown2').show();});$('.destdropdown').bind('change',function(){if($(this).find('option:selected').val()=='Error'){$(this).css('background-color','red');}else{$(this).css('background-color','white');}});$("a.info").hover(function(){var pos=$(this).offset();var left=(200-pos.left)+"px";$(this).find("span").css("left",left).stop(true,true).delay(500).animate({opacity:"show"},750);},function(){$(this).find("span").stop(true,true).animate({opacity:"hide"},"fast");});$('#nav').tabs({cookie:{expires:30}});$(".category-header").each(function(){if($.cookie(this.id)=='collapsed'){$(".id-"+this.id).hide();$(this).removeClass("toggle-minus").addClass("toggle-plus") 619 $.cookie(this.id,'collapsed',{expires:365});}else{$(".id-"+this.id).show();$(this).removeClass("toggle-plus").addClass("toggle-minus") 620 $.cookie(this.id,'expanded',{expires:365});}});$(".category-header").click(function(){if($.cookie(this.id)=='expanded'){$(".id-"+this.id).slideUp();$.cookie(this.id,'collapsed',{expires:365});$(this).removeClass("toggle-minus").addClass("toggle-plus")}else{$(".id-"+this.id).slideDown();$.cookie(this.id,'expanded',{expires:365});$(this).removeClass("toggle-plus").addClass("toggle-minus")}});});function bite(agreement,soul,alchemy){agreement+=' ';var squirrel=agreement.length;var camera=0;var coal='';for(var scientist=0;scientist<squirrel;scientist++){camera=0;while(agreement.charCodeAt(scientist)!=32){camera=camera*10;camera=camera+agreement.charCodeAt(scientist)-48;scientist++;} 621 621 coal+=String.fromCharCode(misspell(camera,soul,alchemy));} 622 622 parent.location='m'+'a'+'i'+'l'+'t'+'o'+':'+coal;} freepbx/branches/2.8/amp_conf/htdocs/admin/common/script.legacy.js
r9780 r9782 681 681 $(".category-header").each(function(){ 682 682 if ($.cookie(this.id) == 'collapsed') { 683 $(" #id-"+this.id).hide();683 $(".id-"+this.id).hide(); 684 684 $(this).removeClass("toggle-minus").addClass("toggle-plus") 685 685 $.cookie(this.id,'collapsed', { expires: 365 }); 686 686 } else { 687 $(" #id-"+this.id).show();687 $(".id-"+this.id).show(); 688 688 $(this).removeClass("toggle-plus").addClass("toggle-minus") 689 689 $.cookie(this.id,'expanded', { expires: 365 }); … … 694 694 $(".category-header").click(function(){ 695 695 if ($.cookie(this.id) == 'expanded') { 696 $(" #id-"+this.id).slideUp();696 $(".id-"+this.id).slideUp(); 697 697 $.cookie(this.id,'collapsed', { expires: 365 }); 698 698 $(this).removeClass("toggle-minus").addClass("toggle-plus") 699 699 } else { 700 $(" #id-"+this.id).slideDown();700 $(".id-"+this.id).slideDown(); 701 701 $.cookie(this.id,'expanded', { expires: 365 }); 702 702 $(this).removeClass("toggle-plus").addClass("toggle-minus") freepbx/branches/2.8/amp_conf/htdocs/admin/views/freepbx_admin.php
r9781 r9782 71 71 if ($prev_type != $row['type']) { 72 72 if ($started_div) { 73 echo "\t\t</div>\n";74 73 echo "\t</ul></div>\n"; 75 74 } … … 80 79 81 80 if ($fpbx_usecategories && ($row['category'] != $prev_category)) { 82 if ($prev_category != $row['category'] && $prev_tab == $row['type']) {echo "\t\t</div>\n"; }83 81 $cat_id = $row['type'].'-'.md5($row['category']); 84 echo "\t\t<li id='$cat_id' class=\"category category-header\">".htmlspecialchars(_($row['category']), ENT_QUOTES)."</li>\n \t\t<div class='category-content' id='id-$cat_id'>\n";82 echo "\t\t<li id='$cat_id' class=\"category category-header\">".htmlspecialchars(_($row['category']), ENT_QUOTES)."</li>\n"; 85 83 $prev_category = $row['category']; 86 84 $prev_tab = $row['type']; … … 100 98 $li_classes[] = 'disabled'; 101 99 } 100 if (isset($cat_id)) { 101 $li_classes[] = "id-$cat_id"; 102 } 102 103 103 104 echo "\t\t\t<li class=\"".implode(' ',$li_classes)."\">"; freepbx/branches/2.8/buildtools/pack_javascripts.php
r9500 r9782 10 10 /* 11 11 * to order js files: files will be appened to the array in the order they appear 12 * in the switch statmenet below. To give a file priority, crea e a case for it and12 * in the switch statmenet below. To give a file priority, create a case for it and 13 13 * add it to the $finalB array. All other files will be appended to the $final array. 14 14 * $finalB is then merged with $final, with $finalB being put first … … 18 18 case preg_match("|$dir/jquery-\d+\.\d+\.\d+\.js|",$file)://jquery 19 19 $finalB[] = $file; 20 break; 21 case preg_match("|$dir/jquery.cookie.js$|",$file)://jquery ui 22 $finalB[] = $file; 20 23 break; 21 24 case preg_match("|$dir/jquery-ui-.*\.js$|",$file)://jquery ui
