From 60f713b8ec2908982be852c5b1dcb7322a2b0f8d Mon Sep 17 00:00:00 2001
From: Ben Klang <ben@alkaloid.net>
Date: Wed, 24 Mar 2010 18:22:28 -0400
Subject: [PATCH] Shout: Make buttons more visually obvious

---
 shout/lib/Shout.php                 |  4 ++--
 shout/templates/accounts/list.inc   | 20 ++++++++++----------
 shout/templates/devices/list.inc    | 20 ++++++++++----------
 shout/templates/dialplan/edit.inc   |  2 +-
 shout/templates/dialplan/list.inc   | 30 ++++++++++++++++--------------
 shout/templates/extensions/list.inc | 20 ++++++++++----------
 shout/themes/screen.css             |  4 ++++
 7 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/shout/lib/Shout.php b/shout/lib/Shout.php
index 176d5bf36..fef60c66c 100644
--- a/shout/lib/Shout.php
+++ b/shout/lib/Shout.php
@@ -145,7 +145,7 @@ class Shout
 
         return array(
             'jump' => array(
-                'description' => _("Jump to menu."),
+                'description' => _("Jump to menu"),
                 'args' => array (
                     'menuName' => array(
                         'name' => _("Menu"),
@@ -169,7 +169,7 @@ class Shout
             'leave_message' => array(
                 'description' => _("Go to voicemail"),
                 'args' => array(
-                    'mailbox' => array(
+                    'exten' => array(
                         'name' => _("Mailbox"),
                         'type' => 'enum',
                         'required' => true,
diff --git a/shout/templates/accounts/list.inc b/shout/templates/accounts/list.inc
index 2278c70b6..f768bab80 100644
--- a/shout/templates/accounts/list.inc
+++ b/shout/templates/accounts/list.inc
@@ -1,14 +1,4 @@
 <div class="header">
-    <ul id="controls">
-        <?php
-        $addurl = Horde::applicationUrl('admin.php');
-        $addurl = Horde_Util::addParameter($addurl, 'action', 'add');
-        ?>
-        <li><a href="<?php echo $addurl; ?>">
-            <?php echo Horde::img('add-extension.png'); ?>&nbsp;New Account
-            </a>
-        </li>
-    </ul>
     Account: <?php echo $_SESSION['shout']['accounts'][$curaccount]; ?>
 </div>
 
@@ -43,3 +33,13 @@
         ?>
     </table>
 </div>
+<ul id="controls">
+    <?php
+    $addurl = Horde::applicationUrl('admin.php');
+    $addurl = Horde_Util::addParameter($addurl, 'action', 'add');
+    ?>
+    <li class="button"><a href="<?php echo $addurl; ?>">
+        <?php echo Horde::img('add-extension.png'); ?>&nbsp;New Account
+        </a>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/shout/templates/devices/list.inc b/shout/templates/devices/list.inc
index 3a8cf8411..d500f13ff 100644
--- a/shout/templates/devices/list.inc
+++ b/shout/templates/devices/list.inc
@@ -1,14 +1,4 @@
 <div class="header">
-    <ul id="controls">
-        <?php
-        $addurl = Horde::applicationUrl('devices.php');
-        $addurl = Horde_Util::addParameter($addurl, 'action', 'add');
-        ?>
-        <li><a href="<?php echo $addurl; ?>">
-            <?php echo Horde::img('add-device.png'); ?>&nbsp;New Device
-            </a>
-        </li>
-    </ul>
     Account: <?php echo $_SESSION['shout']['accounts'][$curaccount]; ?>
 </div>
 
@@ -48,3 +38,13 @@
         ?>
     </table>
 </div>
+<ul id="controls">
+    <?php
+    $addurl = Horde::applicationUrl('devices.php');
+    $addurl = Horde_Util::addParameter($addurl, 'action', 'add');
+    ?>
+    <li class="button"><a href="<?php echo $addurl; ?>">
+        <?php echo Horde::img('add-device.png'); ?>&nbsp;New Device
+        </a>
+    </li>
+</ul>
diff --git a/shout/templates/dialplan/edit.inc b/shout/templates/dialplan/edit.inc
index 54c6fecec..fb491fdc7 100644
--- a/shout/templates/dialplan/edit.inc
+++ b/shout/templates/dialplan/edit.inc
@@ -275,7 +275,7 @@ function refreshMenu()
         switch(action) {
         case 'jump':
             var menu = pair.value.args['menuName'];
-            text = document.createTextNode(destinations.get(exten).name);
+            text = document.createTextNode(menu);
             break;
         case 'ringexten':
         case 'leave_message':
diff --git a/shout/templates/dialplan/list.inc b/shout/templates/dialplan/list.inc
index 431215ab1..9ebb3c756 100644
--- a/shout/templates/dialplan/list.inc
+++ b/shout/templates/dialplan/list.inc
@@ -1,19 +1,10 @@
 <div class="header">
-    <ul id="controls">
-        <?php
-        $addurl = Horde::applicationUrl('dialplan.php');
-        $addurl = Horde_Util::addParameter($addurl, 'action', 'add');
-        $editurl = Horde::applicationUrl('dialplan.php');
-        $editurl = Horde_Util::addParameter($editlink, 'action', 'edit');
-        ?>
-        <li><a href="<?php echo $addurl; ?>">
-            <?php echo Horde::img('add-menu.png'); ?>&nbsp;New Menu
-            </a>
-        </li>
-    </ul>
     Account: <?php echo $_SESSION['shout']['accounts'][$curaccount]; ?>
 </div>
-
+<?php
+$editurl = Horde::applicationUrl('dialplan.php');
+$editurl = Horde_Util::addParameter($editlink, 'action', 'edit');
+?>
 <div id="extensionList">
     <table width="100%" cellspacing="0" class="striped">
         <tr>
@@ -29,4 +20,15 @@
         </tr>
         <?php } ?>
     </table>
-</div>
\ No newline at end of file
+</div>
+<ul id="controls">
+    <?php
+    $addurl = Horde::applicationUrl('dialplan.php');
+    $addurl = Horde_Util::addParameter($addurl, 'action', 'add');
+
+    ?>
+    <li class="button"><a href="<?php echo $addurl; ?>">
+        <?php echo Horde::img('add-menu.png'); ?>&nbsp;New Menu
+        </a>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/shout/templates/extensions/list.inc b/shout/templates/extensions/list.inc
index 7fbcf471b..f3d63d071 100644
--- a/shout/templates/extensions/list.inc
+++ b/shout/templates/extensions/list.inc
@@ -1,14 +1,4 @@
 <div class="header">
-    <ul id="controls">
-        <?php
-        $addurl = Horde::applicationUrl('extensions.php');
-        $addurl = Horde_Util::addParameter($addurl, 'action', 'add');
-        ?>
-        <li><a href="<?php echo $addurl; ?>">
-            <?php echo Horde::img('add-extension.png'); ?>&nbsp;New Extension
-            </a>
-        </li>
-    </ul>
     Account: <?php echo $_SESSION['shout']['accounts'][$curaccount]; ?>
 </div>
 
@@ -48,6 +38,16 @@
         ?>
     </table>
 </div>
+<ul id="controls">
+    <?php
+    $addurl = Horde::applicationUrl('extensions.php');
+    $addurl = Horde_Util::addParameter($addurl, 'action', 'add');
+    ?>
+    <li class="button"><a href="<?php echo $addurl; ?>">
+        <?php echo Horde::img('add-extension.png'); ?>&nbsp;New Extension
+        </a>
+    </li>
+</ul>
 
 <script type="text/javascript">
 <!--
diff --git a/shout/themes/screen.css b/shout/themes/screen.css
index 8f21c4ec0..e3fb6ff7a 100644
--- a/shout/themes/screen.css
+++ b/shout/themes/screen.css
@@ -175,6 +175,10 @@ ul {
     margin: 5px;
 }
 
+.button a {
+    color: #fff;
+}
+
 .buttonActionLabel
 {
     text-align: right;
-- 
2.11.0