From 38141865926730506f55b62a499cb548b94d4bfe Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Fri, 23 Oct 2009 22:25:36 -0600
Subject: Created user.css. Moved user-related form css to the new sheet.

---
 modules/user/css/user.css | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 modules/user/css/user.css

(limited to 'modules/user/css')

diff --git a/modules/user/css/user.css b/modules/user/css/user.css
new file mode 100644
index 00000000..aa21f9c3
--- /dev/null
+++ b/modules/user/css/user.css
@@ -0,0 +1,7 @@
+#g-login-form,
+#g-add-user-form
+#g-edit-user-form,
+#g-delete-user-form,
+#g-user-admin {
+  width: 270px;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From bb47b495a7d719ee679e4747e9fd5b8f7c39b58a Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Fri, 23 Oct 2009 22:28:26 -0600
Subject: Moved remaining user and group admin css into the new user.css style
 sheet.

---
 modules/user/css/user.css        | 51 +++++++++++++++++++++++++++++++++++++++-
 themes/admin_wind/css/screen.css | 44 ----------------------------------
 2 files changed, 50 insertions(+), 45 deletions(-)

(limited to 'modules/user/css')

diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index aa21f9c3..3b5e7ac2 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -4,4 +4,53 @@
 #g-delete-user-form,
 #g-user-admin {
   width: 270px;
-}
\ No newline at end of file
+}
+
+#g-user-admin-list .admin {
+  color: #55f;
+  font-weight: bold;
+}
+
+li.g-group {
+  float: left;
+  display: block;
+  width: 200px;
+  border: 1px solid gray;
+  padding: 0;
+  margin: 0 1em 1em 0;
+}
+
+li.g-group h4 {
+  background-color: #eee;
+  border-bottom: 1px dashed #ccc;
+  padding: .5em 0 .5em .5em;
+}
+
+li.g-group .g-button {
+  padding: 0;
+}
+
+li.g-group ul, li.g-group div {
+  height: 180px;
+  margin: 1px;
+  overflow: auto;
+  padding-top: .2em;
+}
+
+li.g-group div p {
+  color: gray;
+  text-align: center;
+  padding: 2em .5em 0 .5em
+}
+
+li.g-group .g-user {
+  padding: .2em 0 0 .5em;
+}
+
+li.g-group .g-user .g-button {
+  vertical-align: middle;
+}
+
+li.g-default-group h4, li.g-default-group .g-user {
+  color: gray;
+}
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index a889545b..25302407 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -373,55 +373,11 @@ tr.g-warning {
   margin-right: 1em;
 }
 
-#g-user-admin-list .admin {
-  color: #55f;
-  font-weight: bold;
-}
-
 .g-actions a,
 .g-actions span {
   margin-right: 3em;
 }
 
-li.g-group {
-  float: left;
-  display: block;
-  width: 200px;
-  border: 1px solid gray;
-  padding: 0;
-  margin: 0 1em 1em 0;
-}
-
-li.g-group h4 {
-  background-color: #eee;
-  border-bottom: 1px dashed #ccc;
-  padding: .5em 0 .5em .5em;
-}
-li.g-group .g-button {
-  padding: 0;
-}
-li.g-group ul, li.g-group div {
-  height: 180px;
-  margin: 1px;
-  overflow: auto;
-  padding-top: .2em;
-}
-li.g-group div p {
-  color: gray;
-  text-align: center;
-  padding: 2em .5em 0 .5em
-}
-li.g-group .g-user {
-  padding: .2em 0 0 .5em;
-}
-li.g-group .g-user .g-button {
-  vertical-align: middle;
-}
-
-li.g-default-group h4, li.g-default-group .g-user {
-  color: gray;
-}
-
 /* Block admin  ~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .g-admin-blocks-list {
-- 
cgit v1.2.3


From 1347a300509b2ab3083bb88193987c18b33187ad Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 27 Oct 2009 12:23:48 -0700
Subject: Add a password strength meter.

---
 modules/user/controllers/admin_users.php |  13 +++++++----
 modules/user/controllers/password.php    |  11 +++++----
 modules/user/controllers/users.php       |   4 +++-
 modules/user/css/progressImg1.png        | Bin 0 -> 390 bytes
 modules/user/css/user.css                |  36 ++++++++++++++++++++++++++++
 modules/user/helpers/user_theme.php      |   2 ++
 modules/user/js/password_strength.js     |  39 +++++++++++++++++++++++++++++++
 modules/user/views/user_form.html.php    |   7 ++++++
 8 files changed, 101 insertions(+), 11 deletions(-)
 create mode 100644 modules/user/css/progressImg1.png
 create mode 100644 modules/user/js/password_strength.js
 create mode 100644 modules/user/views/user_form.html.php

(limited to 'modules/user/css')

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 55a525ba..ac5dc33c 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -63,7 +63,9 @@ class Admin_Users_Controller extends Admin_Controller {
   }
 
   public function add_user_form() {
-    print $this->_get_user_add_form_admin();
+    $v = new View("user_form.html");
+    $v->form = $this->_get_user_add_form_admin();
+    print $v;
   }
 
   public function delete_user($id) {
@@ -156,12 +158,13 @@ class Admin_Users_Controller extends Admin_Controller {
       kohana::show_404();
     }
 
-    $form = $this->_get_user_edit_form_admin($user);
+    $v = new View("user_form.html");
+    $v->form = $this->_get_user_edit_form_admin($user);
     // Don't allow the user to control their own admin bit, else you can lock yourself out
     if ($user->id == identity::active_user()->id) {
-      $form->edit_user->admin->disabled(1);
+      $v->form->edit_user->admin->disabled(1);
     }
-    print $form;
+    print $v;
   }
 
   public function add_user_to_group($user_id, $group_id) {
@@ -330,7 +333,7 @@ class Admin_Users_Controller extends Admin_Controller {
     $form->add_rules_from(ORM::factory("user"));
 
     $minimum_length = module::get_var("user", "mininum_password_length", 5);
-    $form->edit_user->password
+    $form->add_user->password
       ->rules($minimum_length ? "length[$minimum_length, 40]" : "length[40]");
 
     module::event("user_add_form_admin", $user, $form);
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 888fb37d..5f36b554 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -32,7 +32,7 @@ class Password_Controller extends Controller {
     if (request::method() == "post") {
       $this->_change_password();
     } else {
-      $user = user::lookup_user_by_field("hash", Input::instance()->get("key"));
+      $user = user::lookup_by_hash(Input::instance()->get("key"));
       if (!empty($user)) {
         print $this->_new_password_form($user->hash);
       } else {
@@ -46,7 +46,7 @@ class Password_Controller extends Controller {
 
     $valid = $form->validate();
     if ($valid) {
-      $user = identity::lookup_user_by_name($form->reset->inputs["name"]->value);
+      $user = user::lookup_by_name($form->reset->inputs["name"]->value);
       if (!$user->loaded || empty($user->email)) {
         $form->reset->inputs["name"]->add_error("no_email", 1);
         $valid = false;
@@ -110,19 +110,20 @@ class Password_Controller extends Controller {
       "mistyped", t("The password and the confirm password must match"));
     $group->submit("")->value(t("Update"));
 
-    $template->content = $form;
+    $template->content = new View("user_form.html");
+    $template->content->form = $form;
     return $template;
   }
 
   private function _change_password() {
     $view = $this->_new_password_form();
-    if ($view->content->validate()) {
+    if ($view->content->form->validate()) {
       $user = user::lookup_by_hash(Input::instance()->post("hash"));
       if (empty($user)) {
         throw new Exception("@todo FORBIDDEN", 503);
       }
 
-      $user->password = $view->content->reset->password->value;
+      $user->password = $view->content->form->reset->password->value;
       $user->hash = null;
       $user->save();
       message::success(t("Password reset successfully"));
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 3507ec6d..7bcc74d7 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -63,7 +63,9 @@ class Users_Controller extends Controller {
       access::forbidden();
     }
 
-    print $this->_get_edit_form($user);
+    $v = new View("user_form.html");
+    $v->form = $this->_get_edit_form($user);
+    print $v;
   }
 
   private function _get_edit_form($user) {
diff --git a/modules/user/css/progressImg1.png b/modules/user/css/progressImg1.png
new file mode 100644
index 00000000..a9093647
Binary files /dev/null and b/modules/user/css/progressImg1.png differ
diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index 3b5e7ac2..67d4f196 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -54,3 +54,39 @@ li.g-group .g-user .g-button {
 li.g-default-group h4, li.g-default-group .g-user {
   color: gray;
 }
+
+.g-password-strength0 {
+  background: url(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/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index 191fd15a..31e2e8c0 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -20,9 +20,11 @@
 class user_theme_Core {
   static function head($theme) {
     $theme->css("user.css");
+    $theme->script("password_strength.js");
   }
 
   static function admin_head($theme) {
     $theme->css("user.css");
+    $theme->script("password_strength.js");
   }
 }
\ No newline at end of file
diff --git a/modules/user/js/password_strength.js b/modules/user/js/password_strength.js
new file mode 100644
index 00000000..2442b8de
--- /dev/null
+++ b/modules/user/js/password_strength.js
@@ -0,0 +1,39 @@
+(function($) {
+   // Based on the Password Strength Indictor By Benjamin Sterling
+   // http://benjaminsterling.com/password-strength-indicator-and-generator/
+   $.widget("ui.user_password_strength",  {
+     _init: function() {
+       var self = this;
+       $(this.element).keyup(function() {
+	 var strength = self.calculateStrength (this.value);
+	 var index = Math.min(Math.floor( strength / 10 ), 10);
+         $("#g-password-gauge")
+           .removeAttr('class')
+	   .addClass( "g-password-strength0" )
+	   .addClass( self.options.classes[ index ] );
+       }).after("<div id='g-password-gauge' class='g-password-strength0'></div>");
+     },
+
+     calculateStrength: function(value) {
+       // Factor in the length of the password
+       var strength = Math.min(5, value.length) * 10 - 20;
+       // Factor in the number of numbers
+       strength += Math.min(3, value.length - value.replace(/[0-9]/g,"").length) * 10;
+       // Factor in the number of non word characters
+       strength += Math.min(3, value.length - value.replace(/\W/g,"").length) * 15;
+       // Factor in the number of Upper case letters
+       strength += Math.min(3, value.length - value.replace(/[A-Z]/g,"").length) * 10;
+
+       // Normalizxe between 0 and 100
+       return Math.max(0, Math.min(100, strength));
+     }
+   });
+   $.extend($.ui.user_password_strength,  {
+     defaults: {
+	classes : ['g-password-strength10', 'g-password-strength20', 'g-password-strength30',
+                   'g-password-strength40', 'g-password-strength50', 'g-password-strength60',
+                   'g-password-strength70',' g-password-strength80',' g-password-strength90',
+                   'g-password-strength100']
+     }
+   });
+ })(jQuery);
diff --git a/modules/user/views/user_form.html.php b/modules/user/views/user_form.html.php
new file mode 100644
index 00000000..039ae8a5
--- /dev/null
+++ b/modules/user/views/user_form.html.php
@@ -0,0 +1,7 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<script  type="text/javascript">
+  $("form").ready(function(){
+    $('input[name="password"]').user_password_strength();
+  });
+</script>
+<?= $form ?>
-- 
cgit v1.2.3


From d29d339ea0088b2aa9cd11701289db03ec307ea3 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 14 Nov 2009 13:23:23 -0700
Subject: Move the password strength image out of css and into an images
 folder.

---
 modules/user/css/progressImg1.png    | Bin 390 -> 0 bytes
 modules/user/css/user.css            |   5 ++---
 modules/user/images/progressImg1.png | Bin 0 -> 390 bytes
 3 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 modules/user/css/progressImg1.png
 create mode 100644 modules/user/images/progressImg1.png

(limited to 'modules/user/css')

diff --git a/modules/user/css/progressImg1.png b/modules/user/css/progressImg1.png
deleted file mode 100644
index a9093647..00000000
Binary files a/modules/user/css/progressImg1.png and /dev/null differ
diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index 67d4f196..92441ffd 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -12,9 +12,8 @@
 }
 
 li.g-group {
-  float: left;
   display: block;
-  width: 200px;
+  width: 100%;
   border: 1px solid gray;
   padding: 0;
   margin: 0 1em 1em 0;
@@ -56,7 +55,7 @@ li.g-default-group h4, li.g-default-group .g-user {
 }
 
 .g-password-strength0 {
-  background: url(progressImg1.png) no-repeat 0 0;
+  background: url(../images/progressImg1.png) no-repeat 0 0;
   width: 138px;
   height: 7px;
 }
diff --git a/modules/user/images/progressImg1.png b/modules/user/images/progressImg1.png
new file mode 100644
index 00000000..a9093647
Binary files /dev/null and b/modules/user/images/progressImg1.png differ
-- 
cgit v1.2.3


From 766d49c4614dfcde84ec75e5296635c5fc9d7a67 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 14 Nov 2009 14:03:11 -0700
Subject: Fix floated group rows when more than one row exists. Attach g-
 before all css ids and classes for consistency. Other minor layout
 adjustments.

---
 modules/user/css/user.css                     |  8 ++++++--
 modules/user/views/admin_users.html.php       | 20 ++++++++++----------
 modules/user/views/admin_users_group.html.php |  6 +++---
 3 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'modules/user/css')

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>
-- 
cgit v1.2.3


From 18a168156974fa9f235ff56bdc6eba14224fb6a3 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 14 Nov 2009 14:09:17 -0700
Subject: Added comments to user.css

---
 modules/user/css/user.css | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'modules/user/css')

diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index 77e0b44b..92049f83 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,6 +8,8 @@
   width: 270px;
 }
 
+/* User/group admin ~~~~~~~~~~~~~~~~~~~~~~ */
+
 #g-user-admin-list .admin {
   color: #55f;
   font-weight: bold;
@@ -58,38 +62,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;
 }
-- 
cgit v1.2.3


From 68886627cf76d69973c5956637b29908f58469ef Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 14 Nov 2009 15:48:24 -0700
Subject: A few more g- prefix updates for the user module, this should be it.

---
 modules/user/css/user.css               | 28 +++++++++++++++++++---------
 modules/user/views/admin_users.html.php |  6 +++---
 2 files changed, 22 insertions(+), 12 deletions(-)

(limited to 'modules/user/css')

diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index 92049f83..6edb3d98 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -10,12 +10,20 @@
 
 /* User/group admin ~~~~~~~~~~~~~~~~~~~~~~ */
 
-#g-user-admin-list .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;
@@ -23,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;
 }
 
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) ?>"
-- 
cgit v1.2.3


From a6f1d3ad44a658dc4f813d96735d033248e4de89 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 14 Nov 2009 23:31:14 -0700
Subject: Remove g-dialog-link from special groups delete button (registered
 users, everybody), it's supposed to be disabled. Updated wording of headings
 and instructions.

---
 modules/user/css/user.css                     | 16 +++++++---------
 modules/user/views/admin_users.html.php       | 14 +++++++-------
 modules/user/views/admin_users_group.html.php | 10 +++++-----
 3 files changed, 19 insertions(+), 21 deletions(-)

(limited to 'modules/user/css')

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 ?>
-- 
cgit v1.2.3