radiant-forum-extension 2.0.7 → 2.0.8
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/app/views/forums/index.html.haml +1 -1
- data/app/views/forums/show.html.haml +1 -0
- data/app/views/posts/_search_form.html.haml +22 -17
- data/app/views/topics/index.html.haml +1 -1
- data/app/views/topics/show.html.haml +4 -3
- data/config/locales/en.yml +2 -1
- data/forum_extension.rb +2 -2
- data/radiant-forum-extension.gemspec +1 -1
- metadata +3 -3
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
2.0.
|
1
|
+
2.0.8
|
@@ -1,27 +1,32 @@
|
|
1
|
+
- minimal ||= false
|
2
|
+
|
1
3
|
%form.friendly{:action => posts_url, :method => :get}
|
2
|
-
|
3
|
-
|
4
|
+
- unless minimal
|
5
|
+
%h2
|
6
|
+
=t('search_header')
|
7
|
+
|
4
8
|
%p
|
5
9
|
%label{:for => "q"}
|
6
|
-
= t('search_form.query_label')
|
10
|
+
= t(minimal ? 'search_form.minimal_query_label' : 'search_form.query_label')
|
7
11
|
= text_field_tag "q", params[:q], :class => 'titular'
|
8
12
|
|
9
|
-
|
10
|
-
%
|
11
|
-
|
13
|
+
- unless minimal
|
14
|
+
%p
|
15
|
+
%label{:for => "forum_id"}
|
16
|
+
= t('search_form.forum_label')
|
12
17
|
|
13
|
-
|
14
|
-
|
15
|
-
|
18
|
+
%select{:name => "forum_id"}
|
19
|
+
%option{:value => ""}= t('anywhere')
|
20
|
+
= options_from_collection_for_select(Forum.find(:all), "id", "name", params[:forum_id].to_i)
|
16
21
|
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
22
|
+
- if Radiant::Config['forum.allow_search_by_reader?']
|
23
|
+
%p
|
24
|
+
%label{:for => "reader_id"}
|
25
|
+
= t('search_form.person_label')
|
26
|
+
%select{:name => "reader_id"}
|
27
|
+
%option{:value => ""}
|
28
|
+
=t('anyone')
|
29
|
+
= options_from_collection_for_select(Reader.find(:all), "id", "name", params[:reader_id].to_i)
|
25
30
|
|
26
31
|
%p.buttons
|
27
32
|
%input{:type => 'submit', :value => "Search"}
|
@@ -8,7 +8,7 @@
|
|
8
8
|
= render :partial => 'topics/topic', :collection => @topics
|
9
9
|
|
10
10
|
- content_for :sidebar do
|
11
|
-
= render :partial => 'posts/search_form'
|
11
|
+
= render :partial => 'posts/search_form', :locals => {:minimal => true}
|
12
12
|
= render :partial => 'forums/latest'
|
13
13
|
= render :partial => 'topics/busiest'
|
14
14
|
|
@@ -16,6 +16,10 @@
|
|
16
16
|
- content_for :first_post do
|
17
17
|
= render :partial => 'posts/post', :locals => {:post => @topic.posts.first, :headless => true, :with_context => true}
|
18
18
|
|
19
|
+
- content_for :sidebar do
|
20
|
+
= render :partial => 'posts/search_form', :locals => {:minimal => true}
|
21
|
+
= render :partial => 'topics/latest'
|
22
|
+
|
19
23
|
- content_for :feedurl do
|
20
24
|
= topic_path(@topic, :format => :rss)
|
21
25
|
|
@@ -42,9 +46,6 @@
|
|
42
46
|
- content_for :reply_form do
|
43
47
|
= render :partial => 'topics/reply', :locals => {:topic => @topic}
|
44
48
|
|
45
|
-
- content_for :sidebar do
|
46
|
-
= render :partial => 'topics/latest'
|
47
|
-
|
48
49
|
|
49
50
|
|
50
51
|
#forum
|
data/config/locales/en.yml
CHANGED
@@ -145,7 +145,8 @@ en:
|
|
145
145
|
search_form:
|
146
146
|
forum_label: "In this discussion category"
|
147
147
|
person_label: "From this person"
|
148
|
-
|
148
|
+
minimal_query_label: "Forum search"
|
149
|
+
query_label: "Search for this text"
|
149
150
|
search_header: "Forum Search"
|
150
151
|
search_introduction: "Please choose a search phrase and/or a person or discussion category."
|
151
152
|
search_results: "Search Results"
|
data/forum_extension.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
require_dependency 'application_controller'
|
2
2
|
|
3
3
|
class ForumExtension < Radiant::Extension
|
4
|
-
version "2.0.
|
4
|
+
version "2.0.8"
|
5
5
|
description "Nice clean forums and page comments for inclusion in your radiant site. Requires the reader extension and share_layouts."
|
6
6
|
url "http://spanner.org/radiant/forum"
|
7
7
|
|
@@ -42,4 +42,4 @@ class ForumExtension < Radiant::Extension
|
|
42
42
|
end
|
43
43
|
end
|
44
44
|
|
45
|
-
end
|
45
|
+
end
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: radiant-forum-extension
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 31
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 2
|
8
8
|
- 0
|
9
|
-
-
|
10
|
-
version: 2.0.
|
9
|
+
- 8
|
10
|
+
version: 2.0.8
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- spanner
|