7 files changed, 50 insertions, 77 deletions
diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php
index cb71e1f1..f32bb834 100644
--- a/modules/server_add/controllers/admin_server_add.php
+++ b/modules/server_add/controllers/admin_server_add.php
@@ -83,9 +83,9 @@ class Admin_Server_Add_Controller extends Admin_Controller {
 
   private function _get_admin_form() {
     $form = new Forge("admin/server_add/add_path", "", "post",
-                      array("id" => "g-server-add-admin-form", "class" => "g-short-form g-wide"));
+                      array("id" => "g-server-add-admin-form", "class" => "g-short-form"));
     $add_path = $form->group("add_path");
-    $add_path->input("path")->label(t("Path"))->rules("required")
+    $add_path->input("path")->label(t("Path"))->rules("required")->id("g-path")
       ->error_messages("not_readable", t("This directory is not readable by the webserver"))
       ->error_messages("is_symlink", t("Symbolic links are not allowed"));
     $add_path->submit("add")->value(t("Add Path"));
diff --git a/modules/server_add/css/server_add.css b/modules/server_add/css/server_add.css
new file mode 100644
index 00000000..36746ab5
--- /dev/null
+++ b/modules/server_add/css/server_add.css
@@ -0,0 +1,38 @@
+#g-server-add button {
+  margin-bottom: .5em;
+}
+
+#g-server-add-tree {
+  cursor: pointer;
+  padding-left: 4px;
+  width: 95%;
+}
+
+#g-server-add-tree li {
+  padding: 0;
+  float: none;
+}
+
+#g-server-add-tree span.selected {
+  background: #ddd;
+}
+
+#g-server-add-tree {
+  border: 1px solid #ccc;
+  height: 20em;
+  overflow: auto;
+  margin-bottom: .5em;
+  padding: .5em;
+}
+
+#g-server-add ul ul li {
+  padding-left: 1.2em;
+}
+
+#g-server-add-paths li .ui-icon {
+  margin-top: .4em;
+}
+
+#g-server-add-admin-form .textbox  {
+  width: 400px;
+}
diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index 2ba2e167..0410c9fe 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -20,6 +20,7 @@
 class server_add_theme_Core {
   static function head($theme) {
     if (user::active()->admin) {
+      $theme->css("server_add.css");
       $theme->script("server_add.js");
     }
   }
@@ -27,6 +28,7 @@ class server_add_theme_Core {
   static function admin_head($theme) {
     $head = array();
     if (strpos(Router::$current_uri, "admin/server_add") !== false) {
+      $theme->css("server_add.css");
       $theme->css("jquery.autocomplete.css");
       $base = url::site("__ARGS__");
       $csrf = access::csrf_token();
diff --git a/modules/server_add/js/admin.js b/modules/server_add/js/admin.js
index edbddf33..9d7bd181 100644
--- a/modules/server_add/js/admin.js
+++ b/modules/server_add/js/admin.js
@@ -3,6 +3,6 @@
  *
  */
 $("document").ready(function() {
-  $("#g-server-add-admin input:text").autocomplete(
+  $("#g-path").autocomplete(
     base_url.replace("__ARGS__", "admin/server_add/autocomplete"), {max: 256});
 });
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index eae767af..33fd81f3 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -2,21 +2,20 @@
 <div class="g-block">
   <h1> <?= t("Add From Server Admininstration") ?> </h1>
   <div class="g-block-content">
+    <?= $form ?>
     <h2><?= t("Authorized Paths") ?></h2>
-    <ul<? if (!empty($paths)): ?> style="display: none;"<? endif ?>>
+    <ul id="g-server-add-paths">
+      <? if (empty($paths)): ?>
       <li class="g-module-status g-info"><?= t("No Authorized image source paths defined yet") ?></li>
-    </ul>
-    <ul>
+      <? endif ?>
       <? foreach ($paths as $id => $path): ?>
-      <li class="ui-icon-left">
-        <span class="ui-icon ui-icon-folder-open"></span>
+      <li>
         <?= html::clean($path) ?>
         <a href="<?= url::site("admin/server_add/remove_path?path=" . urlencode($path) . "&amp;csrf=$csrf") ?>"
-           id="icon_<?= $id?>"
-           class="g-remove-dir"><span class="ui-icon ui-icon-trash">X</span></a>
+           id="icon_<?= $id ?>"
+           class="g-remove-dir g-button"><span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
       </li>
       <? endforeach ?>
     </ul>
-    <?= $form ?>
   </div>
 </div>
diff --git a/themes/night_wind/css/screen.css b/themes/night_wind/css/screen.css
index dfc94b6d..b95cfc72 100644
--- a/themes/night_wind/css/screen.css
+++ b/themes/night_wind/css/screen.css
@@ -714,39 +714,6 @@ li.g-error select {
   background: #999;
 }
 
-/* Server Add */
-
-#g-server-add button {
-  margin-bottom: .5em;
-}
-
-#g-server-add-tree {
-  cursor: pointer;
-  padding-left: 4px;
-  width: 95%;
-}
-
-#g-server-add-tree li {
-  padding: 0;
-  float: none;
-}
-
-#g-server-add-tree span.selected {
-  background: #ddd;
-}
-
-#g-server-add-tree {
-  border: 1px solid #ccc;
-  height: 20em;
-  overflow: auto;
-  margin-bottom: .5em;
-  padding: .5em;
-}
-
-#g-server-add ul ul li {
-  padding-left: 1.2em;
-}
-
 /* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-edit-permissions-form {
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index ef2f1510..84b8b090 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -513,39 +513,6 @@ td {
   background: #999;
 }
 
-/* Server Add */
-
-#g-server-add button {
-  margin-bottom: .5em;
-}
-
-#g-server-add-tree {
-  cursor: pointer;
-  padding-left: 4px;
-  width: 95%;
-}
-
-#g-server-add-tree li {
-  padding: 0;
-  float: none;
-}
-
-#g-server-add-tree span.selected {
-  background: #ddd;
-}
-
-#g-server-add-tree {
-  border: 1px solid #ccc;
-  height: 20em;
-  overflow: auto;
-  margin-bottom: .5em;
-  padding: .5em;
-}
-
-#g-server-add ul ul li {
-  padding-left: 1.2em;
-}
-
 /* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-edit-permissions-form {