radiant-reader-extension 0.9.2 → 1.0.0

data/config/routes.rb

@@ -1,11 +1,11 @@
 ActionController::Routing::Routes.draw do |map|
-  map.namespace :admin do |admin|
-    admin.resources :readers, :except => [:show]
+  map.namespace :admin, :path_prefix => 'admin/readers' do |admin|
+    admin.resources :messages, :member => [:preview, :deliver]
+    admin.resource :reader_configuration, :controller => 'reader_configuration'
   end
 
-  map.namespace :admin, :path_prefix => 'admin/readers' do |admin|
-    admin.resources :messages
-    admin.resources :reader_settings, :except => [:destroy]
+  map.namespace :admin do |admin|
+    admin.resources :readers, :except => [:show]
   end
 
   map.resources :readers
@@ -13,7 +13,6 @@ ActionController::Routing::Routes.draw do |map|
   map.resource :reader_activation, :only => [:show, :new]
   map.resource :password_reset
   
-  map.repassword '/password_reset/:id/:confirmation_code', :controller => 'password_resets', :action => 'edit'
   map.activate_me '/activate/:id/:activation_code', :controller => 'reader_activations', :action => 'update'
   map.reader_register '/register', :controller => 'readers', :action => 'new'
   map.reader_login '/login', :controller => 'reader_sessions', :action => 'new'

data/db/migrate/20101019094714_message_sent_date.rb

@@ -0,0 +1,11 @@
+class MessageSentDate < ActiveRecord::Migration
+  def self.up
+    add_column :messages, :sent_at, :datetime
+    Message.reset_column_information
+    Message.all.each { |message| message.sent_at = message.updated_at || message.created_at; message.save! }
+  end
+
+  def self.down
+    remove_column :messages, :sent_at
+  end
+end

data/lib/reader_admin_ui.rb

@@ -3,15 +3,14 @@ module ReaderAdminUI
  def self.included(base)
    base.class_eval do
 
-      attr_accessor :reader, :message, :reader_setting
+      attr_accessor :reader, :message, :reader_configuration
       alias_method :readers, :reader
       alias_method :messages, :message
-      alias_method :reader_settings, :reader_setting
 
       def load_reader_extension_regions
-        reader = load_default_reader_regions
-        message = load_default_message_regions
-        reader_setting = load_default_reader_setting_regions
+        @reader = load_default_reader_regions
+        @message = load_default_message_regions
+        @reader_configuration = load_default_reader_configuration_regions
       end
 
       def load_default_regions_with_reader
@@ -39,11 +38,16 @@ module ReaderAdminUI
         end
       end
 
-      def load_default_reader_setting_regions
-        returning OpenStruct.new do |reader_settings|
-          reader_settings.index = Radiant::AdminUI::RegionSet.new do |index|
-            index.settings.concat %w{registration site sender}
-            index.messages.concat %w{administration}
+      def load_default_reader_configuration_regions
+        returning OpenStruct.new do |reader_configuration|
+          reader_configuration.show = Radiant::AdminUI::RegionSet.new do |show|
+            show.settings.concat %w{registration sender}
+            show.messages.concat %w{administration}
+          end
+          reader_configuration.edit = Radiant::AdminUI::RegionSet.new do |edit|
+            edit.main.concat %w{edit_header edit_form}
+            edit.form.concat %w{edit_registration edit_sender}
+            edit.form_bottom.concat %w{edit_buttons}
           end
         end
       end
@@ -55,6 +59,17 @@ module ReaderAdminUI
             edit.form.concat %w{edit_subject edit_body}
             edit.form_bottom.concat %w{edit_timestamp edit_buttons}
           end
+          message.index = Radiant::AdminUI::RegionSet.new do |index|
+            index.thead.concat %w{subject_header sent_header modify_header}
+            index.tbody.concat %w{subject_cell sent_cell modify_cell}
+            index.bottom.concat %w{buttons}
+          end
+          message.show = Radiant::AdminUI::RegionSet.new do |show|
+            show.header.concat %w{title}
+            show.preview.concat %w{headers body buttons}
+            show.delivery.concat %w{function options}
+            show.footer.concat %w{notes}
+          end
           message.new = message.edit
         end
       end

data/lib/reader_helper.rb

@@ -3,13 +3,6 @@ module ReaderHelper
   def self.included(base)
 
     base.module_eval do
-
-      # wraps the block in a p with the right class and shows the errors nicely, if there are any
-
-      def with_error_report(errors, &block)
-        render({:layout => 'wrappers/field_errors', :locals => {:errors => errors}}, {}, &block)
-      end
-  
       def clean_textilize(text)
         Sanitize.clean(textilize(text), Sanitize::Config::RELAXED)
       end

data/lib/reader_tags.rb

@@ -96,7 +96,7 @@ module ReaderTags
     <pre><code><r:recipient:repassword_url /></code></pre>
   }
   tag "recipient:repassword_url" do |tag|
-    repassword_url(tag.locals.recipient, :confirmation_code => tag.locals.recipient.perishable_token, :host => @mailer_vars[:@host])
+    new_password_reset_url(tag.locals.recipient, :confirmation_code => tag.locals.recipient.perishable_token, :host => @mailer_vars[:@host])
   end
 
   desc %{
@@ -106,18 +106,23 @@ module ReaderTags
   }
   tag 'sender' do |tag|
     raise TagError, "r:sender only works in email" unless @mailer_vars
-    raise TagError, "no sender" unless tag.locals.sender = @mailer_vars[:@sender]
     tag.expand
   end
 
-  [:name, :email].each do |field|
-    desc %{
-      Only for use in email messages. Displays the #{field} field of the user sending the current message.
-      <pre><code><r:sender:#{field} /></code></pre>
-    }
-    tag "sender:#{field}" do |tag|
-      tag.locals.sender.send(field)
-    end
+  desc %{
+    Only for use in email messages. Displays the name of the email-sender (which is probably configured in `email.name`)
+    <pre><code><r:sender:name /></code></pre>
+  }
+  tag "sender:name" do |tag|
+    @mailer_vars['sender']
+  end
+
+  desc %{
+    Only for use in email messages. Displays the address of the email-sender (which is probably configured in `email.address`)
+    <pre><code><r:sender:address /></code></pre>
+  }
+  tag "sender:address" do |tag|
+    @mailer_vars['reply_to']
   end
 
   # and for referring to messages on pages

data/public/stylesheets/sass/admin/reader.sass

@@ -1,5 +1,69 @@
 @import compass
 
+/* index page
+
+#messages_table
+  td.message_sent
+    color: #666
+    font-size: 80%
+  td.name
+    span.function
+      color: #c00
+      font-size: 80%
+      font-weight: normal
+      a
+        color: #06c
+        font-size: 80%
+        font-weight: normal
+        
+/* 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
+
 #content 
   form
     p
@@ -9,87 +73,14 @@
         text-align: right
         label
           display: inline
-    div.body
-      padding: 12px 20px 20px
-      background: image_url('admin/vertical_tan_gradient.png') top left repeat-x #f5f1e2
-      +box-shadow(rgba(0,0,0,0.15), 2px, 2px, 3px)
-      p
-        margin-top: 0
-        label
-          color: #333
-          text-shadow: none
       textarea
-        border: 1px solid #ccc
-        
-  ul.help
-    list-style: square
-    padding-left: 40px
-    color: #ccc
-    font-size: 85%
-    code
-      color: white
-      font-size: 115%
-
-#reader_settings
-  label
-    padding-left: 25px
+        width: 100%
 
-#message_settings
-  label
-    margin-right: 50px
+ul.help
+  list-style: square
+  color: #666
+  font-size: 85%
+  code
+    color: #c00
+    font-size: 115%
 
-.box
-  span.inplace
-    a
-      color: black
-      &:hover
-        color: #06c
-        text-decoration: underline
-    form
-      display: inline
-    padding-left: 25px
-    background:
-      image: none
-      repeat: no-repeat
-      position: left center
-    &.waiting
-      background-image: url(/images/admin/spinner.gif)
-      a
-        color: #666
-      form
-        opacity: 0.2
-  span.checkbox
-    label
-      width: auto
-    margin: 0
-    label
-      padding-left: 25px
-      background:
-        image: none
-        repeat: no-repeat
-        position: left center
-      cursor: pointer
-    &.true
-      label
-        color: #393
-        background-image: url(/images/admin/chk_on.png)
-    &.false
-      label
-        color: #666
-        background-image: url(/images/admin/chk_off.png)
-    &.waiting
-      label
-        color: #999
-        background-image: url(/images/admin/spinner.gif)
-    input
-      position: absolute
-      left: -999px
-  a
-    text-decoration: none
-  a.create
-    color: #393
-  span.notes
-    display: block
-    margin-left: 25px
-    font-size: 85%
-    color: #555

data/radiant-reader-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-reader-extension}
-  s.version = "0.9.2"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2010-10-04}
+  s.date = %q{2010-10-19}
   s.description = %q{Centralises reader/member/user registration and management tasks for the benefit of other extensions}
   s.email = %q{will@spanner.org}
   s.extra_rdoc_files = [
@@ -21,14 +21,13 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "app/controllers/admin/messages_controller.rb",
-     "app/controllers/admin/reader_settings_controller.rb",
+     "app/controllers/admin/reader_configuration_controller.rb",
      "app/controllers/admin/readers_controller.rb",
      "app/controllers/password_resets_controller.rb",
      "app/controllers/reader_action_controller.rb",
      "app/controllers/reader_activations_controller.rb",
      "app/controllers/reader_sessions_controller.rb",
      "app/controllers/readers_controller.rb",
-     "app/helpers/admin/reader_settings_helper.rb",
      "app/models/message.rb",
      "app/models/message_function.rb",
      "app/models/message_reader.rb",
@@ -37,17 +36,17 @@ Gem::Specification.new do |s|
      "app/models/reader_session.rb",
      "app/views/admin/messages/_form.html.haml",
      "app/views/admin/messages/_help.html.haml",
+     "app/views/admin/messages/_list_function.haml",
      "app/views/admin/messages/_message_description.html.haml",
      "app/views/admin/messages/edit.html.haml",
+     "app/views/admin/messages/index.haml",
      "app/views/admin/messages/new.html.haml",
-     "app/views/admin/reader_settings/_setting.html.haml",
-     "app/views/admin/reader_settings/edit.html.haml",
-     "app/views/admin/reader_settings/index.html.haml",
-     "app/views/admin/reader_settings/show.html.haml",
+     "app/views/admin/messages/preview.html.haml",
+     "app/views/admin/messages/show.html.haml",
+     "app/views/admin/reader_configuration/edit.html.haml",
+     "app/views/admin/reader_configuration/show.html.haml",
      "app/views/admin/readers/_avatar.html.haml",
      "app/views/admin/readers/_form.html.haml",
-     "app/views/admin/readers/_list_head.html.haml",
-     "app/views/admin/readers/_listed.html.haml",
      "app/views/admin/readers/_password_fields.html.haml",
      "app/views/admin/readers/edit.html.haml",
      "app/views/admin/readers/index.html.haml",
@@ -57,8 +56,6 @@ Gem::Specification.new do |s|
      "app/views/password_resets/create.html.haml",
      "app/views/password_resets/edit.html.haml",
      "app/views/password_resets/new.html.haml",
-     "app/views/reader_activations/_activation_required.html.haml",
-     "app/views/reader_activations/_on_activation.html.haml",
      "app/views/reader_activations/show.html.haml",
      "app/views/reader_notifier/message.html.haml",
      "app/views/reader_sessions/_login_form.html.haml",
@@ -68,16 +65,15 @@ Gem::Specification.new do |s|
      "app/views/readers/_extra_controls.html.haml",
      "app/views/readers/_flasher.html.haml",
      "app/views/readers/_form.html.haml",
-     "app/views/readers/create.html.haml",
      "app/views/readers/edit.html.haml",
      "app/views/readers/index.html.haml",
      "app/views/readers/login.html.haml",
      "app/views/readers/new.html.haml",
      "app/views/readers/permission_denied.html.haml",
      "app/views/readers/show.html.haml",
-     "app/views/wrappers/_field_errors.html.haml",
+     "config/initializers/radiant_config.rb",
+     "config/locales/en.yml",
      "config/routes.rb",
-     "config/settings.rb",
      "db/migrate/001_create_readers.rb",
      "db/migrate/002_extend_sites.rb",
      "db/migrate/003_reader_honorifics.rb",
@@ -97,6 +93,7 @@ Gem::Specification.new do |s|
      "db/migrate/20100922152338_lock_versions.rb",
      "db/migrate/20100927095703_default_settings.rb",
      "db/migrate/20101004074945_unlock_version.rb",
+     "db/migrate/20101019094714_message_sent_date.rb",
      "lib/config_extensions.rb",
      "lib/controller_extensions.rb",
      "lib/reader_admin_ui.rb",
@@ -105,12 +102,9 @@ Gem::Specification.new do |s|
      "lib/reader_tags.rb",
      "lib/rfc822.rb",
      "lib/tasks/reader_extension_tasks.rake",
-     "pkg/radiant-reader-extension-0.9.0.gem",
      "public/images/admin/chk_off.png",
      "public/images/admin/chk_on.png",
-     "public/images/admin/new-message.png",
-     "public/images/admin/new-reader.png",
-     "public/javascripts/admin/messages.js",
+     "public/images/admin/delta.png",
      "public/stylesheets/sass/admin/reader.sass",
      "radiant-reader-extension.gemspec",
      "reader_extension.rb",

data/reader_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ReaderExtension < Radiant::Extension
-  version "0.9.2"
+  version "1.0.0"
   description "Provides reader/member/user registration and management functions"
   url "http://spanner.org/radiant/reader"
   
@@ -24,9 +24,6 @@ class ReaderExtension < Radiant::Extension
     unless defined? admin.reader
       Radiant::AdminUI.send :include, ReaderAdminUI
       Radiant::AdminUI.load_reader_extension_regions
-      admin.reader = Radiant::AdminUI.load_default_reader_regions
-      admin.message = Radiant::AdminUI.load_default_message_regions
-      admin.reader_setting = Radiant::AdminUI.load_default_reader_setting_regions
       if defined? admin.sites
         admin.sites.edit.add :form, "admin/sites/choose_reader_layout", :after => "edit_homepage"
       end
@@ -35,16 +32,18 @@ class ReaderExtension < Radiant::Extension
     if respond_to?(:tab)
       tab("Readers") do
         add_item("Readers", "/admin/readers")
-        add_item("Settings", "/admin/readers/reader_settings")
+        add_item("Messages", "/admin/readers/messages")
+        add_item("Settings", "/admin/readers/reader_configuration")
       end
       tab("Settings") do
-        add_item("Reader", "/admin/readers/reader_settings")
+        add_item("Reader", "/admin/readers/reader_configuration")
       end
     else
       admin.tabs.add "Readers", "/admin/readers", :after => "Layouts", :visibility => [:all]
       if admin.tabs['Readers'].respond_to?(:add_link)
         admin.tabs['Readers'].add_link('readers', '/admin/readers')
-        admin.tabs['Readers'].add_link('settings', '/admin/readers/reader_settings')
+        admin.tabs['Readers'].add_link('messages', '/admin/readers/messages')
+        admin.tabs['Readers'].add_link('settings', '/admin/readers/reader_configuration')
       end
     end
   end