Shout: mv accounts admin files into place

diff --git a/shout/admin/accounts.php b/shout/admin/accounts.php
index 6969872..8cddbd3 100644 (file)
--- a/shout/admin/accounts.php
+++ b/shout/admin/accounts.php
@@ -107,6 +107,6 @@ $notification->notify();
 
 Shout::getAdminTabs();
 
-require SHOUT_TEMPLATES . '/accounts/' . $action . '.inc';
+require SHOUT_TEMPLATES . '/admin/accounts/' . $action . '.inc';
 
 require $registry->get('templates', 'horde') . '/common-footer.inc';

diff --git a/shout/templates/accounts/edit.inc b/shout/templates/accounts/edit.inc
deleted file mode 100644 (file)
index e42e0b1..0000000
--- a/shout/templates/accounts/edit.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$Form->renderActive($RENDERER, $vars, Horde::applicationUrl('admin.php'), 'post');
-
-if ($vars->get('action') == 'edit') {
-    $deleteUrl = Horde::applicationUrl('admin.php');
-    $params = array ('action' => 'delete',
-                     'account' => $account);
-    $deleteUrl = Horde_Util::addParameter($deleteUrl, $params);
-    echo '<a href="' . $deleteUrl . '">Delete Account</a>';
-}

diff --git a/shout/templates/accounts/list.inc b/shout/templates/accounts/list.inc
deleted file mode 100644 (file)
index d155735..0000000
--- a/shout/templates/accounts/list.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-<div class="header">
-    Account: <?php echo $_SESSION['shout']['curaccount']['name']; ?>
-</div>
-
-<div id="extensionList">
-    <table width="100%" cellspacing="0" class="striped">
-        <tr>
-            <td class="uheader">Account Code</td>
-            <td class="uheader">Account Name</td>
-            <td class="uheader">Admin PIN</td>
-        </tr>
-        <?php
-            $url = Horde::applicationUrl("admin.php");
-            $editurl = Horde_Util::addParameter($url, 'action', 'edit');
-            $deleteurl = Horde_Util::addParameter($url, 'action', 'delete');
-            foreach ($accounts as $acctinfo) {
-                $code = $acctinfo['code'];
-                ?>
-                <tr class="item" style="vertical-align: top">
-                    <td>
-                        <?php echo Horde::link(Horde_Util::addParameter($editurl,
-                            array('account' => $code))); echo $code; echo '</a>'; ?>
-                    </td>
-                    <td>
-                        <?php echo $acctinfo['name']; ?>
-                    </td>
-                    <td>
-                        <?php echo $acctinfo['adminpin']; ?>
-                    </td>
-                </tr>
-                <?php
-            }
-            ?>
-    </table>
-</div>
-<ul id="controls">
-    <?php
-    $addurl = Horde_Util::addParameter($url, 'action', 'add');
-    ?>
-    <li><a class="button" href="<?php echo $addurl; ?>">
-        <?php echo Horde::img('extension-add.png'); ?>&nbsp;New Account
-        </a>
-    </li>
-</ul>
\ No newline at end of file

diff --git a/shout/templates/admin/accounts/edit.inc b/shout/templates/admin/accounts/edit.inc
new file mode 100644 (file)
index 0000000..e42e0b1
--- /dev/null
+++ b/shout/templates/admin/accounts/edit.inc
@@ -0,0 +1,10 @@
+<?php
+$Form->renderActive($RENDERER, $vars, Horde::applicationUrl('admin.php'), 'post');
+
+if ($vars->get('action') == 'edit') {
+    $deleteUrl = Horde::applicationUrl('admin.php');
+    $params = array ('action' => 'delete',
+                     'account' => $account);
+    $deleteUrl = Horde_Util::addParameter($deleteUrl, $params);
+    echo '<a href="' . $deleteUrl . '">Delete Account</a>';
+}

diff --git a/shout/templates/admin/accounts/list.inc b/shout/templates/admin/accounts/list.inc
new file mode 100644 (file)
index 0000000..d155735
--- /dev/null
+++ b/shout/templates/admin/accounts/list.inc
@@ -0,0 +1,44 @@
+<div class="header">
+    Account: <?php echo $_SESSION['shout']['curaccount']['name']; ?>
+</div>
+
+<div id="extensionList">
+    <table width="100%" cellspacing="0" class="striped">
+        <tr>
+            <td class="uheader">Account Code</td>
+            <td class="uheader">Account Name</td>
+            <td class="uheader">Admin PIN</td>
+        </tr>
+        <?php
+            $url = Horde::applicationUrl("admin.php");
+            $editurl = Horde_Util::addParameter($url, 'action', 'edit');
+            $deleteurl = Horde_Util::addParameter($url, 'action', 'delete');
+            foreach ($accounts as $acctinfo) {
+                $code = $acctinfo['code'];
+                ?>
+                <tr class="item" style="vertical-align: top">
+                    <td>
+                        <?php echo Horde::link(Horde_Util::addParameter($editurl,
+                            array('account' => $code))); echo $code; echo '</a>'; ?>
+                    </td>
+                    <td>
+                        <?php echo $acctinfo['name']; ?>
+                    </td>
+                    <td>
+                        <?php echo $acctinfo['adminpin']; ?>
+                    </td>
+                </tr>
+                <?php
+            }
+            ?>
+    </table>
+</div>
+<ul id="controls">
+    <?php
+    $addurl = Horde_Util::addParameter($url, 'action', 'add');
+    ?>
+    <li><a class="button" href="<?php echo $addurl; ?>">
+        <?php echo Horde::img('extension-add.png'); ?>&nbsp;New Account
+        </a>
+    </li>
+</ul>
\ No newline at end of file