summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/helpers/group.php1
-rw-r--r--modules/user/helpers/user.php3
-rw-r--r--modules/user/views/admin_users.html.php8
-rw-r--r--modules/user/views/admin_users_group.html.php4
-rw-r--r--modules/user/views/login.html.php2
-rw-r--r--modules/user/views/login_ajax.html.php27
6 files changed, 24 insertions, 21 deletions
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 04e6efd6..e0dfac8e 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -86,6 +86,7 @@ class group_Core {
static function get_add_form_admin() {
$form = new Forge("admin/users/add_group", "", "post", array("id" => "gAddGroupForm"));
+ $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->inputs["name"]->error_messages(
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index b9162b92..93c385a3 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -26,6 +26,7 @@
class user_Core {
static function get_edit_form($user) {
$form = new Forge("users/$user->id?_method=put", "", "post", array("id" => "gEditUserForm"));
+ $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);
self::_add_locale_dropdown($group, $user);
@@ -66,6 +67,7 @@ class user_Core {
static function get_add_form_admin() {
$form = new Forge("admin/users/add_user", "", "post", array("id" => "gAddUserForm"));
+ $form->set_attr('class', "g-narrow");
$group = $form->group("add_user")->label(t("Add User"));
$group->input("name")->label(t("Username"))->id("gUsername")
->error_messages("in_use", t("There is already a user with that username"));
@@ -112,6 +114,7 @@ class user_Core {
static function get_login_form($url) {
$form = new Forge($url, "", "post", array("id" => "gLoginForm"));
+ $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);
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 5ee62fae..a46e402f 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -28,7 +28,7 @@
{},
function(data) {
$("#group-" + group_id).html(data);
- $("#group-" + group_id + " .gDialogLink").gallery_dialog();
+ $("#group-" + group_id + " .g-dialogLink").gallery_dialog();
});
}
@@ -43,7 +43,7 @@
</script>
<div class="gBlock">
<a href="<?= url::site("admin/users/add_user_form") ?>"
- class="gDialogLink g-button g-right ui-icon-left ui-state-default ui-corner-all"
+ class="g-dialogLink 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") ?>
@@ -89,7 +89,7 @@
<span class="ui-icon ui-icon-pencil"></span><span class="gButtonText"><?= t("edit") ?></span></a>
<? if (user::active()->id != $user->id && !$user->guest): ?>
<a href="<?= url::site("admin/users/delete_user_form/$user->id") ?>"
- class="gDialogLink g-button ui-state-default ui-corner-all ui-icon-left">
+ class="g-dialogLink 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() ?>"
@@ -105,7 +105,7 @@
<div id="gGroupAdmin" class="gBlock">
<a href="<?= url::site("admin/users/add_group_form") ?>"
- class="gDialogLink g-button right ui-icon-left ui-state-default ui-corner-all"
+ class="g-dialogLink 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") ?>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index 6f2496f8..e5c9fcee 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="gDialogLink g-button ui-state-default ui-corner-all">
+ class="g-dialogLink 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="gDialogLink g-button ui-state-disabled ui-corner-all ui-icon-left">
+ class="g-dialogLink g-button ui-state-disabled ui-corner-all ui-icon-left">
<span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
<? endif ?>
</h4>
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index bb670d51..c814bbfa 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -11,7 +11,7 @@
<?= 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="gDialogLink">' .
+ '" id="gUserProfileLink" class="g-dialogLink">' .
html::clean($user->display_name()) . '</a>'))) ?>
</li>
<li>
diff --git a/modules/user/views/login_ajax.html.php b/modules/user/views/login_ajax.html.php
index 56bc1cbd..d3364b46 100644
--- a/modules/user/views/login_ajax.html.php
+++ b/modules/user/views/login_ajax.html.php
@@ -1,12 +1,14 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<script type="text/javascript">
- $("#gLoginForm").ready(function() {
- $("#gForgotPasswordLink").click(function() {
+ $("#g-login-form").ready(function() {
+ $("#g-password-reset").click(function() {
$.ajax({
url: "<?= url::site("password/reset") ?>",
success: function(data) {
- $("div#gLoginView").html(data);
- $("#ui-dialog-title-gDialog").html(<?= t("Reset Password")->for_js() ?>);
+ $("#g-login").html(data);
+ $("#ui-dialog-title-g-dialog").html(<?= t("Reset Password")->for_js() ?>);
+ $(".submit").addClass("g-button ui-state-default ui-corner-all");
+ $(".submit").gallery_hover_init();
ajaxify_login_reset_form();
}
});
@@ -14,31 +16,28 @@
});
function ajaxify_login_reset_form() {
- $("#gLoginView form").ajaxForm({
+ $("#g-login form").ajaxForm({
dataType: "json",
success: function(data) {
if (data.form) {
- $("#gLoginView form").replaceWith(data.form);
+ $("#g-login form").replaceWith(data.form);
ajaxify_login_reset_form();
}
if (data.result == "success") {
- $("#gDialog").dialog("close");
+ $("#g-dialog").dialog("close");
window.location.reload();
}
-
}
});
};
</script>
-<div id="gLoginView">
+<div id="g-login">
<ul>
- <li>
- <div id="gLoginViewForm">
- <?= $form ?>
- </div>
+ <li id="g-login-form">
+ <?= $form ?>
</li>
<li>
- <a href="#" id="gForgotPasswordLink"><?= t("Forgot Your Password?") ?></a>
+ <a href="#" id="g-password-reset" class="g-right g-txt-small"><?= t("Forgot Your Password?") ?></a>
</li>
</ul>
</div>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 22:28:24 +0000