From 3e6ba7acc3291f2268cbe9c9bef0a492b557babb Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 4 Oct 2009 00:27:22 -0600 Subject: Renamed most, if not all css selectors from gName to g-name. Moved a few shared images from wind to lib. Deleted unused images in the admin_wind. This will likely break a few ajax features. --- modules/user/controllers/password.php | 10 ++--- modules/user/helpers/group.php | 10 ++--- modules/user/helpers/user.php | 52 ++++++++++++------------ modules/user/helpers/user_block.php | 2 +- modules/user/views/admin_users.html.php | 36 ++++++++-------- modules/user/views/admin_users_group.html.php | 6 +-- modules/user/views/login.html.php | 8 ++-- modules/user/views/user_languages_block.html.php | 4 +- 8 files changed, 64 insertions(+), 64 deletions(-) (limited to 'modules/user') diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php index 92608dcd..4629bbf2 100644 --- a/modules/user/controllers/password.php +++ b/modules/user/controllers/password.php @@ -85,9 +85,9 @@ class Password_Controller extends Controller { } private function _reset_form() { - $form = new Forge(url::current(true), "", "post", array("id" => "gResetForm")); + $form = new Forge(url::current(true), "", "post", array("id" => "g-reset-form")); $group = $form->group("reset")->label(t("Reset Password")); - $group->input("name")->label(t("Username"))->id("gName")->class(null)->rules("required"); + $group->input("name")->label(t("Username"))->id("g-name")->class(null)->rules("required"); $group->inputs["name"]->error_messages("no_email", t("No email, unable to reset password")); $group->submit("")->value(t("Reset")); @@ -97,15 +97,15 @@ class Password_Controller extends Controller { private function _new_password_form($hash=null) { $template = new Theme_View("page.html", "reset"); - $form = new Forge("password/do_reset", "", "post", array("id" => "gChangePasswordForm")); + $form = new Forge("password/do_reset", "", "post", array("id" => "g-change-password-form")); $group = $form->group("reset")->label(t("Change Password")); $hidden = $group->hidden("hash"); if (!empty($hash)) { $hidden->value($hash); } - $group->password("password")->label(t("Password"))->id("gPassword") + $group->password("password")->label(t("Password"))->id("g-password") ->rules("required|length[1,40]"); - $group->password("password2")->label(t("Confirm Password"))->id("gPassword2") + $group->password("password2")->label(t("Confirm Password"))->id("g-password2") ->matches($group->password); $group->inputs["password2"]->error_messages( "mistyped", t("The password and the confirm password must match")); diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php index e0dfac8e..b13895bc 100644 --- a/modules/user/helpers/group.php +++ b/modules/user/helpers/group.php @@ -74,9 +74,9 @@ class group_Core { } static function get_edit_form_admin($group) { - $form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "gEditGroupForm")); + $form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "g-edit-group-form")); $form_group = $form->group("edit_group")->label(t("Edit Group")); - $form_group->input("name")->label(t("Name"))->id("gName")->value($group->name); + $form_group->input("name")->label(t("Name"))->id("g-name")->value($group->name); $form_group->inputs["name"]->error_messages( "in_use", t("There is already a group with that name")); $form_group->submit("")->value(t("Save")); @@ -85,10 +85,10 @@ class group_Core { } static function get_add_form_admin() { - $form = new Forge("admin/users/add_group", "", "post", array("id" => "gAddGroupForm")); + $form = new Forge("admin/users/add_group", "", "post", array("id" => "g-add-group-form")); $form->set_attr('class', "g-narrow"); $form_group = $form->group("add_group")->label(t("Add Group")); - $form_group->input("name")->label(t("Name"))->id("gName"); + $form_group->input("name")->label(t("Name"))->id("g-name"); $form_group->inputs["name"]->error_messages( "in_use", t("There is already a group with that name")); $form_group->submit("")->value(t("Add Group")); @@ -99,7 +99,7 @@ class group_Core { static function get_delete_form_admin($group) { $form = new Forge("admin/users/delete_group/$group->id", "", "post", - array("id" => "gDeleteGroupForm")); + array("id" => "g-delete-group-form")); $form_group = $form->group("delete_group")->label( t("Are you sure you want to delete group %group_name?", array("group_name" => $group->name))); $form_group->submit("")->value(t("Delete")); diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php index 93c385a3..6ae9203d 100644 --- a/modules/user/helpers/user.php +++ b/modules/user/helpers/user.php @@ -25,16 +25,16 @@ */ class user_Core { static function get_edit_form($user) { - $form = new Forge("users/$user->id?_method=put", "", "post", array("id" => "gEditUserForm")); + $form = new Forge("users/$user->id?_method=put", "", "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("gFullName")->value($user->full_name); + $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name); self::_add_locale_dropdown($group, $user); - $group->password("password")->label(t("Password"))->id("gPassword"); - $group->password("password2")->label(t("Confirm Password"))->id("gPassword2") + $group->password("password")->label(t("Password"))->id("g-password"); + $group->password("password2")->label(t("Confirm Password"))->id("g-password2") ->matches($group->password); - $group->input("email")->label(t("Email"))->id("gEmail")->value($user->email); - $group->input("url")->label(t("URL"))->id("gUrl")->value($user->url); + $group->input("email")->label(t("Email"))->id("g-email")->value($user->email); + $group->input("url")->label(t("URL"))->id("g-url")->value($user->url); $form->add_rules_from($user); module::event("user_edit_form", $user, $form); @@ -44,19 +44,19 @@ class user_Core { static function get_edit_form_admin($user) { $form = new Forge( - "admin/users/edit_user/$user->id", "", "post", array("id" => "gEditUserForm")); + "admin/users/edit_user/$user->id", "", "post", array("id" => "g-edit-user-form")); $group = $form->group("edit_user")->label(t("Edit User")); - $group->input("name")->label(t("Username"))->id("gUsername")->value($user->name); + $group->input("name")->label(t("Username"))->id("g-username")->value($user->name); $group->inputs["name"]->error_messages( "in_use", t("There is already a user with that username")); - $group->input("full_name")->label(t("Full Name"))->id("gFullName")->value($user->full_name); + $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name); self::_add_locale_dropdown($group, $user); - $group->password("password")->label(t("Password"))->id("gPassword"); - $group->password("password2")->label(t("Confirm Password"))->id("gPassword2") + $group->password("password")->label(t("Password"))->id("g-password"); + $group->password("password2")->label(t("Confirm Password"))->id("g-password2") ->matches($group->password); - $group->input("email")->label(t("Email"))->id("gEmail")->value($user->email); - $group->input("url")->label(t("URL"))->id("gUrl")->value($user->url); - $group->checkbox("admin")->label(t("Admin"))->id("gAdmin")->checked($user->admin); + $group->input("email")->label(t("Email"))->id("g-email")->value($user->email); + $group->input("url")->label(t("URL"))->id("g-url")->value($user->url); + $group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin); $form->add_rules_from($user); $form->edit_user->password->rules("-required"); @@ -66,19 +66,19 @@ class user_Core { } static function get_add_form_admin() { - $form = new Forge("admin/users/add_user", "", "post", array("id" => "gAddUserForm")); + $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("gUsername") + $group->input("name")->label(t("Username"))->id("g-username") ->error_messages("in_use", t("There is already a user with that username")); - $group->input("full_name")->label(t("Full Name"))->id("gFullName"); - $group->password("password")->label(t("Password"))->id("gPassword"); - $group->password("password2")->label(t("Confirm Password"))->id("gPassword2") + $group->input("full_name")->label(t("Full Name"))->id("g-fullname"); + $group->password("password")->label(t("Password"))->id("g-password"); + $group->password("password2")->label(t("Confirm Password"))->id("g-password2") ->matches($group->password); - $group->input("email")->label(t("Email"))->id("gEmail"); - $group->input("url")->label(t("URL"))->id("gUrl"); + $group->input("email")->label(t("Email"))->id("g-email"); + $group->input("url")->label(t("URL"))->id("g-url"); self::_add_locale_dropdown($group); - $group->checkbox("admin")->label(t("Admin"))->id("gAdmin"); + $group->checkbox("admin")->label(t("Admin"))->id("g-admin"); $user = ORM::factory("user"); $form->add_rules_from($user); @@ -105,7 +105,7 @@ class user_Core { static function get_delete_form_admin($user) { $form = new Forge("admin/users/delete_user/$user->id", "", "post", - array("id" => "gDeleteUserForm")); + array("id" => "g-delete-user-form")); $group = $form->group("delete_user")->label( t("Are you sure you want to delete user %name?", array("name" => $user->name))); $group->submit("")->value(t("Delete user %name", array("name" => $user->name))); @@ -113,11 +113,11 @@ class user_Core { } static function get_login_form($url) { - $form = new Forge($url, "", "post", array("id" => "gLoginForm")); + $form = new Forge($url, "", "post", array("id" => "g-login-form")); $form->set_attr('class', "g-narrow"); $group = $form->group("login")->label(t("Login")); - $group->input("name")->label(t("Username"))->id("gUsername")->class(null); - $group->password("password")->label(t("Password"))->id("gPassword")->class(null); + $group->input("name")->label(t("Username"))->id("g-username")->class(null); + $group->password("password")->label(t("Password"))->id("g-password")->class(null); $group->inputs["name"]->error_messages("invalid_login", t("Invalid name or password")); $group->submit("")->value(t("Login")); return $form; diff --git a/modules/user/helpers/user_block.php b/modules/user/helpers/user_block.php index e7671f06..f1f8e5eb 100644 --- a/modules/user/helpers/user_block.php +++ b/modules/user/helpers/user_block.php @@ -32,7 +32,7 @@ class user_block_Core { } if (count($locales) > 1) { $block = new Block(); - $block->css_id = "gUserLanguageBlock"; + $block->css_id = "g-userLanguageBlock"; $block->title = t("Language Preference"); $block->content = new View("user_languages_block.html"); $block->content->installed_locales = diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index 46bdb65e..28daff29 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -2,12 +2,12 @@ -
+
" - class="g-dialogLink g-button g-right ui-icon-left ui-state-default ui-corner-all" + class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all" title="for_html_attr() ?>"> @@ -53,8 +53,8 @@ -
- +
+
@@ -64,8 +64,8 @@ $user): ?> - user admin ? "admin" : "" ?>"> - user admin ? "admin" : "" ?>"> + -
+
" title="for_html_attr() ?>" alt="name) ?>" @@ -82,14 +82,14 @@ last_login == 0) ? "" : gallery::date($user->last_login) ?> + id") ?>" open_text="" - class="gPanelLink g-button ui-state-default ui-corner-all ui-icon-left"> - + class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left"> + id != $user->id && !$user->guest): ?> id") ?>" - class="g-dialogLink g-button ui-state-default ui-corner-all ui-icon-left"> + class="g-dialog-link g-button ui-state-default ui-corner-all ui-icon-left"> for_html_attr() ?>" @@ -103,9 +103,9 @@ -
+
" - class="g-dialogLink g-button g-right ui-icon-left ui-state-default ui-corner-all" + class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all" title="for_html_attr() ?>"> @@ -115,10 +115,10 @@ -
+