Changeset 2654

Timestamp:

10/05/06 02:41:54 (7 years ago)

Author:

gregmac

Message:

More work on new modules page layout (still not functional yet);
changed some of the main layout to avoid some css issues;
footer temporarily disabled

Files:

• freepbx/trunk/amp_conf/htdocs/admin/common/mainstyle.css (modified) (7 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/config.php (modified) (3 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/footer.php (modified) (2 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/page.modules.php (modified) (8 diffs)

freepbx/trunk/amp_conf/htdocs/admin/common/mainstyle.css

@@ +1 @@
+div.footer {
+  /** TODO !! nav is no longer a float, so footer doesn't stay below it! we need a way to fix this..
+   * until then, I'm disabling footer
+  */
+  display:none;
+}
+
-body {
-  margin-top: 0px;
@@ -8 +15 @@
-  font-family: Verdana, Arial, Helvetica, Geneva, Swiss, SunSans-Regular;
-  font-size: 13px;
+  position:relative;
+}
+.clear {
+  clear:both;
-}
-td {
@@ -30 +41 @@
-    padding-left: 20px;
-    padding-right: 20px;
+  position:relative;
-   /* border-left: 1px solid #B97054;
-    border-right: 1px solid #B97054;
@@ -84 +96 @@
-
-div.nav {
-
-
+
+
+
+
-  display: block;
-}
@@ -219 +233 @@
-}
-
-span
+div
-  margin-top: 10px;
-    border-top: 1px dashed #808080;
-    padding-top:5px;
-    display:block;
-    text-align:left;
-    font-size:xx-small;
+  clear:both;
-}
-
@@ -291 +305 @@
-
-
-
+
+
+
+
+
+
-#modulelist li {
-    list-style-type: none;
-
-
-
-
+
-}
-#modulelist #modulelist-header {
-  position:relative;
-}
+#modulelist #modulelist-header span {
+  font-size:120%;
+  font-weight:bold;
+  color:#4f3e73;
+}
+#modulelist .moduleheader {
+  background:#ccc;
+  padding:2px;
+}
-#modulelist .modulename {
-  position:absolute;
-0em
+2px
-}
-#modulelist .moduletype {
-  position:absolute;
-0em
+30px
-}
-#modulelist .moduleversion {
-  position:absolute;
-5em
+90px
-}
-#modulelist .modulestatus {
-  position:absolute;
-0em
+60px
-
-}
@@ -322 +347 @@
-  clear:both;
-}
+
+/* for the tabber */
+#modulelist .tabber, #modulelist .tabberlive {
+  /* position:relative; */
+  /*margin-left:130px; */
+  
+}
+#modulelist div.moduleinfopane {
+  display:none; /* hide the information pane by default */
+  background: #eee;
+}
+#modulelist ul.tabbernav {
+  width:8em;
+  float:left;
+  margin-left:0em;
+  margin-bottom:1em;
+}
+#modulelist ul.tabbernav li {
+  text-align:right;
+  padding:2px 7px 2px 2px;
+  
+    border-right: 5px solid #808080;
+    border-left: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+  
+}
+#modulelist ul.tabbernav li.tabberactive a {
+  color: #E87B41;
+  font-weight:bold;
+}
+#modulelist ul.tabbernav li a {
+  text-decoration : none;
+}
+#modulelist div.tabbertab {
+  margin-left:8.5em;
+}
+#modulelist h5 {
+  margin-top: 0;
+  margin-bottom: 0.5em;
+}
+#modulelist .alert {
+  color:#a00;
+}
+#modulelist div.moduleinfopane .actiontab {
+  padding-left:10px;
+}
+
+/************************* For tabber *************************/
+/*--------------------------------------------------
+  REQUIRED to hide the non-active tab content.
+  But do not hide them in the print stylesheet!
+  --------------------------------------------------*/
+.tabberlive .tabbertabhide {
+ display:none;
+}
+
+/**************************************************************/

freepbx/trunk/amp_conf/htdocs/admin/config.php

@@ -97 +97 @@
-
-if (!$quietmode) {
-
+//
-  // show menu
-  echo "<div class=\"nav\">\n";
@@ -142 +142 @@
-}
-if (!$quietmode) {  
+  echo '<div class="clear"></div>';
-  echo "</div>\n<div class=\"content\">\n";
-}
@@ -282 +283 @@
-  
-?>
-
-/td></tr></table
+ <!-- /content -->
+?php // </td></tr></table> ?
-<?php include 'footer.php' ?>

freepbx/trunk/amp_conf/htdocs/admin/footer.php

@@ -104 +104 @@
-?>
-    
-span
+div
-    <!--<a target="_blank" href="http://sourceforge.net/donate/index.php?group_id=121515"><img border="0" style="float:left;" alt="Donate to the Asterisk Management Portal project" src="http://images.sourceforge.net/images/project-support.jpg"></a>-->
-  <?php
@@ -126 +126 @@
-    <br>
-    <br>
-span
+div
-<?php 
-}
-?>
-</div>
-
-
-
-
-
+
+
-</body>
-

freepbx/trunk/amp_conf/htdocs/admin/page.modules.php

@@ -97 +97 @@
-?>
-
-</div>
-<!-- <div class="rnav">
-  <li><a id="<?php echo ($extdisplay=='' ? 'current':'') ?>" href="config.php?display=modules&type=tool&extdisplay="><?php echo _("Local Modules") ?></a></li>
@@ -103 +102 @@
-</div>
--->
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-<?php
+
+
-$modules_local = module_getinfo();
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-function category_sort_callback($a, $b) {
@@ -123 +160 @@
-uasort($modules, 'category_sort_callback');
-
+
+
+
+/** preps a string to use as an HTML id element
+ */
+function prep_id($name) {
+  return preg_replace("/[^a-z0-9]/i", "_", $name);
+}
+
+
+
+
-echo "<div id=\"modulelist\">\n";
-
@@ -145 +194 @@
-    // start a new category header, and associated html blocks
-    $category = $modules[$name]['category'];
-$category
+prep_id($category)
-    echo "\t<ul>";
-  }
-  
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  switch ($modules[$name]['status']) {
-    case MODULE_STATUS_NOTINSTALLED:
@@ -160 +212 @@
-        echo '<span class="alert">Not Installed (Locally available)</span>';
-      } else {
-<span class="alert">Not Installed (Available online: '.$modules_online[$name]['version'].')</span>
+Not Installed (Available online: '.$modules_online[$name]['version'].')
-      }
-    break;
-    case MODULE_STATUS_DISABLED:
-<span class="alert">Disabled</span>
+Disabled
-    break;
-    case MODULE_STATUS_NEEDUPGRADE:
-Awaiting upgrade ('.$modules[$name]['version'].' ready)
+Disabled; Pending upgrade to '.$modules[$name]['version'].'
-    break;
-    case MODULE_STATUS_BROKEN:
@@ -173 +225 @@
-    break;
-    default:
+      // check for online upgrade
-      if (isset($modules_online[$name]['version'])) {
-        $vercomp = version_compare($modules[$name]['version'], $modules_online[$name]['version']);
@@ -179 +232 @@
-        } else if ($vercomp > 0) {
-          echo 'Newer than online version ('.$modules_online[$name]['version'].')';
+        } else {
+          echo 'Enabled and up to date';
+        }
+      } else if (isset($modules_online)) {
+        // we're connected to online, but didn't find this module
+        echo 'Enabled; Not available online';
+      } else {
+        echo 'Enabled';
+      }
+    break;
+  }
+  echo "</span>\n";
+  
+  
+  echo "\t\t\t<span class=\"clear\">&nbsp;</span>\n";
+  echo "\t\t</div>\n";
+  
+  // ---- end of module header
+  
+  
+  // ---- drop-down tab box thingy:
+  
+  echo "\t\t<div class=\"moduleinfopane\" id=\"infopane_".prep_id($name)."\" >\n";
+  echo "\t\t\t<div class=\"tabber\">\n";
+  
+  if (isset($modules_online[$name]['attention']) && !empty($modules_online[$name]['attention'])) {
+    echo "\t\t\t\t<div class=\"tabbertab\" title=\"Attention\">\n";
+    echo nl2br($modules[$name]['attention']);
+    echo "\t\t\t\t</div>\n";
+  }
+  
+  echo "\t\t\t\t<div class=\"tabbertab actiontab\" title=\"Action\">\n";
+  
+  echo '<input type="radio" checked="CHECKED" id="noaction_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="0" /> '.
+       '<label for="noaction_'.prep_id($name).'">No Action</label> <br />'; 
+  switch ($modules[$name]['status']) {
+  
+    case MODULE_STATUS_NOTINSTALLED:
+      echo '<input type="radio" id="install_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="install" /> '.
+           '<label for="install_'.prep_id($name).'">Install</label> <br />';
+    break;
+    case MODULE_STATUS_DISABLED:
+      echo '<input type="radio" id="enable_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="enable" /> '.
+           '<label for="enable_'.prep_id($name).'">Enable</label> <br />';
+      echo '<input type="radio" id="uninstall_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="uninstall" /> '.
+           '<label for="uninstall_'.prep_id($name).'">Uninstall</label> <br />';
+    break;
+    case MODULE_STATUS_NEEDUPGRADE:
+      echo '<input type="radio" id="install_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="install" /> '.
+           '<label for="install_'.prep_id($name).'">Upgrade to '.$modules_local[$name]['version'].' and Enable</label> <br />';
+      echo '<input type="radio" id="uninstall_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="uninstall" /> '.
+           '<label for="uninstall_'.prep_id($name).'">Uninstall</label> <br />';
+    break;
+    case MODULE_STATUS_BROKEN:
+      echo '<input type="radio" id="install_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="install" /> '.
+           '<label for="install_'.prep_id($name).'">Install</label> <br />';
+      echo '<input type="radio" id="uninstall_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="uninstall" /> '.
+           '<label for="uninstall_'.prep_id($name).'">Uninstall</label> <br />';
+    break;
+    default:
+      // check for online upgrade
+      if (isset($modules_online[$name]['version'])) {
+        $vercomp = version_compare($modules[$name]['version'], $modules_online[$name]['version']);
+        if ($vercomp < 0) {
+          echo '<input type="radio" id="install_'.prep_id($name).'" name="moduleaction['.prep_id($name).']" value="install" /> '.
+               '<label for="install_'.prep_id($name).'">Upgrade to '.$modules_online[$name]['version'].'</label> <br />';
-        }
-      }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  
-  echo "\t\t</li>\n";
@@ -193 +337 @@
-echo "</div>";
-
-
-
-echo '<pre>';
-
-
-
-
-
-
-
-exit;
-
-switch($extdisplay) {
-  case "online": 
-    echo "<h2>";
-    echo _("Module Administration (online)");
-    echo "</h2>";
-    echo "<a href='config.php?display=modules&amp;type=tool&amp;extdisplay=local'>"._("Terminate Connection to Online Module Repository")."</a><br />\n";
-    echo "<a href='config.php?display=modules&amp;type=tool&amp;extdisplay=online&amp;refresh=true'>"._("Force Refresh of Local Module Cache")."</a>\n";
-    // If 'refresh' is set to 'true' then truncate the modules_xml table so it doesn't try to 
-    // use the cached XML file.
-    if ($refresh !== false)
-      sql("truncate module_xml;");
-    // Check for a warning or text message at mirror.freepbx.org/version-$version.html
-    $version = getversion();
-    $version = $version[0][0];
-
-    if (isset($amp_conf['AMPMODULEMSG'])) {
-      $announcements = file_get_contents($amp_conf['AMPMODULEMSG']."/version-$version.html");
-    } else {
-      $announcements = file_get_contents("http://mirror.freepbx.org/version-$version.html");
-    }
-
-    print "$announcements";
-
-    // determine which modules we have installed already
-    $installed = find_allmodules();
-    // determine what modules are available
-    $online = module_getonlinexml();
-    $dispMods = new displayModules($installed,$online);
-    echo $dispMods->drawModules();
-  break;
-  default:
-    echo "<h2>";
-    echo _("Module Administration");
-    echo "</h2>";
-    echo "<a href='config.php?display=modules&amp;type=tool&amp;extdisplay=online'>"._("Connect to Online Module Repository")."</a>\n";
-    $installed = find_allmodules();
-    $dispMods = new displayModules($installed);
-    echo $dispMods->drawModules();
-
-  break;
-}
-?>
-
-<?php
-
-/* BEGIN FUNCTIONS */
-
-/* displays table of modules provided in the passed array
- * If displaying online modules, pass that array as the second arg 
-*/
-
-class displayModules {
-  var $html;
-  //constructor
-  function displayModules($installed,$online=false) {
-    // So, we have an array with several:
-  /*
-    [phpinfo] => Array
-      (
-        [displayName] => PHP Info
-        [version] => 1.0
-        [type] => tool
-        [category] => Basic
-        [info] => http://www.freepbx.org/wikiPage
-        [items] => Array
-          (
-            [PHPINFO] => PHP Info
-            [PHPINFO2] => PHP Info2
-          )
-  
-        [requirements] => Array
-          (
-            [FILE] => /usr/sbin/asterisk
-            [MODULE] => core
-          )
-  
-      )
-  */
-  
-    // if we are displaying online modules, determine which are installed
-    if($online) {
-      
-      $online = $this->sortModules($online);
-      foreach(array_keys($online) as $arrkey) {
-      
-        if (!is_array($installed))
-        {
-            continue;
-        }
-            
-        // Determine if module is already local
-        if(array_key_exists($arrkey,$installed)) {
-          //check if online version is newer
-          $newversion = $online[$arrkey]['version'];
-          $oldversion = isset($installed[$arrkey]['version'])?$installed[$arrkey]['version']:'0';
-          // version_compare returns 1 if new > old
-          if (version_compare($newversion,$oldversion) == 1) {
-            $modsOnlineUpdate[] = $online[$arrkey];
-          } else {
-            // we are not displaying this array .. it's just here for kicks
-            $modsOnlineInstalled[] = $online[$arrkey];
-          }
-        } else {
-          $modsOnlineOnly[] = $online[$arrkey];
-        }
-        
-        //$this->html .= $this->tableHtml($online[$arrkey],$status,$action);
-      }
-      
-      /* 
-       *  Available Module Updates
-       */
-      if(isset($modsOnlineUpdate) && is_array($modsOnlineUpdate)) {
-        $color = "orange";
-        $this->options = "
-          <select name=\"modaction\">
-            <option value=\"downloadupdate\">"._("Download and Update selected")."
-            <option value=\"download\">"._("Download selected")."
-          </select>
-          <input type=\"submit\" name=\"submit\" value=\""._("Submit")."\">
-          ";
-        // build the table
-        $this->html .= $this->buildTable(_("Available Module Updates (online)"), $modsOnlineUpdate, $color, $options);
-      }
-      
-      /* 
-       *  Online Modules
-       */     
-      if(isset($modsOnlineOnly) && is_array($modsOnlineOnly)) {
-        $color = "white";
-        $this->options = "
-          <select name=\"modaction\">
-            <option value=\"downloadinstall\">"._("Download and Install selected")."
-            <option value=\"download\">"._("Download selected")."
-          </select>
-          <input type=\"submit\" name=\"submit\" value=\""._("Submit")."\">
-          ";
-        // build the table
-        $this->html .= $this->buildTable(_("Modules Available (online)"), $modsOnlineOnly, $color, $options);
-      }     
-      
-    }
-      
-    $installed = $this->sortModules($installed);
-    if (isset($installed) && is_array($installed)) {
-      foreach($installed as $mod) {
-        //create seperate arrays based on module status
-        if ($mod['status'] == 0) {
-          $modsNotinstalled[] = $mod;
-        } else if($mod['status'] == 1){
-          $modsDisabled[] = $mod;
-        } else if($mod['status'] == 2){
-          $modsEnabled[] = $mod;
-        } else if($mod['status'] == 3){
-          $modsUpdate[] = $mod;
-        } else if($mod['status'] == -1){
-          $modsBroken[] = $mod;
-        }
-
-        //$this->html .= $this->tableHtml($mod,$status,$color);
-      }
-      
-      // draw a form and list for each module status
-      /* 
-       *  Modules Needing Update
-       */
-      if(isset($modsUpdate) && is_array($modsUpdate)) {
-        $color = "#CCFF00";
-        $options = "
-          <select name=\"modaction\">
-            <option value=\"upgrade\">"._("Upgrade Selected")."
-          </select>
-          <input type=\"submit\" name=\"submit\" value=\""._("Submit")."\">
-          ";
-        // build the table
-        $this->html .= $this->buildTable(_("Enabled Modules Requiring Upgrade"), $modsUpdate, $color, $options);
-      }
-      
-      /* 
-       *  Enabled Modules
-       */     
-      if(isset($modsEnabled) && is_array($modsEnabled)) {
-        $color = "white";
-        $this->options = "
-          <select name=\"modaction\">
-            <option value=\"disable\">"._("Disable Selected")."
-            <option value=\"uninstall\">"._("Uninstall Selected")."
-            <option value=\"uninstalldelete\">"._("Uninstall and Delete Selected")."
-          </select>
-          <input type=\"submit\" name=\"submit\" value=\""._("Submit")."\">
-          ";
-        // build the table
-        $this->html .= $this->buildTable(_("Enabled Modules"), $modsEnabled, $color, $options);
-      }
-      
-      /* 
-       *  Disabled Modules
-       */     
-      if(isset($modsDisabled) && is_array($modsDisabled)) {
-        $color = "white";
-        $this->options = "
-          <select name=\"modaction\">
-            <option value=\"enable\">"._("Enable Selected")."
-            <option value=\"uninstall\">"._("Uninstall Selected")."
-            <option value=\"uninstalldelete\">"._("Uninstall and Delete Selected")."
-          </select>
-          <input type=\"submit\" name=\"submit\" value=\""._("Submit")."\">
-          ";
-        // build the table
-        $this->html .= $this->buildTable(_("Disabled Modules"), $modsDisabled, $color, $options);
-      }
-
-      /* 
-       *  Local Modules Not Installed
-       */     
-      if(isset($modsNotinstalled) && is_array($modsNotinstalled)) {
-        $color = "white";
-        $this->options = "
-          <select name=\"modaction\">
-            <option value=\"installenable\">"._("Enable Selected")."
-            <option value=\"delete\">"._("Delete Selected")."
-          </select>
-          <input type=\"submit\" name=\"submit\" value=\""._("Submit")."\">
-          ";
-        // build the table
-        $this->html .= $this->buildTable(_("Not Installed Local Modules"), $modsNotinstalled, $color, $options);
-      }
-      
-      if(isset($modsBroken) && is_array($modsBroken)) {
-        $color = "#FFFFFF";
-          //$rows .= $this->tableHtmlBroken($mod,$color);
-        $this->options = "
-          <select name=\"modaction\">
-            <option value=\"delete\">"._("Delete Selected")."
-          </select>
-          <input type=\"submit\" name=\"submit\" value=\""._("Submit")."\">
-          ";
-        // build the table
-        // BROKEN modname instead of rawname ?? 
-        $this->html .= $this->buildTable(_("Not Installed Local Modules"), $modsBroken, $color, $options);
-      }
-      
-    }
-    
-  }
-  
-  //sorts the modules by category
-  function sortModules($array) {
-    if (isset($array) && is_array($array)) {
-      foreach($array as $key => $mod) {
-        // sort the list in category / displayName order
-        // this is the only way i know how to do this...surely there is another way?
-        
-        // fields for sort
-        $displayName = isset($mod['displayName']) ? $mod['displayName'] : 'unknown';
-        $category = isset($mod['category']) ? $mod['category'] : 'unknown'; 
-        // we want to sort on this so make it first in the new array
-        $newallmods[$key]['asort'] = $category.$displayName;
-      
-        // copy the rest of the array
-        $newallmods[$key]['modname'] = $key;
-        $newallmods[$key]['displayName'] = $displayName;
-        $newallmods[$key]['category'] = $category;
-        $newallmods[$key]['rawname'] = isset($mod['rawname'])?$mod['rawname'] : null;
-        $newallmods[$key]['info'] = isset($mod['info'])?$mod['info'] : null;
-        $newallmods[$key]['location'] = isset($mod['location']) ? $mod['location'] : null ;
-        $newallmods[$key]['version'] = isset($mod['version']) ? $mod['version'] : 'unknown';
-        $newallmods[$key]['type'] = isset($mod['type']) ? $mod['type'] : 'unknown';
-        $newallmods[$key]['status'] = isset($mod['status']) ? $mod['status'] : 0;
-        
-        asort($newallmods); 
-      }
-      return $newallmods;
-    }
-  }
-  
-  // tableRow($color, $mod['rawname'], $mod['version'], $mod['type'], $mod['categrory'], $mod['displayName'], $mod['info']
-  function tableRow($color, $rawname, $version, $type, $category, $displayname, $infourl) {
-    $out = '<tr bgcolor="'.$color.'">';
-    $out .= '<td><input type="checkbox" name="modules[]" value="'.$rawname.'">'.
-            '<input type="hidden" name="'.$rawname.'_version" value="'.$version.'"></td>';
-    $out .= '<td><a target="_BLANK" href="'.$infourl.'">'.$displayname.' ('.$rawname.')</a></td>';
-    $out .= '<td>'.$version.'</td>';
-    $out .= '<td>'.$type.'</td>';
-    $out .= '</tr>';
-    return $out;
-    return <<< End_of_Html
-      
-      <tr bgcolor={$color}>
-        <td>
-          <input type="checkbox" name="modules[]" value="{$arrRow['rawname']}">
-          <input type="hidden" name="{$arrRow['rawname']}_version" value="{$arrRow['version']}">
-        </td>
-        <td><a target=_BLANK href={$arrRow['info']}>{$arrRow['displayName']} ({$arrRow['rawname']})</a></td>
-        <td>{$arrRow['version']}</td>
-        <td>{$arrRow['type']}</td>
-        <td>{$arrRow['category']}</td>
-      </tr>
-      
-End_of_Html;
-  }
-
-  function tableHtmlBroken($arrRow,$color) {
-    return <<< End_of_Html
-      
-      <tr bgcolor={$color}>
-        <td>
-          <input type="checkbox" name="modules[]" value="{$arrRow['modname']}">
-          <input type="hidden" name="{$arrRow['modname']}_version" value="{$arrRow['version']}">
-        </td>
-        <td><a target=_BLANK href={$arrRow['info']}>{$arrRow['displayName']} ({$arrRow['modname']})</a></td>
-        <td>{$arrRow['version']}</td>
-        <td>{$arrRow['type']}</td>
-        <td>{$arrRow['category']}</td>
-      </tr>
-      
-End_of_Html;
-  }
-  
-  function formStart($title = "") {
-    $uri = preg_replace("/&refresh=true/", "//", $_SERVER['REQUEST_URI']);
-    return "
-      <h4>{$title}</h4>
-      <form method=\"POST\" action=\"{$uri}\">
-      <table border=1><tr><th>&nbsp;</th><th>". _("Module")."</th><th>". _("Version")."</th><th>". _("Type") ."</th><th>". _("Category") ."</th></tr>
-        ";
-  }
-
-  function formEnd() {
-    return "</table>{$this->options}</form><hr>";
-  }
-    
-  function drawModules() {
-    return $this->html;
-  }
-  
-  
-  function buildTable($title, $rows, $color, $options) {
-    $out = $this->formStart($title);
-    foreach($rows as $mod) {
-      $out .= $this->tableRow($mod);
-    }
-    $out .= $this->formEnd();
-    return $out;
-  }
-}
-
-?>
-