summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/controllers/password.php10
-rw-r--r--modules/user/helpers/group.php10
-rw-r--r--modules/user/helpers/user.php52
-rw-r--r--modules/user/helpers/user_block.php2
-rw-r--r--modules/user/views/admin_users.html.php36
-rw-r--r--modules/user/views/admin_users_group.html.php6
-rw-r--r--modules/user/views/login.html.php8
-rw-r--r--modules/user/views/user_languages_block.html.php4
8 files changed, 64 insertions, 64 deletions
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 @@
<script type="text/javascript">
var add_user_to_group_url = "<?= url::site("admin/users/add_user_to_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
$(document).ready(function(){
- $("#gUserAdminList .core-info").draggable({
+ $("#g-user-admin-list .core-info").draggable({
helper: "clone"
});
- $("#gGroupAdmin .gGroup").droppable({
+ $("#g-group-admin .g-group").droppable({
accept: ".core-info",
- hoverClass: "gSelected",
+ hoverClass: "g-selected",
drop: function(ev, ui) {
var user_id = $(ui.draggable).attr("id").replace("user-", "");
var group_id = $(this).attr("id").replace("group-", "");
@@ -28,7 +28,7 @@
{},
function(data) {
$("#group-" + group_id).html(data);
- $("#group-" + group_id + " .g-dialogLink").gallery_dialog();
+ $("#group-" + group_id + " .g-dialog-link").gallery_dialog();
});
}
@@ -41,9 +41,9 @@
});
}
</script>
-<div class="gBlock">
+<div class="g-block">
<a href="<?= url::site("admin/users/add_user_form") ?>"
- 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="<?= t("Create a new user")->for_html_attr() ?>">
<span class="ui-icon ui-icon-circle-plus"></span>
<?= t("Add a new user") ?>
@@ -53,8 +53,8 @@
<?= t("User Admin") ?>
</h2>
- <div class="gBlockContent">
- <table id="gUserAdminList">
+ <div class="g-block-content">
+ <table id="g-user-admin-list">
<tr>
<th><?= t("Username") ?></th>
<th><?= t("Full name") ?></th>
@@ -64,8 +64,8 @@
</tr>
<? foreach ($users as $i => $user): ?>
- <tr id="gUser-<?= $user->id ?>" class="<?= text::alternate("g-odd-row", "g-even-row") ?> user <?= $user->admin ? "admin" : "" ?>">
- <td id="user-<?= $user->id ?>" class="core-info gDraggable">
+ <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>">
+ <td id="user-<?= $user->id ?>" class="core-info g-draggable">
<img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
alt="<?= html::clean_attribute($user->name) ?>"
@@ -82,14 +82,14 @@
<td>
<?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
</td>
- <td class="gActions">
+ <td class="g-actions">
<a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
open_text="<?= t("close") ?>"
- class="gPanelLink g-button ui-state-default ui-corner-all ui-icon-left">
- <span class="ui-icon ui-icon-pencil"></span><span class="gButtonText"><?= t("edit") ?></span></a>
+ class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left">
+ <span class="ui-icon ui-icon-pencil"></span><span class="g-button-text"><?= t("edit") ?></span></a>
<? if (user::active()->id != $user->id && !$user->guest): ?>
<a href="<?= url::site("admin/users/delete_user_form/$user->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">
<span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
<? else: ?>
<span title="<?= t("This user cannot be deleted")->for_html_attr() ?>"
@@ -103,9 +103,9 @@
</div>
</div>
-<div id="gGroupAdmin" class="gBlock">
+<div id="g-group-admin" class="g-block">
<a href="<?= url::site("admin/users/add_group_form") ?>"
- 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="<?= t("Create a new group")->for_html_attr() ?>">
<span class="ui-icon ui-icon-circle-plus"></span>
<?= t("Add a new group") ?>
@@ -115,10 +115,10 @@
<?= t("Group Admin") ?>
</h2>
- <div class="gBlockContent">
+ <div class="g-block-content">
<ul>
<? foreach ($groups as $i => $group): ?>
- <li id="group-<?= $group->id ?>" class="gGroup <?= ($group->special ? "gDefaultGroup" : "") ?>" />
+ <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" />
<? $v = new View("admin_users_group.html"); $v->group = $group; ?>
<?= $v ?>
</li>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index e5c9fcee..db3645a0 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -4,11 +4,11 @@
<? if (!$group->special): ?>
<a href="<?= url::site("admin/users/delete_group_form/$group->id") ?>"
title="<?= t("Delete the %name group", array("name" => $group->name))->for_html_attr() ?>"
- class="g-dialogLink g-button ui-state-default ui-corner-all">
+ class="g-dialog-link g-button ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
<? else: ?>
<a title="<?= t("This default group cannot be deleted")->for_html_attr() ?>"
- class="g-dialogLink g-button ui-state-disabled ui-corner-all ui-icon-left">
+ class="g-dialog-link g-button ui-state-disabled ui-corner-all ui-icon-left">
<span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
<? endif ?>
</h4>
@@ -16,7 +16,7 @@
<? if ($group->users->count() > 0): ?>
<ul>
<? foreach ($group->users as $i => $user): ?>
- <li class="gUser">
+ <li class="g-user">
<?= html::clean($user->name) ?>
<? if (!$group->special): ?>
<a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index c814bbfa..65eaab8c 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -1,22 +1,22 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul id="gLoginMenu">
+<ul id="g-login-menu">
<? if ($user->guest): ?>
<li class="first">
<a href="<?= url::site("login/ajax") ?>"
title="<?= t("Login to Gallery")->for_html_attr() ?>"
- id="gLoginLink"><?= t("Login") ?></a>
+ id="g-login-link"><?= t("Login") ?></a>
</li>
<? else: ?>
<li class="first">
<?= t('Logged in as %name', array('name' => html::mark_clean(
'<a href="' . url::site("form/edit/users/{$user->id}") .
'" title="' . t("Edit Your Profile")->for_html_attr() .
- '" id="gUserProfileLink" class="g-dialogLink">' .
+ '" id="g-user-profile-link" class="g-dialog-link">' .
html::clean($user->display_name()) . '</a>'))) ?>
</li>
<li>
<a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(url::current(true))) ?>"
- id="gLogoutLink"><?= t("Logout") ?></a>
+ id="g-logoutLink"><?= t("Logout") ?></a>
</li>
<? endif ?>
</ul>
diff --git a/modules/user/views/user_languages_block.html.php b/modules/user/views/user_languages_block.html.php
index b5ae674c..89185967 100644
--- a/modules/user/views/user_languages_block.html.php
+++ b/modules/user/views/user_languages_block.html.php
@@ -1,7 +1,7 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= form::dropdown("gSelectSessionLocale", $installed_locales, $selected) ?>
+<?= form::dropdown("g-select-session-locale", $installed_locales, $selected) ?>
<script type="text/javascript">
- $("#gSelectSessionLocale").change(function() {
+ $("#g-select-session-locale").change(function() {
var old_locale_preference = <?= html::js_string($selected) ?>;
var locale = $(this).val();
if (old_locale_preference == locale) {
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-14 21:36:42 +0000