radiant-forum-extension 2.0.7 → 2.0.8

data/VERSION

@@ -1 +1 @@
-2.0.7
+2.0.8

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

@@ -8,7 +8,7 @@
     = t('forums_introduction')
 
 - content_for :sidebar do
-  = render :partial => 'posts/search_form'
+  = render :partial => 'posts/search_form', :locals => {:minimal => true}
   = render :partial => 'topics/latest'
   = render :partial => 'topics/busiest'
 

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

@@ -11,6 +11,7 @@
     = link_to t('new_topic_here'), new_post_url(:forum_id => @forum.id)
 
 - content_for :sidebar do
+  = render :partial => 'posts/search_form'
   = render :partial => "topics/latest"
 
 - content_for :pagination do

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

@@ -1,27 +1,32 @@
+- minimal ||= false
+
 %form.friendly{:action => posts_url, :method => :get}
-  %h2
-    =t('search_header')
+  - unless minimal
+    %h2
+      =t('search_header')
+
   %p
     %label{:for => "q"}
-      = t('search_form.query_label')
+      = t(minimal ? 'search_form.minimal_query_label' : 'search_form.query_label')
     = text_field_tag "q", params[:q], :class => 'titular'
 
-  %p
-    %label{:for => "forum_id"}
-      = t('search_form.forum_label')
+  - unless minimal
+    %p
+      %label{:for => "forum_id"}
+        = t('search_form.forum_label')
       
-    %select{:name => "forum_id"}
-      %option{:value => ""}= t('anywhere')
-      = options_from_collection_for_select(Forum.find(:all), "id", "name", params[:forum_id].to_i)
+      %select{:name => "forum_id"}
+        %option{:value => ""}= t('anywhere')
+        = options_from_collection_for_select(Forum.find(:all), "id", "name", params[:forum_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)
+    - 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
     %input{:type => 'submit', :value => "Search"}

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

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

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

@@ -16,6 +16,10 @@
 - content_for :first_post do
   = render :partial => 'posts/post', :locals => {:post => @topic.posts.first, :headless => true, :with_context => true}
 
+- content_for :sidebar do
+  = render :partial => 'posts/search_form', :locals => {:minimal => true}
+  = render :partial => 'topics/latest'
+
 - content_for :feedurl do
   = topic_path(@topic, :format => :rss)
 
@@ -42,9 +46,6 @@
 - content_for :reply_form do
   = render :partial => 'topics/reply', :locals => {:topic => @topic}
 
-- content_for :sidebar do
-  = render :partial => 'topics/latest'
-
 
 
 #forum

data/config/locales/en.yml

@@ -145,7 +145,8 @@ en:
   search_form:
     forum_label: "In this discussion category"
     person_label: "From this person"
-    query_label: "Look for this text"
+    minimal_query_label: "Forum search"
+    query_label: "Search for this text"
   search_header: "Forum Search"
   search_introduction: "Please choose a search phrase and/or a person or discussion category."
   search_results: "Search Results"

data/forum_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ForumExtension < Radiant::Extension
-  version "2.0.7"
+  version "2.0.8"
   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"
 
@@ -42,4 +42,4 @@ class ForumExtension < Radiant::Extension
     end
   end
   
-end
+end

data/radiant-forum-extension.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-forum-extension}
-  s.version = "2.0.7"
+  s.version = "2.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-forum-extension
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: false
   segments: 
   - 2
   - 0
-  - 7
-  version: 2.0.7
+  - 8
+  version: 2.0.8
 platform: ruby
 authors: 
 - spanner