radiant-reader_group-extension 0.9.0 → 1.0.0

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

@@ -0,0 +1,7 @@
+%span.function
+  - if message.administrative?
+    = message.function.description
+    - if message.group
+      = t('for')
+  - if message.group
+    = link_to message.group.name, admin_group_url(message.group)

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

@@ -1,3 +1,5 @@
+%h1 group_id
+
 - fields_for @message do |f|
   - if @message.new_record? && @message.group
     = f.hidden_field :group_id

data/app/views/admin/pages/_page_groups.html.haml

@@ -1,17 +1,11 @@
-- include_stylesheet('admin/group')
-= hidden_field_tag "page[group_ids][]", ""
-
-.row
+.set
   %p
-    Allow access only to:
-    - Group.find(:all).each do |g|
-      = check_box_tag "page[group_ids][]", g.id, @page.has_inherited_group?(g), {:id => "page_group_#{g.id}", :disabled => @page.group_is_inherited?(g)}
-      - if @page.group_is_inherited?(g)
-        %label{:for => "page_group_#{g.id}", :class => 'disabled', :title => "group is attached higher in the page tree: can't be detached here"}
-          = g.name
+    = t('allowed_groups')
+    - Group.find(:all).each do |group|
+      = check_box_tag "page[group_ids][]", group.id, @page.has_inherited_group?(group), :id => "page_group_#{group.id}", :disabled => @page.group_is_inherited?(group)
+      - if @page.group_is_inherited?(group)
+        %label.checkbox{:for => "page_group_#{group.id}", :class => 'disabled', :title => t('inherited_group')}
+          = group.name
       - else
-        %label{:for => "page_group_#{g.id}"}
-          = g.name
-    %br
-    %span.formnote
-      Leave all groups unchecked for public access.
+        %label.checkbox{:for => "page_group_#{group.id}"}
+          = group.name

data/app/views/admin/readers/_reader_groups.html.haml

@@ -3,5 +3,5 @@
   - Group.find(:all).each do |group|
     %span.checkbox
       = check_box_tag "reader[group_ids][]", group.id, @reader.is_in?(group), :id => "reader_group_#{group.id}"
-      %label{:for => "reader_group_#{group.id}"}
+      %label.checkbox{:for => "reader_group_#{group.id}"}
         = group.name

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

@@ -1,7 +1,7 @@
 - if Group.subscribable.any?
   %h3
-    Subscriptions
-  %p{:style => 'margin-top: 0;'}
+    = t('subscriptions').titlecase
+  %p
     - Group.subscribable.each do |group|
       = check_box_tag "reader[group_ids][]", group.id, @reader.is_in?(group), :id => "reader_group_#{group.id}"
       %label{:for => "reader_group_#{group.id}"}

data/app/views/site/not_allowed.html.haml

@@ -1,4 +1,4 @@
 %h1
-  Access Denied
+  = t('access_denied')
 %p
-  Sorry: you don't have permission to view that page.
+  = t('page_private')

data/config/locales/en.yml

@@ -0,0 +1,43 @@
+en:
+  group: "group"
+  subscriptions: "subscriptions"
+  inherited_group: "group is attached higher in the page tree: can't be detached here"
+  public_if_no_groups: "Leave all groups unchecked for public access"
+  allowed_groups: "Allow access only to:"
+  page_private: "Sorry: you don't have permission to view that page."
+  none: "none"
+  new_group: "new group"
+  group_members: "Group members"
+  private_pages: "Private pages"
+  admin_messages: "Administrative messages"
+  other_messages: "Ad-hoc messages"
+  create_new_message: "Send a new message"
+  delete_message: "delete message"
+  create_welcome: "create welcome"
+  create_invitation: "create invitation"
+  last_sent: "last sent"
+  private_page_explanation: "The pages selected on the left are only visible to the people selected on the right."
+  group_welcome_sent_automatically: "This message is sent automatically when someone joins the %{name} group."
+  group_invitation_sent_automatically: "This message is sent automatically when someone is invited into the %{name} group."
+  all_in_group: "Everyone in the group"
+  inactive_in_group: "Group members who have not activated their account"
+  unsent_in_group: "Group members who have not received this message"
+  group_page: "group page"
+  for_group: "for the %{name} group"
+  add_members: "add members"
+  delete_group: "delete group"
+  really_delete_group: "Are you sure you want to completely remove the '%{name}' group? This cannot be undone."
+  edit_group: "edit group"
+  belongs_to_group: "This message belongs to the %{name} group."
+  invite_into_group: "Invite people into the %{name} group"
+  invitation_instructions: "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 (one person per line) and after a bit of checking and tweaking on the next page, 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."
+  check_invitation_message: "Preview invitation message"
+  no_invitation_message: "This group has no invitation message. You will need to create one before you can invite people into it."
+  create_invitation_message: "create invitation message"
+  check_invitation_list: "Check the invitation list"
+  invitation_preview_instructions: "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. 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."
+  full_name: "full name"
+  email: "email"
+  optional_phone: "[phone]"
+  optional_login: "[login]"
+  page_not_public: "The page you have requested is not public. Please log in. If your account has the necessary permission you will be taken straight there."

data/lib/admin_messages_controller_extensions.rb

@@ -5,10 +5,11 @@ module AdminMessagesControllerExtensions
     }
   end
 
+protected
+
   def get_group
     model.group = Group.find(params[:group_id]) if params[:group_id]
   end
-
 end
 
 

data/lib/group_ui.rb

@@ -6,11 +6,14 @@ module GroupUI
       attr_accessor :group
       alias_method :groups, :group
 
-      def load_default_regions_with_group
-        load_default_regions_without_group
+      def load_reader_group_extension_regions
         @group = load_default_group_regions
       end
 
+      def load_default_regions_with_group
+        load_default_regions_without_group
+        load_reader_group_extension_regions
+      end
       alias_method_chain :load_default_regions, :group
 
       protected
@@ -19,7 +22,12 @@ module GroupUI
           returning OpenStruct.new do |group|
             group.edit = Radiant::AdminUI::RegionSet.new do |edit|
               edit.main.concat %w{edit_header edit_form}
-              edit.form.concat %w{edit_group edit_timestamp edit_buttons edit_membership edit_pages}
+              edit.form.concat %w{edit_group edit_timestamp edit_buttons}
+            end
+            group.show = Radiant::AdminUI::RegionSet.new do |show|
+              show.header.concat %w{title}
+              show.main.concat %w{messages pages members}
+              show.footer.concat %w{notes javascript}
             end
             group.index = Radiant::AdminUI::RegionSet.new do |index|
               index.thead.concat %w{name_header home_header members_header pages_header modify_header}
@@ -34,4 +42,3 @@ module GroupUI
     end
   end
 end
-

data/lib/grouped_model.rb

@@ -23,7 +23,6 @@ module GroupedModel
           return true if reader.is_in?(group)
           return false
         end
-
       }
       
       belongs_to :group

data/lib/grouped_page.rb

@@ -4,7 +4,9 @@ module GroupedPage
     base.class_eval {
       has_many :permissions
       has_many :groups, :through => :permissions
+      accepts_nested_attributes_for :permissions
       has_one :group, :foreign_key => 'homepage_id'
+      
       include InstanceMethods
       
       # any page with a group-marker is never cached

data/lib/grouped_reader.rb

@@ -4,6 +4,8 @@ module GroupedReader
     base.class_eval {
       has_many :memberships
       has_many :groups, :through => :memberships
+      accepts_nested_attributes_for :memberships
+
       include InstanceMethods
       alias_method_chain :activate!, :group
       alias_method_chain :send_functional_message, :group

data/lib/site_controller_extensions.rb

@@ -17,11 +17,11 @@ module SiteControllerExtensions
         show_page_without_group_check
       rescue ReaderGroup::PermissionDenied
         if current_reader
-          flash[:error] = "Sorry: you don't have permission to see that page."
+          flash[:error] = "sorry_access_denied"
           redirect_to reader_permission_denied_url
         else
-          flash[:explanation] = "The page you have requested is not public. Please log in, and if your account has the necessary permission you will be taken straight there."
-          flash[:error] = "Please log in."
+          flash[:explanation] = "page_not_public"
+          flash[:error] = "please_log_in"
           store_location
           redirect_to reader_login_url
         end

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

@@ -0,0 +1,242 @@
+@import compass
+
+#content
+  table
+    &#groups 
+      td.name
+        width: 35%
+        a
+          font-size: 160%
+        span.notes
+          font-size: 80%
+          color: #929488
+          font-weight: lighter
+          line-height: 1.2
+          margin-top: 0.25em
+    &#import
+      th
+        text-align: left
+      td
+        padding: 2px
+  form#confirmation_form
+    table
+      width: 90%
+    input
+      &.preview
+        border: 1px solid #929488
+        font-family: 'Lucida Grande'
+        font-size: 16px
+        padding: 3px
+        width: 95%
+      &.with_error
+        border: 1px solid #c00
+        color: #c00
+    tr.invite td input
+      background-color: #e2e1dc
+    p.buttons
+      margin-top: 10px
+  .form-area
+    label.disabled
+      color: #929488
+    span.formnote
+      font-size: 80%
+      color: #929488
+  #group_pages
+    clear: left
+    width: 58%
+    float: left
+  #group_people
+    width: 35%
+    float: right
+  #group_messages
+    float: left
+    width: 98%
+    ul
+      list-style: square
+      font-size: 85%
+      padding-left: 14px
+  div.stretcher
+    clear: left
+  table#group_pages td.page a
+    color: black
+    text-decoration: none
+    &:hover
+      color: blue
+      text-decoration: underline
+  blockquote.messagepreview
+    border: 3px solid #999
+    background-color: #eee
+    margin: 0
+    padding: 20px
+    font-family: courier, monospace
+    font-size: 13px
+    line-height: 16px
+  .form-area p
+    &.description, &.invitation
+      margin-top: 10px
+  #footnotes
+    clear: both
+    margin-top: 50px
+
+#group_pages ul
+  padding-left: 20px
+
+#group_people ul
+  padding-left: 0
+  li
+    font-size: 16px
+    list-style: none
+    line-height: 24px
+    margin-top: 2px
+    font-family: 'Lucida Grande'
+
+#group_pages ul li
+  font-size: 16px
+  list-style: none
+  line-height: 24px
+  margin-top: 2px
+  font-family: 'Lucida Grande'
+
+/*#group_people ul li a, #group_pages ul li a {
+ *  text-decoration: none;
+ *  font-weight: normal;
+ *}
+/*
+ *#group_pages ul li.inherited a {
+ *  color: #ccc;
+ *  font-weight: normal;
+ *}
+ *
+ *#group_people ul li.attached a, #group_pages ul li.attached a {
+ *  color: #060;
+ *  font-weight: bold;
+ *}
+
+.fake_checkbox
+  padding-left: 20px
+  cursor: pointer
+  background-repeat: no-repeat
+  background-position: 0 3px
+  input
+    position: absolute
+    left: -9999px
+  a
+    text-decoration: none
+  &.checked
+    background-image: url(/images/admin/chk_on.png)
+  &.unchecked
+    background-image: url(/images/admin/chk_off.png)
+  &.inherited
+    background-image: url(/images/admin/chk_auto.png)
+
+.checked a, .selected a
+  color: #5da454
+
+.unchecked a, .unselected a
+  color: #ccc
+  font-weight: normal
+
+.waiting a
+  color: #8c8d8e
+
+.failed a
+  color: #c00
+
+.inherited
+  color: #bfe4b9
+  
+span.group_actions
+  img
+    opacity: 0.5
+  a img
+    opacity: 1
+
+.box
+  a.action, span.action.disabled
+    padding: 3px 4px
+    margin: 0 25px 0 1px
+    img
+      vertical-align: auto
+  a.action
+    color: black
+    text-decoration: none
+    &:hover
+      background: #eee image_url('admin/buttons_background.png') repeat-x
+      border: 1px solid #a5c9df
+      margin: 0 24px 0 0
+      +border-radius
+    &.selected
+      background: #c5e0f5
+      +linear-gradient(color_stops(#e5f5ff, #c5e0ff))
+      border: 1px solid #a5c9df
+      margin: 0 24px 0 0
+      +border-top-radius
+      +border-bottom-radius(0)
+  span.action.disabled
+    color: #ccc
+  span.sent
+    color: #ccc
+    
+/* show and send page
+
+div#preview
+  float: left
+  width: 65%
+  +box-shadow
+  background-color: white
+  .message_header
+    padding: 10px
+    overflow: hidden
+    background-color: #eee
+    color: #333
+    font-size: 80%
+    line-height: 1.5
+    ul
+      margin: 0
+      padding: 6px 14px
+      list-style-type: none
+      li.subject
+        font-size: 1.6em
+        margin-top: 6px
+      li.mime-version, li.content-type
+        display: none
+  .message_body
+    iframe.message_body
+      width: 99%
+      height: 520px
+      margin: 0
+      border: 0
+      overflow: auto
+    
+  div.preview_controls
+    height: 24px
+    p
+      margin: 2px 14px
+      text-align: right
+    a
+      text-decoration: none
+      color: #c00
+      
+div#deliver
+  position: relative
+  float: left
+  width: 27%
+  margin-left: 2%
+
+/* edit pages
+
+ul.help
+  list-style: square
+  color: #666
+  font-size: 85%
+  code
+    color: #c00
+    font-size: 115%
+
+
+#content 
+  form
+    p
+      textarea
+        width: 100%
+        height: 8em