Fix floated group rows when more than one row exists. Attach g- before all css ids and classes for consistency. Other minor layout adjustments.

3 files changed, 19 insertions, 15 deletions

diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index 92441ffd..77e0b44b 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -13,10 +13,10 @@
 
 li.g-group {
   display: block;
-  width: 100%;
   border: 1px solid gray;
-  padding: 0;
   margin: 0 1em 1em 0;
+  padding: 0;
+  width: 200px;
 }
 
 li.g-group h4 {
@@ -54,6 +54,10 @@ li.g-default-group h4, li.g-default-group .g-user {
   color: gray;
 }
 
+.g-group.ui-droppable {
+  padding: 0 !important;
+}
+
 .g-password-strength0 {
   background: url(../images/progressImg1.png) no-repeat 0 0;
   width: 138px;
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 18ad9403..df44794a 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -2,15 +2,15 @@
 <script type="text/javascript">
   var add_user_to_group_url = "<?= url::site("admin/users/add_user_to_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
   $(document).ready(function(){
-    $("#g-user-admin-list .core-info").draggable({
+    $("#g-user-admin-list .g-core-info").draggable({
       helper: "clone"
     });
     $("#g-group-admin .g-group").droppable({
-      accept: ".core-info",
+      accept: ".g-core-info",
       hoverClass: "g-selected",
       drop: function(ev, ui) {
         var user_id = $(ui.draggable).attr("id").replace("user-", "");
-        var group_id = $(this).attr("id").replace("group-", "");
+        var group_id = $(this).attr("id").replace("g-group-", "");
         $.get(add_user_to_group_url.replace("__USERID__", user_id).replace("__GROUPID__", group_id),
               {},
               function() {
@@ -18,8 +18,8 @@
               });
       }
     });
-    $("#group-1").droppable("destroy");
-    $("#group-2").droppable("destroy");
+    $("#g-group-1").droppable("destroy");
+    $("#g-group-2").droppable("destroy");
   });
 
   var reload_group = function(group_id) {
@@ -27,8 +27,8 @@
     $.get(reload_group_url.replace("__GROUPID__", group_id),
           {},
           function(data) {
-            $("#group-" + group_id).html(data);
-            $("#group-" + group_id + " .g-dialog-link").gallery_dialog();
+            $("#g-group-" + group_id).html(data);
+            $("#g-group-" + group_id + " .g-dialog-link").gallery_dialog();
           });
   }
 
@@ -68,7 +68,7 @@
 
           <? 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="core-info g-draggable">
+            <td id="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) ?>"
@@ -121,7 +121,7 @@
       <div class="g-block-content">
         <ul>
           <? foreach ($groups as $i => $group): ?>
-          <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" />
+          <li id="g-group-<?= $group->id ?>" class="g-group g-left <?= ($group->special ? "g-default-group" : "") ?>" />
             <? $v = new View("admin_users_group.html"); $v->group = $group; ?>
             <?= $v ?>
           </li>
@@ -129,5 +129,5 @@
         </ul>
       </div>
     </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 e44cbddd..4c629945 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="g-dialog-link g-button ui-state-default ui-corner-all">
+    class="g-dialog-link g-button g-right 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="g-dialog-link g-button ui-state-disabled ui-corner-all ui-icon-left">
+     class="g-dialog-link g-button g-right ui-state-disabled ui-corner-all ui-icon-left">
     <span class="ui-icon ui-icon-trash"><?= t("Delete") ?></span></a>
   <? endif ?>
 </h4>
@@ -20,7 +20,7 @@
     <?= html::clean($user->name) ?>
     <? if (!$group->special): ?>
     <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
-       class="g-button ui-state-default ui-corner-all ui-icon-left"
+       class="g-button g-right ui-state-default ui-corner-all ui-icon-left"
        title="<?= t("Remove %user from %group group",
               array("user" => $user->name, "group" => $group->name))->for_html_attr() ?>">
       <span class="ui-icon ui-icon-closethick"><?= t("Remove") ?></span>