radiant-forum-extension 2.0.3 → 2.0.4

data/VERSION

@@ -1 +1 @@
-2.0.3
+2.0.4

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

@@ -1,17 +1,3 @@
-%h2
-  = t('busy_topics')
-%ul
-  - Topic.most_commented(10).each do |topic|
-    %li
-      = link_to topic.name, forum_topic_url(topic.forum, topic), :class => 'title'
-      = t('started_by')
-      = link_to(topic.reader.name, reader_url(topic.reader))
-      %br
-      = topic.posts.count
-      = t('posts') + ','
-      = t('most_recently')
-      = friendly_date(topic.replied_at) + '.'
-
 %h2
   = t('busy_readers')
 %ul

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

@@ -0,0 +1,12 @@
+%h2
+  = t('busy_topics')
+%ul
+  - Topic.most_commented(10).each do |topic|
+    %li
+      = link_to topic.name, forum_topic_url(topic.forum, topic), :class => 'title'
+      %br
+      = t('started_by')
+      = link_to(topic.reader.name, reader_url(topic.reader)) + ', '
+      = t('now_has')
+      = topic.posts.count
+      = t('posts') + '.'

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

@@ -9,7 +9,7 @@
 
 - content_for :sidebar do
   = render :partial => 'forums/latest'
-  = render :partial => 'forums/statistics'
+  = render :partial => 'topics/busiest'
 
 - content_for :pagination do
   = pagination_and_summary_for(@topics, t('topics'))

data/config/locales/en.yml

@@ -10,8 +10,8 @@ en:
   attach_file: "attach a file"
   author: "author"
   begun_on: "begun on %{date}"
-  busy_topics: "Biggest topics"
-  busy_readers: "Biggest talkers"
+  busy_topics: "Busy topics"
+  busy_readers: "Busiest people"
   by: "by"
   by_content_and_author: "by content, author or category."
   comment: "comment"
@@ -105,6 +105,7 @@ en:
   notice:
     topic_deleted: "Topic '%{name}' was deleted."
     post_deleted: "Post deleted."
+  now_has: "now has"
   of: "of"
   on_date: "on %{date}"
   post: "comment"

data/forum_extension.rb

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

@@ -98,14 +98,6 @@ module ForumTags
   tag 'link' do |tag|
   end
   
-  desc %{
-    Renders a standard gravatar block (as found in the forum pages) for the reader who 
-    started the current topic.
-  }
-  tag 'forum:topic:gravatar' do |tag|
-    %{<div class="speaker">#{standard_gravatar_for(tag.locals.topic.reader)}</div>}
-  end
-
   desc %{
     Renders the name of the reader who started the current topic.
   }
@@ -128,23 +120,35 @@ module ForumTags
   end
 
   desc %{
-    Renders the author and date context line for the current topic.
+    Renders the usual context line for the current topic, but with no date.
   }
   tag 'forum:topic:context' do |tag|
     output = []
-    output << I18n.t('started_by')
-    output << %{<a href="#{reader_path(tag.locals.topic.reader)}">#{tag.render('forum:topic:author')}</a>}
-    output << tag.render('forum:topic:date')
+    topic = tag.locals.topic
+    if tag.locals.topic.has_replies?
+      output << I18n.t('reply_from')
+      output << %{<a href="#{reader_path(tag.locals.topic.replied_by)}">#{tag.locals.topic.replied_by.name}</a>}
+    else
+      output << I18n.t('started_by')
+      output << %{<a href="#{reader_path(tag.locals.topic.reader)}">#{tag.render('forum:topic:author')}</a>}
+    end
     output.join(' ')
   end
 
   desc %{
-    Renders the creation date of the current topic in a friendly, colloquial form.
+    Renders the creation date of the current topic in a colloquial form.
   }
   tag 'forum:topic:date' do |tag|
     I18n.l tag.locals.topic.created_at, :format => :standard
   end
 
+  desc %{
+    Renders the reply date of the current topic in a colloquial form.
+  }
+  tag 'forum:topic:date' do |tag|
+    I18n.l tag.locals.topic.replied_at, :format => :standard
+  end
+
   tag 'forum:posts' do |tag|
     tag.expand
   end
@@ -177,7 +181,7 @@ module ForumTags
     This tag is generally used in double form or as a silent prefix, where it will just expand:
     
     <pre><code>
-      <r:forum:post><r:gravatar /> <r:link /></r:forum:post>
+      <r:forum:post><r:link /></r:forum:post>
       # or just
       <r:forum:post:link />
     </code></pre>
@@ -223,13 +227,6 @@ module ForumTags
     link_to tag.render('forum:post:name'), tag.render('forum:post:url')
   end
 
-  desc %{
-    Renders a standard gravatar block (as in the forum pages) for the author of this post.
-  }
-  tag 'forum:post:gravatar' do |tag|
-    %{<div class="speaker">#{standard_gravatar_for(tag.locals.post.reader)}</div>}
-  end
-
   desc %{
     Renders the name of the author of this post.
   }
@@ -375,7 +372,6 @@ module ForumTags
       tag.expand
     else
       output = %{<div class="post"><div class="post_wrapper">}
-      output << tag.render("forum:post:gravatar")
       output << %{<div class="post_header">}
       output << %{<h2>#{tag.render("forum:post:reader")}</h2>}
       output << %{<p class="context">#{tag.render("forum:post:context")}</p>}

data/radiant-forum-extension.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-forum-extension}
-  s.version = "2.0.3"
+  s.version = "2.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
@@ -80,6 +80,7 @@ Gem::Specification.new do |s|
      "app/views/reader_notifier/post.rhtml",
      "app/views/readers/_forum_messages.html.haml",
      "app/views/readers/_messages_summary.html.haml",
+     "app/views/topics/_busiest.html.haml",
      "app/views/topics/_context.html.haml",
      "app/views/topics/_latest.html.haml",
      "app/views/topics/_locked.html.haml",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-forum-extension
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 2
   - 0
-  - 3
-  version: 2.0.3
+  - 4
+  version: 2.0.4
 platform: ruby
 authors: 
 - spanner
@@ -123,6 +123,7 @@ files:
 - app/views/reader_notifier/post.rhtml
 - app/views/readers/_forum_messages.html.haml
 - app/views/readers/_messages_summary.html.haml
+- app/views/topics/_busiest.html.haml
 - app/views/topics/_context.html.haml
 - app/views/topics/_latest.html.haml
 - app/views/topics/_locked.html.haml