radiant-forum-extension 2.0.4 → 2.0.5

data/VERSION

@@ -1 +1 @@
-2.0.4
+2.0.5

data/app/controllers/posts_controller.rb

@@ -7,11 +7,11 @@ class PostsController < ForumBaseController
   before_filter :require_authority, :only => [:edit, :update, :destroy]
 
   def index
-    posts = Post.scoped
-    posts = posts.from(@reader) if @reader
+    @term = params[:q]
+    posts = @forum ? Post.in_forum(@forum) : Post.scoped
+    posts = posts.containing(@term) unless @term.blank?
+    posts = posts.from_reader(@reader) if @reader
     posts = posts.in_topic(@topic) if @topic
-    posts = posts.in_forum(@forum) if @forum
-    posts = posts.containing(@term) if @term = params[:q]
     @posts = posts.paginate(pagination_parameters)
     render_page_or_feed
   end
@@ -29,8 +29,12 @@ class PostsController < ForumBaseController
       @post.topic = @forum.topics.new
     end
     respond_to do |format|
-      format.html { }
-      format.js { render :partial => 'posts/form', :layout => false }
+      format.html { 
+        expires_now
+      }
+      format.js { 
+        render :partial => 'posts/form', :layout => false 
+      }
     end
   end
     
@@ -51,7 +55,9 @@ class PostsController < ForumBaseController
 
   def edit
     respond_to do |format| 
-      format.html { }
+      format.html { 
+        expires_now
+      }
       format.js { render :partial => 'posts/form' }
     end
   end

data/app/models/post.rb

@@ -20,9 +20,11 @@ class Post < ActiveRecord::Base
   named_scope :non_comments, :conditions => "page_id IS NULL"
   named_scope :imported, :conditions => "old_id IS NOT NULL"
   named_scope :in_topic, lambda { |topic| { :conditions => ["topic_id = ?", topic.id] }}
-  named_scope :in_topics, lambda { |topics| { :conditions => ["topic_id IN (#{topics.map("?").join(',')})", topics.map(&:id)] }}
-  named_scope :in_forum, lambda { |forum| in_topics(forum.topics) }
-  named_scope :from, lambda { |reader| { :conditions => ["reader_id = ?", reader.id] }}
+  named_scope :in_topics, lambda { |topics|
+    ids = topics.map(&:id)
+    { :conditions => ["topic_id IN (#{ids.map{"?"}.join(',')})", *ids] }
+  }
+  named_scope :from_reader, lambda { |reader| { :conditions => ["reader_id = ?", reader.id] }}
   named_scope :latest, lambda { |count| { :order => 'created_at DESC', :limit => count }}
   named_scope :except, lambda { |post| { :conditions => ["NOT posts.id = ?", post.id] }}
   named_scope :distinct_readers, :select => "DISTINCT posts.reader_id" do
@@ -32,11 +34,15 @@ class Post < ActiveRecord::Base
   end
   named_scope :containing, lambda { |term|
     { 
-      :conditions => "posts.body LIKE :term OR topics.name LIKE :term", :term => "%#{term}%",
+      :conditions => ["posts.body LIKE :term OR topics.name LIKE :term", {:term => "%#{term}%"}],
       :joins => "LEFT OUTER JOIN topics on posts.topic_id = topics.id"
     }
   }
 
+  def self.in_forum(forum)
+    in_topics(forum.topics)
+  end
+
   def holder
     page || topic
   end

data/app/views/admin/forums/index.html.haml

@@ -24,9 +24,6 @@
             - tbody.title_cell do
               %td.name
                 = link_to forum.name, edit_admin_forum_url(:id => forum)
-                -if forum.for_comments
-                  %p.context
-                    = t('for_comments')
                     
             - tbody.description_cell do
               %td.forum_description
@@ -57,17 +54,12 @@
 
             - tbody.modify_cell do
               %td.actions
-                -if forum.for_comments
+                - if admin?
+                  = link_to image('minus') + ' ' + t('remove'), remove_admin_forum_url(:id => forum) , :class => 'action'
+                - else
                   %span.action.disabled
                     = image('minus_disabled')
                     = " " + t('remove')
-                -else
-                  - if admin?
-                    = link_to image('minus') + ' ' + t('remove'), remove_admin_forum_url(:id => forum) , :class => 'action'
-                  - else
-                    %span.action.disabled
-                      = image('minus_disabled')
-                      = " " + t('remove')
 
 - render_region :bottom do |bottom|
   - bottom.buttons do

data/app/views/forums/_standard_parts.html.haml

@@ -16,11 +16,8 @@
   = link_to t('navigation.forums'), forums_url
   = link_to t('navigation.readers'), readers_url
   = link_to t('navigation.new_topic'), new_post_url
-  - if current_reader
-    = link_to t('navigation.your_account'), reader_account_url
-    = link_to t('log_out'), reader_logout_url
-  - else
-    = link_to t('log_in'), reader_login_url
+  = link_to t('navigation.your_account'), reader_account_url
+  = link_to t('navigation.search'), posts_url
   - if Radiant::Config['forum.help_url']
     = link_to t('navigation.forum_help'), Radiant::Config['forum.help_url']
 

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

@@ -7,6 +7,11 @@
   %p
     = t('forums_introduction')
 
+- content_for :sidebar do
+  = render :partial => 'posts/search_form'
+  = render :partial => 'topics/latest'
+  = render :partial => 'topics/busiest'
+
 - content_for :messages do
   - if @forums.empty?
     %p 

data/app/views/posts/_post.html.haml

@@ -1,7 +1,7 @@
 - post ||= @post
 - first ||= post.first?
-- headless ||= first
 - with_context ||= false
+- headless ||= first unless defined? headless
 
 - cssclasses = []
 - cssclasses << 'first' if post.first?

data/app/views/posts/_search_form.html.haml

@@ -1,8 +1,10 @@
-%form.friendly{:action => posts_url}
+%form.friendly{:action => posts_url, :method => :get}
+  %h2
+    =t('search_header')
   %p
     %label{:for => "q"}
       = t('search_form.query_label')
-    = text_field_tag "q", params[:q], :class => 'standard'
+    = text_field_tag "q", params[:q], :class => 'titular'
 
   %p
     %label{:for => "forum_id"}
@@ -12,13 +14,14 @@
       %option{:value => ""}= t('anywhere')
       = options_from_collection_for_select(Forum.find(:all), "id", "name", params[:forum_id].to_i)
 
-  %p
-    %label{:for => "reader_id"}
-      = t('search_form.person_label')
-    %select{:name => "reader_id"}
-      %option{:value => ""}
-        =t('anyone')
-      = options_from_collection_for_select(Reader.find(:all), "id", "name", params[:reader_id].to_i)
+  - if Radiant::Config['forum.allow_search_by_reader?']
+    %p
+      %label{:for => "reader_id"}
+        = t('search_form.person_label')
+      %select{:name => "reader_id"}
+        %option{:value => ""}
+          =t('anyone')
+        = options_from_collection_for_select(Reader.find(:all), "id", "name", params[:reader_id].to_i)
 
   %p.buttons
-    = submit_tag t("search")
+    %input{:type => 'submit', :value => "Search"}

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

@@ -1,18 +1,27 @@
+- if !@term.blank? || @reader || @forum || @topic
+  - @searching = true
+  - summary = [t('showing_posts')]
+  - summary << t('in') + ' ' + link_to(@forum.name, forum_url(@forum)) if @forum
+  - summary << t('containing') + " <strong>#{@term}</strong>" unless @term.blank?
+  - summary << t('posted_by') + ' ' + link_to(@reader.name, reader_url(@reader)) if @reader
+  - summary << t('in_topic') + ' ' + link_to(@topic.name, forum_topic_url(@topic.forum, @topic)) if @topic
+
 = render :partial => 'forums/standard_parts'
 
 - content_for :title do
   = t('posts_heading')
 
 - content_for :introduction do
-  = t('posts_introduction')
+  - if @searching
+    = summary.join(' ') + ":"
+  - else
+    = t('posts_introduction')
   
 - content_for :sidebar do
+  - unless @searching && @posts.empty?
+    = render :partial => 'posts/search_form'
   = render :partial => "topics/latest"
 
-- content_for :newtopic do
-  .newmessage
-    = link_to t('new_topic'), new_post_url
-
 - content_for :pagination do
   = pagination_and_summary_for(@posts, t('post'))
 
@@ -26,11 +35,16 @@
 
 - content_for :messages do
   - if @posts.empty?
-    %p 
-      = t('no_posts')
+    - if @searching
+      %p.has_error
+        = t('no_search_results')
+      = render :partial => 'posts/search_form'
+    - else
+      %p 
+        = t('no_posts')
   - else
     = yield :pagination if @posts.previous_page
-    = render :partial => 'posts/post', :collection => @posts, :locals => {:with_context => true}
+    = render :partial => 'posts/post', :collection => @posts, :locals => {:with_context => true, :headless => false}
     = yield :pagination if @posts.next_page
 
 #forum

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

@@ -1,7 +1,7 @@
 %h2
   = t('recent_topics')
 %ul
-  - Topic.latest(10).each do |topic|
+  - Topic.latest(5).each do |topic|
     %li.topic
       = link_to_post(topic.posts.last, :class => 'title')
       %br

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

@@ -8,6 +8,7 @@
     = render :partial => 'topics/topic', :collection => @topics
 
 - content_for :sidebar do
+  = render :partial => 'posts/search_form'
   = render :partial => 'forums/latest'
   = render :partial => 'topics/busiest'
 

data/config/initializers/radiant_config.rb

@@ -12,5 +12,6 @@ Radiant.config do |config|
     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"
+    forum.define 'allow_search_by_reader?', :default => true
   end
 end 

data/config/locales/en.yml

@@ -32,13 +32,7 @@ en:
   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"
+  containing: "containing the phrase"
   definitely_remove_post: "Yes: delete it"
   edit_forum: "Edit forum"
   edit_minimal: "e"
@@ -85,6 +79,7 @@ en:
     forums: "Categories"
     readers: "People"
     new_topic: "New topic"
+    search: "Search"
     topics: "Latest"
     your_account: "Your account"
   new_forum: "New forum"
@@ -101,6 +96,7 @@ en:
   no_messages_yet: "No messages yet"
   no_posts: "The forum is empty."
   no_posts_found: "No messages found."
+  no_search_results: "Sorry: no messages match your criteria. Please use the form below to broaden your search."
   no_topics: "No talk here yet."
   notice:
     topic_deleted: "Topic '%{name}' was deleted."
@@ -126,8 +122,8 @@ en:
     zero: "Nothing found"
     one: "One message found"
     other: "%{count} messages found"
-  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>.'
+  posts_heading: "Search the forum"
+  posts_introduction: 'This begins as a full list of all the posts in the forum. Add criteria below to cut down the list to specific subjects and speakers.'
   really_remove_post: "Are you sure you want to delete this comment?"
   recent_topics: "Recent topics"
   remove_minimal: "x"
@@ -147,10 +143,12 @@ en:
     person_label: "From this person"
     query_label: "Look for this text"
   search_whole_forum: "search the whole forum"
+  search_header: "Forum Search"
   search_introduction: "Please choose a search phrase and/or a person or discussion category."
   search_results: "Search Results"
   separator: ':'
   showing: "showing"
+  showing_posts: "Showing topics and messages"
   sorry_locked: "Sorry: this topic is locked."
   start_topic: "Start a new conversation"
   started: "started"
@@ -158,6 +156,13 @@ en:
   started_topic_in: "started a new topic under"
   started_topic_on: "started a new topic on %{date}"
   sticky: "sticky"
+  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"
   time_remaining_to_edit: "You have %{time} left to "
   topic_count:
     zero: "No discussion."
@@ -165,7 +170,6 @@ en:
     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"
@@ -174,6 +178,6 @@ en:
   topic_name: "Topic name"
   topics: "Topics"
   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>'
+  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 href="/forum/posts">search</a> for particular posts and people.'
   under: "under"
   unknown_date: "unknown date"

data/forum_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ForumExtension < Radiant::Extension
-  version "2.0.4"
+  version "2.0.5"
   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"
 

data/lib/forum_tags.rb

@@ -145,7 +145,7 @@ module ForumTags
   desc %{
     Renders the reply date of the current topic in a colloquial form.
   }
-  tag 'forum:topic:date' do |tag|
+  tag 'forum:topic:replydate' do |tag|
     I18n.l tag.locals.topic.replied_at, :format => :standard
   end
 

data/public/javascripts/gallery.js

@@ -38,6 +38,7 @@
       mimic: function () {
         self.zoomer.setImage(self.item.src);
         self.image.attr('src', self.item.src);
+        self.controls.find('a.download').attr('href', self.item.download_url());
         if (self.item.caption.html()) self.caption.html(self.item.caption.html()).show();
         else self.caption.hide();
       },
@@ -96,7 +97,6 @@
       showControls: function (e) {
         self.controls.fadeIn("fast");
         self.closer.fadeIn("fast");
-        self.controls.find('a.download').attr('href', self.item.download_url());
       },
       hideControls: function (e) {
         self.controls.fadeOut("fast");
@@ -108,11 +108,13 @@
         var w = $(window);
         var d = item.imageSize();
         var p = self.container.offset();
-        self.image.animate(d, 'fast');
-        self.container.animate({
+        var r = {
           left: p.left + (self.image.innerWidth() - d.width)/2,
           top: p.top + (self.image.innerHeight() - d.height)/2
-        }, 'fast');
+        };
+        if (resized.top <= 10) resized.top = 10;
+        self.image.animate(d, 'fast');
+        self.container.animate(r, 'fast');
         self.controls.css({left: (d.width - 96)/2});
       },
       reposition: function (item) {
@@ -123,6 +125,7 @@
           top: w.scrollTop() + (w.height() - d.height)/2,
           left: w.scrollLeft() + (w.width() - d.width)/2
         };
+        if (p.top <= 10) p.top = 10;
         if (self.visible) {
           self.image.animate(d, 'fast');
           self.container.animate(p, 'fast');

data/radiant-forum-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-forum-extension}
-  s.version = "2.0.4"
+  s.version = "2.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2011-02-01}
+  s.date = %q{2011-02-07}
   s.description = %q{Nice clean forums and page comments for inclusion in your radiant site. Derived long ago from beast. Requires the reader extension and share_layouts.}
   s.email = %q{will@spanner.org}
   s.extra_rdoc_files = [

data/spec/lib/forum_tags_spec.rb

@@ -17,11 +17,11 @@ describe "Forum Tags" do
     it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:author /></r:forum:topic>}).as("Normal") }
     it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:date /></r:forum:topic>}).as(on_date) }
     it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:url /></r:forum:topic>}).as("/forum/forums/#{topic.forum.id}/topics/#{topic.id}") }
-    it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:context /></r:forum:topic>}).as(%{Started by <a href="/readers/#{reader_id(:normal)}">Normal</a> #{on_date}}) }
+    it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:context /></r:forum:topic>}).as(%{reply from <a href="/readers/#{reader_id(:normal)}">Normal</a>}) }
     it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:body /></r:forum:topic>}).as("<p>original topic message</p>") }
     it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:link /></r:forum:topic>}).as(%{<a href="/forum/forums/#{topic.forum.id}/topics/#{topic.id}">#{topic.name}</a>}) }
-    it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:summary /></r:forum:topic>}).as(%{<li><a href="/forum/forums/#{topic.forum.id}/topics/#{topic.id}">#{topic.name}</a><br />Started by <a href="/readers/#{reader_id(:normal)}">Normal</a> #{on_date}</li>}) }
-    it { should render(%{<r:forum:topic id="#{sticky.id}"><r:forum:topic:summary /></r:forum:topic>}).as(%{<li><a href="/forum/forums/#{sticky.forum.id}/topics/#{sticky.id}">#{sticky.name}</a><br />Started by <a href="/readers/#{reader_id(:normal)}">Normal</a> #{sticky_date}</li>}) }
+    it { should render(%{<r:forum:topic id="#{topic.id}"><r:forum:topic:summary /></r:forum:topic>}).as(%{<li><a href="/forum/forums/#{topic.forum.id}/topics/#{topic.id}">#{topic.name}</a><br />reply from <a href="/readers/#{reader_id(:normal)}">Normal</a></li>}) }
+    it { should render(%{<r:forum:topic id="#{sticky.id}"><r:forum:topic:summary /></r:forum:topic>}).as(%{<li><a href="/forum/forums/#{sticky.forum.id}/topics/#{sticky.id}">#{sticky.name}</a><br />Started by <a href="/readers/#{reader_id(:normal)}">Normal</a></li>}) }
   end
 
   describe "r:forum:post tags" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-forum-extension
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 2
   - 0
-  - 4
-  version: 2.0.4
+  - 5
+  version: 2.0.5
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +00:00
+date: 2011-02-07 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency