radiant-reader-extension 3.0.1 → 3.0.2

data/app/controllers/accounts_controller.rb

@@ -14,6 +14,7 @@ class AccountsController < ReaderActionController
   def index
     respond_to do |format|
       format.html {
+        set_expiry
         render :template => 'readers/index'
       }
       format.csv {
@@ -28,6 +29,7 @@ class AccountsController < ReaderActionController
   def show
     respond_to do |format|
       format.html {
+        set_expiry
         render :template => 'readers/show'
       }
       format.vcard {
@@ -100,6 +102,14 @@ class AccountsController < ReaderActionController
   
 protected
 
+  def set_expiry
+    if Radiant.config['directory.visibility'] == 'public'
+      expires_in 1.day
+    else
+      expires_now
+    end
+  end
+
   def i_am_me
     params[:id] = current_reader.id if current_reader && params[:id] == 'me'
   end
@@ -142,7 +152,7 @@ private
 
   def get_readers_and_groups
     @readers = Reader.visible_to(current_reader)
-    @groups = Group.roots.visible_to(current_reader)
+    @groups = current_reader.all_visible_groups
     @reader = Reader.find(params[:id]) if params[:id]
   end
 

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

@@ -18,10 +18,11 @@
 = render :partial => 'shared/standard_reader_parts'
 
 - content_for :sidebar do
-  - render_region :sidebar    
+  = render_region :sidebar   
+  // UI => dashboard/profile dashboard/messages dashboard/directory 
 
 - content_for :main do
-  - render_region :main
-
+  = render_region :main
+  // UI => dashboard/welcome dashboard/groups dashboard/description
 
 = yield :main

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

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

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

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

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

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

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

@@ -4,9 +4,11 @@
       
   %p.context
     = t("reader_extension.member_count", :count => group.readers.count) + '.'
-    = link_to t('reader_extension.directory.vcard_link'), group_url(group, :format => :vcard), :class => 'vcard'
-    = link_to t('reader_extension.directory.csv_link'), group_url(group, :format => :csv), :class => 'csv'
     
   - if group.description
     %p
-      = group.description
+      = group.description
+      
+  - if group.children.any?
+    .indented
+      = render :partial => 'groups/group', :collection => group.children

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

@@ -2,6 +2,10 @@
   %p
     =t('reader_extension.groups_introduction')
 
+- content_for :breadhead do
+  = link_to t('reader_extension.readers_title').titlecase, reader_index_url
+  = t('reader_extension.separator')
+
 - content_for :breadcrumbs do
   = link_to t('reader_extension.home').titlecase, '/'
   = t('reader_extension.separator')

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

@@ -32,7 +32,9 @@
       = t('reader_extension.subgroups', :name => @group.name)
     = render :partial => 'groups/group', :collection => @group.children
 
-  = render :partial => 'readers/people', :readers => @readers
+  %h2
+    = t('reader_extension.group_members')
+  = render :partial => 'readers/list', :locals => {:readers => @readers}
 
 = yield :main
 

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

@@ -0,0 +1,23 @@
+- case Radiant.config['reader.directory_visibility']
+  - when 'public'
+    - if @groups.any?
+      %h2
+        = t('reader_extension.groups').titlecase
+      = render :partial => 'groups/group', :collection => @groups
+    - if @readers.any?
+      %h2
+        = t('reader_extension.people').titlecase
+      = render :partial => 'readers/list', :locals => {:readers => @readers}
+
+  - when 'grouped'
+    %h2
+      = t('reader_extension.your_groups')
+    - if @groups.any
+      = render :partial => 'groups/group', :collection => @groups
+    - else
+      = t('reader_extension.no_groups')
+
+  - else
+    = t('reader_extension.no_directory')
+
+    

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

@@ -4,9 +4,6 @@
   %li
     = link_to t("reader_extension.directory.link"), readers_url
   %li
-    = link_to t("reader_extension.directory.csv_link"), readers_url(:format => :csv), :class => 'csv'
+    = 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) + ' ' + t('group')
+    = link_to t("reader_extension.directory.vcard_link"), readers_url(:format => :vcard)

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

@@ -25,6 +25,6 @@
               = t("reader_extension.directory.postal_address") + ': '
             = reader.postal_address.to_html
         - if reader == current_reader
-          %li
+          %li.edit
             = link_to t("reader_extension.edit_profile"), reader_edit_profile_url, :class => 'edit'
           

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

@@ -25,4 +25,4 @@
 
     %td.vcard
       %p
-        = link_to t('reader_extension.vcard'), reader_url(reader, :format => :vcard), :class => 'vcard'
+        = link_to " ", reader_url(reader, :format => :vcard), :class => 'vcard'

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

@@ -16,5 +16,6 @@
 
 - content_for :main do
   = render_region :main
+  // UI -> readers/directory
 
 = yield :main

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

@@ -14,9 +14,11 @@
 
 - content_for :sidebar do
   - render_region :sidebar    
+  // UI -> readers/profile
 
 - content_for :main do
   - render_region :main
+  // UI -> readers/memberships readers/description
 
 = yield :main
 

data/config/locales/en.yml

@@ -153,7 +153,7 @@ en:
     delivery_status: "Delivery"
     directory: 
       contact: "Contact"
-      csv_link: "Download CSV data"
+      csv_link: "CSV"
       email: "Email"
       groups: "Groups"
       link: "Browse members list"
@@ -163,7 +163,7 @@ en:
       postal_address: "Address"
       profile: "Profile"
       title: "Directory"
-      vcard_link: "Download address book file"
+      vcard_link: "vcard"
     dont_fill: "Don't fill this in!"
     download_as: "Download as"
     download_group_as: "Download the whole group as"
@@ -208,7 +208,6 @@ en:
     group: "group"
     group_filter: "Show only members of the group: "
     group_invitation: "This is the invitation message"
-    group_members: "Group Members"
     group_members: "Group members"
     group_page: "group page"
     group_welcome: "This is the welcome message"
@@ -280,6 +279,7 @@ en:
     new_password_instructions: "Please enter and confirm the new password you would like to use. It should be at least six characters long, nothing obvious or typical and with at least one non-letter character."
     'no': "no"
     no_description: "No description available"
+    no_directory: "This site does not make user information public."
     no_invitation_message: "This group has no invitation message. You will need to create one before you can invite people into it."
     no_mobile: "no mobile"
     none_option: "<none>"
@@ -331,7 +331,7 @@ en:
     reader_saved: "Reader saved"
     readers: 'People'
     readers_introduction_edit: 'You can update your listing by <a href="%{url}">editing your profile</a>.'
-    readers_introduction_grouped: "This is a private directory and will only show people who are in the same groups as you."
+    readers_introduction_grouped: "This is a private directory: information is only shared among members of the same groups."
     readers_introduction_none: "This site does not provide a directory of members."
     readers_introduction_private: "This is a private directory visible only to logged-in users of the site."
     readers_introduction_public: "Click on a person to see their profile, contact information and other details."
@@ -395,6 +395,7 @@ en:
     you_are_not_shared: "You have chosen not to share your contact information."
     your_description: "Your profile text"
     your_email: "Your email address"
+    your_groups: "Your groups"
     your_name: "Your name"
   readers: "Readers"
   settings: "Settings"

data/lib/radiant-reader-extension.rb

@@ -1,5 +1,5 @@
 module RadiantReaderExtension
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
   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

@@ -103,11 +103,11 @@ module ReaderAdminUI
     def load_default_account_regions
       OpenStruct.new.tap do |account|
         account.dashboard = Radiant::AdminUI::RegionSet.new do |dashboard|
-          dashboard.main.concat %w{dashboard/welcome dashboard/groups dashboard/description}
+          dashboard.main.concat %w{dashboard/welcome dashboard/groups}
           dashboard.sidebar.concat %w{dashboard/profile dashboard/messages dashboard/directory}
         end
         account.index = Radiant::AdminUI::RegionSet.new do |index|
-          index.main.concat %w{readers/groups readers/people}
+          index.main.concat %w{readers/directory}
         end
         account.show = Radiant::AdminUI::RegionSet.new do |show|
           show.main.concat %w{readers/memberships readers/description}

data/public/stylesheets/sass/reader.sass

@@ -122,7 +122,10 @@ form.friendly
         margin-left: 10px
         color: white
         text-decoration: none
-    
+
+div.indented
+  margin-left: 40px
+
 .dashboard_module
   margin-top: 2em
   &:first-child
@@ -136,11 +139,12 @@ form.friendly
 #marginalia
   div.contact
     border: 1px solid $paler
-    +box-shadow
+    +box-shadow(1px 2px 3px)
     padding: 1em
     margin: 1em -1em
     h3
       margin-bottom: 1em
+      margin-left: -4px
     ul
       margin-bottom: 0
       li
@@ -150,15 +154,12 @@ form.friendly
           margin-right: 0.5em
         address
           overflow: hidden
-  
-a.vcard, a.csv
-  padding-left: 12px
-  background: transparent url(/images/furniture/vcard_tiny.png) no-repeat 0 0
-  &:hover
-    background-position: 0 -19px
+      li.edit
+        text-align: right
 
-a.csv
-  background-image: url(/images/furniture/csv_tiny.png)
+a.vcard
+  padding-left: 30px
+  background: transparent url(/images/furniture/vcard.png) no-repeat 0 0
 
 h2
   span.headernote
@@ -235,3 +236,28 @@ div#preview
       margin: 0
       border: 0
       overflow: auto
+
+table.readers
+  td
+    vertical-align: top
+    padding-right: 1em
+    padding: 0.25em 1em 0.25em 0
+    border-bottom: 1px dotted $pale
+    h4
+      white-space: nowrap
+    h3, p
+      margin: 0
+      line-height: 25px
+  td.phone, td.mobile
+    white-space: nowrap
+  td.missing
+    color: $pale
+    font-size: 80%
+  tr:last-child
+    td
+      border-bottom: none
+    
+p.exception
+  color: #c00
+  font-size: 150%
+  text-align: center

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 3
   - 0
-  - 1
-  version: 3.0.1
+  - 2
+  version: 3.0.2
 platform: ruby
 authors: 
 - William Ross
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-07 00:00:00 +01:00
+date: 2011-09-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -251,12 +251,11 @@ files:
 - app/views/reader_sessions/_login_form.html.haml
 - app/views/reader_sessions/new.html.haml
 - app/views/readers/_description.html.haml
-- app/views/readers/_groups.html.haml
+- app/views/readers/_directory.html.haml
 - app/views/readers/_links.html.haml
 - app/views/readers/_list.html.haml
 - app/views/readers/_memberships.html.haml
 - app/views/readers/_mugshot.html.haml
-- app/views/readers/_people.html.haml
 - app/views/readers/_profile.html.haml
 - app/views/readers/_reader.html.haml
 - app/views/readers/index.html.haml
@@ -350,7 +349,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.1'\n\n  and if you haven't already, remember to enable ActionMailer in your\n  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.2'\n\n  and if you haven't already, remember to enable ActionMailer in your\n  project's config/environment.rb.\n  "
 rdoc_options: []
 
 require_paths: 

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

@@ -1,9 +0,0 @@
-- groups ||= @groups
-
-%h2
-  = t('reader_extension.groups')
-- if groups.any?
-  = render :partial => 'groups/group', :collection => groups
-- else
-  %p
-    = t('reader_extension.no_groups')

data/app/views/readers/_people.html.haml

@@ -1,6 +0,0 @@
-- readers ||= @readers
-
-%h2
-  = t('reader_extension.people').titlecase
-
-= render :partial => 'readers/list', :locals => {:readers => readers}