Merge branch 'master' of git@github.com:gallery/gallery3

3 files changed, 19 insertions, 21 deletions

diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index 6edb3d98..084eac31 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -11,11 +11,10 @@
 /* User/group admin ~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-user-admin {
-  
+  width: auto;
 }
 
 #g-group-admin {
-  
 }
 
 #g-user-admin-list .g-admin {
@@ -25,7 +24,7 @@
 
 .g-group {
   display: block;
-  border: 1px solid gray;
+  border: 1px solid #999;
   margin: 0 1em 1em 0;
   padding: 0;
   width: 200px;
@@ -41,18 +40,17 @@
   padding: 0;
 }
 
-.g-group ul,
+.g-group .g-member-list,
 .g-group div {
   height: 180px;
   margin: 1px;
   overflow: auto;
-  padding-top: .2em;
 }
 
-.g-group div p {
-  color: gray;
+.g-group p {
+  margin-top: 1em;
+  padding: .5em;
   text-align: center;
-  padding: 2em .5em 0 .5em
 }
 
 .g-group .g-user {
@@ -65,7 +63,7 @@
 
 .g-default-group h4,
 .g-default-group .g-user {
-  color: gray;
+  color: #999;
 }
 
 .g-group.ui-droppable {
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 45e970a7..45d04916 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -46,7 +46,8 @@
   <h1> <?= t("Users and groups") ?> </h1>
 
   <div class="g-block-content">
-    <div class="g-block">
+
+    <div id="g-user-admin" class="g-block">
       <a href="<?= url::site("admin/users/add_user_form") ?>"
           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() ?>">
@@ -54,7 +55,7 @@
         <?= t("Add a new user") ?>
       </a>
 
-      <h2> <?= t("User admin") ?> </h2>
+      <h2> <?= t("Users") ?> </h2>
 
       <div class="g-block-content">
         <table id="g-user-admin-list">
@@ -70,7 +71,7 @@
           <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> g-user <?= $user->admin ? "g-admin" : "" ?>">
             <td id="g-user-<?= $user->id ?>" class="g-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() ?>"
+                   title="<?= t("Drag user onto a group to add as a new member")->for_html_attr() ?>"
                    alt="<?= html::clean_attribute($user->name) ?>"
                    width="20"
                    height="20" />
@@ -106,7 +107,7 @@
       </div>
     </div>
 
-    <div id="g-group-admin" class="g-block ui-helper-clearfix">
+    <div id="g-group-admin" class="g-block g-right ui-helper-clearfix">
       <a href="<?= url::site("admin/users/add_group_form") ?>"
           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() ?>">
@@ -114,9 +115,7 @@
         <?= t("Add a new group") ?>
       </a>
 
-      <h2>
-        <?= t("Group admin") ?>
-      </h2>
+      <h2> <?= t("Groups") ?> </h2>
 
       <div class="g-block-content">
         <ul>
@@ -129,5 +128,6 @@
         </ul>
       </div>
     </div>
+
   </div>
 </div>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index 4c629945..b7e573b3 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -4,17 +4,17 @@
   <? 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-dialog-link g-button g-right ui-state-default ui-corner-all">
+    class="g-dialog-link g-button g-right">
     <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-dialog-link g-button g-right ui-state-disabled ui-corner-all ui-icon-left">
+     class="g-button g-right ui-state-disabled ui-icon-left">
     <span class="ui-icon ui-icon-trash"><?= t("Delete") ?></span></a>
   <? endif ?>
 </h4>
 
 <? if ($group->users->count() > 0): ?>
-<ul>
+<ul class="g-member-list">
   <? foreach ($group->users as $i => $user): ?>
   <li class="g-user">
     <?= html::clean($user->name) ?>
@@ -31,8 +31,8 @@
 </ul>
 <? else: ?>
 <div>
-  <p>
-    <?= t("Drag &amp; drop users from the \"User admin\" above into this group box to add group members.") ?>
+  <p class="ui-state-disabled">
+    <?= t("Drag &amp; drop users from the \"Users\" list onto this group to add group members.") ?>
   </p>
 </div>
 <? endif ?>