muck-users 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

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

@@ -12,16 +12,15 @@ class Admin::Muck::AccessCodesController < Admin::Muck::BaseController
   end
   
   def new
-    render :template => 'admin/access_codes/new'
+    render :template => 'admin/access_codes/new', :layout => false
   end
   
   def create
     @access_code = AccessCode.new(params[:access_code])
     if @access_code.save
-      flash[:notice] = 'Access Code was successfully added'
-      redirect_to admin_access_code_path(@access_code)
+      ajax_create_access_code
     else
-      render :template => 'admin/access_codes/new'
+      output_admin_messages(@access_code)
     end
   end
   
@@ -32,47 +31,73 @@ class Admin::Muck::AccessCodesController < Admin::Muck::BaseController
   end
   
   def bulk_create
-    emails = params[:emails].split(',')
+    @access_code = AccessCode.new(params[:access_code])
+    @access_code.bulk_valid?
+    emails = @access_code.emails.split(',')
+    use_random_code = @access_code.code.blank?
     emails.each do |email|
-      @access_code = AccessCode.new(params[:access_code])
-      @access_code.unlimited = false
-      @access_code.use_limit = 1
-      @access_code.uses = 0
-      @access_code.code ||= AccessCode.random_code # If they specified a code then don't change it.
-      @access_code.save!
-      UserMailer.deliver_access_code(email, params[:subject], params[:message], @access_code.code)
+      if use_random_code
+        # need to build a new access code for each email
+        @access_code = AccessCode.new(params[:access_code])
+        @access_code.unlimited = false
+        @access_code.use_limit = 1
+        @access_code.uses = 0
+        @access_code.code = AccessCode.random_code
+        @access_code.save!
+      end
+      UserMailer.deliver_access_code(email, @access_code.subject, @access_code.message, @access_code.code)
     end
     flash[:notice] = translate('muck.users.bulk_access_codes_created', :email_count => emails.count)
-    redirect_to bulk_create_admin_access_codes_path
+    redirect_to bulk_create_admin_access_codes_path    
+    
   rescue ActiveRecord::RecordInvalid => ex
     render :template => "admin/access_codes/bulk"
   end
   
   def edit
-    render :template => "admin/access_codes/edit"
+    render :template => "admin/access_codes/edit", :layout => false
   end
   
   def update
     if @access_code.update_attributes(params[:access_code])
-      redirect_to(admin_access_code_path(@access_code))
+      ajax_update_access_code
     else
-      flash[:notice] = 'There was a problem updating the access code.'
-      render :template => "admin/access_codes/edit"
+      output_admin_messages(@access_code)
     end
   end
 
   def destroy
     if @access_code.users.length <= 0
-      @access_code.destroy
-      flash[:notice] = "Deleted access code."
+      success = @access_code.destroy
+      flash[:notice] = translate('muck.users.access_code_delete_error') unless success
     else
-      flash[:notice] = "Cannot delete access code it has users associated with it."
+      flash[:notice] = translate('muck.users.access_code_delete_problem')
+    end
+    respond_to do |format|
+      format.html { redirect_to admin_access_codes_path }
+      format.js do
+        if success
+          render :template => 'admin/access_codes/destroy', :layout => false
+        else
+          output_admin_messages
+        end
+      end
     end
-    redirect_to admin_access_codes_path
+    
   end
   
   protected
+  
     def setup_access_code
       @access_code = AccessCode.find(params[:id])
     end
+  
+    def ajax_update_access_code
+      render :template => 'admin/access_codes/ajax_update_access_code'
+    end
+    
+    def ajax_create_access_code
+      render :template => 'admin/access_codes/ajax_create_access_code'
+    end
+      
 end

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

@@ -46,7 +46,7 @@ class Admin::Muck::RolesController < Admin::Muck::BaseController
       flash[:notice] = translate('muck.users.cant_delete_administrator_role')
       output_admin_messages
     else
-      success = @role.delete
+      success = @role.destroy
       flash[:notice] = translate('muck.users.role_not_deleted') if !success
 
       respond_to do |format|
@@ -57,7 +57,7 @@ class Admin::Muck::RolesController < Admin::Muck::BaseController
         format.xml  { head :ok }
         format.js do
           if success
-            render :js => 'admin/roles/destroy'
+            render :template => 'admin/roles/destroy', :layout => false
           else
             output_admin_messages
           end

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

@@ -89,7 +89,7 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
     else
       params[:user][:role_ids] ||= []
       if @user.update_attributes(params[:user])
-        return update_permissions(@user, translate('muck.users.updated_permissions'))
+        return update_permissions #(translate('muck.users.updated_permissions'))
       end
     end
     flash[:notice] = message
@@ -125,7 +125,7 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
         redirect_to admin_users_path
       end
       format.xml  { head :ok }
-      format.js { render :js => "#{}jQuery('##{@user.dom_id('row')}').fadeOut();" }
+      format.js { render :js => "jQuery('##{@user.dom_id('row')}').fadeOut();" }
     end
   end
   
@@ -135,17 +135,14 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
   
   protected
 
-    def update_permissions(user, message)
-      flash[:notice] = message
+    def update_permissions(message = '')
+      flash[:notice] = message unless message.blank?
       render :template => 'admin/users/update_permissions', :layout => false
     end
       
     def update_activate(message)
       flash[:notice] = message
-      render :update do |page|
-        page.replace_html 'admin-messages', output_flash
-        page.replace_html @user.dom_id('link'), :partial => 'admin/users/activate', :locals => { :user => @user }
-      end
+      render :template => 'admin/users/update_activate', :layout => false
     end
     
     def get_user

data/app/views/admin/access_codes/_access_code.html.erb

@@ -1,8 +1,10 @@
-<tr>
+<tr id="<%=access_code.dom_id('row')%>">
   <td><%= link_to access_code.code, admin_access_code_path(access_code) %></td>
   <td><%= access_code.uses %></td>
   <td><%= access_code.use_limit %></td>
   <td><%= access_code.unlimited %></td>
   <td><%= format_date(access_code.expires_at) %></td>
   <td><%= format_date(access_code.created_at) %></td>
+  <td><%= link_to(translate('muck.users.edit'), edit_admin_access_code_path(access_code.id), { :class => 'dialog-pop', :title => translate('muck.users.edit_access_code_title') }) %></td>
+  <td><%= link_to(translate('muck.users.delete'), admin_access_code_path(access_code.id), :class => 'ajax-delete', :title => translate('muck.users.access_code_delete_confirm')) %></td>
 </tr>

data/app/views/admin/access_codes/ajax_create_access_code.js.erb

@@ -0,0 +1,2 @@
+jQuery('#current-access-codes').prepend('<%=escape_javascript(render(:partial => 'admin/access_codes/access_code', :locals => { :access_code => @access_code } ))%>');
+jQuery('.dialog').dialog('close');

data/app/views/admin/access_codes/ajax_update_access_code.js.erb

@@ -0,0 +1,2 @@
+jQuery('#<%=@access_code.dom_id('row')%>').replaceWith('<%=escape_javascript(render(:partial => 'admin/access_codes/access_code', :locals => { :access_code => @access_code } ))%>');
+jQuery('.dialog').dialog('close');

data/app/views/admin/access_codes/bulk.html.erb

@@ -1,12 +1,25 @@
 <h2><%=translate('muck.users.bulk_access_codes_title') %></h2>
 <p><%=translate('muck.users.bulk_access_codes_description') %></p>
-
 <%= output_errors(translate('muck.users.bulk_access_code_problem'), {:class => 'help-box'}, @access_code) %>
-
 <% custom_form_for :access_code, :url => bulk_create_admin_access_codes_path, :html => {:class => "standard-form alt"} do |f| -%>
-  <%= render :partial => 'admin/access_codes/form', :locals => {:f => f} %>
-  <%= text_field_tag :subject, params[:subject], :label => {:text => "Subject"} %>
-  <%= text_area_tag :message, params[:message], :label => {:text => "Message"} %>
-  <%= text_area_tag :emails, params[:emails], :label => {:text =>"Emails"}, :tip => translate('muck.users.bulk_access_code_emails_tip') %>
+  <%= f.text_field :code, { :label => translate('muck.users.access_code'),
+                            :tip => translate('muck.users.bulk_access_code_tip'),
+                            :hide_required => true } -%>
+  <%= f.text_field :use_limit, { :label => translate('muck.users.use_limit'),
+                                 :tip => translate('muck.users.use_limit_tip') } -%>
+  <%= f.check_box :unlimited, { :label => translate('muck.users.unlimited'),
+                                :tip => translate('muck.users.unlimited_tip') } -%>
+  <%= f.text_field :expires_at, { :label => translate('muck.users.expiration_date'),
+                                  :tip => translate('muck.users.expiration_date_tip'),
+                                  :class => 'date_pick' } -%>
+  <%= f.text_field :subject, { :label => translate('muck.users.bulk_access_code_subject') } -%>
+  <%= f.text_area :message, { :label => translate('muck.users.bulk_access_code_message') } -%>
+  <%= f.text_area :emails, { :label => translate('muck.users.bulk_access_code_emails'),
+                              :tip => translate('muck.users.bulk_access_code_emails_tip')  } -%>
   <%= f.submit translate('muck.users.save') %>
-<% end -%>
+<% end -%>
+<script type="text/javascript" language="JavaScript">
+  jQuery(document).ready(function(){
+    jQuery('.date_pick').datepicker();
+  });
+</script>

data/app/views/admin/access_codes/destroy.js.erb

@@ -0,0 +1,2 @@
+jQuery('#<%=@access_code.dom_id('row')%>').fadeOut();
+<%= hide_admin_messages %>

data/app/views/admin/access_codes/edit.html.erb

@@ -1,6 +1,6 @@
 <h3><%=translate('muck.users.edit_access_code') %></h3>
 <%= output_errors(translate('muck.users.access_code_edit_problem'), {:class => 'help-box'}, @access_code) %>
-<% custom_form_for @access_code, :url => admin_access_code_path(@access_code), :html => { :method => :put } do |f| -%>
+<% custom_form_for @access_code, :url => admin_access_code_path(@access_code), :html => { :method => :put, :class => 'ajax' } do |f| -%>
   <%= render :partial => 'admin/access_codes/form', :locals => { :f => f } %>
   <%= f.submit translate('muck.users.save') %>
 <% end -%>

data/app/views/admin/access_codes/index.html.erb

@@ -1,7 +1,8 @@
 <h2><%=translate('muck.users.access_codes') %></h2>
-<div>
-  <%= link_to translate('muck.users.access_code_new'), new_admin_access_code_path %>
-</div>
+<p>
+  <%= link_to translate('muck.users.access_code_new'), new_admin_access_code_path, { :class => 'dialog-pop', :title => translate('muck.users.add_access_code_title') } %> 
+  <%= link_to translate('muck.users.bulk_access_codes'), bulk_admin_access_codes_path %>
+</p>
 <table class="adminTable" cellspacing="0" cellpadding="0">
   <thead>
     <tr>
@@ -11,8 +12,12 @@
       <th><%=translate('muck.users.access_code_unlimited') %></th>
       <th><%=translate('muck.users.access_code_expires') %></th>
       <th><%=translate('muck.users.access_code_created') %></th>
+      <th></th>
+      <th></th>
     </tr>
   </thead>
-  <%= render :partial => 'admin/access_codes/access_code', :collection => @codes %>
+  <tbody id="current-access-codes">
+    <%= render :partial => 'admin/access_codes/access_code', :collection => @codes %>
+  </tbody>
 </table>
 <%= will_paginate @codes %>

data/app/views/admin/access_codes/new.html.erb

@@ -1,6 +1,6 @@
 <h3><%=translate('muck.users.add_access_code') %></h3>
 <%= output_errors(translate('muck.users.access_code_add_problem'), {:class => 'help-box'}, @access_code) %>
-<% custom_form_for :access_code, :url => admin_access_codes_path do |f| -%>
+<% custom_form_for :access_code, :url => admin_access_codes_path, :html => { :class => 'ajax' } do |f| -%>
   <%= render :partial => 'admin/access_codes/form', :locals => {:f => f} %>
   <%= f.submit translate('muck.users.save') %>
 <% end -%>

data/app/views/admin/access_codes/show.html.erb

@@ -1,6 +1,6 @@
 <h2><%=translate('muck.users.access_code') %></h2>
 <%= link_to(translate('muck.users.access_code_edit_link'), edit_admin_access_code_path(@access_code.id)) %>
-<%= link_to(translate('muck.users.access_code_delete_link'), admin_access_code_path(@access_code.id), :method => :delete, :confirm => translate('muck.users.access_code_delete_confirm')) %>
+<%= link_to(translate('muck.users.access_code_delete_link'), admin_access_code_path(@access_code.id), :class => 'ajax-delete', :title => translate('muck.users.access_code_delete_confirm')) %>
 
 <table class="adminTable" cellspacing="0" cellpadding="0">
   <thead>

data/app/views/admin/roles/_role.html.erb

@@ -1,5 +1,5 @@
 <tr id="<%=role.dom_id%>">
   <td><%= link_to(role.rolename, admin_role_path(role)) %></td>
   <td><%= link_to(translate('muck.users.edit'), edit_admin_role_path(role), { :class => 'dialog-pop', :title => translate('muck.users.edit_role_dialog_title') } ) %></td>
-  <td><%= link_to(translate('muck.users.delete'), admin_role_path(role), { :class => 'ajax-delete', :confirm => translate('muck.users.role_delete_confirm') } ) %></td>
+  <td><%= link_to(translate('muck.users.delete'), admin_role_path(role), { :class => 'ajax-delete', :title => translate('muck.users.role_delete_confirm') } ) %></td>
 </tr>

data/app/views/admin/roles/destroy.js.erb

@@ -1,2 +1,2 @@
-<%= hide_admin_messages %>
-jQuery('#<%=@role.dom_id%>').fadeOut();"
+jQuery('#<%=@role.dom_id%>').fadeOut();
+<%= hide_admin_messages %>

data/app/views/admin/roles/index.html.erb

@@ -1,7 +1,5 @@
 <h2><%=translate('muck.users.roles') %></h2>
-<p>
-  <%= link_to translate('muck.users.add_role'), new_admin_role_path, { :class => 'dialog-pop', :title => translate('muck.users.add_role_dialog_title') } %>
-</p>
+<p><%= link_to translate('muck.users.add_role'), new_admin_role_path, { :class => 'dialog-pop', :title => translate('muck.users.add_role_dialog_title') } %></p>
 <table class="adminTable">
   <thead>
     <tr>

data/app/views/admin/roles/show.html.erb

@@ -1,3 +1,2 @@
-<h2><%= @role.rolename %></h2>
-<h3><%=translate('muck.users.users_in_role') %></h3>
+<h3><%=translate('muck.users.users_in_role', :role => @role.rolename) %></h3>
 <%= render :partial => 'admin/users/table' -%>

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

@@ -1,5 +1,5 @@
 <% custom_form_for @user, :url => admin_user_path(@user), :html => { :class => 'ajax', :method => :put } do |f| %>
-  <ul class="checkbox-list">
+  <ul class="admin-list checkbox-list">
     <% Role.all.each do |role| -%>
       <li><%= check_box_tag "user[role_ids][]", role.id, @user.has_role?(role.rolename) -%> <%= role.rolename -%></li>
     <% end -%>

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

@@ -0,0 +1,2 @@
+<%= output_admin_messages %>
+jQuery('#<%= @user.dom_id('link') %>').html('<%= escape_javascript(render(:partial => 'admin/users/activate', :locals => { :user => @user })) %>');

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

@@ -1,2 +1,3 @@
 jQuery('.dialog').dialog('close');
-jQuery('#<%= user.dom_id('permissions') %>').html('<%= escape_javascript(render(:partial => 'admin/permissions/permission', :collection => user.permissions, :locals => { :user => user })) %>');
+jQuery('#<%= @user.dom_id('permissions') %>').html('<%= escape_javascript(render(:partial => 'admin/permissions/permission', :collection => @user.permissions, :locals => { :user => @user })) %>');
+<%= output_admin_messages(@user) %>

data/lib/active_record/acts/muck_access_code.rb

@@ -18,6 +18,9 @@ module ActiveRecord
           named_scope :by_alpha, :order => 'access_codes.code ASC'
           named_scope :active, :conditions => 'access_codes.expires_at > Now() AND access_codes.uses <= use_limit'
 
+          # Used to make bulk access code easier to deal with
+          attr_accessor :emails, :subject, :message
+          
           include ActiveRecord::Acts::MuckAccessCode::InstanceMethods
           extend ActiveRecord::Acts::MuckAccessCode::SingletonMethods
           
@@ -53,6 +56,13 @@ module ActiveRecord
       
       module InstanceMethods
         
+        def bulk_valid?
+          errors.add(:emails, I18n.translate('muck.users.validation_are_required')) if self.emails.blank?
+          errors.add(:subject, I18n.translate('muck.users.validation_is_required')) if self.subject.blank?
+          errors.add(:message, I18n.translate('muck.users.validation_is_required')) if self.message.blank?
+          raise RecordInvalid.new(self) if !errors.empty?
+        end
+        
         def use_code
           self.update_attribute(:uses, self.uses + 1)
         end

data/locales/en.yml

@@ -21,6 +21,7 @@ en:
       login_success: Login successful!
       change_password: Change Password
       add_user_to_role: Add User to Role
+      add_access_code_title: Add Access Code
       terms_and_service: By clicking 'Sign-up Now' you agree to comply with the {{tos_link_anchor}}Terms and Conditions{{link_end}}.
       password_reset_link_sent: Instructions to reset your password have been emailed to you. Please check your email.
       deleting_user: deleting user...
@@ -29,28 +30,35 @@ en:
       login_requred: You must be logged in to access this feature.
       recover_password: Recover Password
       confirm_delete_account: Are you sure you want to delete your account?\nThis can not be undone.
+      access_code_deleted: Deleted access code.
       password_updated: Password successfully updated.
       username_sent: Your username has been sent emailed to you. Please check your Email.
       add_permission: (Add Permission)
+      access_code_delete_error: An error occured while trying to delete the access code
       access_code_unlimited: Unlimited
       welcome: Welcome
       bulk_access_codes_created: Bulk access codes created and emailed to {{email_count}} emails.
-      users_in_role: "Users in this role:"
+      users_in_role: "Users in role: {{role}}"
       current_password: Current Password
       problem_creating_account: "There was a problem creating your account.  Please correct the following errors:"
       password_confirmation_help: To ensure that your password is correct please enter it again here.
+      edit_access_code_title: Edit Access Code
       thanks_sign_up_login: Thanks for signing up! You may login now
       already_activated: Your account has already been activated. You can log in below.
       password: Password
       account_not_activated: Your {{application_name}} account has not yet been activated.
       sorry_invalid_reset_code: We're sorry, but we could not locate your account. If you are having issues try copying and pasting the URL from your email into your browser or restarting the reset password process.
       problem_changing_password: There was a problem changing your password. {{errors}}
+      access_code_delete_problem: Cannot delete access code it has users associated with it.
       user_enable_problem: There was a problem enabling this user.
       access_code_tip: Enter a access code.
       email_empty: Please enter an email address
       select_new_password: Select a New Password
+      bulk_access_code_emails: Emails
+      bulk_access_code_subject: Subject
       access_code_delete_link: Delete Access Code
       request_access_code: Request Access Code
+      validation_is_required: is required.
       first_name: First Name
       forgot_username: Forgot Username
       updated_permissions: Updated Permissions
@@ -83,6 +91,7 @@ en:
       click_to_sign_up_now: Click here to sign up now.
       forgot_password: Forgot Password
       login: Login
+      validation_are_required: are required.
       user_not_activated_error: Could not activate user
       password_not_reset: Password not reset.
       save: Save
@@ -98,6 +107,7 @@ en:
       edit: Edit
       activation_instructions: Activation Instructions
       access_code_created: Created
+      access_code_added: Access Code was successfully added
       change_permissions: Change Roles
       what_is_the_email: What is the email address used to create your account?
       activation_complete: Activation Complete
@@ -112,12 +122,11 @@ en:
       access_code_request_tip: Enter your email and we'll send you an access code as soon as one is available. Thank you!
       password_mismatch: Password mismatch.
       add_role_dialog_title: Add Role
+      user_account_deleted: You have successfully deleted your account.
       new_password_doesnt_match: New password does not match the password confirmation.
       add_permission_to_user: Add Permission to user {{user}}
-      user_account_deleted: You have successfully deleted your account.
       sign_in: Sign In
       role_deleted: Role Deleted
-      role_not_deleted: Role could not be deleted
       complete_profile: Complete Your Profile
       access_codes: Access Codes
       access_code_delete_confirm: Are you sure you want to cancel this access code?
@@ -129,6 +138,7 @@ en:
         search_users: Search Users
       user_marked_inactive: User has been marked as inactive
       access_code_request_thank_you: Thank you for your request.  We'll be in touch as soon as possible.
+      bulk_access_code_tip: Optional. If a code is specified then that code will be sent to all users.  Leave this field empty to send a unique code to each user.
       role: Role
       bulk_access_codes_title: Bulk Access Codes
       users_admin: Users
@@ -136,6 +146,7 @@ en:
       access_code_expires: Expires
       user_successfully_deleted: User {{login}} was successfully deleted.
       application_base_url_not_set: Please set application_base_url in global_config.yml
+      access_code_update_problem: There was a problem updating the access code.
       user_not_deactivated_error: Could not deactivate user
       total_users: "Total Users: {{total}}"
       password_cannot_be_blank: Password field cannot be blank.
@@ -146,6 +157,7 @@ en:
       confirm_password: Confirm Password
       add_user_to_role_title: Add user to a new role.
       expiration_date: Expiration Date
+      role_not_deleted: Role could not be deleted
       roles: Roles
       access_code_related_users: Users who signed up with this code
       login_empty: Please enter a login
@@ -163,7 +175,7 @@ en:
       change_your_password: Change Your Password
       forgot_your_password: Forgot your password?
       role_delete_confirm: Are you sure you want to delete this role?  All associated permissions will also be deleted!
-      unlimited: Unlimited
+      unlimited: Unlimited Uses
       remember_me: Remember me
       reset_your_password: Reset Your Password
       access_code_use_limit: Use Limit
@@ -174,6 +186,8 @@ en:
       request_username_subject: Forgotten username
       could_not_find_reset_code: Could not find a password reset code.  Please try resetting your password again.
       register_for_account: Register for an account
+      bulk_access_code_message: Message
+      bulk_access_codes: Email Access Codes
       add_access_code: Add Access Code
       user_update: You're user information has been updated.
       update_profile: Update your profile

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-02-01}
+  s.date = %q{2010-02-04}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -39,7 +39,10 @@ Gem::Specification.new do |s|
      "app/views/admin/access_codes/_access_code.html.erb",
      "app/views/admin/access_codes/_form.html.erb",
      "app/views/admin/access_codes/_user.html.erb",
+     "app/views/admin/access_codes/ajax_create_access_code.js.erb",
+     "app/views/admin/access_codes/ajax_update_access_code.js.erb",
      "app/views/admin/access_codes/bulk.html.erb",
+     "app/views/admin/access_codes/destroy.js.erb",
      "app/views/admin/access_codes/edit.html.erb",
      "app/views/admin/access_codes/index.html.erb",
      "app/views/admin/access_codes/new.html.erb",
@@ -65,6 +68,7 @@ Gem::Specification.new do |s|
      "app/views/admin/users/index.html.erb",
      "app/views/admin/users/permissions.html.erb",
      "app/views/admin/users/search.html.erb",
+     "app/views/admin/users/update_activate.js.erb",
      "app/views/admin/users/update_permissions.js.erb",
      "app/views/password_resets/edit.html.erb",
      "app/views/password_resets/new.html.erb",

data/test/rails_root/public/javascripts/jquery/jquery.tips.js

@@ -1,5 +1,5 @@
 jQuery(document).ready(function() {
-	jQuery(".tip-field").focus(function() {
+	jQuery(".tip-field").live('focus', function() {
 		jQuery(".active").removeClass("active");
 		var tip_key = jQuery('#' + this.id).siblings('.tip-key');
 		var control_id = this.id;
@@ -22,7 +22,7 @@ jQuery(document).ready(function() {
 		jQuery("#" + help_id + "-container").addClass("active");
 	});
 
-	jQuery(".tip-field").blur(function() {
+	jQuery(".tip-field").live('blur', function() {
 		jQuery('#' + this.id + '-tip').hide(1);
 	});
 });

data/test/rails_root/public/javascripts/muck.js

@@ -22,9 +22,16 @@ function add_headers(xhr){
 }
 
 jQuery(document).ready(function() {
-	
+
   jQuery('a.ajax-delete').live('click', function() {
-    jQuery.post(this.href, { _method: 'delete', format: 'js' }, null, "script");
+    var title = jQuery(this).attr('title');
+    var do_delete = true;
+    if(title.length > 0){
+      do_delete = confirm(title);
+    }
+    if (do_delete){
+      jQuery.post(this.href, { _method: 'delete', format: 'js' }, null, "script");
+    }
     return false;
   });
 
@@ -33,15 +40,15 @@ jQuery(document).ready(function() {
     return false;
   });
 
-	jQuery(".submit-form").click(function() {
+  jQuery(".submit-form").click(function() {
     jQuery(this).parent('form').submit();
   });
 
-	apply_ajax_forms();
-	
-	jQuery('a.fancy-pop').fancybox({'hideOnContentClick':false, 'overlayShow':true, 'frameWidth':600, 'frameHeight':500 });
-	
-	jQuery('a.dialog-pop').live('click', function() {
+  apply_ajax_forms();
+
+  jQuery('a.fancy-pop').fancybox({'hideOnContentClick':false, 'overlayShow':true, 'frameWidth':600, 'frameHeight':500 });
+
+  jQuery('a.dialog-pop').live('click', function() {
     var d = jQuery('<div class="dialog"></div>').appendTo("body");
     d.dialog({ modal: true, autoOpen: false, width: 'auto', title: jQuery(this).attr('title') });
     d.load(jQuery(this).attr('href'), '', function(){

data/test/rails_root/public/stylesheets/admin.css

@@ -1,5 +1,7 @@
 /* header */
 a {color:#000;}
+.checkbox-label{display:inline-block;}
+input[type="checkbox"] {margin:0px;}
 #main-navigation{}
 #account-navigation {}
 .navigation ul{padding:2px;margin:0;}
@@ -26,9 +28,10 @@ ul.admin-list li a{font-size:1.2em;}
 /* errors, message */
 .notify-box{font-size:1.2em;color:#555;width:100%}
 .error,.notice,.success {margin:0;}
-#errorExplanation{margin:0;padding:.8em;width:97%;border:2px solid #ddd;background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
+#errorExplanation #field-errors{margin:0;padding:0.4em 1.5em;width:96%;border:2px solid #ddd;background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
 #admin-messages{display:none;}
-
+/* ui elements */
+#ui-datepicker-div{z-index:2005;}
 /* tables */
 .adminTable{margin:5px 0 0 0;padding:0 0 40px 0px;width:980px;}
 .adminTable a{color:#000;text-decoration:none;font-weight:bold;}

data/test/rails_root/public/stylesheets/styles.css

@@ -37,7 +37,7 @@ ul.icon-list a{display:inline-block;margin:2px 0;padding:2px 0 5px 28px;text-dec
 .availability{color:#b61e12;position:absolute;}
 .hidden-tips{display:none;}
 .required-tip{color:#555555;font-size:1.2em;margin:0pt;font-weight:bolder;height:0px;}
-.tip{position:absolute;z-index:100;border:2px solid #CCCCCC;background-color:#fff;width:400px;}
+.tip{position:absolute;z-index:2000;border:2px solid #CCCCCC;background-color:#fff;width:400px;}
 #tip-title{font-size:1.1em;background-color:#CCCCCC;text-align:left;padding:2px 0px 5px 8px;font-weight:bold;}
 #tip-main{padding:10px;color:#333333;}
 #tip-main p,#tip-main ul{font-size:1.3em;}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Justin Ball
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 -07:00
+date: 2010-02-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,7 +95,10 @@ files:
 - app/views/admin/access_codes/_access_code.html.erb
 - app/views/admin/access_codes/_form.html.erb
 - app/views/admin/access_codes/_user.html.erb
+- app/views/admin/access_codes/ajax_create_access_code.js.erb
+- app/views/admin/access_codes/ajax_update_access_code.js.erb
 - app/views/admin/access_codes/bulk.html.erb
+- app/views/admin/access_codes/destroy.js.erb
 - app/views/admin/access_codes/edit.html.erb
 - app/views/admin/access_codes/index.html.erb
 - app/views/admin/access_codes/new.html.erb
@@ -121,6 +124,7 @@ files:
 - app/views/admin/users/index.html.erb
 - app/views/admin/users/permissions.html.erb
 - app/views/admin/users/search.html.erb
+- app/views/admin/users/update_activate.js.erb
 - app/views/admin/users/update_permissions.js.erb
 - app/views/password_resets/edit.html.erb
 - app/views/password_resets/new.html.erb