radiant-reader-extension 3.0.25 → 3.0.26

data/app/models/reader.rb

@@ -153,6 +153,10 @@ class Reader < ActiveRecord::Base
   def preferred_name
     nickname? ? nickname : name
   end
+
+  def preferred_informal_name
+    nickname? ? nickname : forename
+  end
   
   def postal_address?
     !post_line1.blank? && !post_city.blank?

data/app/views/admin/groups/_group.html.haml

@@ -2,7 +2,7 @@
   - render_region :tbody do |tbody|
     - tbody.name_cell do
       %td.name{:style => "padding-left: #{9 + (24 * level)}px;"}
-        = link_to image('group', :alt => '') + ' ' + group.name, admin_group_url(group)
+        = link_to image('group', :alt => '', :class => 'gravatar') + ' ' + group.name, admin_group_url(group)
         %br
         %span.notes
           = group.description

data/lib/message_tags.rb

@@ -45,9 +45,9 @@ module MessageTags
     tag.expand
   end
 
-  [:name, :forename, :surname, :email, :description, :login].each do |field|
+  [:name, :forename, :nickname, :preferred_name, :preferred_informal_name, :surname, :email, :description, :login].each do |field|
     desc %{
-      Only for use in email messages. Displays the #{field} field of the reader currently being emailed.
+      Only for use in email messages. Displays the #{field} of the reader currently being emailed.
       <pre><code><r:recipient:#{field} /></code></pre>
     }
     tag "recipient:#{field}" do |tag|
@@ -97,6 +97,34 @@ module MessageTags
     reader_edit_profile_url(:host => @mailer_vars[:@host])
   end
 
+  desc %{
+    Expands if the addressed reader has activated his or her account. Only for use in email messages. 
+  }
+  tag "recipient:if_activated" do |tag|
+    tag.expand if tag.locals.recipient.activated?
+  end
+
+  desc %{
+    Expands if the addressed reader has not activated his or her account. Only for use in email messages. 
+  }
+  tag "recipient:unless_activated" do |tag|
+    tag.expand unless tag.locals.recipient.activated?
+  end
+
+  desc %{
+    Expands if a clear password is available for the addressed reader.
+  }
+  tag "recipient:if_clear_password" do |tag|
+    tag.expand unless tag.locals.recipient.clear_password.blank?
+  end
+
+  desc %{
+    Expands if no clear password is available for the addressed reader.
+  }
+  tag "recipient:unless_clear_password" do |tag|
+    tag.expand if tag.locals.recipient.clear_password.blank?
+  end
+
   desc %{
     Only for use in email messages. Displays the address that will activate the current reader account.
     <pre><code><r:recipient:activation_url /></code></pre>

data/lib/radiant-reader-extension.rb

@@ -1,5 +1,5 @@
 module RadiantReaderExtension
-  VERSION = '3.0.25'
+  VERSION = '3.0.26'
   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"

data/lib/reader_tags.rb

@@ -76,7 +76,7 @@ module ReaderTags
     tag.expand if get_reader(tag)
   end
 
-  [:name, :forename, :surname, :nickname, :preferred_name, :email, :description, :login].each do |field|
+  [:name, :forename, :surname, :nickname, :preferred_name, :preferred_informal_name, :email, :description, :login].each do |field|
     desc %{
       Displays the #{field} field of the current reader.
       <pre><code><r:reader:#{field} /></code></pre>
@@ -111,7 +111,7 @@ module ReaderTags
       %{<div class="remote_controls"></div>}
     else
       if tag.locals.reader = Reader.current
-        welcome = %{<span class="greeting">#{I18n.t('reader_extension.navigation.greeting', :name => tag.locals.reader.preferred_name)}</span>. }
+        welcome = %{<span class="greeting">#{I18n.t('reader_extension.navigation.greeting', :name => tag.locals.reader.preferred_informal_name)}</span>. }
         if tag.locals.reader.activated?
           welcome << %{
 #{I18n.t('reader_extension.not_you')} <a href="#{reader_logout_path}">#{I18n.t('reader_extension.navigation.log_out')}</a>.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 3
   - 0
-  - 25
-  version: 3.0.25
+  - 26
+  version: 3.0.26
 platform: ruby
 authors: 
 - William Ross
@@ -359,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.25'\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.26'\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: