muck-users 0.3.18 → 0.3.19

data/VERSION

@@ -1 +1 @@
-0.3.18
+0.3.19

data/app/controllers/muck/users_controller.rb

@@ -106,8 +106,16 @@ class Muck::UsersController < ApplicationController
       end
     end
     respond_to do |format|
-      format.html { render :text => result }
-      format.js { render :text => result }
+      if ! @user.errors.on(:login) && ! result.blank?
+        format.html { render :partial => 'users/available', :locals => { :message => result } }
+        format.js { render :partial => 'users/available', :locals => { :message => result } }
+      else
+        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
 
@@ -126,10 +134,24 @@ class Muck::UsersController < ApplicationController
     else
       recover_password_prompt = render_to_string :partial => 'users/recover_password_via_email_link', :locals => { :email => params[:user_email] }
       result = t('muck.users.email_not_available', :reset_password_help => recover_password_prompt)
+      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
     respond_to do |format|
-      format.html { render :text => result }
-      format.js { render :text => result }
+      if errors.blank? && ! result.nil?
+        format.html { render :partial => 'users/available', :locals => { :message => result } }
+        format.js { render :partial => 'users/available', :locals => { :message => result } }
+      else
+        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
 

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

@@ -0,0 +1 @@
+<span class="available"><%= message %></span>

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

@@ -10,12 +10,12 @@
   <% end -%>
   
 	<%= f.text_field :login, { :label => t('muck.users.choose_member_name'), 
-	                           :extra_html => '<span id="username-availibility" class="availability"></span>', 
+	                           :extra_html => '', 
 	                           :tip => t('muck.users.username_help'),
 	                           :required_label => t('muck.users.username') } -%>
 	<%= f.text_field :email, { :label => t('muck.users.email_address'),
 	                           :tip => t('muck.users.email_help'),
-	                           :extra_html => '<span id="email-availibility" class="availability"></span>' } -%>
+	                           :extra_html => '' } -%>
 	<%= 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/users/_unavailable.html.erb

@@ -0,0 +1 @@
+<span class="unavailable"><%= message %></span>

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "0.3.18"
+  s.version = "0.3.19"
 
   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-06-01}
+  s.date = %q{2010-07-13}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -691,9 +691,11 @@ Gem::Specification.new do |s|
      "app/views/user_mailer/welcome_notification.text.zh.plain.erb",
      "app/views/user_sessions/new.html.erb",
      "app/views/username_request/new.html.erb",
+     "app/views/users/_available.html.erb",
      "app/views/users/_recover_password_via_email_link.html.erb",
      "app/views/users/_signup_form.html.erb",
      "app/views/users/_signup_form_javascript.html.erb",
+     "app/views/users/_unavailable.html.erb",
      "app/views/users/_user.html.erb",
      "app/views/users/activation_confirmation.html.erb",
      "app/views/users/activation_instructions.html.erb",
@@ -767,6 +769,8 @@ Gem::Specification.new do |s|
      "public/images/admin/source/User.png",
      "public/images/admin/source/roles.png",
      "public/images/admin/user.gif",
+     "public/images/icon_no.gif",
+     "public/images/icon_success.gif",
      "public/images/profile_default.jpg",
      "public/javascripts/muck-users.js",
      "rails/init.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 3
-  - 18
-  version: 0.3.18
+  - 19
+  version: 0.3.19
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 -06:00
+date: 2010-07-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -773,9 +773,11 @@ files:
 - app/views/user_mailer/welcome_notification.text.zh.plain.erb
 - app/views/user_sessions/new.html.erb
 - app/views/username_request/new.html.erb
+- app/views/users/_available.html.erb
 - app/views/users/_recover_password_via_email_link.html.erb
 - app/views/users/_signup_form.html.erb
 - app/views/users/_signup_form_javascript.html.erb
+- app/views/users/_unavailable.html.erb
 - app/views/users/_user.html.erb
 - app/views/users/activation_confirmation.html.erb
 - app/views/users/activation_instructions.html.erb
@@ -849,6 +851,8 @@ files:
 - public/images/admin/source/User.png
 - public/images/admin/source/roles.png
 - public/images/admin/user.gif
+- public/images/icon_no.gif
+- public/images/icon_success.gif
 - public/images/profile_default.jpg
 - public/javascripts/muck-users.js
 - rails/init.rb