radiant-reader_group-extension 0.9.0 → 1.0.0

data/README.markdown

@@ -12,9 +12,6 @@ This works with multi_site. If you use [our fork](https://github.com/spanner/rad
 
 * groups can be marked subscribable, which puts a checkbox to subscribe or unsubscribe on the readers' registration and preference forms. Migration required.
 * messages can each have a different layout
-* group-mailer moved into Reader as general purpose reader-mailer, now using radiant layouts for styled group mailouts
-* group access control consolidated in `is_grouped` function to simplify maintenance of other extensions
-* invitations factored out, made reasonably restful
 
 ## Status
 
@@ -22,7 +19,7 @@ This has been brought across from a previous version that grouped users instead
 
 ## Requirements
 
-The [reader](https://github.com/spanner/radiant-reader-extension/tree) and [submenu](https://github.com/spanner/radiant-submenu-extension/tree) extensions.
+Radiant 0.9.x and the [reader](https://github.com/spanner/radiant-reader-extension/tree) extension.
 
 ## Installation
 
@@ -34,7 +31,7 @@ Once you've got the reader extension in, the rest is easy:
 
 ## Bugs and comments
 
-In [lighthouse](http://spanner.lighthouseapp.com/projects/26912-radiant-extensions), please, or for little things an email or github message is always welcome.
+On github, please.
 
 ## Author and copyright
 

data/VERSION

@@ -1 +1 @@
-0.9.0
+1.0.0

data/app/controllers/admin/groups_controller.rb

@@ -1,4 +1,8 @@
 class Admin::GroupsController < Admin::ResourceController
   skip_before_filter :load_model
   before_filter :load_model, :except => :index    # we want the filter to run before :show too
+  
+  def show
+    
+  end
 end

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

@@ -1,31 +1,19 @@
-- include_stylesheet('admin/group')
+- include_stylesheet('admin/reader_group')
 
 %h1 
-  Invite people into
-  = @group.name
-
-%p 
-  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 below (one person per line) 
-  and 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.
+  = t('invite_into_group', :name => @group.name)
 
 - if message = @group.messages.for_function('invitation').first
-  %p
-    %strong
-      You may want to check the group's
-      = link_to "invitation message", admin_message_url(message)
-      before going any further.
 
   - form_for :group, @group, :url => admin_group_group_invitations_url(@group), :html => {:id => 'preview_form', :method => 'post'} do
     .form-area
       %p
         %label{:for => "readerlist"}
           List of people
-        - if Radiant::Config['reader.use_honorifics?']
-          title or rank, 
-        name, email, [login], [phone]
-        %br
+          %span.formnote
+            - if Radiant::Config['reader.use_honorifics?']
+              title or rank, 
+            name, email, [login], [phone]
         = text_area_tag "readerlist", params[:readerlist], :class => "textarea", :style => "width: 100%; height: 240px;"
 
       %p.buttons
@@ -33,13 +21,11 @@
         or
         = link_to "Cancel", admin_group_url(@group)
 
-      %p
-        When you press the 'preview import' button, the list will be repeated back to you to show exactly what reader accounts we are going to create and/or invite into this group. 
-        You can make changes at that stage, but please check the list formatting carefully: be sure there are no commas other than where you want them and that the email addresses are correct.
- 
+  %p 
+    = t('invitation_instructions')
+
 - else
-  %p.haserror
-    Before you can proceed, you will need to
-    = link_to("create an invitation message", new_admin_group_message_url(@group, :function => 'invitation')) + '.'
-    for this group.
-    
+  %p
+    = t('no_invitation_message')
+    = link_to image('plus') + ' ' + t("create_invitation_message"), new_admin_group_message_url(@group, :function => 'invitation'), :class => "action"
+  

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

@@ -1,63 +1,58 @@
-- include_stylesheet('admin/group')
+- include_stylesheet('admin/reader_group')
 
 %h1 
-  Populate:
-  = link_to @group.name, admin_group_url(@group)
-  = render :partial => 'admin/groups/actions', :locals => {:group => @group}
+  = t('check_invitation_list', :name => @group.name)
 
 - form_for :group, @group, :url => admin_group_group_invitations_url(@group), :html => {:id => 'confirmation_form', :method => 'post'} do
-  .form-area
-    %h2 Please check the invitation list
-    %ul 
-      %li 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.
-      %li 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.
-      %li Edit anything that needs it, uncheck the box next to anyone that you don't want to invite after all, and hit the 'invite these people' button to send out messages.
-    %table#import
-      %thead
-        %tr
-          %th
-          - if Radiant::Config['reader.use_honorifics?']
-            %th Title or rank
-          %th Full name
-          %th Email
-          %th Login
-          %th Phone
-      %tbody
-        - i = 0
-        - @readers.each do |reader| 
-          - if reader.new_record?
-            %tr.import
-              %td
-                = check_box_tag "import_reader[]", i, reader.valid?
-              - if Radiant::Config['reader.use_honorifics?']
-                %td 
-                  = text_field_tag "reader_#{i}[honorific]", reader.honorific, :class => "preview#{ ' with_error' if reader.errors.on(:honorific)}", :title => reader.errors.on(:honorific)
-              %td 
-                = text_field_tag "reader_#{i}[name]", reader.name, :class => "preview#{ ' with_error' if reader.errors.on(:name)}", :title => reader.errors.on(:name)
-              %td 
-                = text_field_tag "reader_#{i}[email]", reader.email, :class => "preview#{ ' with_error' if reader.errors.on(:email)}", :title => reader.errors.on(:email)
-              %td 
-                = text_field_tag "reader_#{i}[login]", reader.login, :class => "preview#{ ' with_error' if reader.errors.on(:login)}", :title => reader.errors.on(:login)
-              %td 
-                = text_field_tag "reader_#{i}[phone]", reader.phone, :class => "preview#{ ' with_error' if reader.errors.on(:phone)}", :title => reader.errors.on(:phone)
-          - else
-            %tr.invite
+  %p
+    = t('invitation_preview_instructions')
+
+  %table#import
+    %thead
+      %tr
+        %th
+        - if Radiant::Config['reader.use_honorifics?']
+          %th= t('honorific')
+        %th= t('full_name')
+        %th= t('email')
+        %th= t('optional_login')
+        %th= t('optional_phone')
+    %tbody
+      - i = 0
+      - @readers.each do |reader| 
+        - if reader.new_record?
+          %tr.import
+            %td
+              = check_box_tag "import_reader[]", i, reader.valid?
+            - if Radiant::Config['reader.use_honorifics?']
+              %td 
+                = text_field_tag "reader_#{i}[honorific]", reader.honorific, :class => "preview#{ ' with_error' if reader.errors.on(:honorific)}", :title => reader.errors.on(:honorific)
+            %td 
+              = text_field_tag "reader_#{i}[name]", reader.name, :class => "preview#{ ' with_error' if reader.errors.on(:name)}", :title => reader.errors.on(:name)
+            %td 
+              = text_field_tag "reader_#{i}[email]", reader.email, :class => "preview#{ ' with_error' if reader.errors.on(:email)}", :title => reader.errors.on(:email)
+            %td 
+              = text_field_tag "reader_#{i}[login]", reader.login, :class => "preview#{ ' with_error' if reader.errors.on(:login)}", :title => reader.errors.on(:login)
+            %td 
+              = text_field_tag "reader_#{i}[phone]", reader.phone, :class => "preview#{ ' with_error' if reader.errors.on(:phone)}", :title => reader.errors.on(:phone)
+        - else
+          %tr.invite
+            %td
+              = check_box_tag "invite_reader[]", reader.id, {:checked => true}
+            - if Radiant::Config['reader.use_honorifics?']
               %td
-                = check_box_tag "invite_reader[]", reader.id, {:checked => true}
-              - if Radiant::Config['reader.use_honorifics?']
-                %td
-                  = text_field_tag "reader_#{i}[honorific]", reader.honorific, :class => "preview#{ ' with_error' if reader.errors.on(:honorific)}", :title => reader.errors.on(:honorific), :disabled => true
-              %td 
-                = text_field_tag "reader_#{i}[name]", reader.name, :class => "preview#{ ' with_error' if reader.errors.on(:name)}", :title => reader.errors.on(:name), :disabled => true
-              %td 
-                = text_field_tag "reader_#{i}[email]", reader.email, :class => "preview#{ ' with_error' if reader.errors.on(:email)}", :title => reader.errors.on(:email), :disabled => true
-              %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)
-          - i = i + 1
+                = text_field_tag "reader_#{i}[honorific]", reader.honorific, :class => "preview#{ ' with_error' if reader.errors.on(:honorific)}", :title => reader.errors.on(:honorific), :disabled => true
+            %td 
+              = text_field_tag "reader_#{i}[name]", reader.name, :class => "preview#{ ' with_error' if reader.errors.on(:name)}", :title => reader.errors.on(:name), :disabled => true
+            %td 
+              = text_field_tag "reader_#{i}[email]", reader.email, :class => "preview#{ ' with_error' if reader.errors.on(:email)}", :title => reader.errors.on(:email), :disabled => true
+            %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)
+        - i = i + 1
 
-    %p.buttons
-      = submit_tag 'Invite these people into the group', :name => 'confirm', :class => 'button'
-      or 
-      = link_to 'start again', new_admin_group_group_invitation_url(@group)
+  %p.buttons
+    = submit_tag 'Invite these people into the group', :name => 'confirm', :class => 'button'
+    or 
+    = link_to 'start again', new_admin_group_group_invitation_url(@group)

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

@@ -9,6 +9,9 @@
           %p.title
             = f.label :name
             = f.text_field 'name', :maxlength => 100, :class => "textbox"
+          %p.description
+            = f.label :description
+            = f.text_area 'description'
           %p.homepage
             = f.label :homepage_id, "Group home page:"
             = choose_page 'group', 'homepage_id', {:selected =>@group.homepage_id}
@@ -21,41 +24,3 @@
           = save_model_and_continue_editing_button @group
           or
           = link_to "Cancel", admin_groups_url
-
-      - form.edit_membership do
-        - unless @group.new_record?
-          #group_people.box.narrow
-            %h3
-              Group members
-            - readers = Reader.find(:all)
-            - total = readers.count
-            - column_length = (readers.count-1) / 2
-            - columns = [readers[0..column_length], readers[column_length+1..readers.count]]
-            - columns.each do |column|
-              %ul.column
-                - column.each do |reader|
-                  %div{:id => "reader_holder_#{reader.id}"}
-                    = render :partial => 'admin/memberships/reader', :object => reader
-
-      - form.edit_pages do
-        - unless @group.new_record?
-          #group_pages.box.narrow
-            %h3
-              Private pages
-            %ul
-              - page = Page.respond_to?(:homepage) ? Page.homepage : Page.find_by_parent_id(nil)
-              %div{:id => "page_holder_#{page.id}"}
-                = render :partial => 'admin/permissions/page', :object => page
-
-          :javascript
-            var h1 = $('group_pages').getHeight();
-            var h2 = $('group_people').getHeight();
-            var h = (h1 > h2) ? h1 : h2
-            $('group_people').setStyle({'height': h + 'px'});
-            $('group_pages').setStyle({'height': h + 'px'});
-  
-          #footnotes
-            %p
-              The pages selected on the left are only visible to the people selected on the right.
-          
-  

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

@@ -1,4 +1,5 @@
-- include_stylesheet('admin/group')
+- include_stylesheet('admin/reader_group')
+
 - render_region :main do |main|
   - main.edit_header do
     %h1 

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

@@ -1,4 +1,4 @@
-- include_stylesheet('admin/group')
+- include_stylesheet('admin/reader_group')
 
 = render_region :top
 
@@ -8,7 +8,34 @@
       = render :partial => 'list_head'
     %tbody
       - @groups.each do |group|
-        = render :partial => 'listed', :locals => {:group => group}
+        %tr
+          - render_region :tbody do |tbody|
+            - tbody.name_cell do
+              %td.name
+                %p
+                  = link_to group.name, admin_group_url(group)
+                  %br
+                  %span.notes
+                    = truncate_words(group.description, 40)
+            - tbody.home_cell do
+              %td.home
+                - if group.homepage
+                  = link_to group.homepage.title, edit_admin_page_url(group.homepage)
+                - else
+                  = t('none')
+            - tbody.members_cell do
+              %td.members
+                = group.readers.count
+            - tbody.pages_cell do
+              %td.pages
+                = group.pages.count
+            - tbody.modify_cell do
+              %td.actions
+                = link_to_unless_current image('plus') + ' ' + t('add_members'), new_admin_group_group_invitation_url(group), :class => 'action'
+                = link_to_unless_current image('delta') + ' ' + t('edit_group'), edit_admin_group_url(group), :class => 'action'
+                = link_to_unless_current image('minus') + ' ' + t('delete_group'), admin_group_url(group), :method => 'delete', :confirm => t("really_delete_group", :name => group.name), :class => 'action'
+
+        
         
 - render_region :bottom do |bottom|
   - bottom.buttons do
@@ -16,4 +43,4 @@
       = pagination_for @readers
       %ul
         %li
-          = link_to image('plus') + " " + "new group", new_admin_group_url
+          = link_to image('plus') + " " + t("new_group"), new_admin_group_url

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

@@ -1,4 +1,5 @@
-- include_stylesheet('admin/group')
+- include_stylesheet('admin/reader_group')
+
 - render_region :main do |main|
   - main.edit_header do
     %h1 New group

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

@@ -1,41 +1,72 @@
-- include_stylesheet 'admin/group'
+- include_stylesheet 'admin/reader_group'
 - body_classes << "reversed"
 
-%h1
-  Group:
-  = @group.name
+- render_region :header do |header|
+  - header.title do
+    %h1
+      = t('group').titlecase + ":"
+      = @group.name
 
-= textilize(@group.description)
+- render_region :main do |main|
+  - main.messages do
+    #group_messages.box
+      %h3
+        =t('admin_messages').titlecase
+      - ['welcome', 'invitation'].each do |func|
+        - message = Message.functional(func, @group)
+        %p.ruled
+          %label 
+            = t("#{func}_message")
+          - if message
+            %strong
+              = link_to message.subject, admin_message_url(message)
+          - else
+            = link_to image('plus') + ' ' + t("create_#{func}"), new_admin_group_message_url(@group, :function => func), :class => 'action create'
+      %h4
+        =t('other_messages').titlecase
+      - @group.messages.ordinary.each do |message|
+        %p.ruled
+          = link_to message.subject, admin_message_url(message)
+          %span.sent
+            - if message.sent_at
+              = t('last_sent')
+              = l(message.sent_at, :format => :short)
+      %p.ruled
+        = link_to image('plus') + ' ' + t("create_new_message"), new_admin_group_message_url(@group), :class => 'action create'
+        
+  - main.pages do
+    #group_pages.box
+      %h3
+        =t('private_pages').titlecase
+      %ul
+        - page = Page.respond_to?(:homepage) ? Page.homepage : Page.find_by_parent_id(nil)
+        %div{:id => "page_holder_#{page.id}"}
+          = render :partial => 'admin/permissions/page', :object => page
 
+  - main.members do
+    #group_people.box
+      %h3
+        =t('group_members').titlecase
+      - readers = Reader.find(:all)
+      - total = readers.count
+      - column_length = (readers.count-1) / 2
+      - columns = [readers[0..column_length], readers[column_length+1..readers.count]]
+      - columns.each do |column|
+        %ul.column
+          - column.each do |reader|
+            %div{:id => "reader_holder_#{reader.id}"}
+              = render :partial => 'admin/memberships/reader', :object => reader
 
-#group_pages.box.narrow
-  %h2
-    Private pages
-  %ul
-    - page = Page.respond_to?(:homepage) ? Page.homepage : Page.find_by_parent_id(nil)
-    %div{:id => "page_holder_#{page.id}"}
-      = render :partial => 'admin/permissions/page', :object => page
+- render_region :footer do |footer|
+  - footer.notes do
+    #footnotes
+      %p
+        = t('private_page_explanation')
 
-#group_people.box.narrow
-  %h2
-    Group members
-  - readers = Reader.find(:all)
-  - total = readers.count
-  - column_length = (readers.count-1) / 2
-  - columns = [readers[0..column_length], readers[column_length+1..readers.count]]
-  - columns.each do |column|
-    %ul.column
-      - column.each do |reader|
-        %div{:id => "reader_holder_#{reader.id}"}
-          = render :partial => 'admin/memberships/reader', :object => reader
-
-#footnotes
-  %p
-    The pages selected on the left are only visible to the people selected on the right.
-
-:javascript
-  var h1 = $('group_pages').getHeight();
-  var h2 = $('group_people').getHeight();
-  var h = (h1 > h2) ? h1 : h2
-  $('group_people').setStyle({'height': h + 'px'});
-  $('group_pages').setStyle({'height': h + 'px'});
+  - footer.javascript do
+    :javascript
+      var h1 = $('group_pages').getHeight();
+      var h2 = $('group_people').getHeight();
+      var h = (h1 > h2) ? h1 : h2
+      $('group_people').setStyle({'height': h + 'px'});
+      $('group_pages').setStyle({'height': h + 'px'});

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

@@ -0,0 +1,19 @@
+- if @message.administrative?
+  %p
+    - if @message.group
+      = t("group_#{@message.function}_sent_automatically", :name => @message.group.name)
+    - else
+      = t("#{@message.function}_sent_automatically")
+  %ul
+    %li
+      = link_to t('edit_message').titlecase, edit_admin_message_url(@message)
+    %li
+      - if @message.group
+        = link_to @message.group.name + ' ' + t('group_page'), admin_group_url(@message.group)
+      - else
+        = link_to t('reader_configuration_page').titlecase, admin_reader_configuration_url
+
+- if @message.group
+  %p
+    = t("belongs_to_group", :name => @message.group.name)
+