radiant-reader-extension 3.0.0.rc4 → 3.0.0

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'] || current_user.name
-    sender_address = Radiant::Config['email.address'] || current_user.email
+    sender = Radiant::Config['email.name'] ||  message.created_by.name
+    sender_address = Radiant::Config['email.address'] || message.created_by.email
 
     message_layout(message.layout) if message.layout
     content_type("text/html")

data/app/models/reader_page.rb

@@ -21,11 +21,15 @@ class ReaderPage < Page
   end
     
   def cache?
-    !!Radiant.config['readers.public?']
+    public?
+  end
+  
+  def public?
+    Radiant.config['reader.directory_visibility'] == 'public'
   end
   
   def visible?
-    Radiant.config['readers.public?'] || current_reader
+    public? || current_reader
   end
   
   def url_for(thing)
@@ -46,9 +50,9 @@ class ReaderPage < Page
     self.group = Group.find_by_slug(params.first) if params.first =~ /\w/
     self.reader = Reader.find_by_id(params.last) if params.last !~ /\D/
 
-    raise ReaderError::AccessDenied if group && !group.visible_to?(current_reader)
-    raise ReaderError::AccessDenied if reader && !reader.visible_to?(current_reader)
-    raise ActiveRecord::RecordNotFound if reader && group && !reader.is_in?(group)
+    raise ReaderError::AccessDenied, "Group visibility denied" if group && !group.visible_to?(current_reader)
+    raise ReaderError::AccessDenied, "Reader visibility denied: #{current_reader} (#{current_reader.name}) cannot see #{reader} (#{reader.name})" if reader && !reader.visible_to?(current_reader)
+    raise ActiveRecord::RecordNotFound if reader && group && !reader.has_group?(group)
 
     self
   end

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

@@ -4,15 +4,6 @@
 - form_for reader, :html => {:class => 'friendly'} do |f| 
   %input{:type => :hidden, :name => :authentication_type, :value => :user}
 
-  - unless @reader.errors.empty?
-    %p.has_error
-      = t('reader_extension.sorry').titlecase
-      = t('reader_extension.form_problem') + '.'
-      = t('reader_extension.affected_fields_highlighted')
-  - else
-    %p
-      = t('reader_extension.bold_required')
-
   %p
     = f.label :name, nil, :class => 'required'
     %br
@@ -69,7 +60,6 @@
         = f.label :password, nil, :class => 'optional'
         %span.password
           •••••
-        %br
         %span.formnote= link_to t('reader_extension.change_password'), '#', :class => 'toggle', :rel => ".display_password, .new_password"
           
     .new_password.hidden
@@ -83,7 +73,15 @@
         %br
         = f.password_field :password_confirmation, :class => 'standard', :autocomplete => 'off'
 
-  = render :partial => 'memberships'
+- unless reader.new_record?
+  %p
+    = f.label :description, nil, :class => 'optional'
+    %br
+    = f.text_area :description, :class => 'standard'
+    %br
+    %span.formnote= t('reader_extension.form_notes.account.description')
+
+  = render :partial => 'choose_memberships'
 
   %p
     = submit_tag reader.new_record? ? t('reader_extension.create_account') : t("reader_extension.update_account")

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

@@ -0,0 +1,14 @@
+- unless @reader.errors.empty?
+  %p.has_error
+    = t('reader_extension.sorry').titlecase
+    = t('reader_extension.form_problem') + '.'
+    = t('reader_extension.affected_fields_highlighted')
+- else
+  %p
+    = t('reader_extension.bold_required')
+    - unless @reader.new_record?
+      - if controller.action_name == 'edit'
+        = t('reader_extension.or_edit_profile', :url => reader_edit_profile_url)
+      - else
+        = t('reader_extension.or_edit_preferences', :url => reader_account_url)
+    

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

@@ -4,59 +4,37 @@
 - form_for reader, :html => {:class => 'friendly'} do |f| 
   %input{:type => :hidden, :name => :authentication_type, :value => :user}
 
-  - unless @reader.errors.empty?
-    %p.has_error
-      = t('reader_extension.sorry').titlecase
-      = t('reader_extension.form_problem') + '.'
-      = t('reader_extension.affected_fields_highlighted')
-  - else
-    %p
-      = t('reader_extension.bold_required')
-      = t('reader_extension.checked_fields_public')
-
   - if 1 || Radiant::Config['reader.use_honorifics?']
     %p
       = f.label :honorific, nil, :class => 'optional'
       %br
       = f.text_field :honorific, :class => 'standard'
-      %span.formnote= t('reader_extension.form_notes.honorific')
-
-  %p
-    = f.label :name, nil, :class => 'required'
-    %br
-    = f.text_field :name, :class => 'standard'
-    %span.formnote= t('reader_extension.form_notes.name')
-
-  %p
-    = f.label :email, nil, :class => 'required'
-    %br
-    = f.text_field :email, :class => 'standard'
-    %span.formnote= t('reader_extension.form_notes.email')
+      %span.formnote= t('reader_extension.form_notes.account.honorific')
 
   %p
     = f.label :phone, nil, :class => 'optional'
     %br
     = f.text_field :phone, :class => 'standard'
-    %span.formnote= t('reader_extension.form_notes.phone')
+    %span.formnote= t('reader_extension.form_notes.account.phone')
 
   %p
     = f.label :mobile, nil, :class => 'optional'
     %br
     = f.text_field :mobile, :class => 'standard'
-    %span.formnote= t('reader_extension.form_notes.mobile')
+    %span.formnote= t('reader_extension.form_notes.account.mobile')
 
   %p
     = f.label :post_country, nil, :class => 'optional'
     = f.select :post_country, country_options_for_select(reader.post_country)
     %br
-    %span.formnote= t('reader_extension.form_notes.post_country')
+    %span.formnote= t('reader_extension.form_notes.account.post_country')
 
-  - if Radiant::Config['reader.use_postal_organisation?']
+  - if Radiant::Config['reader.postal.use_organisation?']
     %p
       = f.label :post_organisation, nil, :class => 'optional'
       = f.text_field :post_organisation, :class => 'standard'
       %br
-      %span.formnote= t('reader_extension.form_notes.post_organisation')
+      %span.formnote= t('reader_extension.form_notes.account.post_organisation')
   
   %p
     = f.label :post_line1, t('activerecord.attributes.reader.postal_address'), :class => 'optional'
@@ -74,11 +52,17 @@
     = f.label :postcode, nil, :class => 'optional'
     = f.text_field :postcode, :class => 'standard'
 
+  %p
+    = f.label :description, nil, :class => 'optional'
+    %br
+    = f.text_area :description, :class => Radiant::Config['forum.toolbar?'] ? 'rte' : 'standard'
+    %span.formnote= t('reader_extension.form_notes.account.description')
+
   %p
     = f.check_box :unshareable, :class => 'reversed'
     = f.label :unshareable
     %br
-    %span.formnote= t('reader_extension.form_notes.unshareable')
+    %span.formnote= t('reader_extension.form_notes.account.unshareable')
 
   %p
     = submit_tag reader.new_record? ? t('reader_extension.create_account') : t("reader_extension.update_account")

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

@@ -24,5 +24,4 @@
   - render_region :main
 
 
-
 = yield :main

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

@@ -9,7 +9,7 @@
   >
   = link_to t('reader_extension.readers').titlecase, readers_url
   >
-  = link_to t('reader_extension.you').titlecase, profile_url
+  = link_to t('reader_extension.you').titlecase, reader_profile_url
   >
   = t('reader_extension.account_settings')
 
@@ -19,11 +19,11 @@
 = render :partial => 'shared/standard_reader_parts'
 
 - content_for :main do
+  / brings in partials _preamble, _form, _gravatar
   = render_region :main
 
 - content_for :sidebar do
+  / not defined here
   = render_region :sidebar
-    
-
 
 = yield :main

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

@@ -8,21 +8,13 @@
       = t('reader_extension.profile_intro_grouped')
     - else
       = t('reader_extension.profile_intro_private')
-
-- content_for :form do
-  %pre
-    = @reader.errors.full_messages
-  = render :partial => 'profile_form', :locals => {:reader => @reader}
-  %p
-    = standard_gravatar_for(@reader, 'http://gravatar.com/site/login')
-    = link_to t('reader_extension.change_gravatar'), "http://gravatar.com/site/login/"
     
 - content_for :breadcrumbs do 
   = link_to t('reader_extension.home').titlecase, '/'
   >
   = link_to t('reader_extension.readers').titlecase, readers_url
   >
-  = link_to t('reader_extension.you').titlecase, profile_url
+  = link_to t('reader_extension.you').titlecase, reader_profile_url
   >
   = t('reader_extension.edit_profile')
 
@@ -31,4 +23,12 @@
 
 = render :partial => 'shared/standard_reader_parts'
 
-= yield :form
+- content_for :main do
+  / brings in partials _preamble, _profile_form, _gravatar
+  = render_region :main
+
+- content_for :sidebar do
+  / not defined here
+  = render_region :sidebar
+
+= yield :main

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

@@ -0,0 +1,8 @@
+// This is going to be a tree of checkboxes with some 
+// javascript to make visible the inheritance of permission. 
+// It will be used on pages, messages and any other group-linkable object.
+
+- Group.roots.each do |group|
+  = f.check_box :group_ids, {}, group.id
+  = f.label :group_ids, group.name, :class => 'checkbox'
+  %br

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

@@ -1,19 +1,21 @@
 - form_for [:admin, @group] do |f|
   .form-area
     = render_region :form_top
-    = hidden_field 'group', 'lock_version'
 
     - render_region :form do |form|
       - form.edit_group do
         #group
           %p.title
             = f.label :name
-            = f.text_field 'name', :maxlength => 100, :class => "textbox"
+            = f.text_field :name, :maxlength => 100, :class => "textbox"
+          %p.parent
+            = f.label :parent_id
+            = f.select :parent_id, parent_group_options_for_select(@group)
           %p.description
             = f.label :description
-            = f.text_area 'description'
+            = f.text_area :description
           %p.homepage
-            = f.label :homepage_id, "Group home page:"
+            = f.label :homepage_id
             = choose_page 'group', 'homepage_id', {:selected =>@group.homepage_id}
 
       - form.edit_timestamp do
@@ -23,4 +25,4 @@
           = save_model_button @group
           = save_model_and_continue_editing_button @group
           or
-          = link_to "Cancel", admin_groups_url
+          = link_to t("cancel"), admin_groups_url

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

@@ -0,0 +1,29 @@
+%tr{:class =>"level_#{level}"}
+  - render_region :tbody do |tbody|
+    - tbody.name_cell do
+      %td.name{:style => "padding-left: #{9 + (24 * level)}px;"}
+        = link_to image('group', :alt => '') + ' ' + group.name, admin_group_url(group)
+        %br
+        %span.notes
+          = group.description
+    - tbody.home_cell do
+      %td.home
+        - if group.homepage
+          = link_to group.homepage.title, edit_admin_page_url(group.homepage)
+        - else
+          = t('reader_extension.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('reader_extension.add_members'), new_admin_group_group_invitation_url(group), :class => 'action'
+        = link_to_unless_current image('plus') + ' ' + t('reader_extension.add_subgroup'), new_admin_group_url(:parent_id => group.id), :class => 'action'
+        = link_to_unless_current image('delta') + ' ' + t('reader_extension.edit_group'), edit_admin_group_url(group), :class => 'action'
+        = link_to_unless_current image('minus') + ' ' + t('reader_extension.delete_group'), admin_group_url(group), :method => 'delete', :confirm => t("reader_extension.really_delete_group", :name => group.name), :class => 'action'
+
+= render :partial => 'group', :collection => group.children, :locals => {:level => level+1}
+  

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

@@ -7,34 +7,8 @@
     %thead
       = render :partial => 'list_head'
     %tbody
-      - @groups.each do |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
-                    = group.description
-            - tbody.home_cell do
-              %td.home
-                - if group.homepage
-                  = link_to group.homepage.title, edit_admin_page_url(group.homepage)
-                - else
-                  = t('reader_extension.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('reader_extension.add_members'), new_admin_group_group_invitation_url(group), :class => 'action'
-                = link_to_unless_current image('delta') + ' ' + t('reader_extension.edit_group'), edit_admin_group_url(group), :class => 'action'
-                = link_to_unless_current image('minus') + ' ' + t('reader_extension.delete_group'), admin_group_url(group), :method => 'delete', :confirm => t("reader_extension.really_delete_group", :name => group.name), :class => 'action'
-        
+      = render :partial => "group", :collection => @groups, :locals => {:level => 0}
+
 - render_region :bottom do |bottom|
   - bottom.buttons do
     #actions

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

@@ -1,3 +1,4 @@
+- include_javascript 'admin/reader'
 - include_stylesheet 'admin/reader_group'
 - body_classes << "reversed"
 
@@ -40,7 +41,7 @@
         =t('reader_extension.private_pages').titlecase
       %ul
         - page = Page.respond_to?(:homepage) ? Page.homepage : Page.find_by_parent_id(nil)
-        %div{:id => "page_holder_#{page.id}"}
+        %li{:id => "page_holder_#{page.id}"}
           = render :partial => 'admin/permissions/page', :object => page
 
   - main.members do
@@ -56,7 +57,7 @@
       - columns.each do |column|
         %ul.column
           - column.each do |reader|
-            %div{:id => "reader_holder_#{reader.id}"}
+            %li{:id => "reader_holder_#{reader.id}"}
               = render :partial => 'admin/memberships/reader', :object => reader
 
 - render_region :footer do |footer|

data/app/views/admin/memberships/_reader.html.haml

@@ -1,9 +1,5 @@
 - reader ||= @reader
 - group ||= @group
+- cssclass = reader.has_group?(group) ? "fake_checkbox checked" : "fake_checkbox unchecked"
 
-- if membership = group.membership_for(reader)
-  %li{:class => "fake_checkbox checked", :id => "reader_#{reader.id}"}
-    = link_to_remote reader.name, :url => admin_group_membership_url(group, membership), :method => 'delete', :loading => "$('reader_#{reader.id}').addClassName('waiting')", :update => "reader_holder_#{reader.id}"
-- else
-  %li{:class => "fake_checkbox unchecked", :id => "reader_#{reader.id}"}
-    = link_to_remote reader.name, :url => admin_group_memberships_url(group, :reader_id => reader.id), :loading => "$('reader_#{reader.id}').addClassName('waiting')", :update => "reader_holder_#{reader.id}"
+= link_to reader.name, admin_toggle_group_membership_url(:group_id => group.id, :reader_id => reader.id),  {:class => cssclass, :id => "toggle_reader_#{reader.id}"}

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

@@ -17,20 +17,20 @@
           = form.text_area :body, :class => 'textarea', :style => 'width: 100%'
 
     - formpart.edit_function do
-      - if admin?
-        %div.function.set
+      #message_function.set
+        - if admin?
           %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
+            = form.label :group_ids
+            = render :partial => 'admin/groups/chooser', :locals => {:f => form}
+
+        - elsif @message.new_record?
+          - if @message.function
+            = f.hidden_field :function_id
+          - if @message.group_ids
+            = f.hidden_field :group_ids
 
 - render_region :form_bottom do |form_bottom|
   - form_bottom.edit_timestamp do
@@ -41,4 +41,3 @@
       = save_model_and_continue_editing_button(@message)
       = t('or')
       = link_to t("cancel"), @message.new_record? ? admin_messages_url : admin_message_url(@message)
-      

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

@@ -1,7 +1,6 @@
 %span.function
   - if message.administrative?
     = message.function.description
-    - if message.group
+    - if message.groups.any?
       = t('reader_extension.for')
-  - if message.group
-    = link_to message.group.name, admin_group_url(message.group)
+  = message.groups.collect { |group| link_to message.group.name, admin_group_url(message.group) }.join(', ')