muck-users 3.1.24 → 3.1.25

data/VERSION

@@ -1 +1 @@
-3.1.24
+3.1.25

data/app/controllers/admin/muck/users_controller.rb

@@ -54,7 +54,7 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
   end
 
   def edit
-    render :template => 'admin/users/edit'
+    render :template => 'admin/users/edit', :layout => false 
   end
   
   def update

data/app/helpers/muck_users_helper.rb

@@ -34,4 +34,12 @@ module MuckUsersHelper
     render :partial => 'users/signup_form_javascript'
   end
   
+  def active_class(user)
+    if user.active?
+      'user-active'
+    else
+      'user-inactive'
+    end
+  end
+  
 end

data/app/views/admin/users/_row.html.erb

@@ -1,4 +1,4 @@
-<tr id="<%=user.dom_id('row')%>" class="<%= cycle('odd','even') %>">
+<tr id="<%=user.dom_id('row')%>" class="<%= cycle('odd','even') %> <%=active_class(user)%>">
   <td><%= link_to h(user.full_name), user %></td>
   <td><%= mail_to h(user.email), user.email %></td>
   <td>
@@ -7,16 +7,12 @@
 	</ul>
   </td>
   <td>&nbsp;</td>
-  <td id="<%=user.dom_id('link')%>"><%= render :partial => 'admin/users/activate', :locals => { :user => user } %></td>
-	<td valign="bottom">
-	  <a tabindex="<%= user.id %>" href="#menu_<%= user.id %>" class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all flat">
-	    <span class="ui-icon ui-icon-triangle-1-s"></span>Edit
-	  </a> 
-    <div id="menu_<%= user.id %>" class="hidden"> 
-      <ul> 
+  <td valign="bottom">
+    <div id="menu_<%= user.id %>"> 
+      <ul class="drop-menu"> 
       	<li><%= link_to(translate('muck.users.change_permissions'), permissions_admin_user_path(user), { :title => translate('muck.users.change_permissions_for', :user => user.full_name), :class => 'dialog-pop', :alt => 'pop' }) %></li> 
       	<li><%= render :partial => 'admin/users/activate', :locals => { :user => user }, :alt => 'pop' %></li> 
-      	<li><%= link_to(t("muck.users.edit"), edit_admin_user_path(user.id)) -%></li> 
+      	<li><%= link_to(t("muck.users.edit"), edit_admin_user_path(user.id), { :title =>t('muck.users.edit_this_user'), :class => 'dialog-pop', :alt => 'pop'}) -%></li> 
       	<li><%= link_to(t("muck.general.delete"), admin_user_path(user.id), { :title => t('muck.users.delete_this_user'), :class => 'delete-user ajax-delete' }) -%></li> 
       </ul> 
     </div>

data/app/views/admin/users/_table.erb

@@ -7,7 +7,6 @@
   		<th></th>
   		<th></th>
   		<th></th>
-  		<th></th>
   	</tr>
 	</thead>
 	<tbody>
@@ -15,7 +14,7 @@
 	</tbody>
 	<tfoot>
 	  <tr>
-	    <td colspan="7">
+	    <td colspan="6">
 	      <%= will_paginate @users %>
 	    </td>
 	  </tr>

data/app/views/admin/users/{edit.html.erb → edit.erb}

@@ -1,28 +1,20 @@
 <div id="edit-user" class="common-form">
-  <h1><%= t('muck.users.update_user_admin') %></h1>
-
-  <%= muck_form_for @user, :url => admin_user_path(@user), :html => {:id => "edit-user-form", :name => 'edit-user-form', :method => :put, :multipart => true } do |f| -%>
-
+  <%= muck_form_for @user, :url => admin_user_path(@user), :html => {:id => "edit-user-form", :name => 'edit-user-form', :class => 'ajax', :method => :put, :multipart => true } do |f| -%>
    <%= output_errors(t('muck.users.problem_editing_account'), {:class => 'help-box'}, @user) %>
-
-   <%= f.text_field :email, { :label => t('muck.users.email_address'),
-                               :tip => t('muck.users.email_help') } -%>
+   <%= f.text_field :email, { :label => t('muck.users.email_address') } -%>
     <%= f.text_field :first_name, { :label => t('muck.users.first_name') } %>
     <%= f.text_field :last_name, { :label => t('muck.users.last_name') } %>
 		<div class="button form-row">
 	  	<%= f.submit t('muck.general.save') %>
 	  </div>
 	<% end %>
-	
 </div>
 
 <div id="change-password" class="common-form">
   <h2><%= t('muck.users.change_password') %></h2>
   <%= muck_form_for @user, :url => admin_user_path(@user), :html => { :id => "change-password-form", :name => 'change-password-form', :method => :put } do |f| %>
-    <%= f.password_field :password, { :label => t('muck.users.password'),
-                                      :tip => t('muck.users.password_help')} -%>
-    <%= f.password_field :password_confirmation, { :label => t('muck.users.confirm_password'),
-                                  		             :tip => t('muck.users.password_confirmation_help') } -%>
+    <%= f.password_field :password, { :label => t('muck.users.password') } -%>
+    <%= f.password_field :password_confirmation, { :label => t('muck.users.confirm_password') } -%>
   	<div class="button form-row">
   	  <%= submit_tag t('muck.users.change_password'), :class => 'button' %>
   	</div>

data/app/views/admin/users/row.js.erb

@@ -1,3 +1,3 @@
 <%= output_admin_messages(@user) %>
 jQuery('.dialog').dialog('close');
-jQuery('#<%=@user.dom_id('row')%>').replaceWith('<%=escape_javascript(render(:partial => 'admin/users/row', :locals => { :user => @user }))%>');
+jQuery('#<%=@user.dom_id('row')%>').replaceWith('<%=escape_javascript(render(:partial => 'admin/users/row', :locals => { :user => @user }).html_safe)%>');

data/config/locales/en.yml

@@ -155,8 +155,9 @@ en:
       email_recover_prompt: Please provide the email you signed up with to recover your password.
       choose_member_name: Member Name
       user_account_deleted: You have successfully deleted your account.
-      password_reset: Password reset.
-      delete_this_user: Delete this user.
+      password_reset: Password reset
+      delete_this_user: Delete User
+      edit_this_user: Edit User
       use_limit: Number of Uses
       user_successfully_deleted: User %{login} was successfully deleted.
       access_code_requests: Access Code Requests

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "3.1.24"
+  s.version = "3.1.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2011-03-11}
+  s.date = %q{2011-03-15}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -70,12 +70,12 @@ Gem::Specification.new do |s|
     "app/views/admin/users/_table.erb",
     "app/views/admin/users/_user_navigation.html.erb",
     "app/views/admin/users/do_search.html.erb",
-    "app/views/admin/users/edit.html.erb",
+    "app/views/admin/users/edit.erb",
     "app/views/admin/users/inactive.html.erb",
     "app/views/admin/users/inactive_emails.html.erb",
     "app/views/admin/users/index.csv.erb",
     "app/views/admin/users/index.html.erb",
-    "app/views/admin/users/permissions.html.erb",
+    "app/views/admin/users/permissions.erb",
     "app/views/admin/users/row.js.erb",
     "app/views/admin/users/search.html.erb",
     "app/views/admin/users/search.js.erb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 3
   - 1
-  - 24
-  version: 3.1.24
+  - 25
+  version: 3.1.25
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 -07:00
+date: 2011-03-15 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -140,12 +140,12 @@ files:
 - app/views/admin/users/_table.erb
 - app/views/admin/users/_user_navigation.html.erb
 - app/views/admin/users/do_search.html.erb
-- app/views/admin/users/edit.html.erb
+- app/views/admin/users/edit.erb
 - app/views/admin/users/inactive.html.erb
 - app/views/admin/users/inactive_emails.html.erb
 - app/views/admin/users/index.csv.erb
 - app/views/admin/users/index.html.erb
-- app/views/admin/users/permissions.html.erb
+- app/views/admin/users/permissions.erb
 - app/views/admin/users/row.js.erb
 - app/views/admin/users/search.html.erb
 - app/views/admin/users/search.js.erb