radiant-reader-extension 3.0.3 → 3.0.4

data/app/controllers/admin/memberships_controller.rb

@@ -38,6 +38,22 @@ class Admin::MembershipsController < ApplicationController
     end
   end
   
+  def edit
+    @membership = @group.memberships.find(params[:id])
+    respond_to do |format|
+      format.js { render :partial => 'admin/memberships/role_form' }
+    end
+  end
+
+  def update
+    @membership = @group.memberships.find(params[:id])
+    @membership.update_attributes(params[:membership])
+    @membership.save!
+    respond_to do |format|
+      format.js { render :partial => 'admin/memberships/role' }
+    end
+  end
+  
 protected
 
   def find_reader_and_group

data/app/models/membership.rb

@@ -4,10 +4,19 @@ class Membership < ActiveRecord::Base
   belongs_to :reader
   
   named_scope :for, lambda { |reader|
-    {
-      :conditions => ["memberships.reader_id = ?", reader.id]
+    { :conditions => ["memberships.reader_id = ?", reader.id] }
+  }
+
+  named_scope :of, lambda { |group|
+    { :conditions => ["memberships.group_id = ?", group.id] }
+  }
+
+  named_scope :by_reader_name, lambda {
+    { 
+      :joins => "INNER JOIN readers on memberships.reader_id = readers.id", 
+      :group => "readers.id",
+      :order => "readers.name ASC"
     }
   }
   
 end
-

data/app/models/reader.rb

@@ -135,8 +135,12 @@ class Reader < ActiveRecord::Base
     (grouplist & all_groups).any?
   end
 
+  def membership_of(group)
+    memberships.of(group).first
+  end
+
   def has_group? (group)
-    all_groups.include?(group)
+    !!membership_of(group)
   end
   alias :is_in? :has_group?
   

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

@@ -2,12 +2,7 @@
   %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')
+    = t("reader_extension.profile_intro_#{Radiant.config['reader.directory_visibility']}")
     
 - content_for :breadcrumbs do 
   = link_to t('reader_extension.home').titlecase, '/'

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

@@ -50,15 +50,11 @@
         = link_to image('plus') + ' ' + t('reader_extension.add_members'), new_admin_group_group_invitation_url(@group), :class => 'action'
       %h3
         =t('reader_extension.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|
+          - Reader.all.each do |reader|
             %li{:id => "reader_holder_#{reader.id}"}
               = render :partial => 'admin/memberships/reader', :object => reader
+              
 
 - render_region :footer do |footer|
   - footer.notes do

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

@@ -1,5 +1,9 @@
 - reader ||= @reader
 - group ||= @group
-- cssclass = reader.has_group?(group) ? "fake_checkbox checked" : "fake_checkbox unchecked"
+- membership = reader.membership_of(group)
+- cssclass = membership ? "fake_checkbox checked" : "fake_checkbox unchecked"
 
-= link_to reader.name, admin_toggle_group_membership_url(:group_id => group.id, :reader_id => reader.id),  {:class => cssclass, :id => "toggle_reader_#{reader.id}"}
+= link_to reader.name, toggle_admin_membership_url(:group_id => group.id, :reader_id => reader.id),  {:class => cssclass, :id => "toggle_reader_#{reader.id}"}
+- if membership
+  %span.role
+    = render :partial => 'admin/memberships/role', :locals => {:membership => membership, :group => group}

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

@@ -0,0 +1,3 @@
+- membership ||= @membership
+- group ||= @group
+= link_to membership.role || t('reader_extension.member'), edit_admin_membership_url(membership, :group_id => group.id), {:class => 'inplace'}

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

@@ -0,0 +1,5 @@
+- form_for [:admin, @membership], :html => {:class => 'inplace'} do |f|
+  = hidden_field_tag :group_id, @membership.group_id
+  = f.text_field :role, :maxlength => 100, :class => "minibox"
+  = f.check_box :admin
+  = f.label :admin

data/app/views/admin/permissions/_page.html.haml

@@ -9,7 +9,7 @@
 - else
   - cssclass = "fake_checkbox"
   - cssclass << ' checked' if page.has_group?(group)
-  = link_to page.title, admin_toggle_group_permission_url(:group_id => group.id, :page_id => page.id),  {:class => cssclass, :id => "toggle_page_#{page.id}"}
+  = link_to page.title, toggle_admin_permission_url(:group_id => group.id, :page_id => page.id),  {:class => cssclass, :id => "toggle_page_#{page.id}"}
 
 - if page.children.any?
   %ul

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

@@ -32,9 +32,12 @@
       = t('reader_extension.subgroups', :name => @group.name)
     = render :partial => 'groups/group', :collection => @group.children
 
-  %h2
-    = t('reader_extension.group_members')
-  = render :partial => 'readers/list', :locals => {:readers => @readers}
+  - if @group.memberships.any?
+    %h2
+      = t('reader_extension.group_members')
+    %table.readers
+      %tbody
+        = render :partial => 'memberships/membership', :collection => @group.memberships.by_reader_name
 
 = yield :main
 

data/app/views/memberships/_membership.html.haml

@@ -0,0 +1,36 @@
+- if membership
+  - group = membership.group
+  - reader = membership.reader
+  - if reader
+    %tr.reader
+      - if reader.unshareable?
+        %td{:colspan => 8}
+          = t("reader_extension.listing_denied")
+      - else
+        %td.gravatar
+          = link_to gravatar_for(reader, {:size => 18}, {:class => 'gravatar'}), reader_url(reader), :title => reader.name
+        %td.name
+          %h3
+            = link_to reader.name, reader_url(reader)
+        %td.role
+          %p
+            %span.role
+              = membership.role
+        %td.email
+          %p
+            = mail_to reader.email, nil, :encode => 'hex', :replace_at => " #{t('reader_extension.at')} "
+
+        - [:phone, :mobile].each do |field|
+          - value = reader.send(field)
+          - unless value.blank?
+            %td{:class => field.to_s}
+              %p
+                = value
+          - else
+            %td.missing
+              %p
+                = t("reader_extension.no_#{field}")
+
+        %td.vcard
+          %p
+            = link_to " ", reader_url(reader, :format => :vcard), :class => 'vcard'

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

@@ -4,16 +4,6 @@
   - if readers.respond_to?(:previous_page) && readers.previous_page
     = pagination_and_summary_for(readers, t('reader_extension.person'))
 
-  - if @display == 'gallery'
-    - if readers.size > 1
-      - cols = 3
-      - columns = readers.in_groups_of((readers.size / cols), false)
-    - else
-      - columns = [readers]
-    - columns.each do |column|
-      %div.column
-        = render :partial => 'readers/mugshot', :collection => column
-
   - else
     %table.readers
       %tbody

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

@@ -1,8 +1,11 @@
 - reader ||= @reader
-- groups = reader.groups.visible_to(current_reader)
-- if groups.any?
+- memberships = reader.memberships
+- if memberships.any?
   %ul.groups
-    - groups.each do |group|
-      %li
-        = link_to_group(group)
-        = t("reader_extension.member")
+    - memberships.each do |membership|
+      - if membership.group.visible_to?(current_reader)
+        %li
+          = link_to_group(membership.group)
+          - if membership.role?
+            %span.role
+              = membership.role

data/config/locales/en.yml

@@ -6,6 +6,9 @@ en:
         description: "Description"
         parent_id: "Subgroup of"
         homepage_id: "Group home page"
+      membership:
+        role: "Role"
+        admin: "admin?"
       reader:
         description: "Biog or remarks"
         email: "Email address"
@@ -140,7 +143,7 @@ en:
       directory: "Directory"
       edit_profile: "Edit profile"
       groups: "Your groups"
-      introduction: "Hello %{name}. Welcome back to %{site}. This page gathers together recent activity, useful links and bits of administration. You can always get back here by clicking on a 'dashboard' link."
+      introduction: "Hello %{name}. Welcome back. This page gathers together recent activity, useful links and bits of administration. You can always get back here by clicking on a 'dashboard' link."
       listing: "Directory listing"
       messages: "Messages for you"
       profile: "Your page"

data/config/routes.rb

@@ -1,14 +1,14 @@
 ActionController::Routing::Routes.draw do |map|
+  map.namespace :admin do |admin|
+    admin.resources :readers, :except => [:show]
+  end
+
   map.namespace :admin, :path_prefix => 'admin/readers' do |admin|
     admin.resources :messages, :member => [:preview, :deliver]
     admin.resources :groups, :has_many => [:memberships, :permissions, :group_invitations, :messages]
+    admin.resources :memberships, :only => [:edit, :update], :member => [:toggle]
+    admin.resources :permissions, :only => [], :member => [:toggle]
     admin.resource :reader_configuration, :controller => 'reader_configuration'
-    admin.toggle_group_membership "memberships/toggle", :controller => 'memberships', :action => 'toggle'
-    admin.toggle_group_permission "permissions/toggle", :controller => 'permissions', :action => 'toggle'
-  end
-
-  map.namespace :admin do |admin|
-    admin.resources :readers, :except => [:show]
   end
 
   readers_prefix = Radiant.config['reader.profiles_path'] || "directory"

data/db/migrate/20110908194602_membership_attributes.rb

@@ -0,0 +1,11 @@
+class MembershipAttributes < ActiveRecord::Migration
+  def self.up
+    add_column :memberships, :role, :string
+    add_column :memberships, :admin, :boolean
+  end
+
+  def self.down
+    remove_column :memberships, :role
+    remove_column :memberships, :admin
+  end
+end

data/lib/radiant-reader-extension.rb

@@ -1,5 +1,5 @@
 module RadiantReaderExtension
-  VERSION = '3.0.3'
+  VERSION = '3.0.4'
   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/public/javascripts/admin/reader.js

@@ -13,9 +13,26 @@ Remote.UpdatingLink = Behavior.create(Remote.Base, {
   onclick : function() {
     var self = this;
     var options = Object.extend({ 
-      url : this.element.href, 
+      url : self.element.href, 
       method : 'get',
-      update: this.element.up(),
+      update: self.element.up(),
+      onLoading: function () { self.element.addClassName('waiting'); },
+      onComplete: function () { self.element.removeClassName('waiting'); },
+      onSuccess: function () { Event.addBehavior.reload(); },
+      onFailure: function () { self.element.addClassName('failed'); }
+    }, self.options);
+    return self._makeRequest(options);
+  }
+});
+
+Remote.UpdatingForm = Behavior.create(Remote.Base, {
+  onsubmit : function() {
+    var self = this;
+    var options = Object.extend({
+      url : self.element.action,
+      method : self.element.method || 'get',
+      parameters : self.element.serialize(),
+      update: self.element.up(),
       onLoading: function () { self.element.addClassName('waiting'); },
       onComplete: function () { self.element.removeClassName('waiting'); },
       onSuccess: function () { Event.addBehavior.reload(); },
@@ -28,5 +45,7 @@ Remote.UpdatingLink = Behavior.create(Remote.Base, {
 Event.addBehavior({ 
   'div.radio_group': Toggle.RadioGroupBehavior(),
   'input.select_all': Toggle.SelectAllBehavior(),
-  'a.fake_checkbox': Remote.UpdatingLink()
+  'a.fake_checkbox': Remote.UpdatingLink(),
+  'a.inplace': Remote.UpdatingLink(),
+  'form.inplace': Remote.UpdatingForm()
 });

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

@@ -91,15 +91,42 @@
 
 #group_pages ul
   padding-left: 20px
+  li
+    clear: left
 
 #group_people ul
   padding-left: 0
   li
+    clear: left
     font-size: 16px
+    line-height: 1.6
     list-style: none
-    line-height: 24px
     margin-top: 2px
     font-family: 'Lucida Grande'
+    .role
+      display: block
+      float: left
+      font-weight: normal
+      margin-left: 0.5em
+      a
+        color: #999
+        text-decoration: none
+        background-repeat: no-repeat
+        background-position: 0 3px
+        font-size: 60%
+        vertical-align: text-bottom
+        &.waiting
+          color: #8c8d8e
+          padding-left: 20px
+          background-image: url(/images/admin/spinner.gif)
+      form
+        font-size: 60%
+        input.minibox
+          width: 60px
+          color: #666
+        input, label
+          float: left      
+          vertical-align: text-bottom
 
 #group_pages ul li
   font-size: 16px
@@ -125,6 +152,7 @@
 
 .fake_checkbox
   display: block
+  float: left
   padding-left: 20px
   cursor: pointer
   background-repeat: no-repeat

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 3
   - 0
-  - 3
-  version: 3.0.3
+  - 4
+  version: 3.0.4
 platform: ruby
 authors: 
 - William Ross
@@ -208,6 +208,8 @@ files:
 - app/views/admin/groups/remove.html.haml
 - app/views/admin/groups/show.html.haml
 - app/views/admin/memberships/_reader.html.haml
+- app/views/admin/memberships/_role.html.haml
+- app/views/admin/memberships/_role_form.html.haml
 - app/views/admin/messages/_form.html.haml
 - app/views/admin/messages/_help.html.haml
 - app/views/admin/messages/_list_function.haml
@@ -240,6 +242,7 @@ files:
 - app/views/groups/_group.html.haml
 - app/views/groups/index.html.haml
 - app/views/groups/show.html.haml
+- app/views/memberships/_membership.html.haml
 - app/views/messages/preview.html.haml
 - app/views/messages/show.html.haml
 - app/views/password_resets/create.html.haml
@@ -295,6 +298,7 @@ files:
 - db/migrate/20110812111934_groups_nested_set.rb
 - db/migrate/20110814070858_message_has_many_groups.rb
 - db/migrate/20110905194602_group_ancestry.rb
+- db/migrate/20110908194602_membership_attributes.rb
 - lib/controller_extensions.rb
 - lib/group_tags.rb
 - lib/grouped_model.rb
@@ -349,7 +353,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.3'\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.4'\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: