From 64b02026ed645761e910bc31334b66171c58cb5a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 5 Mar 2009 02:26:39 +0000
Subject: Cleanups.

- Show the "Server Add needs configuration" message whenever
  there are no paths.

- Un-ajaxify the admin code to remove complexity and allow us to
  update the status message as appropriate.

- Rename server_add_admin.html.php to admin_server_add.html.php
  for consistency.

- Fix up form to properly display error messages

- Get rid of server_add_dir_list.html.php now that we're
  non-ajaxified.

- Change delete <span> to an <a> for non-ajax world.
---
 modules/server_add/views/admin_server_add.html.php | 25 ++++++++++++++++++++++
 modules/server_add/views/server_add_admin.html.php | 10 ---------
 .../server_add/views/server_add_dir_list.html.php  | 13 -----------
 3 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100644 modules/server_add/views/admin_server_add.html.php
 delete mode 100644 modules/server_add/views/server_add_admin.html.php
 delete mode 100644 modules/server_add/views/server_add_dir_list.html.php

(limited to 'modules/server_add/views')

diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
new file mode 100644
index 00000000..e37b262c
--- /dev/null
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -0,0 +1,25 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div id="gServerAddAdmin">
+  <h2>
+    <?= t("Add From Server Admininstration") ?>
+  </h2>
+  <div id="gAuthorizedPath">
+    <span><?= t("Authorized Paths") ?></span>
+    <ul id="gPathList">
+      <? foreach ($paths as $id => $path): ?>
+      <li class="ui-icon-left">
+        <a href="<?= url::site("admin/server_add/remove_path?path=$path&csrf=" . access::csrf_token()) ?>"
+           id="icon_<?= $id?>"
+           class="gRemoveDir ui-icon ui-icon-trash">
+          X
+        </a>
+        <?= $path ?>
+      </li>
+      <? endforeach ?>
+    </ul>
+    <div id="gNoAuthorizedPaths" <? if (!empty($paths)): ?>style="display:none"<? endif ?>>
+      <span class="gWarning"><?= t("No Authorized image source paths defined") ?></span>
+    </div>
+  </div>
+  <?= $form ?>
+</div>
diff --git a/modules/server_add/views/server_add_admin.html.php b/modules/server_add/views/server_add_admin.html.php
deleted file mode 100644
index 765feeb9..00000000
--- a/modules/server_add/views/server_add_admin.html.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gServerAddAdmin">
-  <h2>
-    <?= t("Add From Server Admininstration") ?>
-  </h2>
-  <div id="gAuthorizedPath">
-    <?= $path_list ?>
-  </div>
-  <?= $add_form ?>
-</div>
diff --git a/modules/server_add/views/server_add_dir_list.html.php b/modules/server_add/views/server_add_dir_list.html.php
deleted file mode 100644
index 762b1a4d..00000000
--- a/modules/server_add/views/server_add_dir_list.html.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<span><?= t("Authorized Paths") ?></span>
-<ul id="gPathList">
-  <? foreach ($paths as $id => $path): ?>
-  <li class="ui-icon-left">
-    <span id="icon_<?= $id?>" class="gRemoveDir ui-icon ui-icon-trash"></span>
-    <?= $path ?>
-  </li>
-  <? endforeach ?>
-</ul>
-<div id="gNoAuthorizedPaths" <? if (!empty($paths)): ?>style="display:none"<? endif ?>>
-  <span class="gWarning"><?= t("No Authorized image source paths defined") ?></span>
-</div>
-- 
cgit v1.2.3