From e3f90a889d5bb4cb1214445bbf5be8c9815d8733 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Fri, 23 Oct 2009 22:24:06 -0600 Subject: Adjust order of items on server_add admin page. Restore autocomplete to the add form. Created a server_add.css file. --- .../server_add/controllers/admin_server_add.php | 4 +-- modules/server_add/css/server_add.css | 38 ++++++++++++++++++++++ modules/server_add/helpers/server_add_theme.php | 2 ++ modules/server_add/js/admin.js | 2 +- modules/server_add/views/admin_server_add.html.php | 15 ++++----- 5 files changed, 50 insertions(+), 11 deletions(-) create mode 100644 modules/server_add/css/server_add.css (limited to 'modules') 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 @@

+

- style="display: none;"> +
    +
    • -
- -
-- cgit v1.2.3 From 38141865926730506f55b62a499cb548b94d4bfe Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Fri, 23 Oct 2009 22:25:36 -0600 Subject: Created user.css. Moved user-related form css to the new sheet. --- modules/user/controllers/admin_users.php | 3 +-- modules/user/controllers/users.php | 1 - modules/user/css/user.css | 7 +++++++ modules/user/helpers/user.php | 2 +- modules/user/helpers/user_theme.php | 28 ++++++++++++++++++++++++++++ 5 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 modules/user/css/user.css create mode 100644 modules/user/helpers/user_theme.php (limited to 'modules') diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php index 5950c358..a34d152a 100644 --- a/modules/user/controllers/admin_users.php +++ b/modules/user/controllers/admin_users.php @@ -313,7 +313,6 @@ class Admin_Users_Controller extends Admin_Controller { static function _get_user_add_form_admin() { $form = new Forge("admin/users/add_user", "", "post", array("id" => "g-add-user-form")); - $form->set_attr('class', "g-narrow"); $group = $form->group("add_user")->label(t("Add User")); $group->input("name")->label(t("Username"))->id("g-username") ->error_messages("in_use", t("There is already a user with that username")); @@ -372,7 +371,7 @@ class Admin_Users_Controller extends Admin_Controller { private function _get_group_add_form_admin() { $form = new Forge("admin/users/add_group", "", "post", array("id" => "g-add-group-form")); - $form->set_attr('class', "g-narrow"); + $form->set_attr('class', "g-one-quarter"); $form_group = $form->group("add_group")->label(t("Add Group")); $form_group->input("name")->label(t("Name"))->id("g-name"); $form_group->inputs["name"]->error_messages( diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php index b03a47cc..2be49065 100644 --- a/modules/user/controllers/users.php +++ b/modules/user/controllers/users.php @@ -68,7 +68,6 @@ class Users_Controller extends Controller { private function _get_edit_form($user) { $form = new Forge("users/update/$user->id", "", "post", array("id" => "g-edit-user-form")); - $form->set_attr("class", "g-narrow"); $group = $form->group("edit_user")->label(t("Edit User: %name", array("name" => $user->name))); $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name); self::_add_locale_dropdown($group, $user); diff --git a/modules/user/css/user.css b/modules/user/css/user.css new file mode 100644 index 00000000..aa21f9c3 --- /dev/null +++ b/modules/user/css/user.css @@ -0,0 +1,7 @@ +#g-login-form, +#g-add-user-form +#g-edit-user-form, +#g-delete-user-form, +#g-user-admin { + width: 270px; +} \ No newline at end of file diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php index e7e75d64..47f57d3d 100644 --- a/modules/user/helpers/user.php +++ b/modules/user/helpers/user.php @@ -26,7 +26,7 @@ class user_Core { static function get_login_form($url) { $form = new Forge($url, "", "post", array("id" => "g-login-form")); - $form->set_attr('class', "g-narrow"); + $form->set_attr('class', "g-one-quarter"); $group = $form->group("login")->label(t("Login")); $group->input("name")->label(t("Username"))->id("g-username")->class(null); $group->password("password")->label(t("Password"))->id("g-password")->class(null); diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php new file mode 100644 index 00000000..191fd15a --- /dev/null +++ b/modules/user/helpers/user_theme.php @@ -0,0 +1,28 @@ +css("user.css"); + } + + static function admin_head($theme) { + $theme->css("user.css"); + } +} \ No newline at end of file -- cgit v1.2.3 From bb47b495a7d719ee679e4747e9fd5b8f7c39b58a Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Fri, 23 Oct 2009 22:28:26 -0600 Subject: Moved remaining user and group admin css into the new user.css style sheet. --- modules/user/css/user.css | 51 +++++++++++++++++++++++++++++++++++++++- themes/admin_wind/css/screen.css | 44 ---------------------------------- 2 files changed, 50 insertions(+), 45 deletions(-) (limited to 'modules') diff --git a/modules/user/css/user.css b/modules/user/css/user.css index aa21f9c3..3b5e7ac2 100644 --- a/modules/user/css/user.css +++ b/modules/user/css/user.css @@ -4,4 +4,53 @@ #g-delete-user-form, #g-user-admin { width: 270px; -} \ No newline at end of file +} + +#g-user-admin-list .admin { + color: #55f; + font-weight: bold; +} + +li.g-group { + float: left; + display: block; + width: 200px; + border: 1px solid gray; + padding: 0; + margin: 0 1em 1em 0; +} + +li.g-group h4 { + background-color: #eee; + border-bottom: 1px dashed #ccc; + padding: .5em 0 .5em .5em; +} + +li.g-group .g-button { + padding: 0; +} + +li.g-group ul, li.g-group div { + height: 180px; + margin: 1px; + overflow: auto; + padding-top: .2em; +} + +li.g-group div p { + color: gray; + text-align: center; + padding: 2em .5em 0 .5em +} + +li.g-group .g-user { + padding: .2em 0 0 .5em; +} + +li.g-group .g-user .g-button { + vertical-align: middle; +} + +li.g-default-group h4, li.g-default-group .g-user { + color: gray; +} diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index a889545b..25302407 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -373,55 +373,11 @@ tr.g-warning { margin-right: 1em; } -#g-user-admin-list .admin { - color: #55f; - font-weight: bold; -} - .g-actions a, .g-actions span { margin-right: 3em; } -li.g-group { - float: left; - display: block; - width: 200px; - border: 1px solid gray; - padding: 0; - margin: 0 1em 1em 0; -} - -li.g-group h4 { - background-color: #eee; - border-bottom: 1px dashed #ccc; - padding: .5em 0 .5em .5em; -} -li.g-group .g-button { - padding: 0; -} -li.g-group ul, li.g-group div { - height: 180px; - margin: 1px; - overflow: auto; - padding-top: .2em; -} -li.g-group div p { - color: gray; - text-align: center; - padding: 2em .5em 0 .5em -} -li.g-group .g-user { - padding: .2em 0 0 .5em; -} -li.g-group .g-user .g-button { - vertical-align: middle; -} - -li.g-default-group h4, li.g-default-group .g-user { - color: gray; -} - /* Block admin ~~~~~~~~~~~~~~~~~~~~~~~~~ */ .g-admin-blocks-list { -- cgit v1.2.3