From 171522bf231e4fca13dd522e8f755e65a8d48b3b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 11 Jul 2009 07:23:31 -0700
Subject: Add a "close" button.

---
 modules/server_add/views/server_add_tree_dialog.html.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'modules/server_add')

diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index bbad4e69..8e9c1c01 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -46,4 +46,8 @@
       });
     });
   </script>
+
+  <button class="ui-state-default ui-corner-all" onclick="closeDialog(); window.location.reload();">
+    <?= t("Close") ?>
+  </button>
 </div>
-- 
cgit v1.2.3


From cbd80b5ff948e23a1fa8b0994291953d38f6a7bd Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 11 Jul 2009 07:37:49 -0700
Subject: Get rid of the form from server_add, we're not using it.

Turn the cancel link into a themed close button which triggers a page
reload.

Add some padding to the left of the tree.
---
 .../server_add/views/server_add_tree_dialog.html.php    | 17 +++++++++--------
 themes/default/css/screen.css                           |  6 ++++++
 2 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'modules/server_add')

diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index 8e9c1c01..21952849 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -19,8 +19,6 @@
     </li>
   </ul>
 
-  <?= form::open(url::abs_site("server_add/start/$item->id"), array("method" => "post")) ?>
-  <?= access::csrf_form_field(); ?>
   <ul id="gServerAddTree" class="gCheckboxTree">
     <?= $tree ?>
   </ul>
@@ -31,10 +29,16 @@
   </div>
 
   <span>
-    <input id="gServerAddAddButton" class="submit ui-state-disabled" disabled="disabled"
-           type="submit" value="<?= t("Add") ?>">
+    <button id="gServerAddAddButton" class="ui-state-default ui-state-disabled ui-corner-all"
+            disabled="disabled">
+      <?= t("Add") ?>
+    </button>
+
+    <button class="ui-state-default ui-corner-all" onclick="closeDialog(); window.location.reload();">
+      <?= t("Close") ?>
+    </button>
   </span>
-  <?= form::close() ?>
+
   <script type="text/javascript">
     $("#gServerAddAddButton").ready(function() {
       $("#gServerAddAddButton").click(function(event) {
@@ -47,7 +51,4 @@
     });
   </script>
 
-  <button class="ui-state-default ui-corner-all" onclick="closeDialog(); window.location.reload();">
-    <?= t("Close") ?>
-  </button>
 </div>
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index c4670a4d..0c65cd96 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -899,8 +899,14 @@ form .gError,
 
 /* Server Add */
 
+#gServerAdd button {
+  float: left;
+  margin-bottom: .5em;
+}
+
 #gServerAddTree {
   cursor: pointer;
+  padding-left: 4px;
 }
 
 #gServerAddTree li {
-- 
cgit v1.2.3