muck-users 3.2.3 → 3.2.4

data/VERSION

@@ -1 +1 @@
-3.2.3
+3.2.4

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

@@ -11,6 +11,19 @@ class Admin::Muck::AccessCodeRequestsController < Admin::Muck::BaseController
     render :template => 'admin/access_code_requests/index'
   end
   
+  def search
+    @is_search = true
+    query = "%#{params[:query]}%"
+    if params[:fullfilled]
+      @access_code_requests = AccessCodeRequest.where("name LIKE ? OR email LIKE ?", query, query).fullfilled.by_newest.paginate(:page => @page, :per_page => @per_page)
+    else
+      @access_code_requests = AccessCodeRequest.where("name LIKE ? OR email LIKE ?", query, query).unfullfilled.by_newest.paginate(:page => @page, :per_page => @per_page)
+    end
+    respond_to do |format|
+      format.html { render :template => 'admin/access_code_requests/index' }
+    end
+  end
+  
   def edit
     @access_code_request = AccessCodeRequest.find(params[:id])
     render :template => "admin/access_code_requests/edit", :layout => false

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

@@ -1,6 +1,15 @@
 <h2><%=translate('muck.users.access_code_requests') %></h2>
 <%= render :partial => 'admin/access_codes/access_code_nav' %>
 <h3><%= @title %></h3>
+
+<div id="search_box" class="search-box">
+  <%= form_tag search_admin_access_code_requests_path do -%>
+    <%= hidden_field_tag :fullfilled, true if params[:fullfilled]%>
+    <%= text_field_tag :query, '', :class => 'span-5' %>
+    <%= submit_tag t("muck.users.admin.search_access_code_requests") %>
+  <% end -%>
+</div>
+
 <table class="adminTable" cellspacing="0" cellpadding="0">
   <thead>
     <tr>

data/app/views/admin/access_code_requests/send_code.erb

@@ -9,6 +9,7 @@
     </div>
     <div class="form-row">
       <label><%= translate('muck.users.access_code_message') %></label>
+      <p><%=translate('muck.users.access_code_message_help') %></p>
       <%= text_area_tag :message, params[:message] -%>  
     </div>
     <div class="form-row">

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

@@ -16,6 +16,7 @@
                                     :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') } -%>
+    <p><%=translate('muck.users.access_code_message_help') %></p>
   </div>
   <div class="span-11 column">
     <div>

data/app/views/user_mailer/access_code.html.erb

@@ -1,3 +1,8 @@
-<p><%= @message %></p>
-<p>Access Code: <%= @code %></p>
-<p><%= link_to translate('muck.users.click_to_sign_up_now'), signup_url(:access_code => @code) %></p>
+<% signup = link_to(translate('muck.users.click_to_sign_up_now'), signup_url(:access_code => @code)) -%>
+<p><%= @message.gsub('{signup_link}', signup).html_safe  %></p>
+<% if !@code_included -%>
+  <p>Access Code: <%= @code %></p>
+<% end -%>
+<% if !@signup_link_included -%>
+  <p><%= signup.html_safe %></p>
+<% end -%>

data/app/views/user_mailer/access_code.text.erb

@@ -1,6 +1,8 @@
-<%= @message %>
-
-Access Code: <%= @code %>
-
-<%= translate('muck.users.go_here_to_sign_up_now') %>
-<%= signup_url(:access_code => @code) %>
+<% signup = "#{translate('muck.users.go_here_to_sign_up_now')}: #{signup_url(:access_code => @code)}".html_safe -%>
+<%= @message.gsub('{signup_link}', signup).html_safe %>
+<% if !@code_included -%>
+  Access Code: <%= @code %>
+<% end -%>
+<% if !@signup_link_included -%>
+  <%= signup.html_safe %>
+<% end -%>

data/config/locales/en.yml

@@ -2,7 +2,6 @@
 en: 
   muck: 
     users: 
-      public_profile: Public Profile
       add_access_code: Add Access Code
       cant_delete_admin: You can't delete a user that is in the admin role.  Remove the user from the administrator role and then try again.  Please be careful when deleting administrators.  If you delete all administrator accounts you will no longer be able to login to the administration system.
       sign_in_now: Sign in now!
@@ -26,19 +25,21 @@ en:
       view_your_account: View Your Account
       password_mismatch: Password mismatch.
       username_not_available: Username already in use. %{reset_password_help}
-      email_not_available: Email already in use. %{reset_password_help}
       admin: 
         activate_all_inactive_users_confirm: Are you sure you want to activate all inactive users in the system?  This cannot be undone!
         activate_all_inactive_users: Activate All Inactive Users
         show_emails: Show Emails
         search_users: Search Users
         unactivated_users: There are %{count} unactivated users
+        search_access_code_requests: Search Requests
+      access_code_used_by: Used By
       invalid_username: Invalid username
       last_name: Last Name
       user_update: Your user information has been updated.
       confirm_select_new_password: Confirm Password Change
       email_invalid: Invalid email
       user_disable_problem: There was a problem disabling this user.
+      email_not_available: Email already in use. %{reset_password_help}
       total_users: "Total Users: %{total}"
       add_role_dialog_title: Add Role
       submit: Submit
@@ -55,10 +56,13 @@ en:
       edit_role_dialog_title: Edit Role
       already_logged_in: You are already logged in and don't need to recover your password.
       forgot_your_username: Forgot your username?
+      public_profile: Public Profile
+      go_here_to_sign_up_now: "Go here to sign up now:"
       access_code_created: Created
       bulk_access_code_problem: Problem adding access code
       signup_wait: Signing you up. Please wait.
       password_not_reset: Password not reset.
+      access_code_not_found: We were unable to find the access code provided. Please %{contact_us_anchor}contact us%{contact_us_anchor_end} or %{access_request_anchor}request another code%{access_request_anchor_end}.
       my_dashboard: My Dashboard
       bulk_access_codes_description: This will generate a unique, single use access code for each of the emails provided.
       cannot_deactivate_yourself: You cannot deactivate yourself!
@@ -71,6 +75,7 @@ en:
       already_registered: Already a member?
       all_users: All Users
       login_out_success: You have been logged out.
+      access_code_provided_by: Provided By
       validation_are_required: are required.
       request_username: Request Username
       send_access_code: Send Code
@@ -92,14 +97,12 @@ en:
         search_users: Search Users
       access_code_uses: Uses
       access_code_sent_to: Sent To
-      access_code_provided_by: Provided By
-      access_code_used_by: Used By
       select_new_password: Select a New Password
       login: Login
       access_code_requests_code_sent_on: Code Sent on
       send_access_codes: Send Codes
+      access_code_message_help: (If you want to embed the code and sign up link inline use {code} and {signup_link} in your message.)
       access_code_help: If you received a access code from us, please enter it in the box above. You may also %{access_request_anchor}request a access code%{access_request_anchor_end}.
-      access_code_not_found: We were unable to find the access code provided. Please %{contact_us_anchor}contact us%{contact_us_anchor_end} or %{access_request_anchor}request another code%{access_request_anchor_end}.
       email_address: Email Address
       delete: Delete
       bulk_access_codes_created: Bulk access codes created and emailed to %{email_count} emails.
@@ -122,10 +125,10 @@ en:
       user_not_deactivated_error: Could not deactivate user
       account_activated: Your account has been activated! You can now login.
       welcome: Welcome
+      edit_this_user: Edit User
       update: Update
       already_activated: Your account has already been activated. You can log in below.
       welcome_email_subject: Welcome to %{application_name}
-      access_code_request_confirm_subject: Thank you for your beta code request for %{application_name}
       deleting_user: deleting user...
       add_user_to_role: Add User to Role
       logout_required: ""
@@ -161,7 +164,6 @@ en:
       user_account_deleted: You have successfully deleted your account.
       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
@@ -179,6 +181,7 @@ en:
       expiration_date_tip: Enter the date upon which the access code will become invalid
       signin_wait: Signing you in. Please wait.
       remember_me: Remember me
+      access_code_request_confirm_subject: Thank you for your beta code request for %{application_name}
       add_user_to_role_title: Add user to a new role.
       access_code_edit_link: Edit Access Code
       access_code_update_problem: There was a problem updating the access code.
@@ -228,10 +231,10 @@ en:
       expiration_date: Expiration Date
       add: Add
       terms_of_service_required: You must accept the terms of service.
+      current_password: Current Password
+      access_request_email: Email
       beta_code_not_required: You are already logged in and so you probably don't really want a beta code.
       password: Password
-      access_request_email: Email
-      current_password: Current Password
       sign_out_title: Sign Out
       email_available: Email available
       thanks_sign_up_check: Your account has been created. Please check your e-mail for your account activation instructions!
@@ -244,7 +247,6 @@ en:
       access_code_edit_problem: Problem editing access code
       access_codes: Access Codes
       click_to_sign_up_now: Click here to sign up now.
-      go_here_to_sign_up_now: "Go here to sign up now:"
       access_request_name: Name
       cant_disable_admin: Can't disable an administrator.  Please remove the user from the administrator role and try again.
     roles: 

data/config/routes.rb

@@ -60,6 +60,9 @@ Rails.application.routes.draw do
     end
     resources :roles, :controller => 'muck/roles'
     resources :access_code_requests, :controller => 'muck/access_code_requests' do
+      collection do
+        post :search
+      end
       member do
         get :send_code
       end

data/lib/muck-users/mailers/user_mailer.rb

@@ -57,6 +57,9 @@ module MuckUsers
       def access_code(email, subject, message, code)
         @message = message
         @code = code
+        @code_included = @message.include?('{code}')
+        @signup_link_included = @message.include?('{signup_link}')
+        @message.gsub!('{code}', @code)
         mail(:to => email, :subject => subject) do |format|
           format.html
           format.text

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "3.2.3"
+  s.version = "3.2.4"
 
   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-05-06}
+  s.authors = [%q{Justin Ball}, %q{Joel Duffin}]
+  s.date = %q{2011-05-11}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -497,8 +497,8 @@ Gem::Specification.new do |s|
     "public/stylesheets/muck-users.css"
   ]
   s.homepage = %q{http://github.com/jbasdf/muck_users}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.0}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.1}
   s.summary = %q{Easy to use user engine for Rails}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 3
   - 2
-  - 3
-  version: 3.2.3
+  - 4
+  version: 3.2.4
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 -06:00
-default_executable: 
+date: 2011-05-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: authlogic
@@ -563,7 +562,6 @@ files:
 - public/images/profile_default.jpg
 - public/javascripts/muck-users.js
 - public/stylesheets/muck-users.css
-has_rdoc: true
 homepage: http://github.com/jbasdf/muck_users
 licenses: []
 
@@ -593,7 +591,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: Easy to use user engine for Rails