2 files changed, 38 insertions, 12 deletions

diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index 77e0b44b..6edb3d98 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -1,3 +1,5 @@
+/* User- and group-related form width ~~~~ */
+
 #g-login-form,
 #g-add-user-form
 #g-edit-user-form,
@@ -6,12 +8,22 @@
   width: 270px;
 }
 
-#g-user-admin-list .admin {
+/* User/group admin ~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-user-admin {
+  
+}
+
+#g-group-admin {
+  
+}
+
+#g-user-admin-list .g-admin {
   color: #55f;
   font-weight: bold;
 }
 
-li.g-group {
+.g-group {
   display: block;
   border: 1px solid gray;
   margin: 0 1em 1em 0;
@@ -19,38 +31,40 @@ li.g-group {
   width: 200px;
 }
 
-li.g-group h4 {
+.g-group h4 {
   background-color: #eee;
   border-bottom: 1px dashed #ccc;
   padding: .5em 0 .5em .5em;
 }
 
-li.g-group .g-button {
+.g-group .g-button {
   padding: 0;
 }
 
-li.g-group ul, li.g-group div {
+.g-group ul,
+.g-group div {
   height: 180px;
   margin: 1px;
   overflow: auto;
   padding-top: .2em;
 }
 
-li.g-group div p {
+.g-group div p {
   color: gray;
   text-align: center;
   padding: 2em .5em 0 .5em
 }
 
-li.g-group .g-user {
+.g-group .g-user {
   padding: .2em 0 0 .5em;
 }
 
-li.g-group .g-user .g-button {
+.g-group .g-user .g-button {
   vertical-align: middle;
 }
 
-li.g-default-group h4, li.g-default-group .g-user {
+.g-default-group h4,
+.g-default-group .g-user {
   color: gray;
 }
 
@@ -58,38 +72,50 @@ li.g-default-group h4, li.g-default-group .g-user {
   padding: 0 !important;
 }
 
+/* Password strength meter ~~~~~~~~~~~~~~~ */
+
 .g-password-strength0 {
   background: url(../images/progressImg1.png) no-repeat 0 0;
   width: 138px;
   height: 7px;
 }
+
 .g-password-strength10 {
   background-position:0 -7px;
 }
+
 .g-password-strength20 {
   background-position:0 -14px;
 }
+
 .g-password-strength30 {
   background-position:0 -21px;
 }
+
 .g-password-strength40 {
   background-position:0 -28px;
 }
+
 .g-password-strength50 {
   background-position:0 -35px;
 }
+
 .g-password-strength60 {
   background-position:0 -42px;
 }
+
 .g-password-strength70 {
   background-position:0 -49px;
 }
+
 .g-password-strength80 {
   background-position:0 -56px;
 }
+
 .g-password-strength90 {
   background-position:0 -63px;
 }
+
 .g-password-strength100 {
   background-position:0 -70px;
 }
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index df44794a..45e970a7 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -9,7 +9,7 @@
       accept: ".g-core-info",
       hoverClass: "g-selected",
       drop: function(ev, ui) {
-        var user_id = $(ui.draggable).attr("id").replace("user-", "");
+        var user_id = $(ui.draggable).attr("id").replace("g-user-", "");
         var group_id = $(this).attr("id").replace("g-group-", "");
         $.get(add_user_to_group_url.replace("__USERID__", user_id).replace("__GROUPID__", group_id),
               {},
@@ -67,8 +67,8 @@
           </tr>
 
           <? foreach ($users as $i => $user): ?>
-          <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>">
-            <td id="user-<?= $user->id ?>" class="g-core-info g-draggable">
+          <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() ?>"
                    alt="<?= html::clean_attribute($user->name) ?>"