From 6892d24d14badc8020181001fdcd82b834d452b9 Mon Sep 17 00:00:00 2001
From: Ben Klang <ben@alkaloid.net>
Date: Sun, 28 Mar 2010 15:58:43 -0400
Subject: [PATCH] Shout: fix clicking on buttons outside text

---
 shout/templates/accounts/list.inc   |  2 +-
 shout/templates/devices/list.inc    |  2 +-
 shout/templates/dialplan/edit.inc   |  7 ++++---
 shout/templates/extensions/list.inc |  2 +-
 shout/templates/recordings/list.inc | 20 ++++++++++----------
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/shout/templates/accounts/list.inc b/shout/templates/accounts/list.inc
index 210476905..cde395ab2 100644
--- a/shout/templates/accounts/list.inc
+++ b/shout/templates/accounts/list.inc
@@ -38,7 +38,7 @@
     $addurl = Horde::applicationUrl('admin.php');
     $addurl = Horde_Util::addParameter($addurl, 'action', 'add');
     ?>
-    <li class="button"><a href="<?php echo $addurl; ?>">
+    <li><a class="button" href="<?php echo $addurl; ?>">
         <?php echo Horde::img('extension-add.png'); ?>&nbsp;New Account
         </a>
     </li>
diff --git a/shout/templates/devices/list.inc b/shout/templates/devices/list.inc
index 4a8dbe669..8ce1d50a0 100644
--- a/shout/templates/devices/list.inc
+++ b/shout/templates/devices/list.inc
@@ -43,7 +43,7 @@
     $addurl = Horde::applicationUrl('devices.php');
     $addurl = Horde_Util::addParameter($addurl, 'action', 'add');
     ?>
-    <li class="button"><a href="<?php echo $addurl; ?>">
+    <li><a class="button" href="<?php echo $addurl; ?>">
         <?php echo Horde::img('device-add.png'); ?>&nbsp;New Device
         </a>
     </li>
diff --git a/shout/templates/dialplan/edit.inc b/shout/templates/dialplan/edit.inc
index 6ca77ee1d..ed1bfd376 100644
--- a/shout/templates/dialplan/edit.inc
+++ b/shout/templates/dialplan/edit.inc
@@ -41,11 +41,12 @@
         $addurl = Horde::applicationUrl('dialplan.php');
         $addurl = Horde_Util::addParameter($addurl, 'action', 'add');
         ?>
-        <a href="<?php echo $addurl; ?>">
-        <li class="button">
+        
+        <li>
+            <a class="button" href="<?php echo $addurl; ?>">
             <?php echo Horde::img('menu-add.png'); ?>&nbsp;New Menu
+            </a>
         </li>
-        </a>
         <li class="button" onclick="editMenu()"><?php echo Horde::img('menu-edit.png'); ?>&nbsp;Edit Menu</li>
         <li class="button" onclick="deleteMenu()"><?php echo Horde::img('menu-delete.png');?>&nbsp;Delete Menu</li>
         </ul>
diff --git a/shout/templates/extensions/list.inc b/shout/templates/extensions/list.inc
index 1c982393d..848cc20b1 100644
--- a/shout/templates/extensions/list.inc
+++ b/shout/templates/extensions/list.inc
@@ -43,7 +43,7 @@
     $addurl = Horde::applicationUrl('extensions.php');
     $addurl = Horde_Util::addParameter($addurl, 'action', 'add');
     ?>
-    <li class="button"><a href="<?php echo $addurl; ?>">
+    <li><a class="button" href="<?php echo $addurl; ?>">
         <?php echo Horde::img('extension-add.png'); ?>&nbsp;New Extension
         </a>
     </li>
diff --git a/shout/templates/recordings/list.inc b/shout/templates/recordings/list.inc
index dc4f6f46e..87bae6c1f 100644
--- a/shout/templates/recordings/list.inc
+++ b/shout/templates/recordings/list.inc
@@ -1,14 +1,4 @@
 <div class="header">
-    <ul id="controls">
-        <?php
-        $addurl = Horde::applicationUrl('recordings.php');
-        $addurl = Horde_Util::addParameter($addurl, 'action', 'add');
-        ?>
-        <li><a href="<?php echo $addurl; ?>">
-            <?php echo Horde::img('recording-add.png'); ?>&nbsp;New Recording
-            </a>
-        </li>
-    </ul>
     Account: <?php echo $_SESSION['shout']['accounts'][$curaccount]; ?>
 </div>
 
@@ -43,3 +33,13 @@
         ?>
     </table>
 </div>
+<ul id="controls">
+    <?php
+    $addurl = Horde::applicationUrl('recordings.php');
+    $addurl = Horde_Util::addParameter($addurl, 'action', 'add');
+    ?>
+    <li><a class="button" href="<?php echo $addurl; ?>">
+        <?php echo Horde::img('recording-add.png'); ?>&nbsp;New Recording
+        </a>
+    </li>
+</ul>
-- 
2.11.0