diff options
| -rw-r--r-- | modules/user/views/admin_users.html.php | 12 | ||||
| -rw-r--r-- | themes/admin_default/js/ui.init.js | 71 |
2 files changed, 43 insertions, 40 deletions
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index b21ef16d..157a084e 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -57,12 +57,13 @@ <th></th> <th><?= t("Username") ?></th> <th><?= t("Full name") ?></th> - <th class="understate"><?= t("last login") ?></th> + <th><?= t("Email") ?></th> + <th><?= t("Last login") ?></th> <th>Actions</th> </tr> <? foreach ($users as $i => $user): ?> - <tr class="<?= text::alternate("gOddRow", "gEvenRow") ?> user"> + <tr id="gUser-<?= $user->id ?>" class="<?= text::alternate("gOddRow", "gEvenRow") ?> user"> <td id="user-<?= $user->id ?>" class="core-info"> <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") ?>" @@ -76,8 +77,11 @@ <td> <?= $user->full_name ?> </td> - <td class="understate"> - <?= ($user->last_login == 0) ? "" : date("m j, y", $user->last_login) ?> + <td> + <?= $user->email ?> + </td> + <td> + <?= ($user->last_login == 0) ? "" : date("j-M-y", $user->last_login) ?> </td> <td class="gActions"> <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>" class="gPanelLink"><?= t("edit") ?></a> diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js index 80ca2342..04b7ab0c 100644 --- a/themes/admin_default/js/ui.init.js +++ b/themes/admin_default/js/ui.init.js @@ -44,49 +44,48 @@ function handlePanelEvent(event) { function togglePanel(element, on_success) { var parent = $(element).parent().parent(); var sHref = $(element).attr("href"); - var ePanel = '<div id="gPanel"></div>'; + var parentClass = $(parent).attr("class"); + var ePanel = '<tr id="gPanel"><td colspan="6"></td></tr>'; if ($("#gPanel").length) { $("#gPanel").slideUp("slow"); $("#gPanel *").remove(); $("#gPanel").remove(); - } - - $(parent).append(ePanel); - - var panel = $(parent).children("#gPanel"); - - showLoading("#gPanel"); - - $(panel).html(sHref); - panel.show().slideDown("slow"); - - $.get(sHref, function(data) { - $(panel).html(data); - ajaxify_panel = function() { - $("#gPanel form").ajaxForm({ - dataType: "json", - success: function(data) { - if (data.form) { - $("#gPanel form").replaceWith(data.form); - ajaxify_panel(); - } - if (data.result == "success") { - if (on_success) { - on_success(); - } else if (data.location) { - window.location = data.location; - } else { - window.location.reload(); + console.log("Removing existing #gPanel"); + //togglePanel(element, on_success); + } else { + console.log("Adding #gPanel"); + $(parent).after(ePanel); + //showLoading("#here"); + $("#gPanel td").html(sHref); + $("#gPanel").addClass(parentClass).show().slideDown("slow"); + $.get(sHref, function(data) { + $("#gPanel td").html(data); + ajaxify_panel = function() { + $("#gPanel td form").ajaxForm({ + dataType: "json", + success: function(data) { + if (data.form) { + $("#gPanel td form").replaceWith(data.form); + ajaxify_panel(); + } + if (data.result == "success") { + if (on_success) { + on_success(); + } else if (data.location) { + window.location = data.location; + } else { + window.location.reload(); + } } } + }); + if ($("#gPanel td").hasClass("gLoadingLarge")) { + showLoading("#gPanel td"); } - }); - if ($("#gPanel").hasClass("gLoadingLarge")) { - showLoading("#gPanel"); - } - }; - ajaxify_panel(); - }); + }; + ajaxify_panel(); + }); + } return false; } |