summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/user/views/admin_users.html.php2
-rw-r--r--modules/user/views/admin_users_group.html.php38
2 files changed, 23 insertions, 17 deletions
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 859f3c8e..a99c9506 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -118,7 +118,7 @@
<div class="gBlockContent">
<ul>
<? foreach ($groups as $i => $group): ?>
- <li id="group-<?= $group->id ?>" class="gGroup">
+ <li id="group-<?= $group->id ?>" class="gGroup <?= ($group->special ? "gDefaultGroup" : "") ?>" />
<? $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 820b3031..dfc8232f 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -1,28 +1,34 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
-<strong><?= p::clean($group->name) ?></strong>
-<? if (!$group->special): ?>
-<a href="<?= url::site("admin/users/delete_group_form/$group->id") ?>"
- title="<?= t("Delete %name", array("name" => p::clean($group->name))) ?>"
- class="gDialogLink gButtonLink ui-state-default ui-corner-all">
- <span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
-<? else: ?>
-<a title="<?= t("This group cannot be deleted") ?>"
- class="gDialogLink gButtonLink ui-state-disabled ui-corner-all ui-icon-left">
- <span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
-<? endif ?>
+<h4>
+ <?= p::clean($group->name) ?>
+ <? if (!$group->special): ?>
+ <a href="<?= url::site("admin/users/delete_group_form/$group->id") ?>"
+ title="<?= t("Delete the %name group", array("name" => p::clean($group->name))) ?>"
+ class="gDialogLink gButtonLink 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") ?>"
+ class="gDialogLink gButtonLink ui-state-disabled ui-corner-all ui-icon-left">
+ <span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
+ <? endif ?>
+</h4>
+
+<? if ($group->users->count() > 0): ?>
<ul>
<? foreach ($group->users as $i => $user): ?>
<li class="gUser">
<?= p::clean($user->name) ?>
<? if (!$group->special): ?>
<a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
- class="gButtonLink ui-state-default ui-corner-all ui-icon-left">
- <span class="ui-icon ui-icon-closethick">
- <?= t("Remove %user from %group",
- array("user" => p::clean($user->name), "group" => p::clean($group->name))) ?>
- </span>
+ class="gButtonLink ui-state-default ui-corner-all ui-icon-left"
+ title="<?= t("Remove %user from %group group",
+ array("user" => p::clean($user->name), "group" => p::clean($group->name))) ?>">
+ <span class="ui-icon ui-icon-closethick"><?= t("remove") ?></span>
</a>
<? endif ?>
</li>
<? endforeach ?>
</ul>
+<? else: ?>
+<div><p>Drag &amp; drop users from the User Admin above into this group box to add group members.</p></div>
+<? endif ?>