radiant-reader-extension 3.0.28 → 3.0.29

data/app/controllers/admin/group_invitations_controller.rb

@@ -58,7 +58,7 @@ private
       csv = line.collect {|value| value ? value.gsub(/^ */, '').chomp : ''}
       input = {}
       input[:honorific] = csv.shift if Radiant::Config['reader.show_honorifics?']
-      [:name, :email, :phone].each {|field| input[field] = csv.shift}
+      [:forename, :surname, :email, :phone].each {|field| input[field] = csv.shift}
       r = Reader.find_by_email(input[:email]) || Reader.new(input)
       r.create_password!    # only for validation purposes: not saved nor passed through
       r.valid?              # so that errors can be shown on the confirmation form

data/app/models/reader.rb

@@ -285,6 +285,10 @@ class Reader < ActiveRecord::Base
     readers.map(&:vcard).join("\n")
   end
   
+  def send_group_invitation_message(group=nil)
+    send_functional_message('group_invitation', group)
+  end
+  
 private
 
   def combine_names
@@ -336,8 +340,4 @@ private
     groups.each { |g| g.send_welcome_to(self) }
   end
 
-  def send_group_invitation_message(group=nil)
-    send_functional_message('group_invitation', group)
-  end
-
 end

data/app/views/admin/group_invitations/new.html.haml

@@ -13,7 +13,7 @@
           %span.formnote
             - if Radiant::Config['reader.show_honorifics?']
               title or rank, 
-            name, email, [phone]
+            forename, surname, email, [phone]
         = text_area_tag "readerlist", params[:readerlist], :class => "textarea", :style => "width: 100%; height: 240px;"
 
       %p.buttons
@@ -27,5 +27,5 @@
 - else
   %p
     = t('reader_extension.no_invitation_message')
-    = link_to image('plus') + ' ' + t("reader_extension.create_invitation_message"), new_admin_group_message_url(@group, :function => 'invitation'), :class => "action"
+    = link_to image('plus') + ' ' + t("reader_extension.create_invitation_message"), new_admin_group_message_url(@group, :function => 'group_invitation'), :class => "action"
   

data/app/views/admin/group_invitations/preview.html.haml

@@ -12,10 +12,11 @@
       %tr
         %th
         - if Radiant::Config['reader.show_honorifics?']
-          %th= t('reader_extension.honorific')
-        %th= t('reader_extension.full_name')
-        %th= t('reader_extension.email')
-        %th= t('reader_extension.optional_phone')
+          %th= t('activerecord.attributes.reader.honorific')
+        %th= t('activerecord.attributes.reader.forename')
+        %th= t('activerecord.attributes.reader.surname')
+        %th= t('activerecord.attributes.reader.email')
+        %th= t('activerecord.attributes.reader.phone')
     %tbody
       - i = 0
       - @readers.each do |reader| 
@@ -27,7 +28,9 @@
               %td 
                 = text_field_tag "reader_#{i}[honorific]", reader.honorific, :class => "preview#{ ' with_error' if reader.errors.on(:honorific)}", :title => reader.errors.on(:honorific)
             %td 
-              = text_field_tag "reader_#{i}[name]", reader.preferred_name, :class => "preview#{ ' with_error' if reader.errors.on(:name)}", :title => reader.errors.on(:name)
+              = text_field_tag "reader_#{i}[forename]", reader.forename, :class => "preview#{ ' with_error' if reader.errors.on(:forename)}", :title => reader.errors.on(:forename)
+            %td 
+              = text_field_tag "reader_#{i}[surname]", reader.surname, :class => "preview#{ ' with_error' if reader.errors.on(:surname)}", :title => reader.errors.on(:surname)
             %td 
               = text_field_tag "reader_#{i}[email]", reader.email, :class => "preview#{ ' with_error' if reader.errors.on(:email)}", :title => reader.errors.on(:email)
             %td 
@@ -40,7 +43,9 @@
               %td
                 = text_field_tag "reader_#{i}[honorific]", reader.honorific, :class => "preview#{ ' with_error' if reader.errors.on(:honorific)}", :title => reader.errors.on(:honorific), :disabled => true
             %td 
-              = text_field_tag "reader_#{i}[name]", reader.preferred_name, :class => "preview#{ ' with_error' if reader.errors.on(:name)}", :title => reader.errors.on(:name), :disabled => true
+              = text_field_tag "reader_#{i}[forename]", reader.preferred_name, :class => "preview#{ ' with_error' if reader.errors.on(:forename)}", :title => reader.errors.on(:forename), :disabled => true
+            %td 
+              = text_field_tag "reader_#{i}[surname]", reader.preferred_name, :class => "preview#{ ' with_error' if reader.errors.on(:surname)}", :title => reader.errors.on(:surname), :disabled => true
             %td 
               = text_field_tag "reader_#{i}[email]", reader.email, :class => "preview#{ ' with_error' if reader.errors.on(:email)}", :title => reader.errors.on(:email), :disabled => true
             %td 

data/config/locales/en.yml

@@ -30,7 +30,7 @@ en:
         postal_address: "Postal address"
         postcode: "Postcode"
         surname: "Surname"
-        unshareable: "Share none of this information"
+        unshareable: "Share none of this information with other users (note that you can omit any fields above)"
       message:
         body: "Message body"
         filter_id: "Filter"
@@ -251,6 +251,7 @@ en:
     is_free_and_quick: " is free and only takes a moment"
     joined_on: "Joined on"
     last_sent: "last sent"
+    listing_denied: "Details hidden"
     log_in: 'log in'
     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"

data/lib/message_tags.rb

@@ -45,7 +45,7 @@ module MessageTags
     tag.expand
   end
 
-  [:name, :forename, :nickname, :preferred_name, :preferred_informal_name, :surname, :email, :description, :login].each do |field|
+  [:name, :forename, :nickname, :preferred_name, :preferred_informal_name, :surname, :email, :description].each do |field|
     desc %{
       Only for use in email messages. Displays the #{field} of the reader currently being emailed.
       <pre><code><r:recipient:#{field} /></code></pre>

data/lib/radiant-reader-extension.rb

@@ -1,5 +1,5 @@
 module RadiantReaderExtension
-  VERSION = '3.0.28'
+  VERSION = '3.0.29'
   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: 63
+  hash: 61
   prerelease: 
   segments: 
   - 3
   - 0
-  - 28
-  version: 3.0.28
+  - 29
+  version: 3.0.29
 platform: ruby
 authors: 
 - William Ross
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 Z
+date: 2011-10-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: radiant-layouts-extension
@@ -331,7 +331,6 @@ files:
 - public/stylesheets/sass/admin/reader.sass
 - public/stylesheets/sass/admin/reader_group.sass
 - public/stylesheets/sass/reader.sass
-- radiant-reader-extension-3.0.27.gem
 - radiant-reader-extension.gemspec
 - Rakefile
 - reader_extension.rb
@@ -360,7 +359,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.28'\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.29'\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: