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

data/app/views/{readers → accounts}/_form.html.haml

@@ -17,26 +17,22 @@
     = f.label :name, nil, :class => 'required'
     %br
     = f.text_field :name, :class => 'standard'
+    %br
     %span.formnote= t('reader_extension.form_notes.name')
 
-  - if 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')
-
   - if reader.new_record?
     %p
-      = f.label reader.email_field, t('reader_extension.label.reader.email'), :class => 'required'
+      = f.label reader.email_field, t('activerecord.attributes.reader.email'), :class => 'required'
       %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')
     .innocuous
       %p
         =f.label :email, nil, :class => 'required'
         %br
         = f.text_field :email, :class => 'standard', :value => ""
+        %br
         %span.formnote= t('reader_extension.spam_trap')
 
   - else
@@ -44,12 +40,14 @@
       = f.label :email, nil, :class => 'required'
       %br
       = f.text_field :email, :class => 'standard'
+      %br
       %span.formnote= t('reader_extension.form_notes.email')
 
   %p
     = f.label :login, nil, :class => 'optional'
     %br
     = f.text_field :login, :class => 'standard'
+    %br
     %span.formnote= t('reader_extension.form_notes.login')
 
   - if reader.new_record?
@@ -57,6 +55,7 @@
       = f.label :password, nil, :class => 'required'
       %br
       = f.password_field :password, :class => 'standard', :autocomplete => 'off'
+      %br
       %span.formnote= t('reader_extension.form_notes.new_password')
 
     %p
@@ -70,6 +69,7 @@
         = 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
@@ -82,13 +82,8 @@
         = f.label :password_confirmation, t('reader_extension.confirm_new_password'), :class => 'required'
         %br
         = f.password_field :password_confirmation, :class => 'standard', :autocomplete => 'off'
-    
-  - if Radiant::Config['reader.get_profile?']
-    %p
-      = f.label :description, nil, :class => 'optional'
-      %br
-      = f.text_area :description, :class => 'standard', :rows => 8
-      %span.formnote= t('reader_extension.form_notes.description')
+
+  = render :partial => 'memberships'
 
   %p
     = submit_tag reader.new_record? ? t('reader_extension.create_account') : t("reader_extension.update_account")

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

@@ -0,0 +1,3 @@
+%p
+  = standard_gravatar_for(current_reader, 'http://gravatar.com/site/login')
+  = link_to t('reader_extension.change_gravatar'), "http://gravatar.com/site/login/"

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

@@ -0,0 +1,9 @@
+- reader ||= @reader
+
+- groups = reader.groups.visible_to(current_reader)
+- if groups.any?
+  %ul.groups
+    - groups.each do |group|
+      %li
+        = link_to_group(group)
+        = t("reader_extension.member")

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

@@ -0,0 +1,12 @@
+%h3
+  =t('reader_extension.dashboard.directory')
+%ul
+  %li
+    = link_to t("reader_extension.directory.link"), readers_url
+  %li
+    = link_to t("reader_extension.directory.csv_link"), readers_url(:format => :csv)
+  %li
+    = link_to t("reader_extension.directory.vcard_link"), readers_url(:format => :vcard), :class => 'vcard'
+  - Group.visible_to(current_reader).each do |group|
+    %li
+      = link_to_group(group)

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

@@ -0,0 +1,17 @@
+- readers ||= @readers
+
+- if readers.any?
+  - if readers.respond_to?(:previous_page) && readers.previous_page
+    = pagination_and_summary_for(readers, t('reader_extension.person'))
+
+  - if readers.size > 1
+    - columns = [readers[0..readers.size/2], readers[readers.size/2+1..readers.size]]
+  - else
+    - columns = [readers]
+  - columns.each do |readers|
+    %div.column
+      = render :partial => 'accounts/reader', :collection => readers
+
+  - if readers.respond_to?(:next_page) && readers.next_page
+    = pagination_and_summary_for(readers, t('reader_extension.person'))
+

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

@@ -0,0 +1,29 @@
+- if Radiant.config['reader.share_details?']
+  - reader ||= @reader
+  
+  - if reader.unshareable?
+    - if reader == current_reader
+      %p.warning
+        = t('reader_extension.you_are_not_shared')
+  - else
+    %h3
+      = t('reader_extension.directory.contact')
+    %ul
+      - if email = reader.email
+        %li
+          = t("reader_extension.directory.email") + ': '
+          = email_link email
+
+      - %w{phone mobile}.each do |field|
+        - if value = reader.send(field.to_sym)
+          %li
+            = t("reader_extension.directory.#{field}") + ': '
+            = value
+          
+    = reader.postal_address.to_html
+
+    %p
+      - if reader == current_reader
+        = link_to t('reader_extension.check_vcard'), reader_url(reader, :format => :vcard), :class => 'vcard'
+      - else
+        = link_to t('reader_extension.directory.vcard_link'), reader_url(reader, :format => :vcard), :class => 'vcard'

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

@@ -0,0 +1,86 @@
+- reader ||= @reader
+- check_password ||= false
+
+- 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')
+
+  %p
+    = f.label :phone, nil, :class => 'optional'
+    %br
+    = f.text_field :phone, :class => 'standard'
+    %span.formnote= t('reader_extension.form_notes.phone')
+
+  %p
+    = f.label :mobile, nil, :class => 'optional'
+    %br
+    = f.text_field :mobile, :class => 'standard'
+    %span.formnote= t('reader_extension.form_notes.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')
+
+  - if Radiant::Config['reader.use_postal_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')
+  
+  %p
+    = f.label :post_line1, t('activerecord.attributes.reader.postal_address'), :class => 'optional'
+    %br
+    = f.text_field :post_line1, :class => 'standard'
+    %br
+    = f.text_field :post_line2, :class => 'standard'
+    %br
+    = f.label :post_city, nil, :class => 'optional'
+    = f.text_field :post_city, :class => 'standard'
+    %br
+    = f.label :post_province, nil, :class => 'optional'
+    = f.text_field :post_province, :class => 'standard'
+    %br
+    = f.label :postcode, nil, :class => 'optional'
+    = f.text_field :postcode, :class => 'standard'
+
+  %p
+    = f.check_box :unshareable, :class => 'reversed'
+    = f.label :unshareable
+    %br
+    %span.formnote= t('reader_extension.form_notes.unshareable')
+
+  %p
+    = submit_tag reader.new_record? ? t('reader_extension.create_account') : t("reader_extension.update_account")
+    or 
+    = link_to 'cancel', request.referer

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

@@ -0,0 +1,10 @@
+.reader        
+  %h2
+    = link_to standard_gravatar_for(reader), reader_url(reader), {:title => reader.name}
+    = link_to reader.name, reader_url(reader)
+    %span.headernote
+      = link_to ' ', reader_url(reader, :format => :vcard), :class => 'vcard'
+      
+  %p.context
+    = t("reader_extension.joined_on")
+    = l(reader.created_at, :format => :date) + '.'

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

@@ -0,0 +1,28 @@
+- content_for :introduction do
+  %p
+    = link_to t('reader_extension.dashboard.profile'), reader_profile_url
+    \|
+    = link_to t('reader_extension.dashboard.account'), reader_account_url
+    - if Radiant.config['reader.share_details?']
+      \|
+      = link_to t('reader_extension.dashboard.edit_profile'), reader_edit_profile_url
+
+- content_for :breadcrumbs do
+  = link_to t('reader_extension.home'), '/'
+  = t('reader_extension.separator')
+  = t('reader_extension.dashboard.title')
+
+- content_for :title do
+  = t('reader_extension.dashboard.title')
+
+= render :partial => 'shared/standard_reader_parts'
+
+- content_for :sidebar do
+  - render_region :sidebar    
+
+- content_for :main do
+  - render_region :main
+
+
+
+= yield :main

data/app/views/{readers → accounts}/edit.html.haml

@@ -4,18 +4,12 @@
     = link_to(@reader.name, reader_url(@reader)) + '.'
     = t('reader_extension.preferences_intro')
 
-- content_for :form do
-  %pre
-    = @reader.errors.full_messages
-  = render :partial => '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.you').titlecase, '/readers/me'
+  = link_to t('reader_extension.readers').titlecase, readers_url
+  >
+  = link_to t('reader_extension.you').titlecase, profile_url
   >
   = t('reader_extension.account_settings')
 
@@ -24,4 +18,12 @@
 
 = render :partial => 'shared/standard_reader_parts'
 
-= yield :form
+- content_for :main do
+  = render_region :main
+
+- content_for :sidebar do
+  = render_region :sidebar
+    
+
+
+= yield :main

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

@@ -0,0 +1,34 @@
+- content_for :introduction do
+  %p
+    = t("reader_extension.hello").titlecase
+    = link_to(@reader.name, reader_url(@reader)) + '.'
+    - if Radiant.config['reader.public?']
+      = t('reader_extension.profile_intro_public')
+    - elsif Radiant.config['reader.confine_to_groups?']
+      = 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
+  >
+  = t('reader_extension.edit_profile')
+
+- content_for :title do 
+  = t('reader_extension.edit_profile')
+
+= render :partial => 'shared/standard_reader_parts'
+
+= yield :form

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

@@ -0,0 +1,23 @@
+- content_for :introduction do
+  %p
+    =t('reader_extension.readers_introduction')
+
+- content_for :breadcrumbs do
+  = link_to t('reader_extension.home').titlecase, '/'
+  = t('reader_extension.separator')
+  = t('reader_extension.people').titlecase
+
+- content_for :title do
+  = t('reader_extension.people').titlecase
+
+= render :partial => 'shared/standard_reader_parts'
+
+- content_for :sidebar do
+  = render_region :sidebar
+
+- content_for :main do
+  = render_region :main
+
+
+
+= yield :main

data/app/views/{readers → accounts}/show.html.haml

@@ -1,14 +1,3 @@
-
-- content_for :description do
-  - if @reader.description.blank?
-    %p 
-      = t('reader_extension.no_description')
-  - else
-    = clean_html @reader.description
-
-  - @show_partials.each do |partial|
-    = render :partial => partial, :locals => {:reader => @reader}
-
 - content_for :breadhead do
   = link_to t('reader_extension.readers').titlecase, readers_url
   = t('reader_extension.separator')
@@ -23,4 +12,12 @@
 
 = render :partial => 'shared/standard_reader_parts'
 
-= yield :description
+- content_for :sidebar do
+  - render_region :sidebar    
+
+- content_for :main do
+  - render_region :main
+
+
+= yield :main
+

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

@@ -0,0 +1,3 @@
+- unless current_reader.description.blank?
+  .dashboard_module
+    = render :partial => 'accounts/description', :locals => {:reader => current_reader}

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

@@ -0,0 +1,3 @@
+- if Radiant.config['reader.share_details?']
+  .dashboard_module
+    = render :partial => 'accounts/links'

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

@@ -0,0 +1,8 @@
+- if current_reader.groups.any?
+  .dashboard_module
+    %h3
+      = t('reader_extension.dashboard.groups')
+    %ul.groups
+      - current_reader.groups.each do |group|
+        %li
+          = link_to_group(group)

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

@@ -0,0 +1,11 @@
+- if current_reader.messages.any?
+  .dashboard_module
+    %h3
+      =t('reader_extension.dashboard.messages')
+    %ul
+      - current_reader.messages.each do |message|
+        %li
+          = link_to_message(message)
+          - if message.delivered_to?(current_reader)
+            %span.note
+              = t('reader_extension.sent_on', :date => friendly_date(message.delivery_to(current_reader).sent_at))

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

@@ -0,0 +1,3 @@
+- if Radiant.config['reader.share_details?']
+  .dashboard_module
+    = render :partial => 'accounts/profile', :locals => {:reader => current_reader}

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

@@ -0,0 +1,5 @@
+%p
+  - if current_reader.newly_activated?
+    = t("reader_extension.dashboard.welcome", :name => current_reader.name, :site => Radiant.config['site.title'])
+  - else
+    = t("reader_extension.dashboard.introduction", :name => current_reader.name, :site => Radiant.config['site.title'])

data/app/views/groups/_all.html.haml

@@ -0,0 +1,10 @@
+- groups = Group.visible_to(current_reader)
+- if groups.any?
+  %h3
+    = t('reader_extension.groups')
+  %ul.groups
+    - groups.each do |group|
+      %li
+        = link_to_group(group)
+    
+    

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

@@ -0,0 +1,21 @@
+- content_for :introduction do
+  %p
+    =t('reader_extension.groups_introduction')
+
+- content_for :breadcrumbs do
+  = link_to t('reader_extension.home').titlecase, '/'
+  = t('reader_extension.separator')
+  = link_to t('reader_extension.people').titlecase, readers_url
+  = t('reader_extension.separator')
+  = t('reader_extension.groups')
+
+- content_for :title do
+  = t('reader_extension.groups').titlecase
+
+= render :partial => 'shared/standard_reader_parts'
+
+- content_for :main do
+  = render :partial => 'group', :collection => @groups
+
+
+= yield :main

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

@@ -0,0 +1,31 @@
+- content_for :breadhead do
+  = link_to t('reader_extension.groups').titlecase, groups_url
+  = t('reader_extension.separator')
+
+- content_for :title do
+  = @group.name
+
+- content_for :breadcrumbs do
+  = link_to t('reader_extension.home').titlecase, '/'
+  = t('reader_extension.separator')
+  = link_to t('reader_extension.people').titlecase, readers_url
+  = t('reader_extension.separator')
+  = yield :breadhead
+  = yield :title
+
+= render :partial => 'shared/standard_reader_parts'
+
+- content_for :main do
+  %p
+    = t('reader_extension.download_group_as')
+    = link_to t("reader_extension.csv_file"), group_url(@group, :format => :csv), :class => 'csv'
+    = t('or')
+    = link_to t("reader_extension.vcard_file"), group_url(@group, :format => :vcard), :class => 'vcard'
+
+  %h3
+    = t('reader_extension.group_members')
+
+  = render :partial => 'accounts/list', :readers => @readers
+
+= yield :main
+

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

@@ -1,6 +1,15 @@
-#message
-  %iframe.message_body{:src => preview_message_url(@message)}
+- content_for :introduction do
+  %p
+    = t('reader_extension.message_preview_introduction', :date => friendly_date(@delivery.sent_at))
+
+- content_for :message do
+  #preview
+    .message_body
+      %iframe{:src => preview_message_url(@message)}
 
 - content_for :title do
   = @message.subject
-  
+  
+= render :partial => 'shared/standard_reader_parts'
+
+= yield :message

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

@@ -14,7 +14,7 @@
   = t('reader_extension.log_in').titlecase
 
 - content_for :title do
-  = t('reader_extension.please_log_in').titlecase
+  = t('reader_extension.please_log_in')
 
 = render :partial => 'shared/standard_reader_parts'
 

data/app/views/shared/_standard_reader_parts.html.haml

@@ -4,11 +4,17 @@
   
 - content_for :section_navigation do
   = link_to t('reader_extension.navigation.readers'), readers_url, :class => 'section'
+  - if current_reader
+    = link_to t('reader_extension.navigation.dashboard'), reader_dashboard_url
+    = link_to t('reader_extension.navigation.directory'), readers_url
+    = link_to t('reader_extension.navigation.profile'), reader_profile_url
+    = link_to t('reader_extension.navigation.account'), reader_account_url
+    = link_to t('reader_extension.navigation.log_out'), reader_logout_url
   - if Radiant::Config['reader.help_url']
-    = link_to t('reader_extension.navigation.reader_help'), Radiant::Config['reader.help_url']
+    = link_to t('reader_extension.navigation.help'), Radiant::Config['reader.help_url']
 
 - content_for :controls do
-  = render :partial => 'readers/controls'
+  = render :partial => 'accounts/controls'
 
 - content_for :signals do
-  = render :partial => 'readers/flasher'
+  = render :partial => 'accounts/flasher'

data/config/initializers/formats.rb

@@ -0,0 +1,2 @@
+Mime::Type.register "text/x-vcard", :vcard
+Mime::Type.register "text/csv", :csv

data/config/initializers/radiant_config.rb

@@ -4,6 +4,9 @@ Radiant.config do |config|
     reader.define 'require_confirmation?', :default => true
     reader.define 'layout', :select_from => lambda { Layout.all.map(&:name) }, :allow_blank => false
     reader.define 'get_profile?', :default => true
+    reader.define 'public?', :default => false
+    reader.define 'confine_to_groups?', :default => false
+    reader.define 'share_details?', :default => false
   end
   config.namespace('email') do |email|
     email.define 'layout', :select_from => lambda { Layout.all.map(&:name) }, :allow_blank => true