Changeset 13481

Timestamp:

02/20/12 07:01:29 (1 year ago)

Author:

mbrevda

Message:

upstream changes, make colapsible gui eleent section actually work

Files:

• 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) (1 diff)
• freepbx/branches/2.10/amp_conf/htdocs/admin/libraries/components.class.php (modified) (11 diffs)
• freepbx/branches/2.10/amp_conf/htdocs/admin/views/footer.php (modified) (1 diff)

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

@@ -723 +723 @@
-    var txt = $(this).find('.guielToggleBut');
-    var el = $(this).data('toggle_class');
+    var section = $.urlParam('display') + '#' + el;
+    
+    //true = hide
+    //false = dont hide
-    switch(txt.text().replace(/ /g,'')) {
-      case '-':
-        txt.text('+ ');
-
+
+
+
+
+
+
-        break;
-      case '+':
-        txt.text('-  ');
-        $('.'+el).show();
+        
+        //set cookie of hidden section
+        guielToggle = $.parseJSON($.cookie('guielToggle')) || {};
+        if (guielToggle.hasOwnProperty(section)){
+          guielToggle[section] = true;
+          $.cookie('guielToggle', JSON.stringify(guielToggle));
+        }
-        break;
-    }

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

@@ -241 +241 @@
-if ($display != '' && isset($configpageinits) && is_array($configpageinits) ) {
-
-
-
+
-  // call every modules _configpageinit function which should just
-  // register the gui and process functions for each module, if relevant

freepbx/branches/2.10/amp_conf/htdocs/admin/libraries/components.class.php

@@ -27 +27 @@
-
-  function component($compname, $type = 'setup') {
+    global $display;
-    $this->_compname = $compname;
-    $this->_type = $type;
@@ -34 +35 @@
-    $this->_sorted_guifuncs = true;
-    $this->_sorted_processfuncs = true;
+    
+    //set section to hidden if requested by user
+    $user_hidden = isset($_COOKIE['guielToggle']) ? json_decode($_COOKIE['guielToggle']) : array();
+    foreach($user_hidden as $k => $v) {
+      list($page, $section) = explode('#', $k);
+      if ($page == $display) {
+        $this->_opts[$section]['guielToggle'] = $v ? true :false;
+      }
+    }
+  }
+  
+  /*
+   * Toggle open state
+   * true = open, false = closed
+   * wont over write a users settings
+   */
+  function sectionToggle($section, $state = false) {
+    $section = preg_replace('/[^A-Za-z]/', '' ,$section);
+    if (!isset($this->_opts[$section]['guielToggle'])) {
+      $this->_opts[$section]['guielToggle'] = $state;
+    }
-  }
-  
@@ -284 +306 @@
-      $this->sortguielems();
-
+
-    // Start of form
-    
@@ -306 +329 @@
-      }
-    }
-
+
-    // Middle
-    if ( is_array($this->_guielems_middle) ) {
@@ -318 +341 @@
-          $htmlout .= "\t\t<td colspan=\"2\">";
-          if ($section) {
-
-
+
+
+
-            $htmlout .= "<h5>" 
-                . "<span class=\"guielToggleBut\">$state</span>" 
@@ -456 +480 @@
-  var $_html;
-  var $_javascript;
-
+
+
-  function guielement($elemname, $html = '', $javascript = '') {
+    global $CC;
-    // name that will be the id tag
-    $this->_elemname = $elemname;
@@ -466 +492 @@
-    $this->_html = $html;
-    $this->_javascript = $javascript;
+    
+
+    $this->_opts = & $CC->_opts;
-  }
-  
@@ -524 +553 @@
-  
-  function guiinput($elemname, $currentvalue = '', $prompttext = '', $helptext = '', $jsvalidation = '', $failvalidationmsg = '', $canbeempty = true, $jsvalidationtest='') {
+
-    // call parent class contructor
-    guielement::guielement($elemname, '', '');
@@ -581 +611 @@
-    // start new row
-    if ($section) {
-
+
+
+
+
+
+
-    } else {
-      $output .= "\t<tr>\n";
@@ -775 +810 @@
-    // this effectivly creates the template using the html_text
-    // we would expect the $html_text to be set by the child class
-
+
-    $output = '';
-    
-    // start new row
-    if ($section) {
-
+
+
+
+
+
+
-    } else {
-      $output .= "\t<tr>\n";
@@ -838 +878 @@
-class gui_link extends guitext {
-  function gui_link($elemname, $text, $url, $uselang = true) {
+    
-    // call parent class contructor
-    $parent_class = get_parent_class($this);

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

@@ -147 +147 @@
-
-//add IE specifc styling polyfills
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-//offer google chrome frame for the richest experience