radiant-forum-extension 2.0.6 → 2.0.7

data/VERSION

@@ -1 +1 @@
-2.0.6
+2.0.7

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

@@ -24,6 +24,9 @@
 - content_for :pagination do
   = pagination_and_summary_for(@forums, t('forum'))
 
+- content_for :feedurl do
+  = forums_path(:format => :rss)
+
 - content_for :feedlink do
   = feed_link(forums_path(:format => :rss))
 

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

@@ -16,6 +16,9 @@
 - content_for :pagination do
   = pagination_and_summary_for @topics, 'topics'
 
+- content_for :feedurl do
+  = forum_path(@forum, :format => :rss)
+
 - content_for :feedlink do
   = feed_link(forum_path(@forum, :format => :rss))
 

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

@@ -1,11 +1,17 @@
-- if !@term.blank? || @reader || @forum || @topic
-  - @searching = true
+- if @searching = !@term.blank? || @reader || @forum || @topic
   - 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
   - summary << t('in_topic') + ' ' + link_to(@topic.name, forum_topic_url(@topic.forum, @topic)) if @topic
 
+- feed_url_parts = {:format => :rss}
+- if @searching
+  - feed_url_parts[:q] = @term unless @term.blank?
+  - feed_url_parts[:reader_id] = @reader.id if @reader
+  - feed_url_parts[:forum_id] = @forum.id if @forum
+  - feed_url_parts[:reader_id] = @topic.id if @topic
+
 = render :partial => 'forums/standard_parts'
 
 - content_for :title do
@@ -31,13 +37,11 @@
   = t('separator')
   = yield :title
 
+- content_for :feedurl do
+  = posts_path(feed_url_parts)
+
 - content_for :feedlink do
-  - 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))
+  = feed_link(posts_path(feed_url_parts))
 
 - content_for :messages do
   - if @posts.empty?

data/app/views/posts/index.rss.builder

@@ -1,14 +1,32 @@
+@searching = !@term.blank? || @reader || @forum || @topic
+
 xml.channel do
   xml.atom :link, nil, {
     :href => formatted_posts_url(:rss),
     :rel => 'self', :type => 'application/rss+xml'
   }
 
-  xml.title "#{@site_title} : Latest posts"
-  xml.description "Latest posts in any topic or forum"
-  xml.link posts_url
-  xml.language "en-us"
+  if @searching
+    summary = [t('topics_and_posts')]
+    summary << t('matching') + " '#{@term}'" unless @term.blank?
+    summary << t('posted_by') + " #{@reader.name}" if @reader
+    summary << t('in_forum') + " #{@forum.name}" if @forum
+    xml.title Radiant::Config['site.name'] + ': ' + summary.join(' ')
+    xml.description summary.join(' ')
+  else
+    xml.title Radiant::Config['site.name'] + ': ' + t('latest_posts')
+    xml.description t('latest_posts_description')
+  end
+  
+  url_parts = {}
+  url_parts[:q] = @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
+  xml.link posts_url(url_parts)
+
+  xml.language I18n.locale.to_s
   xml.ttl "60"
 
-  render :partial => "post", :collection => @posts, :locals => {:xm => xml}
+  render :partial => "posts/post", :collection => @posts, :locals => {:xm => xml}
 end

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

@@ -23,6 +23,9 @@
 - content_for :title do
   = t('topics_heading')
 
+- content_for :feedurl do
+  = topics_url(:format => :rss)
+
 - content_for :feedlink do
   = feed_link(topics_url(:format => :rss))
 

data/app/views/topics/index.rss.builder

@@ -4,10 +4,10 @@ xml.channel do
     :rel => 'self', :type => 'application/rss+xml'
   }
 
-  xml.title "#{@site_title} : Discussions most recently updated"
-  xml.description "The latest new and updated topics"
+  xml.title "#{@site_title} : #{t('latest_topics')}"
+  xml.description t("latest_topics_description")
   xml.link topics_url
-  xml.language "en-us"
+  xml.language I18n.locale.to_s
   xml.ttl "60"
 
   render :partial => "topic", :collection => @topics, :locals => {:xm => xml}

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

@@ -16,6 +16,9 @@
 - content_for :first_post do
   = render :partial => 'posts/post', :locals => {:post => @topic.posts.first, :headless => true, :with_context => true}
 
+- content_for :feedurl do
+  = topic_path(@topic, :format => :rss)
+
 - content_for :feedlink do
   = feed_link(topic_path(@topic, :format => :rss))
 

data/app/views/topics/show.rss.builder

@@ -5,9 +5,9 @@ xml.channel do
   }
 
   xml.title "#{@site_title} : #{@topic.name}"
-  xml.description "#{@posts.length} posts, most recently from #{@posts.last.reader.name} on #{@posts.last.created_at.to_s(:informal)}"
+  xml.description "#{@posts.length} #{t('posts')}, #{t('most_recently')} #{t('from_reader', :name => @posts.last.reader.name)} #{t('on_date', :date => friendly_date(@posts.last.created_at))}"
   xml.link forum_topic_url(@topic.forum, @topic)
-  xml.language "en-us"
+  xml.language I18n.locale.to_s
   xml.ttl "60"
 
   render :partial => "posts/post", :object => @topic.posts.first, :locals => {:xm => xml}

data/config/locales/en.yml

@@ -55,6 +55,7 @@ en:
   from_reader: "from %{name}"
   if_you_not: "If you're not %{name}, please"
   in: "in"
+  in_forum: "filed under"
   in_reply_to: "in reply to"
   label:
     post:
@@ -67,8 +68,10 @@ en:
   last_seen: "last here"
   latest_activity: "latest activity"
   latest_discussion: "Latest topics"
-  latest_posts: "Latest comments"
-  latest_topics: "all the latest topics"
+  latest_posts: "Latest posts"
+  latest_posts_description: "Topics and replies from across the forum in descending date order."
+  latest_topics: "Latest topics"
+  latest_topics_description: "Topics most recently posted or replied to."
   locked: "locked"
   matching: "matching"
   messages_from_reader: "Messages from %{name}"
@@ -138,14 +141,15 @@ en:
   save_changes: "Save changes"
   save_post: "Save post"
   search: "Search"
+  search_feed: "Search Results Feed"
   search_form:
     forum_label: "In this discussion category"
     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"
+  search_whole_forum: "search the whole forum"
   separator: ':'
   showing: "showing"
   sorry_locked: "Sorry: this topic is locked."

data/forum_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ForumExtension < Radiant::Extension
-  version "2.0.6"
+  version "2.0.7"
   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.6"
+  s.version = "2.0.7"
 
   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: 3
+  hash: 1
   prerelease: false
   segments: 
   - 2
   - 0
-  - 6
-  version: 2.0.6
+  - 7
+  version: 2.0.7
 platform: ruby
 authors: 
 - spanner