radiant-forum-extension 1.1.2 → 1.2.1

data/app/views/topics/comments.html.haml

@@ -1,5 +1,6 @@
 #forum
-  %h2 Comments
+  %h2 
+    =t('comments').titlecase
 
   = render :partial => 'posts/post', :collection => @posts, :locals => { :with_context => false }
   = render :partial => 'posts/reply'

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

@@ -1,18 +1,12 @@
 - content_for :signals do
   = render :partial => 'readers/flasher'
 
-- content_for :preamble do
-  %p
-    = t('topics_introduction')
-    = link_to( t('categories'), forums_url) + '.'
-
 - content_for :messages do
   - if @topics.empty?
     %p 
       = t('no_topics')
   - else
-    %ul.main
-      = render :partial => 'topics/topic', :collection => @topics, :locals => {:with_context => true}
+    = render :partial => 'topics/topic', :collection => @topics, :locals => {:with_context => true}
 
 - content_for :sidebar do
   %h2
@@ -48,8 +42,6 @@
   = render :partial => 'readers/controls'
 
 #forum
-  = yield :new_topic
-  = yield :preamble
   = yield :pagination if @topics.previous_page
   = yield :messages
   = yield :pagination if @topics.next_page

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

@@ -2,19 +2,36 @@
   = render :partial => 'readers/flasher'
 
 - content_for :form do
-  - form_for :topic, :url  => @forum ? forum_topics_path(@forum) : topics_path, :html => {:class => 'friendly', :multipart => true} do |f|
-    = render :partial => "form", :object => f
-    %p.buttons
-      = submit_tag t('new_topic_button')
-      or 
-      - if @forum
-        = link_to t('cancel'), forum_path(@forum)
-      - else
-        = link_to t('cancel'), :back
+  .post_wrapper
+    .post_header
+      %h2
+        = t('new_topic_heading')
+      %p.context
+        = t('logged_in_as', :name => current_reader.name)
+        = t('if_not_you')
+        = link_to(t('log_out'), reader_logout_url) + '.'
+
+    - form_for :topic, @topic, :url  => @forum ? forum_topics_path(@forum) : topics_path, :html => {:class => 'friendly', :multipart => true} do |f|
+      = render :partial => "form", :object => f
+      %p.buttons
+        = submit_tag t('new_topic_button')
+        = t('or')
+        - if @forum
+          = link_to t('cancel'), forum_path(@forum)
+        - else
+          = link_to t('cancel'), :back
+
+- content_for :speaker do
+  %div.speaker
+    %a{:href => reader_url(current_reader), :class => 'main'}
+      = gravatar_for(current_reader, {:size => 40}, {:alt => current_reader.name, :class => 'gravatar', :width => '40', :height => '40'})
 
 - content_for :title do
   = t('new_topic_heading')
 
+- content_for :introduction do
+  = t('new_topic_introduction')
+
 - content_for :breadhead do
   = link_to t('forum'), forum_home_url
   = t('separator')
@@ -24,12 +41,6 @@
 - content_for :controls do
   = render :partial => 'readers/controls'
 
-- content_for :credits do
-  %p
-    = t('logged_in_as', :name => current_reader.name)
-    = t('if_not_you')
-    = link_to t('log_out'), reader_logout_url
-
 - content_for :breadcrumbs do
   = link_to t('forum'), topics_url
   = t('separator')
@@ -38,8 +49,8 @@
     = t('separator')
   = t('new_topic')
 
-
 #forum
-  = yield :credits
-  = yield :form
+  .post.first
+    = yield :speaker
+    = yield :form
 

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

@@ -2,10 +2,8 @@
   = render :partial => 'readers/flasher'
 
 - content_for :messages do
-  = render :partial => 'posts/post', :collection => @posts, :locals => { :with_context => false }
-
-- content_for :sidebar do
-  = render :partial => "latest"
+  = render :partial => 'posts/post', :object => @first_post, :locals => { :with_context => false, :first => true}
+  = render :partial => 'posts/post', :collection => @posts, :locals => { :with_context => false, :first => false }
 
 - content_for :new_topic do
   .newmessage
@@ -24,16 +22,15 @@
 - content_for :title do
   = @topic.name
 
-- content_for :credits do
-  %p.context
-    posted by
-    = link_to @topic.reader.name, reader_url(@topic.reader)
-    = friendly_date(@topic.created_at)
-    in
-    = link_to @topic.forum.name + '.', forum_url(@topic.forum), {:class => 'breadhead'}
+- content_for :thing_title do
+  = @topic.name
+
+- content_for :introduction do
+  = t('topic_show_introduction')
 
-- content_for :mugshot do
-  = gravatar_for(@topic.reader, {:size => 42}, {:alt => @topic.reader.name, :class => 'gravatar'})
+- content_for :speaker do
+  .speaker
+    = gravatar_for(@topic.reader, {:size => 40}, {:alt => @topic.reader.name, :class => 'gravatar', :width => '40', :height => '40'})
 
 - content_for :feed do
   = feed_link(topic_path(@topic, :format => :rss))
@@ -41,6 +38,9 @@
 - content_for :controls do
   = render :partial => 'readers/controls'
 
+- content_for :parent do
+  = link_to @topic.forum.name + ':', forum_url(@topic.forum)
+
 - content_for :breadhead do
   = link_to t('forum'), forum_home_url
   = t('separator')
@@ -57,7 +57,7 @@
   = yield :pagination if @posts.previous_page
   = yield :messages
   = yield :pagination if @posts.next_page
-  = yield :reply_form
+  = yield :reply_form unless @posts.next_page
 
 
 

data/config/initializers/radiant_config.rb

@@ -0,0 +1,12 @@
+Radiant.config do |config|
+  config.namespace('forum') do |forum|
+    forum.define 'allow_registration?', :default => true
+    forum.define 'public?', :default => true
+    forum.define 'editable_period', :type => :integer, :default => 15, :units => "minutes"
+    forum.define 'allow_page_comments?', :default => true
+    forum.define 'allow_attachments?', :default => true
+    forum.define 'attachment.content_types'
+    forum.define 'attachment.max_size', :type => :integer, :default => 10, :units => "MB"
+    forum.define 'layout', :select_from => lambda { Layout.all.map(&:name) }, :allow_blank => false
+  end
+end 

data/config/locales/en.yml

@@ -1,59 +1,128 @@
 en:
+  a_reply_to: "A reply to"
+  add_post: "Add a %{message_type}"
   all: "all"
+  anyone: "anyone"
+  anywhere: "anywhere"
+  attached: "attached"
+  attach_file: "attach a file"
+  author: "author"
+  begun_on: "begun on %{date}"
+  breadhead_separator: "»"
   by: "by"
+  by_content_and_author: "by content, author or category."
+  comment: "comment"
+  comments: "comments"
   config:
     forum:
-      allow_page_comments?: "Page comments allowed"
-      comments_have_attachments?: "Attachments allowed"
+      allow_attachments?: "Posts have file attachments?"
+      allow_page_comments?: "Page comments allowed?"
+      attachment:
+        content_types: "Permitted content types"
+        max_size: "Maximum attachment size"
       editable_period: "Editable period"
       layout: "Forum layout"
       public?: "Forum public?"
-  date_this_year: "on %B %e at %l:%M%p"
+  date_recently: "%A"
+  date_this_year: "%B %e"
+  edit_forum: "edit forum"
+  edit_minimal: "e"
+  edit_post: "edit post"
+  edit_topic: "edit topic"
   edit_your_post: "edit your post"
+  filed_in: "under %{name}"
+  for_comments: "for page comments"
   forum: "Forum"
   forums: "Discussion categories"
+  forum_configuration: "Forum settings"
+  forum_search: "Forum Search"
+  forum_show_introduction: ""
   forums_introduction: "These are the broad filing areas we use to organise the forum. You can also see a list of "
+  from_reader: "from %{name}"
   if_not_you: "If that's not you, please"
+  in: "in"
+  in_reply_to: "in reply to"
+  label:
+    topic_body: "Opening message"
+    topic_category: "File in category"
+    topic_name: "Discussion title"
+  latest_activity: "latest activity"
   latest_discussion: "Latest topics"
   latest_posts: "Latest comments"
   latest_topics: "all the latest topics"
+  locked: "locked"
   logged_in_as: "You are logged in as %{name}."
-  new_topic: "new topic"
+  matching: "matching"
+  new_forum: "New forum"
+  new_reply_to: "New reply to"
+  new_topic: "New topic"
   new_topic_button: "Submit topic"
   new_topic_heading: "Start a new topic"
+  new_topic_introduction: ""
   new_topic_here: "start a new<br />topic here"
+  no_description_provided: "No description provided."
+  no_file: "You must choose a file to upload!"
   no_forums: "No discussion categories defined here yet."
+  no_messages_yet: "No messages yet"
   no_posts: "The forum is empty."
+  no_posts_found: "No messages found."
   no_topics: "No talk here yet."
   of: "of"
   on: "on"
+  on_date: "on %{date}"
   post: "comment"
+  post_body: "Post body"
   post_count_from: 
     zero: ""
-    one: "One comment, from"
-    other: "%{count} comments, most recently from"
+    one: "One reply, from"
+    other: "%{count} replies, most recently from"
+  post_post: "Post %{message_type}"
   post_removed: "Post removed"
-  posted_and_updated_on: "posted %{posted} and updated %{updated}"
-  posted_by: "Posted by"
-  posted_on: "posted %{date}"
+  posted_and_updated_on: "posted on %{posted} and updated on %{updated}"
+  posted_by: "posted by"
+  posted_on: "posted on %{date}"
+  post: "message"
+  posts: "Messages"
+  posts_found: 
+    zero: "Nothing found"
+    one: "One message found"
+    other: "%{count} messages found"
   posts_introduction: "This is a list of all forum posts by date."
   really_remove_post: "Are you sure you want to delete this comment?"
   recent_topics: "Recent topics"
+  remove_minimal: "x"
   remove_post: "delete comment"
   replied_on: "replied on %{date}"
+  reply_from: "reply from"
   rss_feed: "RSS feed"
+  save_changes: "Save changes"
+  search: "Search"
+  search_form:
+    forum_label: "In this discussion category"
+    person_label: "From this person"
+    query_label: "Look for this text"
+  search_whole_forum: "search the whole forum"
+  search_introduction: "Please choose a search phrase and/or a person or discussion category."
+  search_results: "Search Results"
   separator: '&raquo;'
   showing: "showing"
-  standard_date: "on %B %e, %Y"
+  sorry_locked: "Sorry: this topic is locked."
+  standard_date: "%B %e, %Y"
   started_topic_in: "started a new topic under"
   started_topic_on: "started a new topic on %{date}"
-  time_recently: "on %A at %l:%M%p"
+  started_on: "started on %{date}"
+  sticky: "sticky"
+  time_recently: "%A at %l:%M%p"
   time_remaining_to_edit: "You have %{time} left to "
   time_today: "today at %l:%M%p"
   time_yesterday: "yesterday at %l:%M%p"
+  topic_show_introduction: ""
   to: "to"
+  to_add_post: "To add a %{message_type}"
   topic: "topic"
+  topic_body: "Opening message"
   topic_empty: "Topic empty!"
-  topics: "topics"
+  topic_name: "Topic name"
+  topics: "Topics"
   topics_introduction: "This is a list of all the discussions going on here, with the most recently updated first. You can also see a more organised list of"
   unknown_date: "unknown date"

data/forum_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ForumExtension < Radiant::Extension
-  version "1.1.2"
+  version "1.2.1"
   description "Nice clean forums and page comments for inclusion in your radiant site. Derived long ago from beast. Requires the reader extension and share_layouts."
   url "http://spanner.org/radiant/forum"
 
@@ -10,40 +10,35 @@ class ForumExtension < Radiant::Extension
   end
 
   def activate
-    Reader.send :include, ForumReader
-    ReaderNotifier.send :include, ForumReaderNotifier
-    ReadersController.send :include, ForumReadersController
-    Page.send :include, ForumPage
-    UserActionObserver.instance.send :add_observer!, Forum
+    Reader.send :include, ForumReader                                          # has topics and posts
+    ReaderNotifier.send :include, ForumReaderNotifier                          # sets up post-notification email
+    Page.send :include, ForumPage                                              # topic association and comment support
+    UserActionObserver.instance.send :add_observer!, Forum                     # hook up the usual ownership and datestamp mechanism
     UserActionObserver.instance.send :add_observer!, Topic
     UserActionObserver.instance.send :add_observer!, Post
-    Page.send :include, ForumTags
+    Page.send :include, ForumTags                                              # radius tags for highlighting forum content on other pages
     
     unless defined? admin.forum # UI is a singleton
       Radiant::AdminUI.send :include, ForumAdminUI
-      admin.forum = Radiant::AdminUI.load_default_forum_regions
+      Radiant::AdminUI.load_forum_extension_regions
     end
     
     # admin.pages.edit.add :parts_bottom, "edit_commentability", :after => "edit_layout_and_type"
-    admin.reader_configuration.show.add :settings, "forum", :after => "sender"
-    admin.reader_configuration.edit.add :form, "edit_forum", :after => "edit_sender"
-    
-    if defined? Site && admin.sites
-      Site.send :include, ForumSite
-    end
+    admin.reader_configuration.show.add :settings, "forum", :after => "administration"
+    admin.reader_configuration.edit.add :form, "edit_forum", :after => "administration"
     
     if defined? RedCloth::DEFAULT_RULES     # identifies redcloth 3
       RedCloth.send :include, ForumRedCloth3
       RedCloth::DEFAULT_RULES.push(:smilies)
     else
-      RedCloth::TextileDoc.send :include, ForumRedCloth4
+      RedCloth::TextileDoc.send :include, ForumRedCloth4                        # interpolate smily icons
     end
 
     tab("Forum") do
       add_item 'Categories', '/admin/forum/forums'
       add_item 'Topics', '/admin/forum/topics'
       add_item 'Posts', '/admin/forum/posts'
-      add_item 'Settings', '/admin/forum/settings'
+      add_item 'Settings', '/admin/reader_configuration'
     end
   end
   

data/lib/forum_admin_ui.rb

@@ -3,12 +3,20 @@ module ForumAdminUI
  def self.included(base)
    base.class_eval do
 
-      attr_accessor :forum
+      attr_accessor :forum, :topic, :post
       alias_method :forums, :forum
+      alias_method :topics, :topic
+      alias_method :posts, :post
+
+      def load_forum_extension_regions
+        @forum = load_default_forum_regions
+        @topic = load_default_topic_regions
+        @post = load_default_post_regions
+      end
 
       def load_default_regions_with_forum
         load_default_regions_without_forum
-        @forum = load_default_forum_regions
+        load_forum_extension_regions
       end
       alias_method_chain :load_default_regions, :forum
 
@@ -22,14 +30,48 @@ module ForumAdminUI
               edit.form_bottom.concat %w{edit_timestamp edit_buttons}
             end
             forum.index = Radiant::AdminUI::RegionSet.new do |index|
-              index.thead.concat %w{title_header latest_header modify_header}
-              index.tbody.concat %w{title_cell latest_cell modify_cell}
-              index.bottom.concat %w{new_button}
+              index.thead.concat %w{title_header description_header latest_header modify_header}
+              index.tbody.concat %w{title_cell description_cell latest_cell modify_cell}
+              index.bottom.concat %w{buttons}
             end
             forum.remove = forum.index
             forum.new = forum.edit
           end
         end
+
+        def load_default_topic_regions
+          returning OpenStruct.new do |topic|
+            topic.edit = Radiant::AdminUI::RegionSet.new do |edit|
+              edit.main.concat %w{edit_header edit_form}
+              edit.form.concat %w{edit_name edit_body}
+              edit.form_bottom.concat %w{edit_timestamp edit_buttons}
+            end
+            topic.index = Radiant::AdminUI::RegionSet.new do |index|
+              index.thead.concat %w{title_header date_header author_header body_header modify_header}
+              index.tbody.concat %w{title_cell date_cell author_cell body_cell modify_cell}
+              index.bottom.concat %w{buttons}
+            end
+            topic.remove = topic.index
+            topic.new = topic.edit
+          end
+        end
+
+        def load_default_post_regions
+          returning OpenStruct.new do |post|
+            post.edit = Radiant::AdminUI::RegionSet.new do |edit|
+              edit.main.concat %w{edit_header edit_form}
+              edit.form.concat %w{show_name edit_body}
+              edit.form_bottom.concat %w{edit_timestamp edit_buttons}
+            end
+            post.index = Radiant::AdminUI::RegionSet.new do |index|
+              index.thead.concat %w{body_header author_header topic_header modify_header}
+              index.tbody.concat %w{body_cell author_cell topic_cell modify_cell}
+              index.bottom.concat %w{buttons}
+            end
+            post.remove = post.index
+            post.new = post.edit
+          end
+        end
       
     end
   end