radiant-forum-extension 1.2.1 → 2.0.0

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

@@ -1,20 +1,8 @@
-- content_for :signals do
-  = render :partial => 'readers/flasher'
+= render :partial => 'forums/standard_parts'
 
-- content_for :messages do
-  = 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
+- content_for :newtopic do
   .newmessage
-    = link_to t('new_topic_here'), new_forum_topic_url(@forum)
-
-- content_for :reply_form do
-  - unless @posts.next_page
-    - if @topic.page
-      = link_to "Post a reply", new_topic_post_url(@topic), :class => 'inviting remote_content'
-    - else
-      = render :partial => 'posts/reply'
+    = link_to t('new_topic_here'), new_post_url(:forum_id => @forum.id)
 
 - content_for :pagination do
   = pagination_and_summary_for(@posts, t('post'))
@@ -22,42 +10,41 @@
 - content_for :title do
   = @topic.name
 
-- content_for :thing_title do
-  = @topic.name
-
-- content_for :introduction do
-  = t('topic_show_introduction')
+- content_for :person do
+  = standard_gravatar_for(@topic.reader)
 
-- content_for :speaker do
-  .speaker
-    = gravatar_for(@topic.reader, {:size => 40}, {:alt => @topic.reader.name, :class => 'gravatar', :width => '40', :height => '40'})
+- content_for :first_post do
+  = render :partial => 'posts/post', :locals => {:post => @topic.posts.first, :headless => true, :with_context => true}
 
-- content_for :feed do
+- content_for :feedlink do
   = feed_link(topic_path(@topic, :format => :rss))
 
-- 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')
-  = link_to @forum.name, forum_url(@forum)
+  = link_to t('forum').titlecase + t('separator'), topics_url
+  = yield :parent
 
 - content_for :breadcrumbs do
-  = link_to 'Forum', topics_url
-  \>
-  = link_to @forum.name, forum_url(@forum) 
-  \>
-  = @topic.name
+  = yield :breadhead
+  = t('separator')
+  = yield :title
 
-#forum
+- content_for :messages do
   = yield :pagination if @posts.previous_page
-  = yield :messages
+  = render :partial => 'posts/post', :collection => @posts, :locals => {:with_context => false}
   = yield :pagination if @posts.next_page
-  = yield :reply_form unless @posts.next_page
+
+- content_for :reply_form do
+  = render :partial => 'topics/reply', :locals => {:topic => @topic}
+
+- content_for :sidebar do
+  = render :partial => 'topics/latest'
 
 
 
+#forum
+  = yield :first_post
+  = yield :messages
+  = yield :reply_form unless @posts.next_page

data/config/initializers/radiant_config.rb

@@ -1,12 +1,16 @@
 Radiant.config do |config|
   config.namespace('forum') do |forum|
-    forum.define 'allow_registration?', :default => true
     forum.define 'public?', :default => true
+    forum.define 'toolbar?', :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
+    forum.define 'default_forum', :select_from => lambda { Forum.all.map(&:name) }, :allow_blank => false
+    forum.define 'paginate_posts?', :default => true
+    forum.define 'posts_per_page', :type => :integer, :default => 20
+    forum.define 'commentable_period', :type => :integer, :default => 7, :units => "days"
   end
 end 

data/config/locales/en.yml

@@ -1,6 +1,8 @@
 en:
   a_reply_to: "A reply to"
   add_post: "Add a %{message_type}"
+  add_reply: "Add a reply"
+  ago: "ago"
   all: "all"
   anyone: "anyone"
   anywhere: "anywhere"
@@ -8,67 +10,99 @@ en:
   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"
+  comment_on_page: "a comment added to the page"
   comments: "comments"
   config:
     forum:
-      allow_attachments?: "Posts have file attachments?"
+      allow_attachments?: "Posts have attachments?"
       allow_page_comments?: "Page comments allowed?"
       attachment:
         content_types: "Permitted content types"
         max_size: "Maximum attachment size"
-      editable_period: "Editable period"
+      commentable_period: "Pages commentable for"
+      editable_period: "Posts editable for"
       layout: "Forum layout"
       public?: "Forum public?"
-  date_recently: "%A"
-  date_this_year: "%B %e"
-  edit_forum: "edit forum"
+  confirm_removal_of: "Are you sure you want to delete this post from %{author}? There's no way to get it back if you change your mind."
+  confirm_remove_forum: "Delete forum?"
+  confirm_remove_post: "Delete post?"
+  confirm_remove_topic: "Delete topic?"
+  time:
+    formats:
+      recently: "%A at %l:%M%p"
+      standard: "on %B %e, %Y at %l:%M%p"
+      this_year: "%B %e at %l:%M%p"
+      today: "today at %l:%M%p"
+      yesterday: "yesterday at %l:%M%p"
+  definitely_remove_post: "Yes: delete it"
+  edit_forum: "Edit forum"
   edit_minimal: "e"
-  edit_post: "edit post"
-  edit_topic: "edit topic"
+  edit_post: "Edit post"
+  edit_topic: "Edit topic"
   edit_your_post: "edit your post"
+  error:
+    message_empty: "Sorry: message can't be empty"
+    no_file: "You must choose a file to upload!"
   filed_in: "under %{name}"
   for_comments: "for page comments"
   forum: "Forum"
   forums: "Discussion categories"
   forum_configuration: "Forum settings"
+  forum_messages: "Forum messages"
   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 "
+  forums_heading: "Forum categories"
+  forums_introduction: 'These are the broad filing areas we use to organise the forum. You can also see lists of <a href="/forum/topics">all the latest topics</a> or <a href="/forum/posts">posts</a> across all these categories.'
   from_reader: "from %{name}"
-  if_not_you: "If that's not you, please"
+  if_you_not: "If you're not %{name}, please"
   in: "in"
   in_reply_to: "in reply to"
   label:
-    topic_body: "Opening message"
-    topic_category: "File in category"
-    topic_name: "Discussion title"
+    post:
+      body: "Your message"
+    topic:
+      forum: "File in category"
+      name: "Discussion title"
+      sticky: "Sticky"
+      locked: "Locked"
   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}."
   matching: "matching"
+  messages_from_reader: "Messages from %{name}"
+  most_recently: "most recently"
+  navigation:
+    forum: "Forum"
+    forum_help: "Help"
+    forums: "Categories"
+    readers: "People"
+    new_topic: "New topic"
+    topics: "Latest"
+    your_account: "Your account"
   new_forum: "New forum"
-  new_reply_to: "New reply to"
-  new_topic: "New topic"
+  new_reply_to: "new reply to"
+  new_reply_from: "new reply from"
+  new_topic: "Start a new discussion"
   new_topic_button: "Submit topic"
   new_topic_heading: "Start a new topic"
   new_topic_introduction: ""
   new_topic_here: "start a new<br />topic here"
+  new_topic_started: "New topic started"
   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."
+  notice:
+    topic_deleted: "Topic '%{name}' was deleted."
+    post_deleted: "Post deleted."
   of: "of"
-  on: "on"
   on_date: "on %{date}"
   post: "comment"
   post_body: "Post body"
@@ -78,24 +112,30 @@ en:
     other: "%{count} replies, most recently from"
   post_post: "Post %{message_type}"
   post_removed: "Post removed"
+  posted: "posted"
   posted_and_updated_on: "posted on %{posted} and updated on %{updated}"
+  posted_on: "posted"
   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."
+  posts_heading: "Latest messages"
+  posts_introduction: 'This is a list of all forum posts by date, with the most recent first. You can get a similar list of recent messages <a href="/forum/topics">organised by topic</a>.'
   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"
+  reply_posted: "reply posted"
+  reply_to: "Reply to"
+  reply: "reply"
   rss_feed: "RSS feed"
   save_changes: "Save changes"
+  save_post: "Save post"
   search: "Search"
   search_form:
     forum_label: "In this discussion category"
@@ -104,19 +144,23 @@ en:
   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;'
+  separator: ':'
   showing: "showing"
   sorry_locked: "Sorry: this topic is locked."
-  standard_date: "%B %e, %Y"
+  start_topic: "Start a new conversation"
+  started: "started"
+  started_by: "Started by"
   started_topic_in: "started a new topic under"
   started_topic_on: "started a new topic on %{date}"
-  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_count:
+    zero: "No discussion."
+    one: "One topic: "
+    other: "%{count} topics, most recently "
   topic_show_introduction: ""
+  topic_removed: "Topic removed"
+  post_removed: "Post removed"
   to: "to"
   to_add_post: "To add a %{message_type}"
   topic: "topic"
@@ -124,5 +168,7 @@ en:
   topic_empty: "Topic empty!"
   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"
+  topics_heading: "Latest 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 <a href="/forum/forums">discussion categories</a> or a purely chronological list of <a href="/forum/posts">recent posts.</a>'
+  under: "under"
   unknown_date: "unknown date"

data/config/routes.rb

@@ -1,9 +1,8 @@
 ActionController::Routing::Routes.draw do |map|
   map.with_options :path_prefix => '/forum' do |forum|
-    forum.resources :forums, :only => [:index, :show], :has_many => [:topics, :posts]
-    forum.resources :topics, :has_many => [:posts]
-    forum.resources :posts, :collection => {:search => :get}
-    forum.resources :pages, :has_many => [:posts], :has_one => [:topic]
+    forum.resources :forums, :only => [:index, :show], :has_many => [:topics]
+    forum.resources :topics, :only => [:index, :show], :has_many => [:posts]
+    forum.resources :posts, :member => { :remove => :get }
   end
   
   map.namespace :admin, :member => { :remove => :get }, :path_prefix => 'admin/forum' do |admin|

data/db/migrate/20101222160900_page_posts.rb

@@ -0,0 +1,21 @@
+class PagePosts < ActiveRecord::Migration
+  def self.up
+    add_column :posts, :page_id, :integer
+    Post.reset_column_information
+    Post.all.each do |post|
+      if topic = Topic.find_by_id(post.topic_id)
+        if (topic.page_id)
+          post.page_id = topic.page_id
+          post.topic_id = nil
+          post.save!
+        end
+      end
+    end
+    remove_column :topics, :page_id
+  end
+
+  def self.down
+    remove_column :posts, :page_id
+    add_column :topics, :page_id, :integer
+  end
+end

data/db/migrate/20101222163605_no_comment_forum.rb

@@ -0,0 +1,10 @@
+class NoCommentForum < ActiveRecord::Migration
+  def self.up
+    Forum.find(:all, :conditions => "for_comments = 1").each {|forum| forum.destroy }
+    remove_column :forums, :for_comments
+  end
+
+  def self.down
+    add_column :forums, :for_comments, :boolean
+  end
+end

data/db/migrate/20110105103827_topic_merely_associative.rb

@@ -0,0 +1,23 @@
+class TopicMerelyAssociative < ActiveRecord::Migration
+  def self.up
+    remove_column :topics, :reader_id
+    remove_column :topics, :first_post_id
+    remove_column :topics, :last_post_id
+    remove_column :topics, :posts_count
+    remove_column :topics, :updated_by_id
+    remove_column :topics, :created_by_id
+    remove_column :topics, :updated_at
+    remove_column :topics, :created_at
+  end
+
+  def self.down
+    add_column :topics, :reader_id, :integer
+    add_column :topics, :first_post_id, :integer
+    add_column :topics, :last_post_id, :integer
+    add_column :topics, :posts_count, :integer
+    add_column :topics, :updated_at, :datetime
+    add_column :topics, :created_at, :datetime
+    add_column :topics, :updated_by_id, :integer
+    add_column :topics, :created_by_id, :integer
+  end
+end

data/db/migrate/20110111080550_detach_observer.rb

@@ -0,0 +1,11 @@
+class DetachObserver < ActiveRecord::Migration
+  def self.up
+    remove_column :posts, :updated_by
+    remove_column :posts, :created_by
+  end
+
+  def self.down
+    add_column :posts, :updated_by, :integer
+    add_column :posts, :created_by, :integer
+  end
+end

data/db/migrate/20110127113852_import_attachments.rb

@@ -0,0 +1,9 @@
+class ImportAttachments < ActiveRecord::Migration
+  def self.up
+    add_column :post_attachments, :old_id, :integer
+  end
+
+  def self.down
+    remove_column :post_attachments, :old_id
+  end
+end

data/forum_extension.rb

@@ -1,37 +1,37 @@
 require_dependency 'application_controller'
 
 class ForumExtension < Radiant::Extension
-  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."
+  version "2.0.0"
+  description "Nice clean forums and page comments for inclusion in your radiant site. Requires the reader extension and share_layouts."
   url "http://spanner.org/radiant/forum"
 
   extension_config do |config|
-    config.gem "paperclip"
+    config.gem "paperclip", "~> 2.3"
   end
 
   def activate
+    ActiveRecord::Base.send :include, CommentableModel                         # provides has_comments class method that is used here by topics and pages but can be called from any model
     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                                              # radius tags for highlighting forum content on other pages
+    Page.send :include, ForumPage                                              # makes commentable and reads some configuration
+    Page.send :include, ForumTags                                              # defines radius tags for highlighting forum content on other pages
+    ReadersController.send :include, ForumReadersController                    # adds some partials and helpers to the reader pages
+    ReaderSessionsController.send :include, ForumReaderSessionsController      # changes default login destination to the forum front page
     
     unless defined? admin.forum # UI is a singleton
       Radiant::AdminUI.send :include, ForumAdminUI
       Radiant::AdminUI.load_forum_extension_regions
     end
     
-    # admin.pages.edit.add :parts_bottom, "edit_commentability", :after => "edit_layout_and_type"
+    admin.pages.edit.add :parts_bottom, "edit_commentability", :after => "edit_layout_and_type"
     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
+    if defined? RedCloth::DEFAULT_RULES
       RedCloth.send :include, ForumRedCloth3
       RedCloth::DEFAULT_RULES.push(:smilies)
     else
-      RedCloth::TextileDoc.send :include, ForumRedCloth4                        # interpolate smily icons
+      RedCloth::TextileDoc.send :include, ForumRedCloth4
     end
 
     tab("Forum") do
@@ -42,5 +42,4 @@ class ForumExtension < Radiant::Extension
     end
   end
   
-end
-
+end