radiant-reader-extension 2.0.0.rc4 → 3.0.0.rc3

data/config/locales/en.yml

@@ -2,13 +2,26 @@ en:
   activerecord:
     attributes:
       reader:
-        description: "Text for your profile page"
+        description: "Biog"
         email: "Email address"
+        phone: "Home phone"
+        mobile: "Mobile phone"
+        forename: "Forename"
         honorific: "Title or rank"
-        login: "Login username (optional)"
+        login: "Login username"
         name: "Your name"
         password: "Password"
         password_confirmation: "Confirm password"
+        postal_address: "Postal address"
+        post_organisation: "Organisation"
+        post_line1: "Building name or number"
+        post_line2: "Street"
+        post_city: "City or town"
+        post_province: "County"
+        post_country: "Country"
+        postcode: "Postcode"
+        surname: "Surname"
+        unshareable: "Share none of this information"
     errors:
       models:
         reader:
@@ -26,8 +39,6 @@ en:
             password:
               too_short: "this must have at least six characters"
               invalid: "this must include at least one non-letter"
-            password_confirmation:
-              
           
   config:
     reader:
@@ -35,13 +46,15 @@ en:
       require_confirmation?: "Confirm email addresses"
       use_honorifics?: "Use honorifics"
       layout: "Layout for forms"
-      get_profile?: "As for profile text"
+      get_profile?: "Ask for profile text"
+      public?: "Readers list public"
+      confine_to_groups?: "Show only members of shared groups"
     email:
       name: "Message sender"
       address: "Message reply-to"
       prefix: "Subject prefix"
       layout: "Email layout"
-  reader: "reader"
+  reader: "Reader"
   readers: "Readers"
   groups: "Groups"
   messages: "Messages"
@@ -58,6 +71,7 @@ en:
     activation_required_explanation: "You should have received a confirmation message containing a link that will activate your account."
     activation_sent: "Activation message sent"
     affected_fields_highlighted: "The affected fields are highlighted below."
+    all: "All"
     all_deliveries_failed: "All deliveries failed"
     already_active: "Your account is already active."
     already_logged_in: "You're already logged in!"
@@ -71,14 +85,48 @@ en:
     change_gravatar: "change gravatar image"
     change_password: "Change your password"
     check_email: "Please check your email for an activation message"
+    check_vcard: "Check your contact card"
+    checked_fields_public: "Uncheck any field (by clicking on the green tick) that you do not want to publish."
+    checked_fields_uncheck: "Click on the arrow to make that field private."
     confirm_new_password: "Confirm new password"
     confirm_password: "Confirm password"
     confirmation_code: "Confirmation code"
     confirming_email: "When you press the 'register' button we will send a confirmation email to the address you enter above. Click on a link in that message, and you're in."
     continue: "Continue"
+    count_people: 
+      zero: "(nobody)"
+      one: "(one person)"
+      other: "(%{count} people)"
     create_message: "create message"
+    csv_file: "a csv file"
+    dashboard:
+      directory: "Directory"
+      edit_profile: "Edit profile"
+      profile: "Your page"
+      account: "Account settings"
+      listing: "Directory listing"
+      introduction: "Hello %{name}. Welcome back to %{site}. This page gathers together recent activity, useful links and bits of administration. You can always get back here by clicking on a 'dashboard' link."
+      welcome: "Hello %{name}. Welcome to %{site} and thank you for persevering with the registration process. Your account is now active and this is your (empty) dashboard page."
+      groups: "Your groups"
+      messages: "Messages for you"
+      title: "Welcome"
+    directory: 
+      name: "Full name"
+      contact: "Contact"
+      profile: "Profile"
+      email: "Email"
+      phone: "Telephone"
+      mobile: "Mobile"
+      postal_address: "Address"
+      link: "Browse members list"
+      title: "Directory"
+      csv_link: "Download as CSV file"
+      vcard_link: "Download to your address book"
+      groups: "Groups"
     dont_fill: "Don't fill this in!"
-    edit_profile: "edit your profile"
+    download_as: "Download as"
+    download_group_as: "Download the whole group as"
+    edit_profile: "Edit your profile"
     email_unknown: "Sorry. That email address is not known here."
     enter_code: "Please enter confirmation code"
     enter_email_for_reminder: "enter your email address and we will send the message again"
@@ -89,11 +137,19 @@ en:
       email: "we will send activation instructions to this address"
       existing_password: "leave blank to keep present password. If changing, at least four characters."
       login: "you can always use your email address instead"
-      name: "this is how you will be credited on the site"
+      name: "this is how you will be referred to on the site"
       new_password: "at least six characters, please, and with at least one non-letter character"
-      honorific: "this is prepended to your name when you are credited"
+      honorific: "this is prepended to your name but only in a formal setting"
+      post_country: "Please choose from the list"
+      post_organisation: "You can omit this unless it's part of your postal address"
+      unshareable: "to keep one field private, uncheck it above. To keep all your contact information private and receive only administrative messages, check this box."
+      phone: "with area code but no country code"
+      mobile: "without country code"
     form_problem: "there was a problem with the form"
     getting_gravatar: "If you would like a picture to appear next to your messages, give yourself a gravatar at"
+    groups: "Groups"
+    group_filter: "Show only members of the group: "
+    group_members: "Group Members"
     hello: "hello"
     honorific: "Title or rank"
     invitation_message: "Invitation message"
@@ -103,15 +159,6 @@ en:
     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:
-      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_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"
@@ -119,14 +166,19 @@ en:
     login_or_email: "Login name or email address"
     login_unknown: "Sorry: we don't recognise that combination of username and password."
     logout_message: "You are logged out. Bye!"
+    member: "member"
     message_delivered: "Message delivered"
+    message_preview_introduction: "This is a snapshot of the message that was delivered to you %{date}. If it contains instructions they may now be out of date."
     must_be_empty: "must be empty"
     navigation:
       account: "Your account"
       activate: "Activate account"
       admin: "Admin"
+      dashboard: "Dashboard"
+      directory: "Directory"
       greeting: "Hello %{name}"
-      readers: "Readers"
+      help: "Help"
+      readers: "Members"
       preferences: "Preferences"
       profile: "Profile"
       log_in: "Log in"
@@ -136,7 +188,7 @@ en:
       your_account: "Preferences"
     new_account: "Register here"
     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."
+    new_password_instructions: "Please enter and confirm the new password you would like to use. It should be at least six characters long, nothing obvious or typical and with at least one non-letter character."
     'no': "no"
     no_description: "No description available"
     notes: "notes"
@@ -157,9 +209,12 @@ en:
     please_log_in: "Please log in"
     please_log_out: "Please log out"
     please_read_our: "Please read our"
-    please_register: "Please take a moment to register an account."
+    please_register: "Please take a moment to choose a login and password. We need your email address to confirm your identity and send administrative messages: any other information you can fill in later."
     please_use_form: "Please use the registration form"
     preferences_intro: "You can use this form to change your preferences and enter a bit more information about yourself."
+    profile_intro_private: "The information that you put in here is made available to other members both on the site and in their address books. It is not available to the public and nobody will see it who is not logged in to this site."
+    profile_intro_grouped: "The information that you put in here is made available to the other members of your groups both on the site and in their address books. It is not available to the public or to users of this site outside your groups."
+    profile_intro_public: "The information that you put in here is made visible to the public. Email addresses are spam-protected but your contact information will be visible to everyone."
     reader_admin: "Reader administration"
     reader_emails: "Administrative messages"
     reader: 'Reader'
@@ -181,7 +236,13 @@ 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"
+    sent_on: "sent %{date}"
     set_new_password: "set new password"
+    showing: "Showing"
+    showing_of_total:
+      zero: "No %{names} to show."
+      one: "Showing one %{name}"
+      other: "Showing %{start} to %{finish} of %{count} %{names}"
     some_deliveries_failed: "Some deliveries failed"
     sorry: "sorry"
     sorry_access_denied: "Sorry: access denied"
@@ -199,13 +260,10 @@ en:
     your_description: "Some text for your profile page"
     your_email: "Your email address"
     your_name: "Your name"
-    count_people: 
-      zero: "(nobody)"
-      one: "(one person)"
-      other: "(%{count} people)"
     send_to: "Send to"
     reader_configuration_page: "reader settings"
     welcome_sent_automatically: "This message is sent automatically when someone completes the registration and email-confirmation process."
+    welcome_please_log_in: '<span class="greeting">Welcome!</span> To take part, please <a href="%{login_url}">log in</a> or <a href="%{register_url}">register</a>.'
     password_reset_sent_automatically: "This message is sent automatically when someone asks to reset their password."
     activation_sent_automatically: "This message is sent automatically when someone begins to register."
     invitation_sent_automatically: "This message is sent automatically when someone is invited to the site."
@@ -227,6 +285,13 @@ en:
     update_account: "Save changes"
     create_account: "Register"
     separator: " &raquo; "
+    vcard_file: "address book"
+    you_are_not_shared: "You have chosen not to share your contact information."
   time:
     formats:
       date: "%B %e, %Y"
+      recently: "on %A at %l:%M%p"
+      standard: "on %B %e, %Y at %l:%M%p"
+      this_year: "on %B %e at %l:%M%p"
+      today: "today at %l:%M%p"
+      yesterday: "yesterday at %l:%M%p"

data/config/routes.rb

@@ -9,9 +9,9 @@ ActionController::Routing::Routes.draw do |map|
     admin.resources :readers, :except => [:show]
   end
 
-  map.resources :readers
+  map.resources :readers, :controller => 'accounts'
   map.resources :messages, :only => [:index, :show], :member => [:preview]
-  map.resources :groups, :only => [] do |group|
+  map.resources :groups, :only => [:index, :show] do |group|
     group.resources :messages, :only => [:index, :show], :member => [:preview]
   end
 
@@ -21,10 +21,12 @@ ActionController::Routing::Routes.draw do |map|
   
   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_register '/register', :controller => 'accounts', :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'
+  map.reader_dashboard '/dashboard', :controller => 'accounts', :action => 'dashboard'
+  map.reader_account '/account', :controller => 'accounts', :action => 'edit'
+  map.reader_profile '/profile', :controller => 'accounts', :action => 'show'
+  map.reader_edit_profile '/edit_profile', :controller => 'accounts', :action => 'edit_profile'
+  map.reader_permission_denied '/permission_denied', :controller => 'accounts', :action => 'permission_denied'
 end

data/db/migrate/20110707101339_group_slugs.rb

@@ -0,0 +1,9 @@
+class GroupSlugs < ActiveRecord::Migration
+  def self.up
+    add_column :groups, :slug, :string
+  end
+
+  def self.down
+    remove_column :groups, :slug
+  end
+end

data/db/migrate/20110711150605_snail_addresses.rb

@@ -0,0 +1,21 @@
+class SnailAddresses < ActiveRecord::Migration
+  def self.up
+    rename_column :readers, :post_place, :post_organisation
+    rename_column :readers, :post_building, :post_line1
+    rename_column :readers, :post_street, :post_line2
+    rename_column :readers, :post_town, :post_city
+    rename_column :readers, :post_county, :post_province
+    add_column :readers, :post_country, :string
+    add_column :readers, :mobile, :string
+  end
+
+  def self.down
+    rename_column :readers, :post_organisation, :post_place
+    rename_column :readers, :post_line1, :post_building
+    rename_column :readers, :post_line2, :post_street
+    rename_column :readers, :post_city, :post_place
+    rename_column :readers, :post_province, :post_county
+    remove_column :readers, :post_country
+    remove_column :readers, :mobile
+  end
+end

data/db/migrate/20110712081159_directory_permissions.rb

@@ -0,0 +1,11 @@
+class DirectoryPermissions < ActiveRecord::Migration
+  def self.up
+    add_column :readers, :unshareable, :boolean
+    add_column :readers, :unshared, :text
+  end
+
+  def self.down
+    remove_column :readers, :unshareable
+    remove_column :readers, :unshared
+  end
+end

data/db/migrate/20110712141134_name_parts.rb

@@ -0,0 +1,9 @@
+class NameParts < ActiveRecord::Migration
+  def self.up
+    add_column :readers, :surname, :string
+  end
+
+  def self.down
+    remove_column :readers, :surname, :string
+  end
+end

data/db/migrate/20110728112254_current_login_at.rb

@@ -0,0 +1,9 @@
+class CurrentLoginAt < ActiveRecord::Migration
+  def self.up
+    add_column :readers, :current_login_at, :datetime
+  end
+
+  def self.down
+    remove_column :readers, :current_login_at
+  end
+end

data/lib/grouped_model.rb

@@ -42,24 +42,28 @@ module GroupedModel
         } 
       }
 
-      named_scope :ungrouped, {
-        :select => "#{self.table_name}.*, count(pp.id) as group_count",
-        :joins => "LEFT OUTER JOIN permissions as pp on pp.permitted_id = #{self.table_name}.id AND pp.permitted_type = '#{self.to_s}'", 
-        :having => "group_count = 0",
-        :group => column_names.map { |n| self.table_name + '.' + n }.join(','),    # postgres requires that we group by all selected (but not aggregated) columns
-        :readonly => false
+      named_scope :ungrouped, lambda {
+        {
+          :select => "#{self.table_name}.*, count(pp.id) as group_count",
+          :joins => "LEFT OUTER JOIN permissions as pp on pp.permitted_id = #{self.table_name}.id AND pp.permitted_type = '#{self.to_s}'", 
+          :having => "group_count = 0",
+          :group => column_names.map { |n| self.table_name + '.' + n }.join(','),    # postgres requires that we group by all selected (but not aggregated) columns
+          :readonly => false
+        }
       } do
         def count
           length
         end
       end
 
-      named_scope :grouped, {
-        :select => "#{self.table_name}.*, count(pp.id) as group_count",
-        :joins => "LEFT OUTER JOIN permissions as pp on pp.permitted_id = #{self.table_name}.id AND pp.permitted_type = '#{self.to_s}'", 
-        :having => "group_count > 0",
-        :group => column_names.map { |n| self.table_name + '.' + n }.join(','),
-        :readonly => false
+      named_scope :grouped, lambda {
+          {
+          :select => "#{self.table_name}.*, count(pp.id) as group_count",
+          :joins => "LEFT OUTER JOIN permissions as pp on pp.permitted_id = #{self.table_name}.id AND pp.permitted_type = '#{self.to_s}'", 
+          :having => "group_count > 0",
+          :group => column_names.map { |n| self.table_name + '.' + n }.join(','),
+          :readonly => false
+        }
       } do
         def count
           length

data/lib/grouped_page.rb

@@ -20,6 +20,7 @@ module GroupedPage
       permitted_groups_without_inheritance + inherited_groups
     end
 
+    # this is regrettably expensive
     def cache?
       self.permitted_groups.empty?
     end        

data/lib/radiant-reader-extension.rb

@@ -1,5 +1,5 @@
 module RadiantReaderExtension
-  VERSION = '2.0.0.rc4'
+  VERSION = '3.0.0.rc3'
   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_admin_ui.rb

@@ -3,16 +3,18 @@ module ReaderAdminUI
  def self.included(base)
    base.class_eval do
 
-      attr_accessor :reader, :message, :group, :reader_configuration
+      attr_accessor :reader, :message, :group, :reader_configuration, :account
       alias_method :readers, :reader
       alias_method :messages, :message
       alias_method :groups, :group
+      alias_method :accounts, :account      #note to self: plurals are called by region_helper
 
       def load_reader_extension_regions
         @reader = load_default_reader_regions
         @message = load_default_message_regions
         @group = load_default_group_regions
         @reader_configuration = load_default_reader_configuration_regions
+        @account = load_default_account_regions
       end
 
       def load_default_regions_with_reader
@@ -97,6 +99,35 @@ module ReaderAdminUI
         end
       end
     end
+    
+    def load_default_account_regions
+      OpenStruct.new.tap do |account|
+        account.dashboard = Radiant::AdminUI::RegionSet.new do |dashboard|
+          dashboard.main.concat %w{dashboard/welcome dashboard/groups dashboard/description}
+          dashboard.sidebar.concat %w{dashboard/profile dashboard/messages dashboard/directory}
+        end
+        account.index = Radiant::AdminUI::RegionSet.new do |index|
+          index.main.concat %w{list}
+          index.sidebar.concat %w{groups/all}
+        end
+        account.show = Radiant::AdminUI::RegionSet.new do |show|
+          show.main.concat %w{groups description}
+          show.sidebar.concat %w{profile}
+        end
+        account.edit = Radiant::AdminUI::RegionSet.new do |edit|
+          edit.main.concat %w{preamble form gravatar}
+          edit.form.concat %w{edit_name edit_email edit_username edit_password}
+          edit.form_bottom.concat %w{edit_buttons}
+        end
+        account.edit_profile = Radiant::AdminUI::RegionSet.new do |edit_profile|
+          edit_profile.main.concat %w{edit_header edit_form}
+          edit_profile.form.concat %w{edit_honorific edit_name edit_email edit_phone edit_mobile edit_address edit_shareability}
+          edit_profile.form_bottom.concat %w{edit_buttons}
+        end
+        account.new = account.edit
+      end
+    end
+    
   end
 end