radiant-reader-extension 1.2.4 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.4
+1.3.0

data/app/controllers/password_resets_controller.rb

@@ -1,9 +1,10 @@
-class PasswordResetsController < ApplicationController
+class PasswordResetsController < ReaderActionController
   helper :reader
 
   # rest gone mad! but it works, and keeps the processes well-defined.
 
-  no_login_required 
+  no_login_required
+  skip_before_filter :require_reader
   before_filter :get_reader, :only => [:edit, :update]
   radiant_layout { |controller| Radiant::Config['reader.layout'] }
   
@@ -16,22 +17,20 @@ class PasswordResetsController < ApplicationController
     if @reader
       if @reader.activated?
         @reader.send_password_reset_message
-        flash[:notice] = "reset_message_sent"
         render
       else
         @reader.send_activation_message
-        flash[:notice] = "activation_message_sent"
         redirect_to new_reader_activation_url
       end
     else  
-      @error = flash[:error] = "email_unknown"
+      @error = flash[:error] = t("email_unknown")
       render :action => :new  
     end  
   end
 
   def edit  
     unless @reader
-      flash[:error] = 'reset_not_found'
+      flash[:error] = t('reset_not_found')
     end
     render
   end  
@@ -42,14 +41,14 @@ class PasswordResetsController < ApplicationController
       @reader.password_confirmation = params[:reader][:password_confirmation]
       if @reader.save 
         self.current_reader = @reader
-        flash[:notice] = 'password_updated_notice'
+        flash[:notice] = t('password_updated_notice')
         redirect_to url_for(@reader)
       else
-        flash[:error] = 'password_mismatch'
+        flash[:error] = t('password_mismatch')
         render :action => :edit 
       end  
     else
-      flash[:error] = 'reset_not_found'
+      flash[:error] = t('reset_not_found')
       render :action => :edit     # without @reader, this will take us back to the enter-your-code form
     end
   end  

data/app/controllers/reader_action_controller.rb

@@ -1,6 +1,11 @@
 class ReaderActionController < ApplicationController
+  include Radiant::Pagination::Controller
+
   helper :reader
   helper_method :current_site, :current_site=, :logged_in?, :logged_in_user?, :logged_in_admin?
+
+  attr_accessor :css, :js
+  helper_method :reader_css_paths, :reader_js_paths, :add_reader_js, :add_reader_css
   
   no_login_required
   before_filter :set_site_title
@@ -10,6 +15,31 @@ class ReaderActionController < ApplicationController
   
   radiant_layout { |controller| Radiant::Config['reader.layout'] }
 
+  # allow reader-based extensions to contribute to the public interface
+  # these methods can be called from any view
+
+  def add_reader_css(path)
+    @css ||= []
+    @css << path
+  end
+
+  def add_reader_js(path)
+    @js ||= []
+    @js << path
+  end
+
+  # these methods are called from :reader_css and :reader_js page parts defined in view/readers/_standard_parts
+
+  def reader_css_paths
+    @css ||= []
+    @css.uniq
+  end
+  
+  def reader_js_paths
+    @js ||= []
+    @js.uniq
+  end
+  
   # authorisation helpers
 
   def logged_in?

data/app/controllers/reader_activations_controller.rb

@@ -20,7 +20,7 @@ class ReaderActivationsController < ReaderActionController
     if current_reader
       @reader = current_reader
       @reader.send_activation_message
-      flash[:notice] = "activation_message_sent"
+      flash[:notice] = t("activation_message_sent")
     end
     render :action => 'show'
   end
@@ -29,11 +29,11 @@ class ReaderActivationsController < ReaderActionController
     if @reader
       @reader.activate!
       self.current_reader = @reader
-      flash[:notice] = "thanks_activated"
+      flash[:notice] = t("thanks_activated")
       redirect_back_or_to default_activated_url
     else
-      @error = "please_check_message"
-      flash[:error] = "activation_failed."
+      @error = t("please_check_message")
+      flash[:error] = t("activation_failed")
       render :action => 'show'
     end
   end

data/app/controllers/reader_sessions_controller.rb

@@ -45,7 +45,7 @@ class ReaderSessionsController < ReaderActionController
       current_user = nil
     end
     flash[:notice] = t('logout_message')
-    redirect_back_or_to reader_login_url
+    redirect_to reader_login_url
   end
   
 protected

data/app/controllers/readers_controller.rb

@@ -1,19 +1,18 @@
 class ReadersController < ReaderActionController
   helper :reader
   
-  @@extended_form_partials = []
-  cattr_accessor :extended_form_partials
+  cattr_accessor :edit_partials, :show_partials, :index_partials
   
   before_filter :check_registration_allowed, :only => [:new, :create]
-  before_filter :initialize_form_partials, :only => [:new, :edit, :update, :create]
-  before_filter :i_am_me, :only => [:show]
+  before_filter :initialize_partials
+  before_filter :i_am_me, :only => [:show, :edit]
   before_filter :require_reader, :except => [:index, :new, :create, :activate]
   before_filter :restrict_to_self, :only => [:edit, :update, :resend_activation]
   before_filter :no_removing, :only => [:remove, :destroy]
   before_filter :require_password, :only => [:update]
 
   def index
-    @readers = Reader.paginate(:page => params[:page], :order => 'readers.created_at desc')
+    @readers = Reader.all.paginate(pagination_parameters.merge(:per_page => 60))
   end
 
   def show
@@ -40,7 +39,7 @@ class ReadersController < ReaderActionController
     end
     @reader = Reader.new
     session[:return_to] = request.referer
-    session[:email_field] = @email_field = @reader.generate_email_field_name
+    session[:email_field] = @reader.generate_email_field_name
   end
   
   def edit
@@ -87,7 +86,7 @@ class ReadersController < ReaderActionController
 protected
 
   def i_am_me
-    params[:id] = current_reader.id if params[:id] == 'me' && current_reader
+    params[:id] = current_reader.id if current_reader && params[:id] == 'me'
   end
 
   def restrict_to_self
@@ -120,13 +119,26 @@ protected
     end
   end
   
-  def self.add_form_partial(path)
-    extended_form_partials.push(path)
+  def self.add_edit_partial(path)
+    @@edit_partials ||= []
+    edit_partials.push(path)
+  end
+
+  def self.add_show_partial(path)
+    @@show_partials ||= []
+    show_partials.push(path)
+  end
+
+  def self.add_index_partial(path)
+    @@index_partials ||= []
+    index_partials.push(path)
   end
 
 private
-  def initialize_form_partials
-    @form_partials = extended_form_partials
+  def initialize_partials
+    @show_partials = show_partials
+    @edit_partials = edit_partials
+    @index_partials = index_partials
   end
 
 end

data/app/helpers/reader_helper.rb

@@ -1,10 +1,27 @@
 require 'sanitize'
 
 module ReaderHelper
-  def gravatar_for(reader, gravatar_options={}, img_options ={})
+  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})
+    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
-    image_tag gravatar_url(reader.email, gravatar_options), img_options
+    img_options[:size] ||= "#{size}x#{size}" if size
+    img_options[:alt] ||= reader.name if reader
+    if reader.nil? || reader.email.blank?
+      image_tag gravatar_options[:default], img_options
+    else
+      image_tag gravatar_url(reader.email, gravatar_options), img_options
+    end
+  end
+
+  def home_page_link(options={})
+    home_page = Page.find_by_parent_id(nil)
+    link_to home_page.title, home_page.url, options
   end
 
   def clean_textilize(text)
@@ -28,4 +45,32 @@ module ReaderHelper
   def truncate_and_textilize(text, length=64)
     clean_textilize( truncate_words(text, length) )
   end
+
+  def pagination_and_summary_for(list, name='')
+    %{<div class="pagination">
+        #{will_paginate list, :container => false}
+        <span class="pagination_summary">
+          #{pagination_summary(list, name)}
+        </span>
+      </div>
+    }
+  end
+    
+  def pagination_summary(list, name='')
+    total = list.total_entries
+    if list.empty?
+      %{#{t('no')} #{name.pluralize}}
+    else      
+      name ||= t(list.first.class.to_s.underscore.gsub('_', ' '))
+      if total == 1
+        %{#{t('showing')} #{t('one')} #{name}}
+      elsif list.current_page == 1 && total < list.per_page
+        %{#{t('all')} #{total} #{name.pluralize}}
+      else
+        start = list.offset + 1
+        finish = ((list.offset + list.per_page) < list.total_entries) ? list.offset + list.per_page : list.total_entries
+        %{#{start} #{t('to')} #{finish} #{t('of')} #{total} #{name.pluralize}}
+      end
+    end
+  end
 end

data/app/models/reader.rb

@@ -24,7 +24,8 @@ class Reader < ActiveRecord::Base
   has_many :messages, :through => :message_readers
 
   attr_accessor :current_password   # used for authentication on update
-
+  attr_accessor :email_field        # used in blocking spam registrations
+  
   before_save :set_login
   before_update :update_user
 
@@ -39,6 +40,7 @@ class Reader < ActiveRecord::Base
   named_scope :any
   named_scope :active, :conditions => "activated_at IS NOT NULL"
   named_scope :inactive, :conditions => "activated_at IS NULL"
+  named_scope :imported, :conditions => "old_id IS NOT NULL"
   named_scope :except, lambda { |readers|
     readers = [readers].flatten
     { :conditions => ["NOT readers.id IN (#{readers.map{"?"}.join(',')})", readers.map(&:id)] }
@@ -79,21 +81,21 @@ class Reader < ActiveRecord::Base
     message.deliver_to(self)
   end
 
-  def generate_email_field_name
-    generate_password(32)
-  end
-
   def generate_password(length=12)
     chars = ("a".."z").to_a + ("A".."Z").to_a + ("1".."9").to_a
     Array.new(length, '').collect{chars[rand(chars.size)]}.join
   end
 
+  def generate_email_field_name
+    self.email_field = generate_password(32)
+  end
+
   def is_user?
-    self.user ? true : false
+    !!self.user
   end
 
   def is_admin?
-    self.user && self.user.admin? ? true : false
+    is_user? && self.user.admin?
   end
 
   def self.find_or_create_for_user(user)

data/app/models/reader_notifier.rb

@@ -1,6 +1,5 @@
 class ReaderNotifier < ActionMailer::Base
 
-  # this sets a default that will be overridden by the layout association of each message as it is sent out
   radiant_layout lambda { Radiant::Config['email.layout'] || 'email'}
   
   def message(reader, message, sender=nil)

data/app/views/password_resets/edit.html.haml

@@ -1,12 +1,7 @@
-.mainform
-  - if @reader
-
-    %p
-      %strong
-        = t('hello')
-        = @reader.name + '.'
-      = t('new_password_instructions')
+- render :partial => 'readers/standard_parts'
 
+- content_for :form do
+  - if @reader
     - form_for @reader, :url => password_reset_path, :method => :put, :html => {:class => 'friendly', :autocomplete => "off"} do |f|
 
       - if @reader.errors.any?
@@ -20,28 +15,20 @@
 
       %p
         = f.label :password, t('new_password'), :class => 'required'
-        %span.formnote= t('password_notes')
         %br
         = f.password_field :password, :class => 'titular'
 
       %p
-        = f.label :password_confirmation, t('repeat_password'), :class => 'required'
+        = f.label :password_confirmation, t('confirm_password'), :class => 'required'
         %br
         = f.password_field :password_confirmation, :class => 'titular'
       %p
-        = f.submit "Update my password and log me in"
+        = f.submit t('set_new_password')
         
       %p
-        = t('password_not_yet_changed')
-
-      - content_for :title do
-        = t('change_password')
+        = t('password_not_yet_changed', :url => reader_login_url)
 
   - else 
-
-    %p.errornote
-      = t('sorry_reset_not_found')
-      
     - form_tag edit_password_reset_path, :method => 'GET', :class => 'friendly', :autocomplete => "off" do
       = hidden_field_tag :id, params[:id]
       %p
@@ -57,11 +44,27 @@
       %li
         = link_to t("restart_password_change"), new_password_reset_url
       
-    - content_for :title do
-      = t('enter_code')
-      
+- content_for :title do
+  - if @reader
+    = t('change_password')
+  - else
+    = t('enter_code')
+
+- content_for :introduction do
+  - if @reader
+    %p
+      %strong
+        = t('hello').titlecase
+        = @reader.name + '!'
+      = t('new_password_instructions')
+  - else
+    %p.errornote
+      = t('sorry_reset_not_found')
+    
+
 - content_for :breadcrumbs do
   = link_to t('home').titlecase, '/'
   > 
   = t('reset_password')
 
+= yield :form

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

@@ -1,36 +1,36 @@
-- content_for :signals do
-  = render :partial => 'readers/flasher'
+= render :partial => 'readers/standard_parts'
 
-- if current_reader
-  %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
+- content_for :login do
+  - if current_reader
     %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')
+      = 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')
       
-- else
-  - if flash[:explanation]
-    %p
-      = flash[:explanation]
+  - else
+    - if @message
+      %p
+        = @message
       
-  = render :partial => 'login_form', :locals => {:no_title => true}
+    = render :partial => 'login_form', :locals => {:no_title => true}
 
 - content_for :breadcrumbs do
   = link_to t('home').titlecase, '/' 
@@ -39,3 +39,7 @@
 
 - content_for :title do
   = t('please_log_in').titlecase
+
+
+
+= yield :login

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

@@ -1,66 +1,96 @@
-%p
-  = f.label :name, t('your_name'), :class => 'required'
-  %span.formnote= t('name_notes')
-  %br
-  = f.text_field :name, :class => 'standard'
+- reader ||= @reader
+- check_password ||= false
+
+- form_for :reader, reader, :html => { :method => "put", :class => 'friendly'} do |f| 
+  - unless @reader.errors.empty?
+    %p.errornote
+      %strong 
+        = t('sorry').titlecase
+        = t('form_problem') + '.'
+  - else
+    %p
+      = t('bold_required')
 
-- if Radiant::Config['reader.use_honorifics?']
   %p
-    = f.label :honorific, t(:honorific), :class => 'optional'
-    %span.formnote= t('honorific_notes')
+    = f.label :name, t('your_name'), :class => 'required'
+    %span.formnote= t('name_notes')
     %br
-    = f.text_field :honorific, :class => 'standard'
+    = f.text_field :name, :class => 'standard'
 
-- if @reader.new_record? && @email_field
+  - if Radiant::Config['reader.use_honorifics?']
+    %p
+      = f.label :honorific, t(:honorific), :class => 'optional'
+      %span.formnote= t('honorific_notes')
+      %br
+      = f.text_field :honorific, :class => 'standard'
 
-  %p
-    = f.label @email_field, t('your_email'), :class => 'required'
-    %span.formnote= t('email_notes')
-    %br
-    = text_field_tag @email_field, params[@email_field] || @reader.email, :id => "reader_#{@email_field}", :class => 'standard'
+  - if reader.new_record? && reader.email_field
+    %p
+      = f.label reader.email_field, t('label.reader.email'), :class => 'required'
+      %span.formnote= t('email_notes')
+      %br
+      = text_field_tag reader.email_field, params[reader.email_field] || reader.email, :id => "reader_#{reader.email_field}", :class => 'standard'
+    .innocuous
+      %p
+        =f.label :email, t("dont_fill"), :class => 'required'
+        %br
+        = f.text_field :email, :class => 'standard'
+        %span.formnote= t('spam_trap')
 
-  .innocuous
+  - else
     %p
-      =f.label :email, t("dont_fill"), :class => 'required'
-      %span.formnote= t('spam_trap')
+      = f.label :email, t('your_email'), :class => 'required'
       %br
       = f.text_field :email, :class => 'standard'
+      %span.formnote= t('email_notes')
 
-- else
   %p
-    = f.label :email, t('your_email'), :class => 'required'
-    %span.formnote= t('email_notes')
+    = f.label :login, t('login_name'), :class => 'optional'
     %br
-    = f.text_field :email, :class => 'standard'
+    = f.text_field :login, :class => 'standard'
+    %span.formnote= t('login_notes')
 
-- if Radiant::Config['reader.use_description?']
-  %p
-    = f.label :description, t('your_description'), :class => 'optional'
-    %span.formnote= t('description_notes')
-    %br
-    = f.text_area :description, :class => 'standard', :rows => 8
+  - if reader.new_record?
+    %p
+      = f.label :password, t('password'), :class => 'required'
+      %br
+      = f.password_field :password, :class => 'standard', :autocomplete => 'off'
+      %span.formnote= t('password_notes')
 
-%p
-  = f.label :login, t('login_name'), :class => 'optional'
-  %span.formnote= t('login_notes')
-  %br
-  = f.text_field :login, :class => 'standard'
+    %p
+      = f.label :password_confirmation, t('confirm_password'), :class => 'required'
+      %br
+      = f.password_field :password_confirmation, :class => 'standard', :autocomplete => 'off'
 
-%p
-  - label = @reader.new_record? ? t('password') : t('change_password')
-  - cssclass = @reader.new_record? ? 'required' : 'optional'
-  = f.label :password, label, :class => cssclass
-  %span.formnote= @reader.new_record? ? t('password_notes') : t('existing_password_notes')
-  %br
-  = f.password_field :password, :class => 'standard', :autocomplete => 'off'
+  - else 
+    .display_password
+      %p
+        = f.label :password, t('password').titlecase, :class => 'optional'
+        %span.password
+          •••••
+          = link_to t('change_password'), '#', :class => 'toggle', :rel => ".display_password, .new_password"
+    .new_password.hidden
+      %p
+        = f.label :password, t('new_password'), :class => 'required'
+        %br
+        = f.password_field :password, :class => 'standard', :autocomplete => 'off'
+        %span.formnote= t('new_password_notes')
+      %p
+        = f.label :password_confirmation, t('confirm_new_password'), :class => 'required'
+        %br
+        = f.password_field :password_confirmation, :class => 'standard', :autocomplete => 'off'
+    
+  - if Radiant::Config['reader.use_description?']
+    %p
+      = f.label :description, t('your_description'), :class => 'optional'
+      %br
+      = f.text_area :description, :class => 'standard', :rows => 8
+      %span.formnote= t('description_notes')
 
-%p
-  - label = @reader.new_record? ? t('confirm_password') : t('confirm_new_password')
-  - cssclass = @reader.new_record? ? 'required' : 'optional'
-  = f.label :password_confirmation, label, :class => cssclass
-  %span.formnote= t('existing_password_notes')
-  %br
-  = f.password_field :password_confirmation, :class => 'standard', :autocomplete => 'off'
+  - @edit_partials.each do |partial|
+    = render :partial => partial, :locals => {:reader => @reader}
 
-- @form_partials.each do |partial|
-  = render :partial => partial
+  %p
+    = submit_tag reader.new_record? ? t('create_account') : t("update_account")
+    or 
+    = link_to 'cancel', request.referer

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

@@ -0,0 +1,33 @@
+- add_reader_js '/javascripts/reader.js'
+- add_reader_css '/stylesheets/reader.css'
+
+- 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
+  - 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'}
+
+- content_for :reader_js do
+  - reader_js_paths.each do |path|
+    %script{:src => path, :type => 'text/javascript'}
+
+- content_for :person do
+  - if @reader
+    = standard_gravatar_for(@reader)

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

@@ -1,37 +1,15 @@
-= render :partial => 'flasher'
+= render :partial => 'readers/standard_parts'
 
-%div.preferences_form
+- content_for :introduction do
   %p
-    = t("hello")
+    = t("hello").titlecase
     = link_to(@reader.name, reader_url(@reader)) + '.'
     = t('preferences_intro')
-    = t('enter_own_password')
-
-  - unless @reader.errors.empty?
-    %p.errornote
-      %strong 
-        = t('sorry').titlecase
-        = t('form_problem') + '.'
-      
-  - form_for :reader, :url => reader_url(@reader), :html => { :method => "put", :class => 'friendly'} do |f| 
-    
-    %p
-      = f.label :current_password, "Current password", :class => 'required'
-      %span.formnote
-        = link_to t('forgotten_password'), new_password_reset_url
-      = f.password_field :current_password, :class => 'standard', :autocomplete => 'off'
-      
-    %p
-      = t('bold_required')
-      
-    = render :partial => 'form', :locals => {:f => f}
-    %p
-      = submit_tag "Update your account"
-      or 
-      = link_to 'cancel', request.referer
 
+- content_for :form do
+  = render :partial => 'form', :locals => {:reader => @reader}
   %p
-    = link_to gravatar_for(@reader, {:size => 60}, {:class => 'gravatar'}), 'http://gravatar.com/site/login'
+    = standard_gravatar_for(@reader, 'http://gravatar.com/site/login')
     = link_to t('change_gravatar'), "http://gravatar.com/site/login/"
     
 - content_for :breadcrumbs do 
@@ -42,4 +20,8 @@
   = t('account_settings')
 
 - content_for :title do 
-  = t('account')
+  = t('account_settings')
+    
+
+
+= yield :form

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

@@ -1,9 +1,29 @@
-= render :partial => 'flasher'
+= render :partial => 'readers/standard_parts'
 
-%div
+- content_for :introduction do
+  =t('readers_introduction')
+  
+- content_for :list do
   #readers
-    - @readers.each do |reader|
-      = link_to gravatar_for(reader, {:size => 100}, {:class => 'big gravatar'}), reader_url(reader), {:title => reader.name}
+    - if @readers.size > 1
+      - columns = [@readers[0..@readers.size/2], @readers[@readers.size/2+1..@readers.size]]
+    - else
+      - columns = [@readers]
+    - columns.each do |readers|
+      %div.column
+        - readers.each do |reader|
+          .reader
+            %h2
+              = link_to standard_gravatar_for(reader), reader_url(reader), {:title => reader.name}
+              = link_to reader.name, reader_url(reader)
+            %p.context
+              = t("joined_on")
+              = l(reader.created_at, :format => :date) + '.'
+              - @index_partials.each do |partial|
+                = render :partial => partial, :locals => {:reader => reader}
+
+- content_for :pagination do
+  = pagination_and_summary_for(@readers, t('person'))
 
 - content_for :breadcrumbs do
   = link_to t('home').titlecase, '/'
@@ -12,3 +32,8 @@
 
 - content_for :title do
   = t('people').titlecase
+
+
+= yield :pagination if @readers.previous_page
+= yield :list
+= yield :pagination if @readers.next_page

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

@@ -1,4 +1,4 @@
-= render :partial => 'readers/flasher'
+= render :partial => 'readers/standard_parts'
 
 %div.login_form
   %h1 

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

@@ -1,27 +1,20 @@
-= render :partial => 'flasher'
+= render :partial => 'readers/standard_parts'
 
-%div.register_form
+- 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
 
-  - unless @reader.errors.empty?
-    %p.errornote
-      %strong 
-        = t('sorry').titlecase
-        = t('form_problem') + '.'
-      
-  - form_for :reader, :url => readers_url, :html => {:class => 'friendly'} do |f|
-    = render :partial => 'form', :locals => {:f => f}
-    %p
-      = submit_tag t("register")
-      or 
-      = link_to t('cancel'), request.referer
+- content_for :form do
+  = render :partial => 'form', :locals => {:f => f}
 
+- content_for :notes do
   %h3
     = t('notes').titlecase
-
   %ul.friendly
     %li
       = t('confirming_email')
@@ -40,3 +33,8 @@
 
 - content_for :title do
   = t('new_account').titlecase
+
+
+
+= yield :form
+= yield :notes

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

@@ -1,38 +1,27 @@
-= render :partial => 'flasher'
-
-%div.reader_show
-  - if @reader == current_reader
-    %p.system_message
-      %strong
-        =t('hello').titlecase
-        = @reader.name + '.'
-      = t('this_is_your_page')
-    %ul.actions
-      %li
-        = link_to t('edit_profile'), edit_reader_url(@reader)
-      %li
-        = link_to t('change_gravatar'), "http://gravatar.com/site/login/"
-
-  = gravatar_for(@reader, {:size => 128}, {:class => 'big_gravatar'})
+= render :partial => 'readers/standard_parts'
 
+- content_for :description do
   - if @reader.description.blank?
     %p 
-     = t('no_description')
+      = t('no_description')
   - else
     = clean_textilize @reader.description
 
-  = render :partial => 'contributions'
-      
+  - @show_partials.each do |partial|
+    = render :partial => partial, :locals => {:reader => @reader}
+
 - content_for :breadhead do
-  = link_to t('people').titlecase, '/readers'
+  = link_to t('readers').titlecase + t('separator'), readers_url
+  = yield :parent
 
-- content_for :breadcrumbs do
-  = link_to t('home').titlecase, '/'
-  >
-  = link_to t('people').titlecase, '/readers'
-  >
+- content_for :title do
   = @reader.name
 
-- content_for :pagetitle do
-  = @reader.name
+- content_for :breadcrumbs do
+  = yield :breadhead
+  = t('separator')
+  = yield :title
+
+
 
+= yield :description

data/config/locales/en.yml

@@ -17,8 +17,8 @@ en:
   cancel: "cancel"
   cannot_delete_readers: "To delete readers, please log in as an administrator"
   cannot_edit_others: "You are not allowed to edit other people's accounts."
-  change_gravatar: "change your gravatar image"
-  change_password: "Change my password"
+  change_gravatar: "change gravatar image"
+  change_password: "Change your password"
   config:
     reader:
       allow_registration?: "Allow registration"
@@ -56,6 +56,16 @@ en:
   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."
   is_free_and_quick: " is free and only takes a moment"
+  joined_on: "Joined on"
+  label:
+    reader:
+      name: "Your name"
+      honorific: "Title"
+      login: "Login username"
+      email: "Email address"
+      password: "Password"
+      repeat_password: "Confirm password"
+      current_password: "Current password"
   log_in: 'log in'
   log_out: "log out"
   login_name: "Login name"
@@ -64,6 +74,13 @@ en:
   logout_message: "You are logged out. Bye!"
   must_be_empty: "must be empty"
   name_notes: "as you would like it to appear on the site"
+  navigation:
+    activate: "Activate account"
+    readers: "People"
+    preferences: "Preferences"
+    profile: "Your profile"
+    login: "Log in"
+    logout: "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."
@@ -74,7 +91,7 @@ en:
   password: "password"
   password_incorrect: "Sorry. Wrong password."
   password_mismatch: "Passwords don't match! Please try again."
-  password_not_yet_changed: "Your password hasn't changed yet, so if you've just remembered it you can still log in as usual."
+  password_not_yet_changed: "Your password hasn't changed yet, so if you've just remembered it please <a href='%{url}'>log in as usual</a>."
   password_notes: "at least four characters, please"
   password_reset_instructions: "Please enter your email address below. If we recognise it, we'll send you a message with a confirmation link (or if your account is not yet active, we'll send the activation message again)."
   password_reset_reassurance: "Your password will not change until you fill in that form, so only you can complete this process."
@@ -95,14 +112,14 @@ en:
   reader: 'Reader'
   reader_logged_in_as: "You are logged in as %{name}."
   reader_saved: "Reader saved"
-  readers: 'Readers'
+  readers: 'People'
   register: "register"
   registration: "registration"
   registration_disallowed: "Sorry. This site does not allow visitors to register"
   remember_me: "remember me"
   resend_activation: "resent activation messages"
   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_message_sent: "Password-reset instructions have been emailed to you"
   reset_not_found: "Password-reset code not found"
   sorry_reset_not_found: "Sorry: the system can't find you. That link must have been garbled somewhere along the line. Please paste the 20-character confirmation code into the box below and we'll try again."
   reset_password: "Reset your password"
@@ -110,6 +127,7 @@ en:
   return_to_page: "return to the page you were looking at before you started registering"
   send_it_again: "send it again"
   send_reset_button: "send me instructions"
+  set_new_password: "set new password"
   sorry: "sorry"
   sorry_access_denied: "Sorry: access denied"
   spam_trap: "it's a spam trap and shouldn't be visible"
@@ -117,6 +135,9 @@ en:
   thanks_activated: "Thank you! Your account has been activated."
   thanks_and_activation_instructions: "Thank you for registering. Now please check your email. We have sent a message containing a link that will automatically activate your account and log you in."
   this_is_your_page: "This is the page that other (logged-in) site visitors will see when they click on your name."
+  time:
+    formats:
+      date: "%B %e, %Y"
   username: "username"
   welcome_back: "Welcome back"
   welcome_message: "Welcome message"
@@ -149,4 +170,6 @@ en:
   never_sent: 'never sent'
   for: 'for'
   home: 'home'
-  reader_required: "Sorry: this part of the site requires an account."
+  reader_required: "Sorry: this part of the site requires an account."
+  update_account: "Save changes"
+  create_account: "Register"

data/config/routes.rb

@@ -15,8 +15,11 @@ ActionController::Routing::Routes.draw do |map|
   map.resource :password_reset
   
   map.activate_me '/activate/:id/:activation_code', :controller => 'reader_activations', :action => 'update'
+  map.repassword_me 'repassword/:id/:confirmation_code', :controller => 'password_resets', :action => 'edit'
   map.reader_register '/register', :controller => 'readers', :action => 'new'
   map.reader_login '/login', :controller => 'reader_sessions', :action => 'new'
+  map.reader_account '/account', :controller => 'readers', :action => 'edit'
+  map.reader_profile '/profile', :controller => 'readers', :action => 'show'
   map.reader_logout '/logout', :controller => 'reader_sessions', :action => 'destroy'
   map.reader_permission_denied '/permission_denied', :controller => 'readers', :action => 'permission_denied'
 end

data/lib/reader_tags.rb

@@ -96,7 +96,7 @@ module ReaderTags
     <pre><code><r:recipient:repassword_url /></code></pre>
   }
   tag "recipient:repassword_url" do |tag|
-    new_password_reset_url(tag.locals.recipient, :confirmation_code => tag.locals.recipient.perishable_token, :host => @mailer_vars[:@host])
+    repassword_me_url(tag.locals.recipient, :confirmation_code => tag.locals.recipient.perishable_token, :host => @mailer_vars[:@host])
   end
 
   desc %{

data/public/javascripts/reader.js

@@ -0,0 +1,19 @@
+(function($) { 
+
+	$.fn.toggler = function() { 
+		this.each(function() { 
+		  var self = $(this);
+		  var toggling = $(self.attr.rel);
+      self.click( function (event) {
+        event.preventDefault();
+        toggling.toggle();
+      });
+		});
+		return this;
+	};
+
+})(jQuery);
+
+$(function() {
+  $("a.toggle").toggler();
+});

data/radiant-reader-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-reader-extension}
-  s.version = "1.2.4"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2011-01-13}
+  s.date = %q{2011-01-27}
   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 = [
@@ -70,6 +70,7 @@ Gem::Specification.new do |s|
      "app/views/readers/_extra_controls.html.haml",
      "app/views/readers/_flasher.html.haml",
      "app/views/readers/_form.html.haml",
+     "app/views/readers/_standard_parts.html.haml",
      "app/views/readers/edit.html.haml",
      "app/views/readers/index.html.haml",
      "app/views/readers/login.html.haml",
@@ -107,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/javascripts/reader.js",
      "public/stylesheets/sass/_reader_constants.sass",
      "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.2.4"
+  version "1.3.0"
   description "Provides reader/member/user registration and management functions"
   url "http://spanner.org/radiant/reader"
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 4
-  version: 1.2.4
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 +00:00
+date: 2011-01-27 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -153,6 +153,7 @@ files:
 - app/views/readers/_extra_controls.html.haml
 - app/views/readers/_flasher.html.haml
 - app/views/readers/_form.html.haml
+- app/views/readers/_standard_parts.html.haml
 - app/views/readers/edit.html.haml
 - app/views/readers/index.html.haml
 - app/views/readers/login.html.haml
@@ -190,6 +191,7 @@ files:
 - public/images/admin/chk_off.png
 - public/images/admin/chk_on.png
 - public/images/admin/delta.png
+- public/javascripts/reader.js
 - public/stylesheets/sass/_reader_constants.sass
 - public/stylesheets/sass/admin/reader.sass
 - public/stylesheets/sass/reader.sass