move server_add styles into the theme screen.css files

7 files changed, 99 insertions, 100 deletions

diff --git a/modules/server_add/css/admin.css b/modules/server_add/css/admin.css
deleted file mode 100644
index b700919b..00000000
--- a/modules/server_add/css/admin.css
+++ /dev/null
@@ -1,29 +0,0 @@
-#gServerAddAdmin {
-  margin:auto;
-  text-align: left;
-}
-
-#gServerAddAdmin form fieldset {
-  border: medium none;
-}
-
-#gServerAddAdmin legend {
-  display: none;
-}
-
-#gServerAddAdmin .gWarning {
-  background-color: #FFFF99;
-}
-
-#gAuthorizedPath {
-  margin: 0 !important;
-  padding: 0.3em 1.5em 0.3em 1em;
-}
-
-#gServerAdd Admin #path {
-  width: 80%;
-}
-
-.gRemoveDir:hover {
-  cursor: pointer;
-}
diff --git a/modules/server_add/css/server_add.css b/modules/server_add/css/server_add.css
deleted file mode 100644
index 16ccc539..00000000
--- a/modules/server_add/css/server_add.css
+++ /dev/null
@@ -1,60 +0,0 @@
-.gCheckboxTree {
-  display: none;
-}
-
-.gCheckboxTree input {
-  display: inline;
-}
-
-.gCheckboxTree li {
-  padding: 0;
-  float: none;
-}
-
-.gCheckboxTree .ui-icon {
-  cursor: pointer;
-}
-
-.gFile {
-  padding-left: 2.5em;
-}
-
-#gProgressBar {
-  visibility: hidden;
-  height: 1em;
-  width: 100%;
-  margin-top: 0.5em;
-  display: inline-block;
-}
-
-#gServerAdd #gServerAddTree {
-  border: 1px solid #CCCCCC;
-  height: 25em;
-  overflow: auto;
-  margin-bottom: .5em;
-  padding-top: .5em;
-  padding-bottom: .5em;
-}
-
-#gServerAdd ul ul li {
-  padding-left: 1.2em;
-}
-
-#gServerAdd ul li .gFile {
-  padding-left: 2.5em;
-}
-
-#gServerAdd .gBreadcrumbs {
-  font-size: 1em;
-  padding: 0;
-  margin: 0;
-  border-top-width: 0px;
-}
-
-#gServerAdd p {
-  margin: 0;
-}
-
-#gServerAdd .gBreadcrumbs li {
-  padding: 10px 6px 10px 16px;
-}
diff --git a/modules/server_add/helpers/server_add_block.php b/modules/server_add/helpers/server_add_block.php
index c2a94e97..34ed644c 100644
--- a/modules/server_add/helpers/server_add_block.php
+++ b/modules/server_add/helpers/server_add_block.php
@@ -19,12 +19,6 @@
  */
 class server_add_block_Core {
   static function head($theme) {
-    $head[] = html::script("modules/server_add/js/server_add.js");
-
-    $url = url::file("modules/server_add/css/server_add.css");
-    $head[] = "<link rel=\"stylesheet\" type=\"text/css\" href=\"$url\" " .
-      "media=\"screen,print,projection\" />";
-
-    return implode("\n", $head);
+    return html::script("modules/server_add/js/server_add.js");
   }
 }
diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index 2ca1331b..73538d78 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -23,8 +23,6 @@ class server_add_theme_Core {
     if (Router::$current_uri == "admin/server_add") {
       $head[] = "<link media=\"screen, projection\" rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("lib/jquery.autocomplete.css") . "\" />";
-      $head[] = "<link media=\"screen, projection\" rel=\"stylesheet\" type=\"text/css\" href=\"" .
-        url::file("modules/server_add/css/admin.css") . "\" />";
       $base = url::base(true);
       $csrf = access::csrf_token();
       $head[] = "<script> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
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 26286e05..3ce1e632 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -1,6 +1,4 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<link media="screen, projection" rel="stylesheet" type="text/css"
-      href="<?= url::file("modules/server_add/css/server_add.css") ?>" />
 <?= html::script("modules/server_add/js/server_add.js"); ?>
 
 <div id="gServerAdd">
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 31fd2697..e5d7391d 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -287,3 +287,37 @@ li.gGroup {
   float: left;
   padding: .2em .2em 0 .1em;
 }
+
+/** *******************************************************************
+ * 7) Server Add 
+ *********************************************************************/
+#gServerAddAdmin {
+  margin:auto;
+  text-align: left;
+}
+
+#gServerAddAdmin form fieldset {
+  border: medium none;
+}
+
+#gServerAddAdmin legend {
+  display: none;
+}
+
+#gServerAddAdmin .gWarning {
+  background-color: #FFFF99;
+}
+
+#gAuthorizedPath {
+  margin: 0 !important;
+  padding: 0.3em 1.5em 0.3em 1em;
+}
+
+#gServerAdd Admin #path {
+  width: 80%;
+}
+
+.gRemoveDir:hover {
+  cursor: pointer;
+}
+
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index d8f9419c..1a456c1b 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -847,3 +847,67 @@ form p.gError {
 #gMove .selected {
   background: #999;
 }
+
+/** *******************************************************************
+ * 8) Server Add
+ *********************************************************************/
+.gCheckboxTree {
+  display: none;
+}
+
+.gCheckboxTree input {
+  display: inline;
+}
+
+.gCheckboxTree li {
+  padding: 0;
+  float: none;
+}
+
+.gCheckboxTree .ui-icon {
+  cursor: pointer;
+}
+
+.gFile {
+  padding-left: 2.5em;
+}
+
+#gProgressBar {
+  visibility: hidden;
+  height: 1em;
+  width: 100%;
+  margin-top: 0.5em;
+  display: inline-block;
+}
+
+#gServerAdd #gServerAddTree {
+  border: 1px solid #CCCCCC;
+  height: 25em;
+  overflow: auto;
+  margin-bottom: .5em;
+  padding-top: .5em;
+  padding-bottom: .5em;
+}
+
+#gServerAdd ul ul li {
+  padding-left: 1.2em;
+}
+
+#gServerAdd ul li .gFile {
+  padding-left: 2.5em;
+}
+
+#gServerAdd .gBreadcrumbs {
+  font-size: 1em;
+  padding: 0;
+  margin: 0;
+  border-top-width: 0px;
+}
+
+#gServerAdd p {
+  margin: 0;
+}
+
+#gServerAdd .gBreadcrumbs li {
+  padding: 10px 6px 10px 16px;
+}