Changeset 12716

Timestamp:

09/27/11 12:33:39 (2 years ago)

Author:

mbrevda

Message:

re #5342 - more gui tweaks

Files:

• freepbx/branches/2.10/amp_conf/htdocs/admin/assets/js/pbxlib.js.php (modified) (2 diffs)
• freepbx/branches/2.10/amp_conf/htdocs/admin/assets/js/script.legacy.js (modified) (1 diff)
• freepbx/branches/2.10/amp_conf/htdocs/admin/config.php (modified) (2 diffs)
• freepbx/branches/2.10/amp_conf/htdocs/admin/views/footer.php (modified) (3 diffs)
• freepbx/branches/2.10/amp_conf/htdocs/admin/views/footer_content.php (added)
• freepbx/branches/2.10/amp_conf/htdocs/admin/views/menu.php (modified) (1 diff)
• freepbx/branches/2.10/upgrades/2.10alpha1/migration.php (modified) (8 diffs)

freepbx/branches/2.10/amp_conf/htdocs/admin/assets/js/pbxlib.js.php

@@ -125 +125 @@
-function freepbx_reload_error(txt){var box=$('<div></div>').html(txt).dialog({title:'Error!',resizable:false,modal:true,minWidth:600,position:['center',50],close:function(e){$(e.target).dialog("destroy").remove();},buttons:[{text:fpbx.msg.framework.retry,click:function(){$(this).dialog("destroy").remove();fpbx_reload();}},{text:fpbx.msg.framework.cancel,click:function(){$(this).dialog("destroy").remove();}}]});$('#error_more_info').click(function(){$(this).next('pre').show();$(this).hide();return false;})}
-function toggle_reload_button(action){switch(action){case'show':$('#button_reload').show().css('display','inline-block');break;case'hide':$('#button_reload').hide();break;}}
-
+$(this).find('span').remove();$(this).replaceWith($(this).text())
-$(".help").live('mouseenter',function(){side=fpbx.conf.text_dir=='lrt'?'left':'right';var pos=$(this).offset();var offset=(200-pos.side)+"px";$(this).find("span").css(side,offset).stop(true,true).delay(500).animate({opacity:"show"},750);}).live('mouseleave',function(){$(this).find("span").stop(true,true).animate({opacity:"hide"},"fast");});$('.guielToggle').click(function(){var txt=$(this).find('.guielToggleBut');var el=$(this).data('toggle_class');switch(txt.text().replace(/ /g,'')){case'-':txt.text('+ ');$('.'+el).hide()
-break;case'+':txt.text('-  ');$('.'+el).show();break;}})
@@ -131 +131 @@
-$('.rnav > ul').menu();$('.radioset').buttonset();$('.menubar').show().menubar();if(fpbx.conf.reload_needed){toggle_reload_button('show');}
-$('.sortable').menu();$('.ui-menu-item').click(function(){go=$(this).find('a').attr('href');if(go&&!$(this).find('a').hasClass('ui-state-disabled')){document.location.href=go;}})
-
-
+
-(function(jQuery){jQuery.hotkeys={version:"0.8",specialKeys:{8:"backspace",9:"tab",13:"return",16:"shift",17:"ctrl",18:"alt",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",191:"/",224:"meta"},shiftNums:{"`":"~","1":"!","2":"@","3":"#","4":"$","5":"%","6":"^","7":"&","8":"*","9":"(","0":")","-":"_","=":"+",";":": ","'":"\"",",":"<",".":">","/":"?","\\":"|"}};function keyHandler(handleObj){if(typeof handleObj.data!=="string"){return;}
-var origHandler=handleObj.handler,keys=handleObj.data.toLowerCase().split(" ");handleObj.handler=function(event){if(this!==event.target&&(/textarea|select/i.test(event.target.nodeName)||event.target.type==="text")){return;}

freepbx/branches/2.10/amp_conf/htdocs/admin/assets/js/script.legacy.js

@@ -696 +696 @@
-  bind_dests_double_selects();
-  
-. based on: http://www.dvq.co.nz/jquery/create-a-jquery-popup-bubble-effect/
+
-  $("a.info").each(function(){
-    $(this).after('<span class="help">?<span>' + $(this).find('span').html() + '</span></span>');
+    $(this).find('span').remove();
+    $(this).replaceWith($(this).text())
-  })
+  
-  $(".help").live('mouseenter', function(){
-      side = fpbx.conf.text_dir == 'lrt' ? 'left' : 'right';

freepbx/branches/2.10/amp_conf/htdocs/admin/config.php

@@ -123 +123 @@
-  $header['title']  = framework_server_name();
-  $header['amp_conf'] = $amp_conf;
-dirname(__FILE__) . '/views/header.php'
+$amp_conf['VIEW_HEADER']
-  
-  if (isset($no_auth)) {
-dirname(__FILE__) . 
+
-    $fw_gui_html .= $no_auth;
-
+
+
+
-    echo $fw_gui_html;
-    exit();
@@ -370 +372 @@
-  $footer['benchmark_starttime']  = $benchmark_starttime;
-  $footer['reload_needed']    = check_reload_needed();
-
+
+
-
-

freepbx/branches/2.10/amp_conf/htdocs/admin/views/footer.php

@@ -2 +2 @@
-global $amp_conf;
-global $module_name, $active_modules;
-
-$html = '';
-$html .= '</div>';//page_body
-$html .= '<div id="footer"><hr />';
-$html .= '<div id="footer_content">';
-$html .= '<div id="footer_content_fpbx">';
-$version   = get_framework_version();
-$version_tag = '?load_version=' . urlencode($version);
@@ -17 +11 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-$html .= '</div>'; //footer_content
-$html .= '</div>'; //footer
@@ -127 +78 @@
-    . '<script type="text/javascript" src="assets/js/tabber-minimized.js"></script>';
-}
+if ($amp_conf['BRAND_ALT_JS']) {
+  $html .= '<script type="text/javascript" src="' . $amp_conf['BRAND_ALT_JS'] . '"></script>';
+}
-
-if (isset($module_name) && $module_name != '') {

freepbx/branches/2.10/amp_conf/htdocs/admin/views/menu.php

@@ -5 +5 @@
-$out .= '<div id="header">';
-$out .= '<div class="menubar ui-widget-header ui-corner-all">';
-
-
-
-
+
-$out .= '<img src="' . $amp_conf['BRAND_IMAGE_FREEPBX_LEFT'] 
-    . '" alt="FreePBX" title="FreePBX" id="BRAND_IMAGE_FREEPBX_LEFT" '

freepbx/branches/2.10/upgrades/2.10alpha1/migration.php

@@ -21 +21 @@
-);
-$freepbx_conf->define_conf_setting('buffering_callback', $set);
-$freepbx_conf->commit_conf_settings();
-
-$set = array(
@@ -37 +36 @@
-);
-$freepbx_conf->define_conf_setting('MODULE_REPO', $set);
-$freepbx_conf->commit_conf_settings();
-
-//login view
@@ -54 +52 @@
-);
-$freepbx_conf->define_conf_setting('VIEW_LOGIN', $set);
-$freepbx_conf->commit_conf_settings();
-
-
-//menu
@@ -72 +68 @@
-);
-$freepbx_conf->define_conf_setting('VIEW_MENU', $set);
-$freepbx_conf->commit_conf_settings();
-
-//jquery ui css
@@ -89 +84 @@
-);
-$freepbx_conf->define_conf_setting('JQUERY_CSS', $set);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-//footer
@@ -106 +116 @@
-);
-$freepbx_conf->define_conf_setting('VIEW_FOOTER', $set);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-//browser stats
@@ -124 +149 @@
-);
-$freepbx_conf->define_conf_setting('BROWSER_STATS', $set);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-//set some settings
@@ -151 +191 @@
-$freepbx_conf->remove_conf_settings('VIEW_FREEPBX_RELOAD');
-$freepbx_conf->remove_conf_settings('VIEW_FREEPBX_RELOADBAR');
-$freepbx_conf->remove_conf_settings('VIEW_FREEPBX_RELOADBAR');
-$freepbx_conf->remove_conf_settings('VIEW_UNAUTHORIZED');
-$freepbx_conf->remove_conf_settings('VIEW_LOGGEDOUT');
-$freepbx_conf->remove_conf_settings('VIEW_LOGGEDOUT');
-
+
+
+
+
+
+
+
+
+
+
+
-//settings
-global $amp_conf;