radiant-reader-extension 3.0.23 → 3.0.24

data/app/models/reader.rb

@@ -14,7 +14,6 @@ class Reader < ActiveRecord::Base
     config.validations_scope = :site_id if defined? Site
     config.transition_from_restful_authentication = true
     config.validate_email_field = false
-    config.validate_login_field = false
     config.validate_password_field = false
   end
 

data/app/views/reader_sessions/_login_form.html.haml

@@ -26,11 +26,11 @@
         %br
         = link_to t('reader_extension.forgotten_password'), new_password_reset_url
 
-    %p{ :class => @reader_session.errors.on(:login) ? 'haserror' : '' }
-      %label{:for => "reader_session_login"}
-        = t('reader_extension.login_or_email')
+    %p{ :class => @reader_session.errors.on(:email) ? 'haserror' : '' }
+      %label{:for => "reader_session_email"}
+        = t('reader_extension.nickname_or_email')
       %br
-      = f.text_field :login, :class => 'login' 
+      = f.text_field :email, :class => 'login' 
         
     %p{ :class => @reader_session.errors.on(:password) ? 'haserror' : '' }
       %label{:for => "reader_session_password"}

data/config/locales/en.yml

@@ -55,6 +55,11 @@ en:
             password:
               too_short: "this must have at least six characters"
               invalid: "this must include at least one non-letter"
+  authlogic:
+    error_messages:
+      login_blank: "Please enter your email address or nickname"
+      login_not_found: "This is not recognised"
+      no_authentication_details: Please enter your email address and password
   config:
     reader:
       allow_registration?: "Allow registration"
@@ -250,7 +255,6 @@ en:
     log_in_or_register: "Please log in here. If you haven't already, you will need to <a href='/register'>register</a> first."
     log_out: "log out"
     login_name: "Login name"
-    login_or_email: "Login name or email address"
     login_unknown: "Sorry: we don't recognise that combination of username and password."
     logout_message: "You are logged out. Bye!"
     member: "member"
@@ -297,6 +301,7 @@ en:
     new_group: "new group"
     new_password: "New password"
     new_password_instructions: "Please enter and confirm the new password you would like to use. It should be at least six characters long, nothing obvious or typical and with at least one non-letter character."
+    nickname_or_email: "Nickname or email address"
     'no': "no"
     no_description: "No description available"
     no_directory: "This site does not make user information public."

data/lib/radiant-reader-extension.rb

@@ -1,5 +1,5 @@
 module RadiantReaderExtension
-  VERSION = '3.0.23'
+  VERSION = '3.0.24'
   SUMMARY = %q{Reader/viewer/visitor registration, login and access-control for Radiant CMS}
   DESCRIPTION = %q{Provides reader/member/user registration and management functions including password-reminder, group-based page access control and administrative email.}
   URL = "http://radiant.spanner.org/reader"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 55
   prerelease: 
   segments: 
   - 3
   - 0
-  - 23
-  version: 3.0.23
+  - 24
+  version: 3.0.24
 platform: ruby
 authors: 
 - William Ross
@@ -331,6 +331,7 @@ files:
 - public/stylesheets/sass/admin/reader.sass
 - public/stylesheets/sass/admin/reader_group.sass
 - public/stylesheets/sass/reader.sass
+- radiant-reader-extension-3.0.23.gem
 - radiant-reader-extension-3.1.0.gem
 - radiant-reader-extension.gemspec
 - Rakefile
@@ -360,7 +361,7 @@ files:
 homepage: http://radiant.spanner.org/reader
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with a line in your Gemfile:\n\n    gem 'radiant-reader-extension', '~> 3.0.23'\n\n  and if you haven't already, remember to enable ActionMailer in your\n  project's config/environment.rb.\n  "
+post_install_message: "\n  Add this to your radiant project with a line in your Gemfile:\n\n    gem 'radiant-reader-extension', '~> 3.0.24'\n\n  and if you haven't already, remember to enable ActionMailer in your\n  project's config/environment.rb.\n  "
 rdoc_options: []
 
 require_paths: