muck-users 0.3.20 → 3.0.0

data/README.rdoc

@@ -5,104 +5,114 @@
 The muck users engine is part of the muck framework and relies upon the muck_engine as well as authlogic.
 Both gems should be installed automatically when you install the muck_users engine.
 
-Then
-  sudo gem install muck-users
-
-Use search logic for searching users.  Add this to environment.rb:
+Make sure that your 'Gemfile' contains the following:
 
   config.gem "authlogic"
-  config.gem "searchlogic"
-
-  
-In addition, you will need to install the ssl_requirement plugin (http://github.com/rails/ssl_requirement/tree/master) into your Rails project:
+  config.gem "muck-users"
 
-  ruby script/plugin install ssl_requirement
-
-If you used the muck template to create your rails application you will have a global_config.yml file.  If not then you will need to create a 
-global_config.yml file and then add the following to environment.rb right above Rails::Initializer.run do |config|
+If you used the muck template to create your rails application you will have a secrets.yml file.  If not then you will need to create a 
+secrets.yml file and then add the following to environment.rb right above Rails::Initializer.run do |config|
 
   require 'ostruct'
   require 'yaml'
-  ::GlobalConfig = OpenStruct.new(YAML.load_file("#{RAILS_ROOT}/config/global_config.yml")[RAILS_ENV])
-
+  ::Secrets = OpenStruct.new(YAML.load_file("\#{RAILS_ROOT}/config/secrets.yml")[RAILS_ENV])
+
+Omit secrets.yml from your version control system and use it to keep sensitive data like email server credentials
+
+  email_user_name: 'TODO_admin@#{domain_name}'    # Email server username
+  email_password = 'TODO_password'                # Email server password
+
+  production:
+    <<: *DEFAULT
+    # Add production only secrets
+  staging:
+    <<: *DEFAULT
+    # Add staging only secrets
+  development:
+    <<: *DEFAULT
+    # Development specific
+  test:
+    <<: *DEFAULT
+    # Test specific
+  
 
-Inside of global_config.yml add the following changing the emails to match your application:
+=== Configuration
 
-  default: &DEFAULT
+Create an initializer and add the following adjusting the settings to meet your specific needs:
 
-    # Sent in emails to users
-    application_name: 'Name of my application'
-    from_email: 'support@example.com'
-    support_email: 'support@example.com'
-    admin_email: 'admin@example.com'
-    
-    require_access_code: false # Determines whether or not a access code is required to sign up.
+  MuckEngine.configure do |config|
   
-=== Users migration
-The users table is frequently one of the most significant of any application.  A migration to create users is not included in this
-gem so that the users tables can be customized appropriately.  Here's an example migration:
-
-  class CreateUsers < ActiveRecord::Migration
-
-    def self.up
-      create_table :users, :force => true do |t|
-        t.string   :login
-        t.string   :email
-        t.string   :first_name
-        t.string   :last_name
-        t.string   :crypted_password
-        t.string   :password_salt
-        t.string   :persistence_token
-        t.string   :single_access_token
-        t.string   :perishable_token
-        t.integer  :login_count,         :null => false, :default => 0
-        t.integer  :failed_login_count,  :null => false, :default => 0
-        t.datetime :last_request_at                                   
-        t.datetime :last_login_at 
-        t.datetime :current_login_at                                  
-        t.string   :current_login_ip                                  
-        t.string   :last_login_ip
-        t.boolean  :terms_of_service,   :default => false, :null => false
-        t.string   :time_zone,          :default => "UTC"
-        t.datetime :disabled_at
-        t.datetime :activated_at
-        t.timestamps
-      end
-
-      add_index :users, :login
-      add_index :users, :email
-      add_index :users, :persistence_token
-      add_index :users, :perishable_token
-      add_index :users, :single_access_token
-      add_index :users, :last_request_at
-    end
-
-    def self.down
-      drop_table :users
+    # Global application values.  These are used to display the app name, send emails, and configure where system emails go.
+    if Rails.env.production?
+      config.application_url = 'www.#{domain_name}'     # Url of the application in production
+    elsif Rails.env.staging?
+      config.application_url = 'www.#{domain_name}'     # Url of the application on staging
+    else
+      config.application_url = 'localhost:3000'         # Url of the application for test or development
     end
+  
+    config.application_name = 'Example App'       # Common name for your application.  i.e. My App, Billy Bob, etc
+    config.from_email = 'support@example.com'     # Emails will come from this address i.e. noreply@example.com, support@example.com, system@example.com, etc
+    config.from_email_name = 'Example App'        # This will show up as the name on emails.  i.e. support@example.com <Example>
+    config.support_email = 'support@example.com'  # Support email for your application.  This is used for contact us etc.
+    config.admin_email = 'admin@example.com'      # Admin email for your application
+    config.customer_service_number = '1-800-'     # Phone number if you have one (optional)
+  
+    # Email charset.  No need to change this unless you have a good reason to change the encoding.
+    config.mail_charset = 'utf-8'
+
+    # Email server configuration
+    # Sendgrid is easy: https://sendgrid.com/user/signup
+    config.email_server_address = "smtp.sendgrid.net"   # Email server address.  'smtp.sendgrid.net' works for sendgrid
+    config.email_user_name = Secrets.email_user_name    # Email server username
+    config.email_password = Secrets.email_password      # Email server password
+    config.base_domain = 'example.com'                  # Basedomain that emails will come from
+    
+    # ssl
+    config.enable_ssl = false # Enable ssl if you have an ssl certificate installed.  This will provide security between the client and server.
+  
+    # Google Analtyics Configuration.  This will enable Google Analytics on your site and will be used if your template includes:
+    #                                  <%= render :partial => 'layouts/global/google_analytics' %>
+    config.google_tracking_code = ""                    # Get a tracking code here: http://www.google.com/analytics/. The codes look like this: 'UA-9685000-0'
+    config.google_tracking_set_domain = "example.com"   # Base domain provided to Google Analytics. Useful if you are using subdomains but want all traffic 
+                                                # recorded into one account.
   end
 
+  MuckUsers.configure do |config|
+    config.automatically_activate = true                    # Automatically active a users account during registration. If true the user won't get a 
+                                                            # 'confirm account' email. If false then the user will need to confirm their account via an email.
+    config.automatically_login_after_account_create = true  # Automatically log the user in after they have setup their account. This should be false if you 
+                                                            # require them to activate their account.
+    config.send_welcome = true                              # Send out a welcome email after the user has signed up.
 
+    # if you use recaptcha you will need to also provide a public and private key available from http://recaptcha.net.
+    config.use_recaptcha = false      # This will turn on recaptcha during registration. This is an alternative to sending the 
+                                      # user a confirm email and can help reduce spam registrations.
+
+    config.require_access_code = false              # Only let a user sign up if they have an access code
+    config.let_users_delete_their_account = false   # Turn on/off ability for users to delete their own account. It is not recommended that you let 
+                                                    # users delete their own accounts since the delete can cascade through the system with unknown results.
+  end
+
+  
 == Usage
 
 There are a couple of routes that muck-users will look for:
 
 Route to the site home page:
 
-  map.root '', :controller => 'default', :action => 'index'
+  root :to => "default#index"
 
 Route to a public user page (this could also go to home etc. if needed)
-
-  map.public_user '/profiles/:id', :controller => 'profiles', :action => 'show'
+  match '/profiles/:id' => 'profiles#show', :as => :public_user
   
 This is the path that a user will be redirected to if they attempt to access another user's dashboard page.
 
 By default when a user logs out they are sent to the login page.  You can add a new route and change the behavior:
  
-  map.logout_complete '/login', :controller => 'user_session', :action => 'new'
-
+  match '/login' => 'user_session#new', :as => :logout_complete
 
-muck-users sends out emails that need to be able to generate links.  Be sure to set a value for application_url in global_config.yml
+muck-users sends out emails that need to be able to generate links.  Be sure to set a value for MuckEngine.configuration.application_url.
 
 === Helpers
 Muck users provides an autocomplete login search.  To enable this functionality create a text box with the class 'login-search' and add 
@@ -132,7 +142,7 @@ After installing the engine just create a user model thus:
 
   class User < ActiveRecord::Base
     acts_as_authentic
-    acts_as_muck_user
+    include MuckUsers::Models::User
   end
 
 Then you will be able to go to:
@@ -140,4 +150,4 @@ http//:localhost:3000/login
 http//:localhost:3000/signup
 
 
-Copyright (c) 2009 Tatemae, released under the MIT license
+Copyright (c) 2009-2010 Tatemae, released under the MIT license

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/rdoctask'
 
 desc 'Translate this gem'
 task :translate do
-  file = File.join(File.dirname(__FILE__), 'locales', 'en.yml')
+  file = File.join(File.dirname(__FILE__), 'config', 'locales', 'en.yml')
   system("babelphish -o -y #{file}")
   path = File.join(File.dirname(__FILE__), 'app', 'views', 'user_mailer')
   system("babelphish -o -h #{path} -l en")
@@ -34,20 +34,12 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-desc 'Test the muck_users gem.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test/rails_root/test'
-  t.pattern = 'test/rails_root/test/**/*_test.rb'
-  t.verbose = true
-end
-
 begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |t|
     #t.libs << 'lib'
-    t.libs << 'test/rails_root/lib'
-    t.pattern = 'test/rails_root/test/**/*_test.rb'
+    t.libs << 'test/rails_test/lib'
+    t.pattern = 'test/rails_test/test/**/*_test.rb'
     t.verbose = true
     t.output_dir = 'coverage'
     t.rcov_opts << '--exclude "gems/*"'
@@ -58,7 +50,7 @@ rescue LoadError
   end
 end
 
-task :default => :test
+task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.3.20
+3.0.0

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

@@ -50,7 +50,7 @@ class Admin::Muck::AccessCodesController < Admin::Muck::BaseController
         @access_code.code = AccessCode.random_code
         @access_code.save!
       end
-      UserMailer.deliver_access_code(email, @access_code.subject, @access_code.message, @access_code.code)
+      UserMailer.access_code(email, @access_code.subject, @access_code.message, @access_code.code).deliver
     end
     AccessCodeRequest.mark_fullfilled(access_code_requests) if access_code_requests
     flash[:notice] = translate('muck.users.bulk_access_codes_created', :email_count => emails.count)

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

@@ -1,5 +1,4 @@
 class Admin::Muck::RolesController < Admin::Muck::BaseController
-  unloadable
   
   def index
     @roles = Role.by_alpha

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

@@ -1,5 +1,4 @@
 class Admin::Muck::UsersController < Admin::Muck::BaseController
-  unloadable
     
   before_filter :get_user, :only => [:edit, :update, :destroy, :permissions]
   before_filter :setup_subnavigation
@@ -46,23 +45,11 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
     end
   end
 
-  def search_results
-    @users = User.do_search( params[:query] ).paginate(:page => @page, :per_page => @per_page )
-  end
-
   def search
-    search_results
+    @users = User.where("first_name LIKE ? OR last_name LIKE ? OR email LIKE ?", params[:query], params[:query], params[:query] ).paginate(:page => @page, :per_page => @per_page )
     respond_to do |format|
-      format.html do
-        render :template => 'admin/users/index'
-      end
-    end
-  end
-
-  def ajax_search
-    search_results
-    respond_to do |format|
-      format.html { render :partial => 'admin/users/table', :layout => false }
+      format.html { render :template => 'admin/users/index' }
+      format.js { render :partial => 'admin/users/table', :layout => false }
     end
   end
 
@@ -146,7 +133,7 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
   end
   
   protected
-
+    
     def update_permissions(message = '')
       flash[:notice] = message unless message.blank?
       respond_to do |format|

data/app/controllers/muck/access_code_requests_controller.rb

@@ -1,5 +1,5 @@
 class Muck::AccessCodeRequestsController < ApplicationController
-  unloadable
+
   layout 'popup'
 
   ssl_required :new, :create

data/app/controllers/muck/activations_controller.rb

@@ -1,5 +1,4 @@
 class Muck::ActivationsController < ApplicationController
-  unloadable
   
   ssl_required :new
   before_filter :not_logged_in_required, :only => [:new]

data/app/controllers/muck/password_resets_controller.rb

@@ -1,5 +1,4 @@
 class Muck::PasswordResetsController < ApplicationController
-  unloadable
   
   ssl_required :edit, :update
   ssl_allowed :new, :create

data/app/controllers/muck/user_sessions_controller.rb

@@ -1,5 +1,4 @@
 class Muck::UserSessionsController < ApplicationController
-  unloadable
   
   ssl_required :new, :create
   before_filter :login_required, :only => :destroy

data/app/controllers/muck/username_request_controller.rb

@@ -1,5 +1,4 @@
 class Muck::UsernameRequestController < ApplicationController
-  unloadable
   
   ssl_allowed :new, :create
   before_filter :not_logged_in_required

data/app/controllers/muck/users_controller.rb

@@ -1,5 +1,4 @@
 class Muck::UsersController < ApplicationController
-  unloadable
 
   ssl_required :show, :new, :edit, :create, :update
   before_filter :not_logged_in_required, :only => [:new, :create] 
@@ -34,7 +33,7 @@ class Muck::UsersController < ApplicationController
   end
 
   def new
-    @page_title = t('muck.users.register_account', :application_name => GlobalConfig.application_name)
+    @page_title = t('muck.users.register_account', :application_name => MuckEngine.configuration.application_name)
     @user = User.new
     standard_response('new')
   end
@@ -48,7 +47,7 @@ class Muck::UsersController < ApplicationController
   end
     
   def create
-    @page_title = t('muck.users.register_account', :application_name => GlobalConfig.application_name)
+    @page_title = t('muck.users.register_account', :application_name => MuckEngine.configuration.application_name)
     cookies.delete :auth_token
     @user = User.new(params[:user])
     setup_tos
@@ -70,7 +69,7 @@ class Muck::UsersController < ApplicationController
   end
 
   def destroy
-    return unless admin? || GlobalConfig.let_users_delete_their_account
+    return unless admin? || MuckUsers.configuration.let_users_delete_their_account
     @user = admin? ? User.find(params[:id]) : User.find(current_user)
     if @user.destroy
       flash[:notice] = t("muck.users.user_account_deleted")
@@ -99,14 +98,14 @@ class Muck::UsersController < ApplicationController
     elsif !User.login_exists?(params[:user_login])
       @user = User.new(:login => params[:user_login])
       @user.valid? # we aren't interested in the output of this.
-      if @user.errors.on(:login)
-        result = "#{t('muck.users.invalid_username')} <br /> #{t('muck.users.username')} #{@user.errors.on(:login)}"
+      if !@user.errors[:login].blank?
+        result = "#{t('muck.users.invalid_username')} <br /> #{t('muck.users.username')} #{@user.errors[:login]}"
       else
         result = t('muck.users.username_available')
       end
     end
     respond_to do |format|
-      if !@user.blank? && !@user.errors.on(:login) && !result.blank?
+      if !@user.blank? && @user.errors[:login].blank? && !result.blank?
         format.html { render :partial => 'users/available', :locals => { :message => result } }
         format.js { render :partial => 'users/available', :locals => { :message => result } }
       else
@@ -137,7 +136,6 @@ class Muck::UsersController < ApplicationController
       respond_to do |format|
         format.html { render :partial => 'users/unavailable', :locals => { :message => result } }
         format.js { render :partial => 'users/unavailable', :locals => { :message => result } }
-        
       end
       return
     end
@@ -149,9 +147,6 @@ class Muck::UsersController < ApplicationController
         format.html { render :partial => 'users/unavailable', :locals => { :message => result } }
         format.js { render :partial => 'users/unavailable', :locals => { :message => result } }
       end
-      
-      #format.html { render :text => result }
-      #format.js { render :text => result }
     end
   end
 
@@ -160,7 +155,7 @@ class Muck::UsersController < ApplicationController
     def valid_email?(email)
       user = User.new(:email => email)
       user.valid?
-      if user.errors[:email]
+      if !user.errors[:email].blank?
         [false, user.errors[:email]]
       else
         [true, '']
@@ -193,7 +188,7 @@ class Muck::UsersController < ApplicationController
   
     # Sign up methods
     def check_access_code
-      if GlobalConfig.require_access_code
+      if MuckUsers.configuration.require_access_code
         access_code, valid_code = AccessCode.valid_code?(params[:user][:access_code_code])
         if valid_code
           @user.access_code = access_code
@@ -213,7 +208,7 @@ class Muck::UsersController < ApplicationController
     end
     
     def check_recaptcha
-      if GlobalConfig.use_recaptcha
+      if MuckUsers.configuration.use_recaptcha
         if !(verify_recaptcha(@user) && @user.valid?)
           raise ActiveRecord::RecordInvalid, @user
         end
@@ -221,8 +216,8 @@ class Muck::UsersController < ApplicationController
     end
   
     def setup_user
-      if GlobalConfig.automatically_activate
-        if GlobalConfig.automatically_login_after_account_create
+      if MuckUsers.configuration.automatically_activate
+        if MuckUsers.configuration.automatically_login_after_account_create
           setup_user_login
         else
           setup_user_no_login

data/app/models/role.rb

@@ -17,7 +17,7 @@ class Role < ActiveRecord::Base
   validates_presence_of :rolename
   validates_uniqueness_of :rolename
 
-  named_scope :by_alpha, :order => 'roles.rolename ASC'
+  scope :by_alpha, order('roles.rolename ASC')
 
   # roles can be defined as symbols.  We want to store them as strings in the database
   def rolename= val

data/app/views/access_code_requests/new.html.erb

@@ -1,6 +1,6 @@
 <h3><%=translate('muck.users.request_access_code') %></h3>
 <%= output_errors('Problem adding access code', {:class => 'help-box'}, @access_code_request) %>
-<% custom_form_for :access_code_request, :url => access_code_requests_path do |f| -%>
+<%= muck_form_for :access_code_request, :url => access_code_requests_path do |f| -%>
   <%= f.text_field :email, { :label => translate('muck.users.email_address'),
                              :tip => translate('muck.users.access_code_request_tip')  } -%>
   <%= f.submit translate('muck.users.submit') %>

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

@@ -1,7 +1,7 @@
 <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| -%>
+<%= muck_form_for :access_code, :url => bulk_create_admin_access_codes_path, :html => {:class => "standard-form alt"} do |f| -%>
   <div class="span-11 column colborder">
     <%= f.text_field :code, { :label => translate('muck.users.access_code'),
                               :tip => translate('muck.users.bulk_access_code_tip'),

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, :class => 'ajax' } do |f| -%>
+<%= muck_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/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, :html => { :class => 'ajax' } do |f| -%>
+<%= muck_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/roles/edit.html.erb

@@ -1,4 +1,4 @@
-<% custom_form_for @role, :url => admin_role_path(@role), :html => { :class => 'ajax', :method => :put } do |f| %>
+<%= muck_form_for @role, :url => admin_role_path(@role), :html => { :class => 'ajax', :method => :put } do |f| %>
   <%= f.text_field :rolename %>
   <%= f.submit translate('muck.users.update') %>
 <% end %>

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

@@ -1,4 +1,4 @@
-<% custom_form_for @role, :url => admin_roles_path, :html => { :class => 'ajax' } do |f| %>
+<%= muck_form_for @role, :url => admin_roles_path, :html => { :class => 'ajax' } do |f| %>
   <%= f.text_field :rolename %>
   <%= f.submit translate('muck.users.add') %>
 <% end %>

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

@@ -1,6 +1,6 @@
 <div id="search_box" class="search-box">
-  <% form_tag :action => 'search' do %>
+  <%= form_tag search_admin_users_path, :class => 'ajax' do -%>
     <%= text_field_tag :query, '', :class => 'span-5' %>
     <%= submit_tag t("muck.users.admin.search_users") %>
-  <% end %>
+  <% end -%>
 </div>

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

@@ -4,5 +4,4 @@
     <li><%= link_to t("muck.users.navigation.inactive_users"), inactive_admin_users_path %></li>
   </ul>
   <%= render :partial => 'admin/users/search_box' -%>
-  <%= render :partial => 'admin/users/ajax_search_box' -%>
 </div>

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

@@ -1,7 +1,7 @@
 <div id="edit-user" class="common-form">
   <h1><%= t('muck.users.update_user_admin') %></h1>
 
-  <% custom_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', :method => :put, :multipart => true } do |f| -%>
 
    <%= output_errors(t('muck.users.problem_editing_account'), {:class => 'help-box'}, @user) %>
 
@@ -18,7 +18,7 @@
 
 <div id="change-password" class="common-form">
   <h2><%= t('muck.users.change_password') %></h2>
-  <% custom_form_for @user, :url => admin_user_path(@user), :html => { :id => "change-password-form", :name => 'change-password-form', :method => :put } do |f| %>
+  <%= 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'),

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

@@ -1,4 +1,4 @@
-<% custom_form_for @user, :url => admin_user_path(@user), :html => { :class => 'ajax', :method => :put } do |f| %>
+<%= muck_form_for @user, :url => admin_user_path(@user), :html => { :class => 'ajax', :method => :put } do |f| %>
   <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>

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

@@ -0,0 +1 @@
+jQuery('#manage').replaceWith('<%= escape_javascript(render('admin/users/table')) %>');

data/app/views/password_resets/edit.html.erb

@@ -1,7 +1,7 @@
 <div id="reset-password-confirm" class="common-form">
   <h1><%= t('muck.users.select_new_password') %></h1>
   <%= output_errors(t('muck.users.select_new_password'), {:class => 'help-box'}) %>
-  <% custom_form_for @user, :url => password_reset_path, :html => {:method => :put} do |f| -%>
+  <%= muck_form_for @user, :url => password_reset_path, :html => {:method => :put} do |f| -%>
     <%= f.password_field :password, { :label => t('muck.users.password'), :hide_required => true } -%>
     <%= f.password_field :password_confirmation, { :label => t('muck.users.confirm_password'), :hide_required => true } -%>
     <%= submit_tag t('muck.users.confirm_select_new_password') %>

data/app/views/password_resets/new.html.erb

@@ -1,7 +1,7 @@
 <div id="reset-password" class="common-form">
   <h1><%= t('muck.users.forgot_password') %></h1>
   <%= output_errors(t('muck.users.reset_password'), {:class => 'help-box'}) %>
-  <% custom_form_for :reset_password, :url => password_resets_path do |f| -%>
+  <%= muck_form_for :reset_password, :url => password_resets_path do |f| -%>
     <p><%= t('muck.users.email_recover_prompt') %></p>
     <%= f.text_field :email, { :label => t('muck.users.email_address'), :hide_required => true, :value => params[:email] } -%>
     <div class="button form-row">

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

@@ -0,0 +1,3 @@
+<p style=";text-align:right;direction:rtl"> <%= @message %> </p>
+<p style=";text-align:right;direction:rtl"> الوصول إلى التعليمات البرمجية : <%= @code %> </p>
+<p style=";text-align:right;direction:rtl"> <%= link_to translate('muck.users.click_to_sign_up_now'), signup_url(:access_code => @code) %> </p>

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

@@ -0,0 +1,3 @@
+<p> <%= @message %> </p>
+<p> Adgang Kode: <%= @code %> </p>
+<p> <%= link_to translate('muck.users.click_to_sign_up_now'), signup_url(:access_code => @code) %> </p>

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

@@ -0,0 +1,3 @@
+<p> <%= @message %> </p>
+<p> Zugangscode: <%= @code %> </p>
+<p> <%= link_to translate('muck.users.click_to_sign_up_now'), signup_url(:access_code => @code) %> </p>

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

@@ -0,0 +1,3 @@
+<p style=";text-align:right;direction:rtl"> <%= @message %> </p>
+<p style=";text-align:right;direction:rtl"> کد دسترسی : <%= @code %> </p>
+<p style=";text-align:right;direction:rtl"> <%= link_to translate('muck.users.click_to_sign_up_now'), signup_url(:access_code => @code) %> </p>

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

@@ -0,0 +1,3 @@
+<p> <%= @message %> </p>
+<p> Pristupni kod: <%= @code %> </p>
+<p> <%= link_to translate('muck.users.click_to_sign_up_now'), signup_url(:access_code => @code) %> </p>