Enhancements to the dialplan listing. Still feels clumsy...

git-svn-id: https://svn.alkaloid.net/gpl/shout/trunk@61 06cd67b6-e706-0410-b29e-9de616bca6e9

diff --git a/shout.webprj b/shout.webprj
index dd0ba55..9b650ad 100644 (file)
--- a/shout.webprj
+++ b/shout.webprj
@@ -9,57 +9,57 @@
     <item url="templates/" uploadstatus="2" />
     <item url="lib/" uploadstatus="2" />
     <item url="lib/Driver/" uploadstatus="2" />
-    <item modified_time="1121313992" url="lib/Driver/ldap.php" uploadstatus="2" />
-    <item modified_time="1120589135" url="lib/base.php" uploadstatus="2" />
-    <item modified_time="1121306551" url="lib/Driver.php" uploadstatus="2" />
-    <item modified_time="1121401934" url="index.php" uploadstatus="2" />
+    <item modified_time="1121374073" url="lib/Driver/ldap.php" uploadstatus="2" />
+    <item modified_time="1120792108" url="lib/base.php" uploadstatus="2" />
+    <item modified_time="1120815592" url="lib/Driver.php" uploadstatus="2" />
+    <item modified_time="1121439895" url="index.php" uploadstatus="2" />
     <uploadprofiles showtreeviews="true" defaultProfile="Shout" >
       <profile remote_host="picasso.v-office.biz" remote_port="" remote_path="/srv/vhost/users/aklang/sites/intranet.v-office.biz/shout" remote_protocol="sftp" user="aklang" name="Shout" >
         <uploadeditem upload_time="0" url="config/" />
         <uploadeditem upload_time="1120073766" url="config/conf.xml" />
         <uploadeditem upload_time="1120183942" url="contexts.php" />
         <uploadeditem upload_time="1120355053" url="dialplan.php" />
-        <uploadeditem upload_time="1121401934" url="index.php" />
+        <uploadeditem upload_time="1121439895" url="index.php" />
         <uploadeditem upload_time="1120021874" url="index.php~" />
         <uploadeditem upload_time="0" url="lib/" />
-        <uploadeditem upload_time="1121306551" url="lib/Driver.php" />
+        <uploadeditem upload_time="1120815592" url="lib/Driver.php" />
         <uploadeditem upload_time="1120022560" url="lib/Driver.php~" />
         <uploadeditem upload_time="0" url="lib/Driver/" />
-        <uploadeditem upload_time="1121313992" url="lib/Driver/ldap.php" />
+        <uploadeditem upload_time="1121374073" url="lib/Driver/ldap.php" />
         <uploadeditem upload_time="1120026921" url="lib/Driver/ldap.php~" />
         <uploadeditem upload_time="1120288491" url="lib/SelectContext.php" />
-        <uploadeditem upload_time="1121317814" url="lib/Shout.php" />
-        <uploadeditem upload_time="1120815615" url="lib/System.php" />
-        <uploadeditem upload_time="1121404494" url="lib/User.php" />
+        <uploadeditem upload_time="1121374073" url="lib/Shout.php" />
+        <uploadeditem upload_time="1120812245" url="lib/System.php" />
+        <uploadeditem upload_time="1121439895" url="lib/User.php" />
         <uploadeditem upload_time="1120279975" url="lib/Users.php" />
-        <uploadeditem upload_time="1120589135" url="lib/base.php" />
+        <uploadeditem upload_time="1120792108" url="lib/base.php" />
         <uploadeditem upload_time="1120073766" url="lib/defines.php" />
         <uploadeditem upload_time="0" url="main/" />
-        <uploadeditem upload_time="1120355053" url="main/dialplan.php" />
-        <uploadeditem upload_time="1120287842" url="main/moh.php" />
-        <uploadeditem upload_time="1120815615" url="main/system.php" />
-        <uploadeditem upload_time="1121306550" url="main/users.php" />
+        <uploadeditem upload_time="1121401845" url="main/dialplan.php" />
+        <uploadeditem upload_time="1121401845" url="main/moh.php" />
+        <uploadeditem upload_time="1121401845" url="main/system.php" />
+        <uploadeditem upload_time="1121401845" url="main/users.php" />
         <uploadeditem upload_time="1120287842" url="moh.php" />
         <uploadeditem upload_time="1120027019" url="shout.webprj" />
         <uploadeditem upload_time="1120815615" url="system.php" />
         <uploadeditem upload_time="0" url="templates/" />
-        <uploadeditem upload_time="1120174958" url="templates/common-header.inc" />
+        <uploadeditem upload_time="1120158044" url="templates/common-header.inc" />
         <uploadeditem upload_time="1120073766" url="templates/content_page" />
         <uploadeditem upload_time="0" url="templates/context/" />
-        <uploadeditem upload_time="1120175005" url="templates/context/contextline.inc" />
+        <uploadeditem upload_time="1120169761" url="templates/context/contextline.inc" />
         <uploadeditem upload_time="0" url="templates/dialplan/" />
-        <uploadeditem upload_time="1121396278" url="templates/dialplan/dialplanlist.inc" />
-        <uploadeditem upload_time="1121396278" url="templates/menu.inc" />
+        <uploadeditem upload_time="1121458889" url="templates/dialplan/dialplanlist.inc" />
+        <uploadeditem upload_time="1121449266" url="templates/menu.inc" />
         <uploadeditem upload_time="0" url="templates/users/" />
-        <uploadeditem upload_time="1121396278" url="templates/users/userlist.inc" />
+        <uploadeditem upload_time="1121440395" url="templates/users/userlist.inc" />
         <uploadeditem upload_time="0" url="themes/" />
         <uploadeditem upload_time="0" url="themes/graphics/" />
-        <uploadeditem upload_time="1121300828" url="themes/graphics/add-user.gif" />
-        <uploadeditem upload_time="1121404451" url="users.php" />
+        <uploadeditem upload_time="1121295816" url="themes/graphics/add-user.gif" />
+        <uploadeditem upload_time="1121439895" url="users.php" />
         <uploadeditem upload_time="0" url="users/" />
-        <uploadeditem upload_time="1121404120" url="users/add.php" />
+        <uploadeditem upload_time="1121439895" url="users/add.php" />
         <uploadeditem upload_time="1121396278" url="users/index.php" />
-        <uploadeditem upload_time="1121402549" url="users/save.php" />
+        <uploadeditem upload_time="1121405057" url="users/save.php" />
       </profile>
     </uploadprofiles>
     <debuggers>
@@ -80,16 +80,16 @@
     <defaultDTD>-//w3c//dtd xhtml 1.0 strict//en</defaultDTD>
     <item modified_time="1120073766" url="config/conf.xml" uploadstatus="1" />
     <item url="config/" uploadstatus="1" />
-    <item modified_time="1121317814" url="lib/Shout.php" uploadstatus="1" />
-    <item modified_time="1120174958" url="templates/common-header.inc" uploadstatus="1" />
-    <item modified_time="1121396278" url="templates/menu.inc" uploadstatus="1" />
+    <item modified_time="1121374073" url="lib/Shout.php" uploadstatus="1" />
+    <item modified_time="1120158044" url="templates/common-header.inc" uploadstatus="1" />
+    <item modified_time="1121449266" url="templates/menu.inc" uploadstatus="1" />
     <item url="templates/context/" uploadstatus="1" />
-    <item modified_time="1120175005" url="templates/context/contextline.inc" uploadstatus="1" />
+    <item modified_time="1120169761" url="templates/context/contextline.inc" uploadstatus="1" />
     <item url="templates/users/" uploadstatus="1" />
-    <item modified_time="1121396278" url="templates/users/userlist.inc" uploadstatus="1" />
-    <item modified_time="1121396278" url="templates/dialplan/dialplanlist.inc" uploadstatus="1" />
+    <item modified_time="1121440395" url="templates/users/userlist.inc" uploadstatus="1" />
+    <item modified_time="1121458889" url="templates/dialplan/dialplanlist.inc" uploadstatus="1" />
     <item url="templates/dialplan/" uploadstatus="1" />
-    <item modified_time="1120815615" url="lib/System.php" uploadstatus="1" />
+    <item modified_time="1120812245" url="lib/System.php" uploadstatus="1" />
     <author>Ben Klang</author>
     <email>ben@alkaloid.net</email>
     <debuggerclient>Gubed</debuggerclient>
@@ -102,17 +102,17 @@
     <events/>
     <item url="themes/" uploadstatus="1" />
     <item url="themes/graphics/" uploadstatus="1" />
-    <item modified_time="1121300828" url="themes/graphics/add-user.gif" uploadstatus="1" />
+    <item modified_time="1121295816" url="themes/graphics/add-user.gif" uploadstatus="1" />
     <item url="users/" uploadstatus="1" />
-    <item modified_time="1121404494" url="lib/User.php" uploadstatus="1" />
-    <item modified_time="1121404120" url="users/add.php" uploadstatus="1" />
-    <item url="main/" />
-    <item modified_time="1120355053" url="main/dialplan.php" />
-    <item modified_time="1120287842" url="main/moh.php" />
-    <item modified_time="1120815615" url="main/system.php" />
-    <item modified_time="1121306550" url="main/users.php" />
-    <item modified_time="1121404451" url="users.php" />
-    <item modified_time="1121402549" url="users/save.php" />
+    <item modified_time="1121439895" url="lib/User.php" uploadstatus="1" />
+    <item modified_time="1121439895" url="users/add.php" uploadstatus="1" />
+    <item url="main/" uploadstatus="1" />
+    <item modified_time="1121401845" url="main/dialplan.php" uploadstatus="1" />
+    <item modified_time="1121401845" url="main/moh.php" uploadstatus="1" />
+    <item modified_time="1121401845" url="main/system.php" uploadstatus="1" />
+    <item modified_time="1121401845" url="main/users.php" uploadstatus="1" />
+    <item modified_time="1121439895" url="users.php" uploadstatus="1" />
+    <item modified_time="1121405057" url="users/save.php" uploadstatus="1" />
     <treestatus>
       <openfolder url="config" />
       <openfolder url="lib" />

diff --git a/templates/dialplan/dialplanlist.inc b/templates/dialplan/dialplanlist.inc
index 227c7f4..d5756cb 100644 (file)
--- a/templates/dialplan/dialplanlist.inc
+++ b/templates/dialplan/dialplanlist.inc
@@ -1,37 +1,70 @@
-<table width="95%" border="0" cellpadding="0" cellspacing="0" class="header">
-  <tr valign="bottom">
-    <td width="61"><div align="center"><font size="1">
-      &nbsp;
-    </td>
-    <td width="148"><div align="center"></div></td>
-    <td width="332">&nbsp;</td>
-    <td width="202"><font size="3">Context: <?php echo $context; ?></font></td>
+<table width="95%" border="0" cellpadding="0" cellspacing="0" class="item">
+  <tr valign="bottom" class="header">
+   <td colspan="2"><font size="3">Context: <?php echo $context; ?></font></td>
   </tr>
-</table>
-<table class="item">
-    <tbody>
-        <?php
-        $line = 0;
-        $dialplan = $shout->getDialplan($context);
-        if (isset($dialplan['extensions']) &&
-            (count($dialplan['extensions']) > 0)) {
-            foreach ($dialplan['extensions'] as $extension => $priorities) {
-                foreach ($priorities as $priority => $application) {
-                    $rowcolor = $line % 2;
-                    $line++;
-        ?>
-        <tr style="item<?php echo $rowcolor; ?>">
-            <td><?php echo $extension; ?></td>
-            <td><?php echo $priority;
-                      ?></td>
-            <td>
-                <?php echo $application; ?>
-            </td>
-        </tr>
-        <?php
+  <tr class="body"><td colspan="2">&nbsp;</td></tr>
+  <tr class="body"><td colspan="2" align="center">
+  <table width="95%" border="0" cellpadding="0" cellspacing="0" class="item">
+  <?php
+    $line = 0;
+    $dialplan = $shout->getDialplan($context);
+    if (isset($dialplan['extensions']) &&
+        (count($dialplan['extensions']) > 0)) {
+        foreach ($dialplan['extensions'] as $extension => $priorities) {
+            unset($extname);
+            # Cast as a string to avoid misinterpreted digits
+            switch ((string)$extension) {
+                case "h":
+                    $extname = "Hangup";
+                    break;
+                case "i":
+                    $extname = "Invalid";
+                    break;
+                case "t":
+                    $extname = "Timeout";
+                    break;
+                case "s":
+                    $extname = "Start";
+                    break;
+                case "o":
+                    $extname = "Operator";
+                    break;
+                default:
+                    break;
+            }
+            ?>
+            <tr class="header">
+              <th colspan="2" class="header">
+                <?php
+                if (isset($extname)) {
+                    echo $extname;
+                } else {
+                    echo "Extension $extension";
                 }
+                ?>
+              </th>
+            </tr>
+            <tr class="smallheader">
+              <th align="left">Priority</th>
+              <th align="left">Application</th>
+            </tr>
+            <?php
+            foreach ($priorities as $priority => $application) {
+                $rowcolor = $line % 2;
+                $line++;
+                ?>
+                <tr class="item<?php echo $rowcolor; ?>">
+                    <td align="center"><?php echo $priority; ?></td>
+                    <td align="left"><?php echo $application; ?></td>
+                </tr>
+                <?php
             }
+            ?>
+            <tr class="body"><td colspan="2">&nbsp;</td></tr>
+            <?php
         }
-        ?>
-    </tbody>
-</table>
\ No newline at end of file
+    }
+  ?>
+  </table>
+  </td></tr>
+</>
\ No newline at end of file

diff --git a/templates/menu.inc b/templates/menu.inc
index ae483d2..66e7a35 100644 (file)
--- a/templates/menu.inc
+++ b/templates/menu.inc
@@ -22,6 +22,13 @@ $menu_view = $prefs->getValue('menu_view');
      ?>
     </select>
    </label>
+   <?php
+     if (isset($section)) {
+         ?>
+         <input type="hidden" name="section" value="<?php echo $section; ?>" />
+         <?php
+     }
+    ?>
   </form>
  </span>
  <span style="float:right">

diff --git a/templates/users/userlist.inc b/templates/users/userlist.inc
index 0e0f8d5..9c09397 100644 (file)
--- a/templates/users/userlist.inc
+++ b/templates/users/userlist.inc
@@ -1,11 +1,11 @@
 <table width="95%" border="0" cellpadding="0" cellspacing="0" class="header">
   <tr valign="bottom">
-    <td width="61"><div align="center"><font size="1">
+    <td width="8%"><div align="center"><font size="1">
       &nbsp;
     </td>
-    <td width="148"><div align="center"></div></td>
-    <td width="332">&nbsp;</td>
-    <td width="202"><font size="3">Context: <?php echo $context; ?></font></td>
+    <td width="20%"><div align="center"></div></td>
+    <td width="45%">&nbsp;</td>
+    <td width="27%"><font size="3">Context: <?php echo $context; ?></font></td>
   </tr>
 </table>