Tweaks to javascript. *CAUTION* Some things in the dialplan.js are hardcoded which...

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

diff --git a/andrew.webprj b/andrew.webprj
index 2f0db53..ed54c47 100644 (file)
--- a/andrew.webprj
+++ b/andrew.webprj
@@ -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="1131593241" url="themes/screen.css" uploadstatus="1" />
+    <item modified_time="1131744337" 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" />
@@ -84,12 +84,12 @@
         <uploadeditem upload_time="0" url="templates/dialplan/" />
         <uploadeditem upload_time="1131723538" url="templates/dialplan/contexttree.inc" />
         <uploadeditem upload_time="1131593241" url="templates/dialplan/dialplanlist.inc" />
-        <uploadeditem upload_time="1131741629" url="templates/dialplan/extensiondetail.inc" />
+        <uploadeditem upload_time="1131744370" 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" />
         <uploadeditem upload_time="0" url="templates/javascript/" />
-        <uploadeditem upload_time="1131741807" url="templates/javascript/dialplan.js" />
+        <uploadeditem upload_time="1131744813" url="templates/javascript/dialplan.js" />
         <uploadeditem upload_time="1131593241" url="templates/menu.inc" />
         <uploadeditem upload_time="1121578596" url="templates/table-limiter-begin.inc" />
         <uploadeditem upload_time="1121578596" url="templates/table-limiter-end.inc" />
@@ -99,7 +99,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="1131593241" url="themes/screen.css" />
+        <uploadeditem upload_time="1131744337" 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" />
@@ -123,10 +123,10 @@
     <events/>
     <item modified_time="1131045729" url="lib/defines.php" uploadstatus="1" />
     <item modified_time="1131723538" url="templates/dialplan/contexttree.inc" uploadstatus="1" />
-    <item modified_time="1131741629" url="templates/dialplan/extensiondetail.inc" uploadstatus="1" />
+    <item modified_time="1131744370" url="templates/dialplan/extensiondetail.inc" uploadstatus="1" />
     <item modified_time="1131497712" url="security.php" uploadstatus="1" />
     <item url="templates/javascript/" uploadstatus="1" />
-    <item modified_time="1131741807" url="templates/javascript/dialplan.js" uploadstatus="1" />
+    <item modified_time="1131744813" url="templates/javascript/dialplan.js" uploadstatus="1" />
     <treestatus>
       <openfolder url="lib" />
       <openfolder url="lib/Driver" />
@@ -134,6 +134,7 @@
       <openfolder url="templates" />
       <openfolder url="templates/dialplan" />
       <openfolder url="templates/javascript" />
+      <openfolder url="themes" />
     </treestatus>
   </project>
 </webproject>

diff --git a/templates/dialplan/extensiondetail.inc b/templates/dialplan/extensiondetail.inc
index 5f14248..8bac71c 100644 (file)
--- a/templates/dialplan/extensiondetail.inc
+++ b/templates/dialplan/extensiondetail.inc
@@ -44,69 +44,66 @@ if(!isset($dialplan['extensions'])) {
                     <?php echo Shout::exten2name($extension); ?>
                 </div>
             </a>
-        </div>
-
-        <div>
-            <div>
-                <div id="<?php echo "pList-$extension"; ?>"
-                    name="<?php echo "pList-$extension"; ?>">
-                    <table class="pList" cellspacing="0">
-                        <?php
-                        $p = 0;
-                        foreach($priorities as $priority => $data) {
-                            ?>
-                            <tr class="priority">
-                                <td class="pButtons"
-                                    id="<?php echo "pButtons-$extension-$priority"; ?>"
-                                    name="<?php echo "pButtons-$extension-$priority"; ?>">
-                                    <span class="add"
-                                        onclick="javascript:dp.addPrio('<?php
-                                            echo $extension; ?>', '<?php echo $priority; ?>');">+</span>
-                                    <span class="remove"
-                                        onclick="javascript:dp.delPrio('<?php
-                                            echo $extension; ?>', '<?php echo $priority; ?>');">-</span>
-                                </td>
-                                <td class="pElement"
-                                    id="<?php echo "pNumber-$extension-$priority"; ?>"
-                                    name="<?php echo "pNumber-$extension-$priority"; ?>"
-                                    onclick="javascript:dp.activatePriority('<?php
-                                        echo $extension; ?>', '<?php
-                                        echo $priority; ?>')">
-                                    <span class="priorityBox">
-                                        <?php echo $priority; ?>
-                                    </span>
-                                </td>
-                                <td class="pElement"
-                                    id="<?php echo "pApp-$extension-$priority"; ?>"
-                                    name="<?php echo "pApp-$extension-$priority"; ?>">
-                                    <span class="applicationBox">
-                                        <select
-                                            name="app[<?php echo $extension; ?>][<?php echo $priority; ?>]"
-                                            id="app[<?php echo $extension; ?>][<?php echo $priority; ?>]">
-                                            <option value="<?php echo $data['application']; ?>">
-                                                <?php echo $data['application']; ?></option>
-                                        </select>
-                                    </span>
-                                </td>
-                                <td class="pElement"
-                                    id="<?php echo "pArgs-$extension-$priority"; ?>"
-                                    name="<?php echo "pArgs-$extension-$priority"; ?>">
-                                    <span class="argBox">
-                                        <?php echo $data['args']; ?>
-                                    </span>
-                                </td>
-                            </tr>
-                            <?php
-                            $p++;
-                        }
+            <div id="<?php echo "pList-$extension"; ?>"
+                name="<?php echo "pList-$extension"; ?>">
+                <table class="pList" cellspacing="0">
+                    <?php
+                    $p = 0;
+                    foreach($priorities as $priority => $data) {
                         ?>
-                    </table>
-                    <br />
-                </div>
+                        <tr class="priority">
+                            <td class="pButtons"
+                                id="<?php echo "pButtons-$extension-$priority"; ?>"
+                                name="<?php echo "pButtons-$extension-$priority"; ?>">
+                                <span class="add"
+                                    onclick="javascript:dp.addPrio('<?php
+                                        echo $extension; ?>', '<?php echo $priority; ?>');">+</span>
+                                <span class="remove"
+                                    onclick="javascript:dp.delPrio('<?php
+                                        echo $extension; ?>', '<?php echo $priority; ?>');">-</span>
+                            </td>
+                            <td class="pElement"
+                                id="<?php echo "pNumber-$extension-$priority"; ?>"
+                                name="<?php echo "pNumber-$extension-$priority"; ?>"
+                                onclick="javascript:dp.activatePriority('<?php
+                                    echo $extension; ?>', '<?php
+                                    echo $priority; ?>')">
+                                <span class="priorityBox">
+                                    <?php echo $priority; ?>
+                                </span>
+                            </td>
+                            <td class="pElement"
+                                id="<?php echo "pApp-$extension-$priority"; ?>"
+                                name="<?php echo "pApp-$extension-$priority"; ?>">
+                                <span class="applicationBox">
+                                    <select
+                                        name="app[<?php echo $extension; ?>][<?php echo $priority; ?>]"
+                                        id="app[<?php echo $extension; ?>][<?php echo $priority; ?>]">
+                                        <option value="<?php echo $data['application']; ?>">
+                                            <?php echo $data['application']; ?></option>
+                                    </select>
+                                </span>
+                            </td>
+                            <td class="pElement"
+                                id="<?php echo "pArgs-$extension-$priority"; ?>"
+                                name="<?php echo "pArgs-$extension-$priority"; ?>">
+                                <span class="argBox">
+                                    <?php echo $data['args']; ?>
+                                </span>
+                            </td>
+                        </tr>
+                        <?php
+                        $p++;
+                    }
+                    ?>
+                </table>
             </div>
-        </div>
         <?php
         $e++;
+        ?>
+        </div>
+        <br />
+        <?php
     } ?>
     </div>
     <?php

diff --git a/templates/javascript/dialplan.js b/templates/javascript/dialplan.js
index 40748e4..bfca7af 100644 (file)
--- a/templates/javascript/dialplan.js
+++ b/templates/javascript/dialplan.js
@@ -79,12 +79,12 @@ Dialplan.prototype.drawPrioTable = function (exten)
     for (var p in this.dp[exten]['priorities']) {
         table += '        <td class="pButtons" id="pButtons-'+exten+'-'+p+'"\n';
         table += '            name="pButtons-'+exten+'-'+p+'">\n';
-        table += '            <span class="add">+</span>\n';
-        table += '            <span class="remove">-</span>\n';
+        table += '            <span class="add" onclick="javascript:dp.addPrio(\''+exten+'\', \''+p+'\');">+</span>\n';
+        table += '            <span class="remove" onclick="javascript:dp.delPrio(\''+exten+'\', \''+p+'\');">-</span>\n';
         table += '        </td>\n';
         table += '        <td class="pElement" id="pNumber-'+exten+'-'+p+'"\n';
         table += '            name="pNumber-'+exten+'-'+p+'"\n';
-        table += '            onclick="javascript:activatePriority(\''+exten+'\', \''+p+'\')">\n';
+        table += '            onclick="javascript:dp.activatePriority(\''+exten+'\', \''+p+'\')">\n';
         table += '            <span class="priorityBox">'+p+'</span>\n';
         table += '        </td>\n';
         table += '        <td class="pElement" id="pApp-'+exten+'-'+p+'"\n';
@@ -116,7 +116,7 @@ Dialplan.prototype.addExten = function (exten, extenName)
 Dialplan.prototype.addPrio = function(exten, prio)
 {
     prio = Number(prio);
-    if (this.dp[exten][prio] != 'undefined') {
+    if (this.dp[exten]['priorities'][prio] != 'undefined') {
         this._incrPrio(exten, prio);
     }
     this.dp[exten]['priorities'][prio] = new Array();
@@ -129,17 +129,17 @@ Dialplan.prototype._incrPrio = function (exten, prio)
     h = Number(prio) + 101;
 
     // Check for error handlers
-    if (this.dp[exten][h] != 'undefined') {
-        //alert(this.dp[exten][h]);
+    if (this.dp[exten]['priorities'][h] != 'undefined') {
+        alert(this.dp[exten][h]);
         //this._incrPrio(exten, h);
     }
 
     // Make sure the next slot is empty.  If not move it first.
-    if (this.dp[exten][p] != 'undefined') {
-        //alert(p);
+    if (this.dp[exten]['priorities'][p] != 'undefined') {
+        alert(p);
         //this._incrPrio(exten, p);
     }
 
     // Copy the existing prio to its new home
-    this.dp[exten][p] = this.dp[exten][prio];
+    this.dp[exten]['priorities'][p] = this.dp[exten]['priorities'][prio];
 }
\ No newline at end of file

diff --git a/themes/screen.css b/themes/screen.css
index 5246a3b..b3f270a 100644 (file)
--- a/themes/screen.css
+++ b/themes/screen.css
@@ -65,7 +65,6 @@
     border: 2px solid #000;
     background: inherit;
     padding: 5px;
-    padding-bottom: 20px;
 }
 
 #extensionDetail .extensionHighlight {