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

data/app/controllers/admin/messages_controller.rb

@@ -24,6 +24,8 @@ class Admin::MessagesController < Admin::ResourceController
       @readers = @message.inactive_readers
     when "unsent"
       @readers = @message.undelivered_readers
+    when "selected"
+      @readers = @message.possible_readers.find(params['recipients'])
     else
       redirect_to admin_message_url(@message)
       return

data/app/controllers/admin/permissions_controller.rb

@@ -9,7 +9,8 @@ class Admin::PermissionsController < ApplicationController
   def create
     @page = Page.find(params[:page_id])
     raise ActiveRecord::RecordNotFound unless @page
-    @permission = Permission.find_or_create_by_page_id_and_group_id(@page.id, @group.id)
+    scope = @group.permissions.for(@page)
+    @permission = scope.first || scope.create!
     respond_to do |format|
       format.html { 
         flash[:notice] = "#{@page.name} bound to group #{@group.name}"
@@ -21,7 +22,7 @@ class Admin::PermissionsController < ApplicationController
   
   def destroy
     @permission = @group.permissions.find(params[:id])
-    @page = @permission.page
+    @page = @permission.permitted
     @permission.delete if @permission
     respond_to do |format|
       format.html { 

data/app/models/group.rb

@@ -40,7 +40,7 @@ class Group < ActiveRecord::Base
       :select => "groups.*, count(pp.group_id) AS pcount",
       :joins => "INNER JOIN permissions as pp on pp.group_id = groups.id", 
       :conditions => [conditions, *binds],
-      :having => "pcount > 0",    # otherwise attached_to([]) returns all groups
+      :having => "count(pp.group_id) > 0",    # otherwise attached_to([]) returns all groups
       :group => column_names.map { |n| 'groups.' + n }.join(','),
       :readonly => false
     }

data/app/models/message.rb

@@ -1,11 +1,11 @@
 class Message < ActiveRecord::Base
 
-  has_groups
   has_site if respond_to? :has_site
 
   belongs_to :layout
   belongs_to :created_by, :class_name => 'User'
   belongs_to :updated_by, :class_name => 'User'
+  belongs_to :group
 
   has_many :deliveries, :class_name => 'MessageReader', :conditions => ["message_readers.sent_at IS NOT NULL and message_readers.sent_at <= ?", Time.now.to_s(:db)]
   has_many :recipients, :through => :deliveries, :source => :reader
@@ -21,13 +21,19 @@ class Message < ActiveRecord::Base
   named_scope :ordinary, { :conditions => "function_id = '' OR function_id IS NULL" }
   named_scope :published, { :conditions => "status_id >= 100" }
 
+  named_scope :belonging_to, lambda {|group|
+   { :conditions => {:group_id => group }}
+  }
+
+  named_scope :ungrouped, :conditions => {:group_id => nil}
+
   def filtered_body
     filter.filter(body)
   end
 
-  # has to return a named_scope for chainability
+  # has to return a scope for chainability
   def possible_readers
-    groups.any? ? Reader.in_groups(groups) : Reader.scoped({})
+    group ? group.readers : Reader.scoped({})
   end
 
   def undelivered_readers

data/app/models/message_function.rb

@@ -1,9 +1,8 @@
 class MessageFunction
-  attr_accessor :name, :description
+  attr_accessor :name
   
   def initialize(name, description='')
     @name = name
-    @description = description
   end
   
   def symbol
@@ -14,6 +13,10 @@ class MessageFunction
     @name
   end
   
+  def description
+    I18n.t("message_functions.#{@name}")
+  end
+  
   def humanize
     to_s.gsub('_', ' ')
   end
@@ -34,6 +37,8 @@ class MessageFunction
   @@functions = [
     MessageFunction.new('welcome', 'Welcome'),
     MessageFunction.new('invitation', 'Invitation' ),
+    MessageFunction.new('group_welcome', 'Group welcome'),
+    MessageFunction.new('group_invitation', 'Group invitation' ),
     MessageFunction.new('password_reset', 'Password instructions'),
     MessageFunction.new('activation', 'Activation instructions')
   ]

data/app/models/permission.rb

@@ -2,10 +2,10 @@ class Permission < ActiveRecord::Base
 
   belongs_to :group
   belongs_to :permitted, :polymorphic => true
-  
+
   named_scope :for, lambda { |object|
-    { :conditions => ["permissions.permitted_id = ? and permissions.permitted_type = ?", object.id, object.class.to_s] }
+    { :conditions => {:permitted_id => object.id, :permitted_type => object.class.name.to_s} }
   }
-  
+
 end
 

data/app/models/reader.rb

@@ -47,7 +47,7 @@ class Reader < ActiveRecord::Base
   named_scope :except, lambda { |readers|
     readers = [readers].flatten
     if readers.any?
-      { :conditions => ["NOT readers.id IN (#{readers.map{"?"}.join(',')})", readers.map(&:id)] }
+      { :conditions => ["NOT readers.id IN (#{readers.map{"?"}.join(',')})", *readers.map(&:id)] }
     else
       { }
     end
@@ -229,7 +229,7 @@ class Reader < ActiveRecord::Base
 private
 
   def email_must_not_be_in_use
-    reader = Reader.find_by_email(self.email)   # the finds will be site-scoped if appropriate
+    reader = Reader.find_by_email(self.email)
     user = User.find_by_email(self.email)
     if user && user != self.user
       errors.add :value, :taken_by_author
@@ -258,7 +258,7 @@ private
   end
 
   def send_group_invitation_message(group=nil)
-    send_functional_message('invitation', group)
+    send_functional_message('group_invitation', group)
   end
 
 end

data/app/models/reader_notifier.rb

@@ -7,8 +7,8 @@ class ReaderNotifier < ActionMailer::Base
     prefix = site ? site.abbreviation : Radiant::Config['email.prefix']
     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}"
+    sender = Radiant::Config['email.name'] || current_user.name
+    sender_address = Radiant::Config['email.address'] || current_user.email
 
     message_layout(message.layout) if message.layout
     content_type("text/html")

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

@@ -18,7 +18,7 @@
     %br
     = f.text_field :name, :class => 'standard'
     %br
-    %span.formnote= t('reader_extension.form_notes.name')
+    %span.formnote= t('reader_extension.form_notes.account.name')
 
   - if reader.new_record?
     %p
@@ -26,7 +26,7 @@
       %br
       = text_field_tag reader.email_field, params[reader.email_field] || reader.email, :id => "reader_#{reader.email_field}", :class => 'standard'
       %br
-      %span.formnote= t('reader_extension.form_notes.email')
+      %span.formnote= t('reader_extension.form_notes.account.email')
     .innocuous
       %p
         =f.label :email, nil, :class => 'required'
@@ -41,14 +41,14 @@
       %br
       = f.text_field :email, :class => 'standard'
       %br
-      %span.formnote= t('reader_extension.form_notes.email')
+      %span.formnote= t('reader_extension.form_notes.account.email')
 
   %p
     = f.label :login, nil, :class => 'optional'
     %br
     = f.text_field :login, :class => 'standard'
     %br
-    %span.formnote= t('reader_extension.form_notes.login')
+    %span.formnote= t('reader_extension.form_notes.account.login')
 
   - if reader.new_record?
     %p
@@ -56,7 +56,7 @@
       %br
       = f.password_field :password, :class => 'standard', :autocomplete => 'off'
       %br
-      %span.formnote= t('reader_extension.form_notes.new_password')
+      %span.formnote= t('reader_extension.form_notes.account.new_password')
 
     %p
       = f.label :password_confirmation, nil, :class => 'required'
@@ -77,7 +77,7 @@
         = f.label :password, t('reader_extension.new_password'), :class => 'required'
         %br
         = f.password_field :password, :class => 'standard', :autocomplete => 'off'
-        %span.formnote= t('reader_extension.form_notes.new_password')
+        %span.formnote= t('reader_extension.form_notes.account.new_password')
       %p
         = f.label :password_confirmation, t('reader_extension.confirm_new_password'), :class => 'required'
         %br

data/app/views/admin/group_invitations/new.html.haml

@@ -3,7 +3,7 @@
 %h1 
   = t('reader_extension.invite_into_group', :name => @group.name)
 
-- if message = @group.messages.for_function('invitation').first
+- if message = @group.messages.for_function('group_invitation').first
 
   - form_for :group, @group, :url => admin_group_group_invitations_url(@group), :html => {:id => 'preview_form', :method => 'post'} do
     .form-area

data/app/views/admin/group_invitations/preview.html.haml

@@ -49,7 +49,7 @@
             %td 
               = text_field_tag "reader_#{i}[login]", reader.login, :class => "preview#{ ' with_error' if reader.errors.on(:login)}", :title => reader.errors.on(:login), :disabled => true
             %td 
-              = text_field_tag "reader_#{i}[phone]", reader.phone, :class => "preview#{ ' with_error' if reader.errors.on(:phone)}", :title => reader.errors.on(:phone)
+              = text_field_tag "reader_#{i}[phone]", reader.phone, :class => "preview#{ ' with_error' if reader.errors.on(:phone)}", :title => reader.errors.on(:phone), :disabled => true
         - i = i + 1
 
   %p.buttons

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

@@ -14,11 +14,11 @@
         = link_to image('plus') + ' ' + t("reader_extension.create_new_message"), new_admin_group_message_url(@group), :class => 'action create'
       %h3
         =t('reader_extension.admin_messages').titlecase
-      - ['welcome', 'invitation'].each do |func|
+      - ['group_welcome', 'group_invitation'].each do |func|
         - message = Message.functional(func, @group)
         %p.ruled
           %label 
-            = t("reader_extension.#{func}_message")
+            = t("message_functions.#{func}")
           - if message
             %strong
               = link_to message.subject, admin_message_url(message)

data/app/views/admin/messages/_form.html.haml

@@ -4,28 +4,41 @@
   - render_region :form do |formpart|
     - formpart.edit_subject do
       %p.title
-        = form.label :subject, "Message Subject"
+        = form.label :subject
         = form.text_field :subject, :class => 'textbox', :maxlength => 255
-        - if @message.new_record?
-          = form.hidden_field :function_id
 
     - formpart.edit_body do
       %div.body
         %p
           %span.filter
-            = form.label :filter_id, "Filter:"
-            = form.select :filter_id, TextFilter.descendants.map { |tf| tf.filter_name }.sort, :id => 'message_filter', :include_blank => true
-          = form.label :body, "Message Body"
+            = form.label :filter_id
+            = form.select :filter_id, TextFilter.descendants.map { |tf| tf.filter_name }.sort, :include_blank => true
+          = form.label :body
           = form.text_area :body, :class => 'textarea', :style => 'width: 100%'
 
-      = render_region :body_bottom, :locals => {:form => form}
+    - formpart.edit_function do
+      - if admin?
+        %div.function.set
+          %p
+            = form.label :function_id
+            = form.select :function_id, MessageFunction.find_all.map { |mf| [t("message_functions.#{mf.name}"), mf.name] }, :include_blank => true
+          %p
+            = form.label :group_id
+            = form.select :group_id, Group.all.map { |g| [g.name, g.id] }, :include_blank => true
+        
+      - elsif @message.new_record?
+        - if @message.group
+          = f.hidden_field :group_id
+        - if @message.function
+          = f.hidden_field :function_id
 
 - render_region :form_bottom do |form_bottom|
   - form_bottom.edit_timestamp do
-    = updated_stamp @message  
+    = updated_stamp @message
   - form_bottom.edit_buttons do
     %p.buttons
       = save_model_button(@message)
       = save_model_and_continue_editing_button(@message)
-      or
-      = link_to "cancel", admin_reader_configuration_url
+      = t('or')
+      = link_to t("cancel"), @message.new_record? ? admin_messages_url : admin_message_url(@message)
+      

data/app/views/admin/messages/edit.html.haml

@@ -5,8 +5,7 @@
 
   - main.edit_header do
     %h1 
-      Edit
-      = render :partial => 'message_description'
+      = t('reader_extension.edit_message')
 
   - main.edit_form do
     - form_for :message, @message, :url => admin_message_url(@message), :html => {:id => 'message_form', :method => 'put'} do |f|

data/app/views/admin/messages/index.haml

@@ -19,7 +19,14 @@
             - tbody.subject_cell do
               %td.name
                 = link_to message.subject, admin_message_url(message), :class => message.has_function? ? "functional" : "normal"
-                = render :partial => '/admin/messages/list_function', :locals => {:message => message}
+                %span.function
+                  - if message.administrative?
+                    = t("message_functions.#{message.function}")
+                  - else
+                    = t("message_functions.ad_hoc")
+                  - if message.group
+                    = t('reader_extension.for')
+                    = link_to message.group.name, admin_group_url(message.group)
 
             - tbody.sent_cell do
               %td.message_sent

data/app/views/admin/messages/new.html.haml

@@ -5,8 +5,7 @@
 
   - main.edit_header do
     %h1
-      Create 
-      = render :partial => 'message_description'
+      = t('reader_extension.create_message')
 
   - main.edit_form do
     - form_for :message, @message, :url => admin_messages_url, :html => {:id => 'message_form', :method => 'post'} do |f|

data/app/views/admin/messages/show.html.haml

@@ -1,4 +1,5 @@
 - include_stylesheet('admin/reader')
+- include_javascript('admin/reader')
 - body_classes << "reversed"
 
 = render_region :top 
@@ -33,37 +34,57 @@
     - delivery.function do
       - if @message.administrative?
         %p
-          = t("reader_extension.#{@message.function}_sent_automatically")
-        %ul
-          %li
-            = link_to t('reader_extension.edit_message').titlecase, edit_admin_message_url(@message)
-          %li
-            = link_to t('reader_extension.reader_configuration_page').titlecase, admin_reader_configuration_url
- 
+          - if @message.group
+            = t("reader_extension.belongs_to_group", :name => @message.group.name, :href => admin_group_url(@message.group))
+            = t("reader_extension.message_group_administrative")
+            = t("reader_extension.message_function.#{@message.function}")
+          - else
+            = t("reader_extension.message_administrative")
+            = t("reader_extension.message_function.#{@message.function}")
+      - else
+        %p
+          = t("reader_extension.message_adhoc")
+          = t("reader_extension.message_group_adhoc", :name => @message.group.name, :href => admin_group_url(@message.group))
+          
     - delivery.options do
       - unless @message.administrative?
         - form_for :message, @message, :url => deliver_admin_message_url(@message), :html => {"data-onsubmit_status"=>"Sending email messages&#8230;"} do |f|
           %h3
             = t("reader_extension.send_to").titlecase + ":"
-          %p
-            = radio_button_tag 'delivery', 'all', true, :id => 'delivery_to_all', :disabled => @message.possible_readers.empty?
-            %label.checkbox{:for => 'delivery_to_all', :class => @message.possible_readers.empty? ? 'disabled' : ''} 
-              = t('reader_extension.everyone')
-              = t('reader_extension.count_people', :count => @message.possible_readers.count)
-          %p
-            = radio_button_tag 'delivery', 'unsent', false, :id => 'delivery_to_unsent', :disabled => @message.undelivered_readers.empty?
-            %label.checkbox{:for => 'delivery_to_unsent', :class => @message.undelivered_readers.empty? ? 'disabled' : ''} 
-              = t('reader_extension.everyone_unsent')
-              = t('reader_extension.count_people', :count => @message.undelivered_readers.count)
-          %p
-            = radio_button_tag 'delivery', 'inactive', false, :id => 'delivery_to_inactive', :disabled => @message.inactive_readers.empty?
-            %label.checkbox{:for => 'delivery_to_inactive', :class => @message.inactive_readers.empty? ? 'disabled' : ''} 
-              = t('reader_extension.everyone_inactive')
-              = t('reader_extension.count_people', :count => @message.inactive_readers.count)
+          .radio_group
+            %p
+              = radio_button_tag 'delivery', 'all', true, :id => 'delivery_to_all', :disabled => @message.possible_readers.empty?
+              %label.checkbox{:for => 'delivery_to_all', :class => @message.possible_readers.empty? ? 'disabled' : ''} 
+                = t('reader_extension.everyone')
+                = t('reader_extension.count_people', :count => @message.possible_readers.count)
+            %p
+              = radio_button_tag 'delivery', 'unsent', false, :id => 'delivery_to_unsent', :disabled => @message.undelivered_readers.empty?
+              %label.checkbox{:for => 'delivery_to_unsent', :class => @message.undelivered_readers.empty? ? 'disabled' : ''} 
+                = t('reader_extension.everyone_unsent')
+                = t('reader_extension.count_people', :count => @message.undelivered_readers.count)
+            %p
+              = radio_button_tag 'delivery', 'inactive', false, :id => 'delivery_to_inactive', :disabled => @message.inactive_readers.empty?
+              %label.checkbox{:for => 'delivery_to_inactive', :class => @message.inactive_readers.empty? ? 'disabled' : ''} 
+                = t('reader_extension.everyone_inactive')
+                = t('reader_extension.count_people', :count => @message.inactive_readers.count)
+            %p
+              = radio_button_tag 'delivery', 'selected', false, :id => 'delivery_to_selected', :disabled => @message.possible_readers.empty?, :rel => 'toggle[select_recipients]'
+              %label.checkbox{:for => 'delivery_to_selected', :class => @message.possible_readers.empty? ? 'disabled' : ''} 
+                = t('reader_extension.selected_people') + "..."
+            %ul#select_recipients
+              %li
+                = check_box_tag 'null', '', false, :class => 'select_all'
+                %label.checkbox.select_all
+                  = t('reader_extension.select_all')
+              - @message.possible_readers.each do |reader|
+                %li
+                  = check_box_tag "recipients[]", reader.id, false, :id => "recipients_#{reader.id}", :class => 'toggled'
+                  %label.checkbox
+                    = reader.name
 
           %p.buttons
             = submit_tag t('reader_extension.send_message')
-            = t('reader_extension.or')
+            = t('or')
             = link_to t('reader_extension.cancel'), admin_messages_url
             
     

data/config/locales/en.yml

@@ -22,6 +22,10 @@ en:
         postcode: "Postcode"
         surname: "Surname"
         unshareable: "Share none of this information"
+      message:
+        subject: "Message Subject"
+        filter_id: "Filter"
+        body: "Message body"
     errors:
       models:
         reader:
@@ -39,7 +43,6 @@ en:
             password:
               too_short: "this must have at least six characters"
               invalid: "this must include at least one non-letter"
-          
   config:
     reader:
       allow_registration?: "Allow registration"
@@ -59,6 +62,14 @@ en:
   groups: "Groups"
   messages: "Messages"
   settings: "Settings"
+  message_functions:
+    activation: "Activation instructions"
+    ad_hoc: "Ad hoc message"
+    invitation: "Invitation"
+    group_welcome: "Group welcome"
+    group_invitation: "Group invitation"
+    password_reset: "Password instructions"
+    welcome: "Registration complete"
   reader_extension:
     access_denied: "Access denied"
     account_settings: "Account settings"
@@ -133,18 +144,19 @@ en:
     everyone_in_group: "Everyone in the group"
     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"
-      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 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 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"
+      account:
+        description: "you can fill this in later. Textile formatting is allowed."
+        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 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 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"
@@ -170,6 +182,17 @@ en:
     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"
+    message_adhoc: "This is an ad-hoc message you can send at any time."
+    message_administrative: "This message is sent automatically"
+    message_group_adhoc: 'It is restricted to members of the <a href="%{href}">%{name}</a> group.'
+    message_group_administrative: "It is sent automatically"
+    message_function:
+      welcome: "when someone completes the registration and email-confirmation process."
+      password_reset: "when someone asks to reset their password."
+      activation: "when someone registers here."
+      invitation: "when someone is invited to visit the site."
+      group_welcome: "when someone is admitted to the group."
+      group_invitation: "when someone is invited into the group."
     navigation:
       account: "Your account"
       activate: "Activate account"
@@ -234,6 +257,8 @@ en:
     reset_password: "Reset your password"
     restart_password_change: "Send another password-reset message"
     return_to_page: "return to the page you were looking at before you started registering"
+    select_all: "Select all"
+    selected_people: "Selected people"
     send_it_again: "send it again"
     send_reset_button: "send me instructions"
     sent_on: "sent %{date}"
@@ -262,17 +287,14 @@ en:
     your_name: "Your name"
     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."
-    everyone_unsent: "anyone who has not received this message"
-    everyone_inactive: "anyone who has not activated their account"
+    everyone_unsent: "Anyone who has not received this message"
+    everyone_inactive: "Anyone who has not activated their account"
     everyone: "Everyone"
-    send_message: "Send Message"
-    edit_message: "edit message"
-    delete_message: "delete message"
+    create_message: "Create new message"
+    send_message: "Send message"
+    edit_message: "Edit message"
+    delete_message: "Delete message"
     this_message_functional: "This is the %{function} message."
     preview_and_send_message: "Preview and send message"
     really_delete_message: "Are you sure you want to delete the message '%{title}'? This cannot be undone."
@@ -287,6 +309,54 @@ en:
     separator: " &raquo; "
     vcard_file: "address book"
     you_are_not_shared: "You have chosen not to share your contact information."
+
+    # group
+    group: "group"
+    subscriptions: "subscriptions"
+    inherited_group: "group is attached higher in the page tree: can't be detached here"
+    public_if_no_groups: "Leave all groups unchecked for public access"
+    allowed_groups: "Allow access only to:"
+    page_private: "Sorry: you don't have permission to view that page."
+    none: "none"
+    new_group: "new group"
+    group_members: "Group members"
+    private_pages: "Private pages"
+    admin_messages: "Administrative messages"
+    other_messages: "Ad-hoc messages"
+    create_new_message: "Send a new message"
+    delete_message: "delete message"
+    create_welcome: "create welcome"
+    create_invitation: "create invitation"
+    last_sent: "last sent"
+    private_page_explanation: "The pages selected on the left are only visible to the people selected on the right (unless another group is also given permission to see that page)."
+    sent_to_group: "sent automatically to the %{name} group"
+    sent_to_these_groups: "sent automatically to these groups"
+    group_welcome: "This is the welcome message"
+    group_invitation: "This is the invitation message"
+    all_in_group: "Everyone in the group"
+    inactive_in_group: "Group members who have not activated their account"
+    unsent_in_group: "Group members who have not received this message"
+    group_page: "group page"
+    for_group: "for the %{name} group"
+    add_members: "add members"
+    delete_group: "delete group"
+    really_delete_group: "Are you sure you want to completely remove the '%{name}' group? This cannot be undone."
+    edit_group: "edit group"
+    belongs_to_group: 'This message belongs to the <a href="%{href}">%{name}</a> group.'
+    belongs_to_these_groups: "This message is sent to these groups:"
+    invite_into_group: "Invite people into the %{name} group"
+    invitation_instructions: "This is a quick way to bring a group of people into the system in one go. Enter a comma-separated list of names and email addresses (one person per line) and after a bit of checking and tweaking on the next page, each of those people will be invited into the system and issued an account with a vaguely adequate username and entirely random password. Anyone who is already here will just be added to the group."
+    check_invitation_message: "Preview invitation message"
+    no_invitation_message: "This group has no invitation message. You will need to create one before you can invite people into it."
+    create_invitation_message: "create invitation message"
+    check_invitation_list: "Check the invitation list"
+    invitation_preview_instructions: "Fields in red have validation problems. That usually means an email address or login needs checking. Hover your mouse pointer over the affected field to find out more. Fields in grey show that we already have that person here (based on their email address). You can still bring them into the group but you can't edit their details here."
+    full_name: "full name"
+    email: "email"
+    optional_phone: "[phone]"
+    optional_login: "[login]"
+    page_not_public: "The page you have requested is not public. Please log in. If your account has the necessary permission you will be taken straight there."
+
   time:
     formats:
       date: "%B %e, %Y"

data/lib/message_tags.rb

@@ -45,7 +45,7 @@ module MessageTags
     tag.expand
   end
 
-  [:name, :forename, :email, :description, :login].each do |field|
+  [:name, :forename, :surname, :email, :description, :login].each do |field|
     desc %{
       Only for use in email messages. Displays the #{field} field of the reader currently being emailed.
       <pre><code><r:recipient:#{field} /></code></pre>
@@ -58,8 +58,8 @@ module MessageTags
   desc %{
     Only for use in email messages. Displays the password of the reader currently being emailed, if we still have it.
 
-    (After the first successful login we forget the cleartext version of their password, so you only want to use this 
-    tag in welcome and activation messages.)
+    (After the first successful login we forget the cleartext version of their password, so in normal use you would 
+    only see this tag in welcome and activation messages.)
   
     <pre><code><r:recipient:url /></code></pre>
   }

data/lib/radiant-reader-extension.rb

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

@@ -60,7 +60,7 @@ module ReaderAdminUI
         OpenStruct.new.tap do |message|
           message.edit = Radiant::AdminUI::RegionSet.new do |edit|
             edit.main.concat %w{edit_header edit_form edit_footer}
-            edit.form.concat %w{edit_subject edit_body edit_group}
+            edit.form.concat %w{edit_subject edit_body edit_function}
             edit.form_bottom.concat %w{edit_timestamp edit_buttons}
           end
           message.index = Radiant::AdminUI::RegionSet.new do |index|

data/public/javascripts/admin/reader.js

@@ -0,0 +1,11 @@
+Toggle.SelectAllBehavior = Behavior.create(Toggle.CheckboxBehavior, {
+  toggle: function() {
+    var state = this.element.checked;
+    this.element.ancestors()[1].select('input.toggled').each(function (el) { el.checked = state; });
+  }
+});
+
+Event.addBehavior({ 
+  'div.radio_group': Toggle.RadioGroupBehavior(),
+  'input.select_all': Toggle.SelectAllBehavior()
+});

data/public/stylesheets/sass/admin/reader.sass

@@ -19,6 +19,7 @@
 div#preview
   float: left
   width: 65%
+  margin-bottom: 50px
   +box-shadow
   background-color: white
   .message_header
@@ -59,6 +60,13 @@ div#deliver
   float: left
   width: 27%
   margin-left: 2%
+  ul#select_recipients
+    height: 250px
+    overflow-y: auto
+    overflow-x: hidden
+    label.select_all
+      color: #c00
+      font-size: 80%
 
 /* edit pages
 

data/public/stylesheets/sass/admin/reader_group.sass

@@ -0,0 +1,253 @@
+@import compass
+
+#content
+  table
+    &#groups
+      td.name
+        width: 35%
+        a
+          font-size: 160%
+        span.notes
+          font-size: 80%
+          color: #929488
+          font-weight: lighter
+          line-height: 1.2
+          margin-top: 0.25em
+    &#import
+      th
+        text-align: left
+      td
+        padding: 2px
+  form#confirmation_form
+    table
+      width: 90%
+    input
+      &.preview
+        border: 1px solid #929488
+        font-family: 'Lucida Grande'
+        font-size: 16px
+        padding: 3px
+        width: 95%
+      &.with_error
+        border: 1px solid #c00
+        color: #c00
+    tr.invite td input
+      background-color: #e2e1dc
+    p.buttons
+      margin-top: 10px
+  .form-area
+    label.disabled
+      color: #929488
+    span.formnote
+      font-size: 80%
+      color: #929488
+  #group_pages
+    clear: left
+    width: 58%
+    float: left
+  #group_people
+    width: 35%
+    float: right
+  #group_messages
+    float: left
+    width: 98%
+    ul
+      list-style: square
+      font-size: 85%
+      padding-left: 14px
+  div.stretcher
+    clear: left
+  table#group_pages td.page a
+    color: black
+    text-decoration: none
+    &:hover
+      color: blue
+      text-decoration: underline
+  blockquote.messagepreview
+    border: 3px solid #999
+    background-color: #eee
+    margin: 0
+    padding: 20px
+    font-family: courier, monospace
+    font-size: 13px
+    line-height: 16px
+  .form-area p
+    &.description, &.invitation
+      margin-top: 10px
+  #footnotes
+    clear: both
+    margin-top: 50px
+
+#group_pages ul
+  padding-left: 20px
+
+#group_people ul
+  padding-left: 0
+  li
+    font-size: 16px
+    list-style: none
+    line-height: 24px
+    margin-top: 2px
+    font-family: 'Lucida Grande'
+
+#group_pages ul li
+  font-size: 16px
+  list-style: none
+  line-height: 24px
+  margin-top: 2px
+  font-family: 'Lucida Grande'
+
+/*#group_people ul li a, #group_pages ul li a {
+ *  text-decoration: none;
+ *  font-weight: normal;
+ *}
+/*
+ *#group_pages ul li.inherited a {
+ *  color: #ccc;
+ *  font-weight: normal;
+ *}
+ *
+ *#group_people ul li.attached a, #group_pages ul li.attached a {
+ *  color: #060;
+ *  font-weight: bold;
+ *}
+
+.fake_checkbox
+  padding-left: 20px
+  cursor: pointer
+  background-repeat: no-repeat
+  background-position: 0 3px
+  input
+    position: absolute
+    left: -9999px
+  a
+    text-decoration: none
+  &.checked
+    background-image: url(/images/admin/chk_on.png)
+  &.unchecked
+    background-image: url(/images/admin/chk_off.png)
+  &.inherited
+    background-image: url(/images/admin/chk_auto.png)
+  &.waiting
+    background-image: url(/images/admin/spinner.gif)
+
+.checked a, .selected a
+  color: #5da454
+
+.unchecked a, .unselected a
+  color: #ccc
+  font-weight: normal
+
+.waiting a
+  color: #8c8d8e
+
+.failed a
+  color: #c00
+
+.inherited
+  color: #bfe4b9
+
+span.group_actions
+  img
+    opacity: 0.5
+  a img
+    opacity: 1
+
+.box
+  h3
+    float: left
+    border: 0
+  p, ul
+    clear: both
+  .actions
+    float: right
+    margin-top: 10px
+  a.action, span.action.disabled
+    padding: 3px 4px
+    margin: 0 25px 0 1px
+    img
+      vertical-align: auto
+  a.action
+    color: black
+    text-decoration: none
+    &:hover
+      background: #eee image_url('admin/buttons_background.png') repeat-x
+      border: 1px solid #a5c9df
+      margin: 0 24px 0 0
+      +border-radius
+    &.selected
+      background: #c5e0f5
+      +linear-gradient(color_stops(#e5f5ff, #c5e0ff))
+      border: 1px solid #a5c9df
+      margin: 0 24px 0 0
+      +border-top-radius
+      +border-bottom-radius(0)
+  span.action.disabled
+    color: #ccc
+  span.sent
+    color: #ccc
+
+/* show and send page
+
+div#preview
+  float: left
+  width: 65%
+  +box-shadow
+  background-color: white
+  .message_header
+    padding: 10px
+    overflow: hidden
+    background-color: #eee
+    color: #333
+    font-size: 80%
+    line-height: 1.5
+    ul
+      margin: 0
+      padding: 6px 14px
+      list-style-type: none
+      li.subject
+        font-size: 1.6em
+        margin-top: 6px
+      li.mime-version, li.content-type
+        display: none
+  .message_body
+    iframe.message_body
+      width: 99%
+      height: 520px
+      margin: 0
+      border: 0
+      overflow: auto
+
+  div.preview_controls
+    height: 24px
+    p
+      margin: 2px 14px
+      text-align: right
+    a
+      text-decoration: none
+      color: #c00
+
+div#deliver
+  position: relative
+  float: left
+  width: 27%
+  margin-left: 2%
+
+/* edit pages
+
+ul.help
+  list-style: square
+  color: #666
+  font-size: 85%
+  code
+    color: #c00
+    font-size: 115%
+
+
+#content
+  form
+    p
+      textarea
+        width: 100%
+        height: 8em
+

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 15424115
+  hash: 15424125
   prerelease: 6
   segments: 
   - 3
   - 0
   - 0
   - rc
-  - 3
-  version: 3.0.0.rc3
+  - 4
+  version: 3.0.0.rc4
 platform: ruby
 authors: 
 - William Ross
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-28 00:00:00 +01:00
+date: 2011-08-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -201,12 +201,9 @@ files:
 - app/views/admin/groups/show.html.haml
 - app/views/admin/memberships/_reader.html.haml
 - app/views/admin/messages/_form.html.haml
-- app/views/admin/messages/_function.haml
 - app/views/admin/messages/_help.html.haml
 - app/views/admin/messages/_list_function.haml
 - app/views/admin/messages/_list_notes.html.haml
-- app/views/admin/messages/_message_description.html.haml
-- app/views/admin/messages/_message_group.html.haml
 - app/views/admin/messages/edit.html.haml
 - app/views/admin/messages/index.haml
 - app/views/admin/messages/new.html.haml
@@ -296,8 +293,10 @@ files:
 - public/images/admin/chk_on.png
 - public/images/admin/delta.png
 - public/images/furniture/no_gravatar.png
+- public/javascripts/admin/reader.js
 - public/javascripts/reader.js
 - public/stylesheets/sass/admin/reader.sass
+- public/stylesheets/sass/admin/reader_group.sass
 - public/stylesheets/sass/reader.sass
 - radiant-reader-extension.gemspec
 - Rakefile
@@ -327,7 +326,7 @@ has_rdoc: true
 homepage: http://radiant.spanner.org/reader
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-reader-extension', :version => '~> 3.0.0.rc3'\n\n  and please remember to enable ActionMailer in your project's config/environment.rb.\n  "
+post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-reader-extension', :version => '~> 3.0.0.rc4'\n\n  and please remember to enable ActionMailer in your project's config/environment.rb.\n  "
 rdoc_options: []
 
 require_paths: 

data/app/views/admin/messages/_function.haml

@@ -1,31 +0,0 @@
-- if @message.administrative?
-  %p
-    - if @message.group
-      = t("reader_extension.group_#{@message.function}")
-      = t("reader_extension.sent_to_group")
-    - elsif @message.groups.any?
-      = t("reader_extension.group_#{@message.function}")
-      = t("reader_extension.sent_to_these_groups")
-      %ul
-        - @message.groups.each do |group|
-          %li= link_to group.name, admin_group_url(group)
-    - else
-      = t("reader_extension.#{@message.function}_sent_automatically")
-  %ul
-    %li
-      = link_to t('reader_extension.edit_message').titlecase, edit_admin_message_url(@message)
-    %li
-      - if @message.group
-        = link_to @message.group.name + ' ' + t('reader_extension.group_page'), admin_group_url(@message.group)
-      - else
-        = link_to t('reader_extension.reader_configuration_page').titlecase, admin_reader_configuration_url
-
-- if @message.group
-  %p
-    = t("reader_extension.belongs_to_group", :name => @message.group.name)
-- elsif @message.groups.any?
-  %p
-    = t("reader_extension.belongs_to_these_groups")
-  %ul
-    - @message.groups.each do |group|
-      %li= link_to group.name, admin_group_url(group)

data/app/views/admin/messages/_message_description.html.haml

@@ -1,7 +0,0 @@
-- if @message.function
-  = @message.function
-message
-- if @message.group
-  for the
-  = @message.group.name
-  group

data/app/views/admin/messages/_message_group.html.haml

@@ -1,5 +0,0 @@
-%h1 group_id
-
-- fields_for @message do |f|
-  - if @message.new_record? && @message.group
-    = f.hidden_field :group_id