radiant-reader-extension 1.3.1 → 1.3.3

data/README.md

@@ -10,7 +10,10 @@ The purpose of this extension is to provide a common core that supports other vi
 
 ## Latest
 
-* everything updated for 0.9.x
+This version requires edge radiant, or radiant 0.9.2 when it becomes available. We are using a lot of the new configuration and sheets code.
+
+Right now we are **not compatible with multi_site or the sites extension**: that's mostly because neither is radiant edge: it will all be sorted out in time for the release of 0.9.2, which isn't far away.
+
 * public interface internationalized;
 * Uses the new configuration interface;
 * Messaging much simplified and now intended to be purely administrative.

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.3

data/app/controllers/reader_sessions_controller.rb

@@ -5,7 +5,18 @@ class ReaderSessionsController < ReaderActionController
   radiant_layout { |controller| Radiant::Config['reader.layout'] }
   
   def new
-    @reader_session = ReaderSession.new
+    if current_reader
+      if current_reader.activated?
+        cookies[:error] = t('already_logged_in')
+        redirect_to reader_url(current_reader)
+      else
+        cookies[:error] = t('account_requires_activation')
+        redirect_to reader_activation_url
+      end
+    else
+      @reader_session = ReaderSession.new
+      expires_now
+    end
   end
   
   def create

data/app/controllers/readers_controller.rb

@@ -43,6 +43,7 @@ class ReadersController < ReaderActionController
   end
   
   def edit
+    expires_now
   end
   
   def create

data/app/helpers/reader_helper.rb

@@ -4,13 +4,14 @@ module ReaderHelper
   def standard_gravatar_for(reader=nil, url=nil)
     size = Radiant::Config['forum.gravatar_size'] || 40
     url ||= reader_url(reader)
-    gravatar = gravatar_for(reader, {:size => size, :default => "#{request.protocol}#{request.host_with_port}/images/furniture/no_gravatar.png"}, {:class => 'gravatar offset', :width => size, :height => size})
+    gravatar = gravatar_for(reader, {:size => size}, {:class => 'gravatar offset', :width => size, :height => size})
     link_to gravatar, url
   end
 
   def gravatar_for(reader=nil, gravatar_options={}, img_options ={})
-    size = gravatar_options[:size]
-    img_options[:size] ||= "#{size}x#{size}" if size
+    size = gravatar_options[:size] || 40
+    img_options[:size] ||= "#{size}x#{size}"
+    gravatar_options[:default] ||= "#{request.protocol}#{request.host_with_port}/images/furniture/no_gravatar.png"
     img_options[:alt] ||= reader.name if reader
     if reader.nil? || reader.email.blank?
       image_tag gravatar_options[:default], img_options

data/app/models/reader_notifier.rb

@@ -5,7 +5,7 @@ class ReaderNotifier < ActionMailer::Base
   def message(reader, message, sender=nil)
     site = reader.site if reader.respond_to?(:site)
     prefix = site ? site.abbreviation : Radiant::Config['email.prefix']
-    host = site ? site.base_domain : Radiant::Config['site.domain'] || 'www.example.com'
+    host = site ? site.base_domain : Radiant::Config['site.host'] || 'www.example.com'
     default_url_options[:host] = host
     sender = Radiant::Config['email.name'] || "sender_not_configured"
     sender_address = Radiant::Config['email.address'] || "admin@#{host}"
@@ -27,8 +27,8 @@ class ReaderNotifier < ActionMailer::Base
       :reply_to => sender_address,
       :reader => reader,
       :site => site || {
-        :name => Radiant::Config['site.title'],
-        :url => Radiant::Config['site.domain']
+        :name => Radiant::Config['site.name'],
+        :url => Radiant::Config['site.host']
       }
     })
   end

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

@@ -43,11 +43,11 @@
       %label.paranthetical{:for => "reader_session_remember_me"}
         = t('remember_me')
 
-  %ul.quiet
+  %ul
     - if Radiant::Config['reader.allow_registration?']
       %li
         = link_to "registration".titlecase, new_reader_url
         = t('is_free_and_quick')
     %li
-      = link_to t("forgotten_password").titlecase, new_password_reset_url
+      = link_to t("forgotten_password"), new_password_reset_url
       

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

@@ -1,36 +1,14 @@
 = render :partial => 'readers/standard_parts'
 
 - content_for :login do
-  - if current_reader
+  - if @message
     %p
-      = t('reader_logged_in_as')
-      %strong
-        = current_reader.name
-      - unless current_reader.activated?
-        = t('but_not_active')
-    
-    - if current_reader.activated?
-      %p
-        =t('if_not_you')
-        = link_to t("log_out"), reader_logout_url
-    - else
-      %p
-        =t('if_cant_find')
-        = link_to(t("send_it_again"), new_reader_activation_url) + '.'
-      %p
-        =t('if_not_you')
-        =t('or')
-        =t('wrong_email')
-        =t('please')
-        = link_to "log out", reader_logout_url
-        =t('and_try_again')
-      
+      = @message
   - else
-    - if @message
-      %p
-        = @message
-      
-    = render :partial => 'login_form', :locals => {:no_title => true}
+    %p
+      = t('log_in_or_register')
+  
+  = render :partial => 'login_form', :locals => {:no_title => true}
 
 - content_for :breadcrumbs do
   = link_to t('home').titlecase, '/' 

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

@@ -3,23 +3,10 @@
 
 - content_for :section_navigation do
   = link_to t('navigation.readers'), readers_url, :class => 'section'
-  - if current_reader
-    = link_to t('navigation.profile'), reader_profile_url
-    = link_to t('navigation.preferences'), reader_account_url
-    - unless current_reader.activated?
-      = link_to t('navigation.activate'), new_reader_activation_url
-    = link_to t('navigation.logout'), reader_logout_url
-  - else
-    = link_to t('log_in'), reader_login_url
+  = link_to t('navigation.preferences'), reader_account_url
   - if Radiant::Config['reader.help_url']
     = link_to t('navigation.reader_help'), Radiant::Config['reader.help_url']
 
-- content_for :controls do
-  = render :partial => 'readers/controls'
-
-- content_for :signals do
-  = render :partial => 'readers/flasher'
-
 - content_for :reader_css do
   - reader_css_paths.each do |path|
     %link{:rel => 'stylesheet', :href => path, :type => 'text/css'}

data/config/locales/en.yml

@@ -42,7 +42,7 @@ en:
   enter_code: "Please enter confirmation code"
   enter_email_for_reminder: "enter your email address and we will send the message again"
   enter_own_password: "First, just to make sure you're you, please enter your current password:"
-  forgotten_password: "forgotten password?"
+  forgotten_password: "Forgotten your password?"
   form_notes:
     description: "you can fill this in later. Textile formatting is allowed."
     email: "we will send activation instructions to this address"
@@ -59,6 +59,7 @@ en:
   invite_description: '<a href="%{url}">Edit your preferences to put some text about yourself here.'
   if_cant_find: "If you can't find the message, we can"
   if_mistake_see_admin: "If this is a mistake, please talk to the site administrator about your account."
+  if_not_you: "If that's not you, please"
   is_free_and_quick: " is free and only takes a moment"
   joined_on: "Joined on"
   label:
@@ -71,6 +72,7 @@ en:
       repeat_password: "Confirm password"
       current_password: "Current password"
   log_in: 'log in'
+  log_in_or_register: "To use this part of the site you need to be logged in. It's easy to get an account: if you have received an invitation, please follow the instructions in that message. Otherwise, please <a href='/register'>register here</a>. It only takes a moment."
   log_out: "log out"
   login_name: "Login name"
   login_unknown: "Sorry: we don't recognise that combination of username and password."
@@ -81,8 +83,8 @@ en:
     readers: "People"
     preferences: "Preferences"
     profile: "Your profile"
-    login: "Log in"
-    logout: "Log out"
+    log_in: "Log in"
+    log_out: "Log out"
   new_account: "Register"
   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."

data/public/stylesheets/sass/reader.sass

@@ -17,6 +17,28 @@ $accent = #d1005d     / rubine red
   +functional
   font-size: 80%
 
+.error, .notice
+  position: absolute
+  width: 300px
+  top: 50px
+  right: 50px
+  +border-radius
+  +box-shadow
+  color: white
+  padding: 1px 1em
+  a.closer
+    display: block
+    position: absolute
+    top: 5px
+    right: 5px
+    color: white
+    font-weight: bold
+.notice
+  background-color: #b2e5b2
+  color: #060
+.error
+  background-color: #f3c2c2
+  color: #770000
 
 div#readers
   .reader
@@ -47,6 +69,9 @@ form.friendly
   margin: 0 0 60px 0
   p
     margin: 1em 0 0 0
+  input.login
+    width: 95%
+    font-size: 140%
   input.titular
     width: 95%
     font-size: 200%
@@ -56,8 +81,6 @@ form.friendly
     height: 400px
   input.standard
     width: 95%
-  input.login
-    width: 50%
   span.formnote
     color: $mid
   label

data/radiant-reader-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-reader-extension}
-  s.version = "1.3.1"
+  s.version = "1.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2011-01-31}
+  s.date = %q{2011-02-07}
   s.description = %q{Centralises reader/member/user registration and management tasks for the benefit of other extensions}
   s.email = %q{will@spanner.org}
   s.extra_rdoc_files = [
@@ -108,6 +108,7 @@ Gem::Specification.new do |s|
      "public/images/admin/chk_off.png",
      "public/images/admin/chk_on.png",
      "public/images/admin/delta.png",
+     "public/images/furniture/no_gravatar.png",
      "public/javascripts/reader.js",
      "public/stylesheets/sass/admin/reader.sass",
      "public/stylesheets/sass/reader.sass",

data/reader_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ReaderExtension < Radiant::Extension
-  version "1.3.1"
+  version "1.3.3"
   description "Provides reader/member/user registration and management functions"
   url "http://spanner.org/radiant/reader"
   
@@ -18,6 +18,8 @@ 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: 25
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 +00:00
+date: 2011-02-07 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -191,6 +191,7 @@ files:
 - public/images/admin/chk_off.png
 - public/images/admin/chk_on.png
 - public/images/admin/delta.png
+- public/images/furniture/no_gravatar.png
 - public/javascripts/reader.js
 - public/stylesheets/sass/admin/reader.sass
 - public/stylesheets/sass/reader.sass