muck-users 3.1.21 → 3.1.22

data/VERSION

@@ -1 +1 @@
-3.1.21
+3.1.22

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

@@ -2,4 +2,5 @@
 
 Access Code: <%= @code %>
 
-<%= link_to translate('muck.users.click_to_sign_up_now'), signup_url(:access_code => @code) %>
+<%= translate('muck.users.go_here_to_sign_up_now') %>
+<%= signup_url(:access_code => @code) %>

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

@@ -2,6 +2,5 @@ Hello <%= h(@user.login) %>,
 
 Welcome to <%= MuckEngine.configuration.application_name %>.  Your account has been successfully created.
 
-Use this link to visit the site:
-
+Visit the site at:
 <%= root_url %>

data/app/views/users/_signup_form.html.erb

@@ -22,7 +22,7 @@
         </p>
   	  <% end -%>
       <%= f.text_field :access_code_code, { :label => translate('muck.users.access_code'), 
-                                            :extra_html => '<p id="access_code_help">' + 
+                                            :extra_html => '<p id="access_code_help" class="attention">' + 
                                               translate('muck.users.access_code_help', 
                                                 :access_request_anchor => %Q{<a class="fancy-access-request iframe" href="#{new_access_code_request_path}">},
                                                 :access_request_anchor_end => "</a>") + '<p>'.html_safe } -%>
@@ -56,7 +56,11 @@
   	<% end -%>
 
   	<div class="button form-row">
-    	<%= f.submit t('muck.users.sign_up_now') %>
+  	  <%if params[:wait]%>
+    	  <%= f.submit t('muck.users.sign_up_now'), :class => 'wait-button' %>
+    	<% else %>
+    	  <%= f.submit t('muck.users.sign_up_now') %>
+    	<% end %>
       <div class="waiting" style="display:none;"><%=translate('muck.users.signup_wait') %></div>
     </div>
 

data/config/locales/en.yml

@@ -239,6 +239,7 @@ 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/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "3.1.21"
+  s.version = "3.1.22"
 
   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-04}
+  s.date = %q{2011-03-07}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: 
   segments: 
   - 3
   - 1
-  - 21
-  version: 3.1.21
+  - 22
+  version: 3.1.22
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-04 00:00:00 -07:00
+date: 2011-03-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency