From 7ef789253d001372504424967fed14fc34213f5f Mon Sep 17 00:00:00 2001
From: Ben Klang <ben@alkaloid.net>
Date: Fri, 29 Jan 2010 22:27:57 -0500
Subject: [PATCH] Shout: Improve display of extension/device information

---
 shout/lib/Forms/DeviceForm.php      | 2 +-
 shout/templates/devices/list.inc    | 8 ++++----
 shout/templates/extensions/list.inc | 4 ----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/shout/lib/Forms/DeviceForm.php b/shout/lib/Forms/DeviceForm.php
index 9b79c558b..0d2182ced 100644
--- a/shout/lib/Forms/DeviceForm.php
+++ b/shout/lib/Forms/DeviceForm.php
@@ -33,7 +33,7 @@ class DeviceDetailsForm extends Horde_Form {
             $this->addHidden('', 'devid', 'text', true);
 
         }
-        $this->addVariable(_("Device Name"), 'name', 'text', false);
+        $this->addVariable(_("Device Name"), 'name', 'text', true);
         $this->addVariable(_("Mailbox"), 'mailbox', 'int', false);
         $this->addVariable(_("CallerID"), 'callerid', 'text', false);
         $this->addVariable(_("Reset authentication token?"), 'genauthtok',
diff --git a/shout/templates/devices/list.inc b/shout/templates/devices/list.inc
index 7ba6ce815..48b2e1f37 100644
--- a/shout/templates/devices/list.inc
+++ b/shout/templates/devices/list.inc
@@ -15,9 +15,9 @@
 <div id="extensionList">
     <table width="100%" cellspacing="0" class="striped">
         <tr>
-            <td class="uheader">Device ID</td>
+            <td class="uheader">Name</td>
             <td class="uheader">Mailbox</td>
-            <td class="uheader">CallerID</td>
+            <td class="uheader">Device ID</td>
         </tr>
         <?php
             $line = 0;
@@ -34,13 +34,13 @@
         ?>
         <tr class="item">
             <td>
-                <?php echo Horde::link($editurl); echo $devid; ?></a>
+                <?php echo Horde::link($editurl); echo $info['name']; ?></a>
             </td>
             <td>
                 <?php echo $info['mailbox']; ?>
             </td>
             <td>
-                <?php echo $info['callerid']; ?>
+                <?php echo Horde::link($editurl); echo $devid; ?></a>
             </td>
         </tr>
         <?php
diff --git a/shout/templates/extensions/list.inc b/shout/templates/extensions/list.inc
index b4859149a..4a538733c 100644
--- a/shout/templates/extensions/list.inc
+++ b/shout/templates/extensions/list.inc
@@ -17,7 +17,6 @@
         <tr>
             <td class="uheader">Extension</td>
             <td class="uheader">Destinations</td>
-            <td class="uheader">E-Mail Address</td>
         </tr>
         <?php
             foreach ($extensions as $extension => $info) {
@@ -46,9 +45,6 @@
                 <div class="extensionDestinations" id="destX<?php echo $extension; ?>info">
                 </div>
             </td>
-            <td>
-                <?php echo $info['email']; ?>
-            </td>
         </tr>
         <?php
             }
-- 
2.11.0