radiant-forum-extension 2.0.5 → 2.0.6

data/VERSION

@@ -1 +1 @@
-2.0.5
+2.0.6

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

@@ -1,6 +1,6 @@
 - if !@term.blank? || @reader || @forum || @topic
   - @searching = true
-  - summary = [t('showing_posts')]
+  - summary = [t('topics_and_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
@@ -12,10 +12,11 @@
   = t('posts_heading')
 
 - content_for :introduction do
-  - if @searching
-    = summary.join(' ') + ":"
-  - else
-    = t('posts_introduction')
+  %p
+    - if @searching
+      = summary.join(' ') + ":"
+    - else
+      = t('posts_introduction')
   
 - content_for :sidebar do
   - unless @searching && @posts.empty?
@@ -31,7 +32,12 @@
   = yield :title
 
 - content_for :feedlink do
-  = feed_link(posts_path(:format => :rss))
+  - url_parts = {:format => :rss}
+  - url_parts[:term] = @term unless @term.blank?
+  - url_parts[:reader_id] = @reader.id if @reader
+  - url_parts[:forum_id] = @forum.id if @forum
+  - url_parts[:reader_id] = @topic.id if @topic
+  = feed_link(posts_path(url_parts))
 
 - content_for :messages do
   - if @posts.empty?

data/config/locales/en.yml

@@ -148,7 +148,6 @@ en:
   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"
@@ -170,6 +169,7 @@ en:
     other: "%{count} topics, most recently "
   topic_show_introduction: ""
   topic_removed: "Topic removed"
+  topics_and_posts: "Topics and messages"
   to: "to"
   to_add_post: "To add a %{message_type}"
   topic: "topic"

data/forum_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ForumExtension < Radiant::Extension
-  version "2.0.5"
+  version "2.0.6"
   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/radiant-forum-extension.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-forum-extension}
-  s.version = "2.0.5"
+  s.version = "2.0.6"
 
   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: 5
+  hash: 3
   prerelease: false
   segments: 
   - 2
   - 0
-  - 5
-  version: 2.0.5
+  - 6
+  version: 2.0.6
 platform: ruby
 authors: 
 - spanner