Changeset 12446

Timestamp:

08/29/11 08:31:32 (2 years ago)

Author:

mbrevda

Message:

re #5342 - quick touch up

Files:

• freepbx/trunk/amp_conf/htdocs/admin/assets/js/pbxlib.js.php (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/assets/js/script.legacy.js (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/components.class.php (modified) (18 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/view.functions.php (modified) (1 diff)

freepbx/trunk/amp_conf/htdocs/admin/assets/js/pbxlib.js.php

@@ -125 +125 @@
-function toggle_reload_button(action){switch(action){case'show':$('#button_reload').show();break;case'hide':$('#button_reload').hide();break;}}
-$(document).ready(function(){bind_dests_double_selects();$("a.info").each(function(){$(this).after('<span class="help">?<span>'+$(this).find('span').text()+'</span></span>');})
-
-
-
-
+
-break;case'+':txt.text('-  ');$('.'+el).show();break;}})
-$('#fpbx_lang > li').click(function(){$.cookie('lang',$(this).data('lang'));window.location.reload();})

freepbx/trunk/amp_conf/htdocs/admin/assets/js/script.legacy.js

@@ -702 +702 @@
-  });
-
-
-  // initialize the displayed/hidden nav bar categories
-  $(".category-header").each(function(){
-    if ($.cookie(this.id) == 'collapsed') {
-      $(".id-"+this.id).hide();
-      $(this).removeClass("toggle-minus").addClass("toggle-plus")
-      $.cookie(this.id,'collapsed', { expires: 365 });
-    } else {
-      $(".id-"+this.id).show();
-      $(this).removeClass("toggle-plus").addClass("toggle-minus")
-      $.cookie(this.id,'expanded', { expires: 365 });
-    }
-  });
-
-  //slide open/closed each section
-  $(".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")
-    }
-  });
-
-  //show/hide a gui_eleements section
-  $('.guielToggle').click(function() {
-    var txt = $(this).find('.guielToggleBut');
-Class')
+_class');
-    switch(txt.text().replace(/ /g,'')) {
-      case '-':

freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php

@@ -175 +175 @@
-    return $ast_with_dahdi;
-  }
-
-
+
-    $engine_info = engine_getinfo();
-    $version = $engine_info['version'];

freepbx/trunk/amp_conf/htdocs/admin/libraries/components.class.php

@@ -287 +287 @@
-    
-    $form_action = isset($this->_opts['form_action']) ? $this->_opts['form_action'] : $_SERVER['PHP_SELF'];
-
-
-
+\n
+\n
+\n\n
-    
-    // Start of table
-
+\n
-    
-    // Gui Elements / JavaScript validation
@@ -315 +315 @@
-            continue;
-          // Header for $section        
-<tr class=\"guielToggle\" data-toggleClass=\"".preg_replace('/[^A-Za-z]/', '' ,$section)."\">
-
+\t<tr class=\"guielToggle\" data-toggle_class=\"".preg_replace('/[^A-Za-z]/', '' ,$section)."\">\n
+\t\t
-          if ($section) {
-            $state = isset($this_opts[$section]['guielToggle']) && $this_opts[$section]['guielToggle'] == true 
@@ -328 +328 @@
-          }
-
-
-</tr>
+\n
+\t</tr>\n
-          
-          // Elements
@@ -345 +345 @@
-      // Spacer before bottom
-      if ( is_array($this->_guielems_bottom) ) {
-<tr>
-
-
-</tr>
+\t<tr>\n
+\t\t
+\n
+\t</tr>\n
-      }
-    }
@@ -370 +370 @@
-    //
-    if (guielement::getformfields()) {
-<tr>
-
+\t<tr>\n
+\t\t
-      $htmlout .= "<h6>";
-      $htmlout .= "<input name=\"Submit\" type=\"submit\" tabindex=\"$tabindex\" value=\""._("Submit")."\">";
-      $htmlout .= "</h6>";
-
-</tr>
-
-
+\n
+\t</tr>\n
+
+\n\n
-
-    if ( !$this->_sorted_jsfuncs )
@@ -384 +384 @@
-
-    // Javascript
-<!--
-
+\n<!--\n
+\n\n
-    
-    // TODO:  * Create standard JS to go thru each text box looking for first one not hidden and set focus
@@ -391 +391 @@
-      foreach ( array_keys($this->_jsfuncs) as $function ) {
-        // Functions
-
+\n
-        foreach ( array_keys($this->_jsfuncs[$function]) as $sortorder ) {
-          foreach ( array_keys($this->_jsfuncs[$function][$sortorder]) as $idx ) {
@@ -399 +399 @@
-        }
-        if ( $function == 'onsubmit()' )
-return true;
-
-
-
-
+\treturn true;\n
+\n
+
+
+\n
-    
-    // End of form
-</form>
+\n</form>\n\n
-    
-    if ( $hasoutput ) {
@@ -510 +510 @@
-    
-    // make it a new row
-<tr><td>" . $this->_html . "</td></tr>
+\t<tr>\n\t\t<td>" . $this->_html . "</td>\n\t</tr>\n
-  }
-}
@@ -567 +567 @@
-    
-      if ($this->canbeempty) {
-defaultEmptyOK = true;
+\tdefaultEmptyOK = true;\n
-      } else {
-defaultEmptyOK = false;
-
-
-if (" . str_replace("()", "(" . $thefldvalue . ")", $this->jsvalidation) . ") 
-return warnInvalid(" . $thefld . ", \"" . $this->failvalidationmsg . "\");
-
+\tdefaultEmptyOK = false;\n
+
+
+\tif (" . str_replace("()", "(" . $thefldvalue . ")", $this->jsvalidation) . ") \n
+\t\treturn warnInvalid(" . $thefld . ", \"" . $this->failvalidationmsg . "\");\n
+\n
-    }
-    
@@ -588 +588 @@
-    // start new row
-    if ($section) {
-<tr class=\"$section\">
+\t<tr class=\"$section\">\n
-    } else {
-<tr>
+\t<tr>\n
-    }
-    
-
-    // prompt in first column
-
+\t\t
-    if ($this->helptext != '') {
-      $output .= fpbx_label($this->prompttext,$this->helptext);
@@ -601 +601 @@
-      $output .= $this->prompttext;
-    }
-
+\n
-    
-    // actual input in second row
-
+\t\t
-    $output .= $this->html_input;
-
+\n
-    
-    // end this row
-</tr>
+\t</tr>\n
-    
-    return $output;
@@ -666 +666 @@
-    $tabindex = guielement::gettabindex();
-    $disable_state = $disable ? 'disabled="true"':'';
-<select name=\"$this->_elemname\" id=\"$this->_elemname\" tabindex=$tabindex $disable_state $onchange >
+\n\t\t\t<select name=\"$this->_elemname\" id=\"$this->_elemname\" tabindex=$tabindex $disable_state $onchange >\n
-    // include blank option if required
-    if ($canbeempty)
@@ -677 +677 @@
-      $itemselected = ((string) $currentvalue == (string) $itemvalue) ? ' selected' : '';
-      
-<option value=\"$itemvalue\"$itemselected>$itemtext</option>
-
-</select>
+\t\t\t\t<option value=\"$itemvalue\"$itemselected>$itemtext</option>\n
+
+\t\t\t</select>\n\t\t
-    
-    return $output;
@@ -695 +695 @@
-    $tabindex = guielement::gettabindex();
-
-
+\n
-  }
-}
@@ -724 +724 @@
-      $tabindex = guielement::gettabindex();
-      $disable_state = $disable ? 'disabled="true"':'';
-
+\n
-      $count++;
-    }
@@ -755 +755 @@
-    $maxlength = ($maxchars > 0) ? " maxlength=\"$maxchars\"" : '';
-  
-
+\n
-    $rows = count($list); 
-    $rows = (($rows > 20) ? 20 : $rows);
@@ -787 +787 @@
-    // start new row
-    if ($section) {
-<tr class=\"$section\">
+\t<tr class=\"$section\">\n
-    } else {
-<tr>
+\t<tr>\n
-    }
-    
-
-    // actual input in second row
-
+\t\t
-    $output .= $this->html_text;
-
+\n
-    
-    // end this row
-</tr>
+\t</tr>\n
-    
-    return $output;

freepbx/trunk/amp_conf/htdocs/admin/libraries/view.functions.php

@@ -425 +425 @@
-
-function framework_include_js($module_name, $module_page) {
-  dbug('mod', $module_name);
-  dbug('page', $module_name);
-  global $amp_conf, $active_modules;
-  $version      = get_framework_version();