Experimenting with extensions to dialplan management

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

diff --git a/andrew.webprj b/andrew.webprj
index 1b016cd..c627baf 100644 (file)
--- a/andrew.webprj
+++ b/andrew.webprj
@@ -1,6 +1,6 @@
 <!DOCTYPE webproject>
 <webproject>
-  <project usePreviewPrefix="0" type="Local" previewPrefix="" usePersistentBookmarks="0" name="Shout" encoding="iso 8859-1" enableEvents="true" >
+  <project usePreviewPrefix="0" previewPrefix="" type="Local" usePersistentBookmarks="0" name="Shout" encoding="iso 8859-1" enableEvents="true" >
     <upload/>
     <defaultDTD>-//w3c//dtd xhtml 1.0 strict//en</defaultDTD>
     <item url="config/" uploadstatus="1" />
@@ -17,7 +17,7 @@
     <item modified_time="1121689003" url="lib/System.php" uploadstatus="1" />
     <item modified_time="1130769961" url="lib/User.php" uploadstatus="1" />
     <item url="main/" uploadstatus="1" />
-    <item modified_time="1131047244" url="main/dialplan.php" uploadstatus="1" />
+    <item modified_time="1131050319" url="main/dialplan.php" uploadstatus="1" />
     <item modified_time="1121401845" url="main/moh.php" uploadstatus="1" />
     <item modified_time="1130769962" url="main/system.php" uploadstatus="1" />
     <item modified_time="1121689003" url="main/users.php" uploadstatus="1" />
@@ -40,7 +40,7 @@
     <item url="themes/graphics/" uploadstatus="1" />
     <item modified_time="1121581526" url="themes/graphics/add-extension.gif" uploadstatus="1" />
     <item modified_time="1130861777" url="themes/graphics/add-user.gif" uploadstatus="1" />
-    <item modified_time="1121578596" url="themes/screen.css" uploadstatus="1" />
+    <item modified_time="1131050251" url="themes/screen.css" uploadstatus="1" />
     <item url="users/" uploadstatus="1" />
     <item modified_time="1122704539" url="users/add.php" uploadstatus="1" />
     <item modified_time="1122704539" url="users/delete.php" uploadstatus="1" />
@@ -71,7 +71,7 @@
         <uploadeditem upload_time="1130769961" url="lib/base.php" />
         <uploadeditem upload_time="1131045729" url="lib/defines.php" />
         <uploadeditem upload_time="0" url="main/" />
-        <uploadeditem upload_time="1131047244" url="main/dialplan.php" />
+        <uploadeditem upload_time="1131050319" url="main/dialplan.php" />
         <uploadeditem upload_time="1121401845" url="main/moh.php" />
         <uploadeditem upload_time="1130769962" url="main/system.php" />
         <uploadeditem upload_time="1121689003" url="main/users.php" />
@@ -81,7 +81,9 @@
         <uploadeditem upload_time="0" url="templates/context/" />
         <uploadeditem upload_time="1120175005" url="templates/context/contextline.inc" />
         <uploadeditem upload_time="0" url="templates/dialplan/" />
+        <uploadeditem upload_time="1131050005" url="templates/dialplan/contexttree.inc" />
         <uploadeditem upload_time="1121581526" url="templates/dialplan/dialplanlist.inc" />
+        <uploadeditem upload_time="1131050271" url="templates/dialplan/extensiondetail.inc" />
         <uploadeditem upload_time="1121689030" url="templates/dialplan/priority-form-begin.inc" />
         <uploadeditem upload_time="1121689030" url="templates/dialplan/priority-form-end.inc" />
         <uploadeditem upload_time="1121689030" url="templates/dialplan/priority-form-line.inc" />
@@ -94,7 +96,7 @@
         <uploadeditem upload_time="0" url="themes/graphics/" />
         <uploadeditem upload_time="1121581526" url="themes/graphics/add-extension.gif" />
         <uploadeditem upload_time="1130861777" url="themes/graphics/add-user.gif" />
-        <uploadeditem upload_time="1121578596" url="themes/screen.css" />
+        <uploadeditem upload_time="1131050251" url="themes/screen.css" />
         <uploadeditem upload_time="1122704475" url="users.php" />
         <uploadeditem upload_time="0" url="users/" />
         <uploadeditem upload_time="1122704539" url="users/add.php" />
@@ -117,6 +119,8 @@
     </teamdata>
     <events/>
     <item modified_time="1131045729" url="lib/defines.php" uploadstatus="1" />
+    <item modified_time="1131050005" url="templates/dialplan/contexttree.inc" />
+    <item modified_time="1131050271" url="templates/dialplan/extensiondetail.inc" />
     <treestatus>
       <openfolder url="config" />
       <openfolder url="dialplan" />
@@ -125,6 +129,7 @@
       <openfolder url="main" />
       <openfolder url="templates" />
       <openfolder url="templates/dialplan" />
+      <openfolder url="themes" />
       <openfolder url="users" />
     </treestatus>
   </project>

diff --git a/main/dialplan.php b/main/dialplan.php
index 3fac838..e9cd3f7 100644 (file)
--- a/main/dialplan.php
+++ b/main/dialplan.php
@@ -46,10 +46,13 @@ foreach ($dialplan as $linetype => $linedata) {
                         $nodetext = $extension;
                         break;
                     }
-                $tree->addNode($extension, 'extensions', $nodetext, null);
-                foreach ($priorities as $priority => $application) {
-                    $tree->addNode("$extension-$priority", $extension, "$priority: $application", null);
-                }
+                $url = Horde::applicationUrl('index.php?section=dialplan' .
+                    '&extension=' . $extension . '&context=' . $context);
+                $tree->addNode($extension, 'extensions', $nodetext, null, false,
+                    array('url' => $url));
+//                 foreach ($priorities as $priority => $application) {
+//                     $tree->addNode("$extension-$priority", $extension, "$priority: $application", null);
+//                 }
             }
             break;
 
@@ -71,7 +74,11 @@ foreach ($dialplan as $linetype => $linedata) {
     }
 }
 
-$tree->renderTree();
+require SHOUT_TEMPLATES . '/dialplan/contexttree.inc';
+
+if ($extension = Util::getFormData('extension')) {
+    require SHOUT_TEMPLATES . '/dialplan/extensiondetail.inc';
+}
 
 // Horde::addScriptFile('httpclient.js', 'horde', true);
 // Horde::addScriptFile('hideable.js', 'horde', true);

diff --git a/themes/screen.css b/themes/screen.css
index 7cb3ae4..34df6da 100644 (file)
--- a/themes/screen.css
+++ b/themes/screen.css
@@ -6,4 +6,13 @@
 .darkhint {
     color: #770000;
     font-size: 10px;
+}
+
+.contexttree {
+    float: left;
+    width: 50px;
+}
+
+.extensiondetail {
+    float: right;
 }
\ No newline at end of file