radiant-reader-extension 3.0.18 → 3.0.19

data/lib/controller_extensions.rb

@@ -1,7 +1,6 @@
 module ControllerExtensions    # for inclusion into ApplicationController
 
   def self.included(base)
-    
     base.class_eval do
       rescue_from ReaderError::AccessDenied, :with => :access_denied
       rescue_from ReaderError::LoginRequired, :with => :login_required

data/lib/radiant-reader-extension.rb

@@ -1,5 +1,5 @@
 module RadiantReaderExtension
-  VERSION = '3.0.18'
+  VERSION = '3.0.19'
   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

@@ -114,14 +114,16 @@ module ReaderTags
         welcome = %{<span class="greeting">#{I18n.t('reader_extension.navigation.greeting', :name => tag.locals.reader.name)}</span> }
         links = []
         if tag.locals.reader.activated?
-          links << %{<a href="#{edit_reader_path(tag.locals.reader)}">#{I18n.t('reader_extension.navigation.preferences')}</a>}
-          links << %{<a href="#{reader_path(tag.locals.reader)}">#{I18n.t('reader_extension.navigation.account')}</a>}
+          links << %{<a href="#{reader_dashboard_url}">#{I18n.t('reader_extension.navigation.dashboard')}</a>}
+          links << %{<a href="#{reader_index_url}">#{I18n.t('reader_extension.navigation.directory')}</a>}
+          links << %{<a href="#{reader_account}">#{I18n.t('reader_extension.navigation.account')}</a>}
+          links << %{<a href="#{reader_edit_profile_url}">#{I18n.t('reader_extension.navigation.profile')}</a>}
           links << %{<a href="/admin">#{I18n.t('reader_extension.navigation.admin')}</a>} if tag.locals.reader.is_user?
           links << %{<a href="#{reader_logout_path}">#{I18n.t('reader_extension.navigation.log_out')}</a>}
         else
           welcome << I18n.t('reader_extension.navigation.activate')
         end
-        %{<div class="controls"><p>} + welcome + links.join(%{<span class="separator"> | </span>}) + %{</p></div>}
+        %{<div class="controls"><p>} + welcome + '<br />' + links.join(%{<span class="separator"> | </span>}) + %{</p></div>}
       elsif Radiant::Config['reader.allow_registration?']
         %{<div class="controls"><p>#{I18n.t('reader_extension.navigation.welcome_please_log_in', :login_url => reader_login_url, :register_url => new_reader_url)}</p></div>}
       end

data/lib/site_controller_extensions.rb

@@ -2,6 +2,10 @@ module SiteControllerExtensions
   
   def self.included(base)
     base.class_eval {
+      rescue_from ReaderError::AccessDenied, :with => :access_denied
+      rescue_from ReaderError::LoginRequired, :with => :login_required
+      rescue_from ReaderError::ActivationRequired, :with => :activation_required
+      
       # NB. to control access without disabling the cache we have overridden Page.cache? 
       # to return false for any page that has a group association.
       

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: 
   segments: 
   - 3
   - 0
-  - 18
-  version: 3.0.18
+  - 19
+  version: 3.0.19
 platform: ruby
 authors: 
 - William Ross
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-12 00:00:00 Z
+date: 2011-10-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: radiant-layouts-extension
@@ -356,7 +356,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.18'\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.19'\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: