radiant-reader-extension 1.3.3 → 1.3.4

data/VERSION

@@ -1 +1 @@
-1.3.3
+1.3.4

data/app/controllers/reader_activations_controller.rb

@@ -13,6 +13,7 @@ class ReaderActivationsController < ReaderActionController
   # .update activates the reader, if the token is correct
 
   def show
+    expires_now
     render
   end
   
@@ -22,6 +23,7 @@ class ReaderActivationsController < ReaderActionController
       @reader.send_activation_message
       flash[:notice] = t("activation_message_sent")
     end
+    expires_now
     render :action => 'show'
   end
   
@@ -34,6 +36,7 @@ class ReaderActivationsController < ReaderActionController
     else
       @error = t("please_check_message")
       flash[:error] = t("activation_failed")
+      expires_now
       render :action => 'show'
     end
   end

data/app/views/reader_activations/show.html.haml

@@ -19,7 +19,7 @@
         = @error
     %p
       = t('thanks_and_activation_instructions')
-      = link_to("resend_activation", new_reader_activation_url) + '.'
+      = link_to(t("resend_activation"), new_reader_activation_url) + '.'
       - unless current_reader
         = t('enter_email_for_reminder')
 

data/app/views/readers/_form.html.haml

@@ -1,12 +1,12 @@
 - reader ||= @reader
 - check_password ||= false
 
-- form_for :reader, reader, :html => { :method => "put", :class => 'friendly'} do |f| 
+- form_for reader, :html => {:class => 'friendly'} do |f| 
   - unless @reader.errors.empty?
-    %p.errornote
-      %strong 
-        = t('sorry').titlecase
-        = t('form_problem') + '.'
+    %p.has_error
+      = t('sorry').titlecase
+      = t('form_problem') + '.'
+      = t('affected_fields_highlighted')
   - else
     %p
       = t('bold_required')
@@ -20,16 +20,16 @@
   - if Radiant::Config['reader.use_honorifics?']
     %p
       = f.label :honorific, t(:honorific), :class => 'optional'
-      %span.formnote= t('form_notes.honorific')
       %br
       = f.text_field :honorific, :class => 'standard'
+      %span.formnote= t('form_notes.honorific')
 
   - if reader.new_record? && reader.email_field
     %p
       = f.label reader.email_field, t('label.reader.email'), :class => 'required'
-      %span.formnote= t('form_notes.email')
       %br
       = text_field_tag reader.email_field, params[reader.email_field] || reader.email, :id => "reader_#{reader.email_field}", :class => 'standard'
+      %span.formnote= t('form_notes.email')
     .innocuous
       %p
         =f.label :email, t("dont_fill"), :class => 'required'

data/app/views/readers/_standard_parts.html.haml

@@ -3,7 +3,7 @@
 
 - content_for :section_navigation do
   = link_to t('navigation.readers'), readers_url, :class => 'section'
-  = link_to t('navigation.preferences'), reader_account_url
+  = link_to t('navigation.your_account'), reader_account_url
   - if Radiant::Config['reader.help_url']
     = link_to t('navigation.reader_help'), Radiant::Config['reader.help_url']
 
@@ -16,5 +16,5 @@
     %script{:src => path, :type => 'text/javascript'}
 
 - content_for :person do
-  - if @reader
+  - if @reader && !@reader.new_record?
     = standard_gravatar_for(@reader)

data/app/views/readers/new.html.haml

@@ -1,16 +1,11 @@
 = render :partial => 'readers/standard_parts'
 
-- content_for :person do
-  = standard_gravatar_for(@reader)
-
 - content_for :introduction do
   %p
     = t('please_register')
-    = t('already_registered')
-    = link_to t('log_in') + '.', reader_login_url
 
 - content_for :form do
-  = render :partial => 'form', :locals => {:f => f}
+  = render :partial => 'form'
 
 - content_for :notes do
   %h3

data/config/locales/en.yml

@@ -8,6 +8,7 @@ en:
   activation_required_header: "Please check your email"
   activation_required_explanation: "You should have received a confirmation message containing a link that will activate your account."
   activation_sent: "Activation message sent"
+  affected_fields_highlighted: "The affected fields are highlighted below."
   already_active: "Your account is already active."
   already_logged_in: "You're already logged in!"
   already_registered: "If you've already registered, you should only need to"
@@ -85,7 +86,8 @@ en:
     profile: "Your profile"
     log_in: "Log in"
     log_out: "Log out"
-  new_account: "Register"
+    your_account: "Your account"
+  new_account: "Create an account"
   new_password: "New password"
   new_password_instructions: "Please enter and confirm the new password you would like to use. It must be at least four characters long, nothing obvious or typical and ideally a mixture of numbers and letters."
   'no': "no"
@@ -120,7 +122,7 @@ en:
   registration: "registration"
   registration_disallowed: "Sorry. This site does not allow visitors to register"
   remember_me: "remember me"
-  resend_activation: "resent activation messages"
+  resend_activation: "Resend activation message"
   reset_message_instructions: "Thank you. A message has been sent containing the instructions for setting a new password. Remember it hasn't changed yet and won't until you follow the instructions in the message. If you remember your old password, you can just carry on using it and ignore the reset message."
   reset_message_sent: "Password-reset instructions have been emailed to you"
   reset_not_found: "Password-reset code not found"

data/radiant-reader-extension.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-reader-extension}
-  s.version = "1.3.3"
+  s.version = "1.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]

data/reader_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ReaderExtension < Radiant::Extension
-  version "1.3.3"
+  version "1.3.4"
   description "Provides reader/member/user registration and management functions"
   url "http://spanner.org/radiant/reader"
   
@@ -18,8 +18,6 @@ class ReaderExtension < Radiant::Extension
     UserActionObserver.instance.send :add_observer!, Reader 
     UserActionObserver.instance.send :add_observer!, Message
     
-    
-    
     unless defined? admin.reader
       Radiant::AdminUI.send :include, ReaderAdminUI
       Radiant::AdminUI.load_reader_extension_regions

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 3
-  - 3
-  version: 1.3.3
+  - 4
+  version: 1.3.4
 platform: ruby
 authors: 
 - spanner