diff options
Diffstat (limited to 'modules/user')
-rw-r--r-- | modules/user/controllers/admin_users.php | 3 | ||||
-rw-r--r-- | modules/user/controllers/users.php | 1 | ||||
-rw-r--r-- | modules/user/css/user.css | 56 | ||||
-rw-r--r-- | modules/user/helpers/user.php | 2 | ||||
-rw-r--r-- | modules/user/helpers/user_theme.php | 28 |
5 files changed, 86 insertions, 4 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php index 8b96ebd2..4d80521e 100644 --- a/modules/user/controllers/admin_users.php +++ b/modules/user/controllers/admin_users.php @@ -317,7 +317,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")); @@ -375,7 +374,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 dee54f63..28164e9c 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..3b5e7ac2 --- /dev/null +++ b/modules/user/css/user.css @@ -0,0 +1,56 @@ +#g-login-form, +#g-add-user-form +#g-edit-user-form, +#g-delete-user-form, +#g-user-admin { + width: 270px; +} + +#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/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 @@ +<?php defined("SYSPATH") or die("No direct script access."); +/** + * Gallery - a web based photo album viewer and editor + * Copyright (C) 2000-2009 Bharat Mediratta + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + */ +class user_theme_Core { + static function head($theme) { + $theme->css("user.css"); + } + + static function admin_head($theme) { + $theme->css("user.css"); + } +}
\ No newline at end of file |