radiant-forum-extension 2.1.6 → 3.0.0.rc3

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

@@ -9,25 +9,28 @@
 - cssclasses << 'deleted' if post.frozen?
   
 .post{:id => post.dom_id, :class => cssclasses.join(' ')}
-  .wrapper
+  - unless headless
+    = standard_gravatar_for(post.reader)
+  .post_header
     - unless headless
-      .speaker
-        = standard_gravatar_for(post.reader)
-    .post_header
-      - unless headless
-        - if with_context
-          %h2.reply
-            = link_to post.topic.name, paginated_post_url(post)
-        - else
-          %h2
-            = post.reader.name
+      - if with_context
+        %h2.reply
+          - if post.comment?
+            = t('forum_extension.comment_on')
+          -elsif post.reply?
+            = t('forum_extension.reply_to')
+          = link_to post.topic.name, paginated_post_url(post)
+      - else
+        %h2
+          = post.reader.name
 
-      %p.context
-        - if with_context
-          = render :partial => 'posts/context', :locals => {:post => post}
-        = friendly_date(post.created_at) + '.'
-        = render :partial => 'posts/edit_links', :locals => {:post => post}
+    %p.context
+      - if with_context
+        = render :partial => 'posts/context', :locals => {:post => post}
+      = friendly_date(post.created_at) + '.'
+      = render :partial => 'posts/edit_links', :locals => {:post => post}
 
+  .wrapper
     .post_body
-      = clean_textilize(post.body)
+      = clean_html(post.body)
       = render :partial => 'posts/attachments', :locals => {:post => post}

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

@@ -6,8 +6,8 @@ xm.item do
   else
     xm.title "Reply to '#{h(post.topic.name)}' (from #{h post.reader.name})"
   end
-  xm.description clean_textilize(truncate_words(post.body, 64))
+  xm.description clean_html(truncate_words(post.body, 64))
   xm.pubDate post.created_at.to_s(:rfc822)
-  xm.guid [ActionController::Base.session_options[:session_key], post.forum_id.to_s, post.topic_id.to_s, post.id.to_s].join(":"), "isPermaLink" => "false"
+  xm.guid UUIDTools::UUID.timestamp_create(post.created_at).to_s, "isPermaLink" => "false"
   xm.link paginated_post_url(post)
 end

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

@@ -1,31 +1,31 @@
 - minimal ||= false
 
-%form.friendly{:action => posts_url, :method => :get}
+%form.friendly.forum_search{:action => posts_url, :method => :get}
   - unless minimal
     %h2
-      =t('search_header')
+      =t('forum_extension.search_header')
 
   %p
     %label{:for => "q"}
-      = t(minimal ? 'search_form.minimal_query_label' : 'search_form.query_label')
-    = text_field_tag "q", params[:q], :class => 'titular'
+      = t(minimal ? 'forum_extension.search_form.minimal_query_label' : 'forum_extension.search_form.query_label')
+    %input{:name => 'q', :type => 'search', :value => params[:q], :placeholder => 'Search', :class => 'standard search'}
 
   - 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)
+    - if using_forums?
+      %p
+        %label{:for => "forum_id"}
+          = t('forum_extension.search_form.forum_label')
+        %select{:name => "forum_id"}
+          %option{:value => ""}= t('forum_extension.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')
+          = t('forum_extension.search_form.person_label')
         %select{:name => "reader_id"}
           %option{:value => ""}
-            =t('anyone')
+            =t('forum_extension.anyone')
           = options_from_collection_for_select(Reader.find(:all), "id", "name", params[:reader_id].to_i)
 
   %p.buttons

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

@@ -0,0 +1,15 @@
+%h2= t('forum_extension.search_results')
+%p
+  = render :partial => 'search_summary'
+
+- if @posts.empty?
+  - if @searching
+    %p.has_error
+      = t('forum_extension.no_search_results')
+    = render :partial => 'posts/search_form'
+  - else
+    %p 
+      = t('forum_extension.no_posts')
+- else
+  %ul.search_results
+    = render :partial => 'posts/minimal', :collection => @posts

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

@@ -0,0 +1,13 @@
+- @searching = !@term.blank? || @reader || @forum || @topic
+
+- if @searching
+  = t('forum_extension.topics_and_posts')
+  - if @forum
+    = t('forum_extension.in') + ' ' + link_to(@forum.name, forum_url(@forum))
+  - unless @term.blank?
+    = t('forum_extension.containing') 
+    %strong= @term
+  - if @reader
+    = t('forum_extension.posted_by') + ' ' + link_to(@reader.name, reader_url(@reader))
+  - if @topic
+    - summary << t('forum_extension.in_topic') + ' ' + link_to_topic(@topic)

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

@@ -12,4 +12,4 @@
       - f.fields_for :attachments, new_attachment do |naf|
         = render :partial => 'posts/new_attachment', :object => new_attachment, :locals => {:naf => naf}
       .addfile
-        = link_to t('attach_file'), "#"
+        = link_to t('forum_extension.attach_file'), "#"

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

@@ -1,31 +1,32 @@
-= render :partial => 'forums/standard_parts'
+- content_for :context do
+  %p.context
+    = render :partial => 'posts/context'
 
-- content_for :form do
-  .wrapper
-    .post_header
-      .speaker
-        = standard_gravatar_for(@post.reader)
-      %h2.person
-        = current_reader.name
-      %p.context
-        = friendly_date(@post.created_at)
-    = render :partial => 'form', :locals => {:post => @post}
+- content_for :person do
+  = standard_gravatar_for(@post.reader)
 
 - content_for :title do
   - if @post.page
-    = t('edit_comment')
+    = t('forum_extension.edit_comment')
   - elsif @post.first? 
-    = t('edit_topic')
+    = t('forum_extension.edit_topic')
   - else
-    = t('edit_reply')
+    = t('forum_extension.edit_reply')
 
 - content_for :breadhead do
-  - if @post.page
-    = link_to @page.title, @page.url, :class => 'breadhead'
-  - elsif @post.topic && !@post.first?
-    = link_to @post.topic.name, forum_topic_url(@topic.forum, @topic), :class => 'breadhead'
-
+  %span.breadhead
+    - if @post.page
+      = link_to @page.title, @page.url, :class => 'breadhead'
+    - elsif @post.topic && !@post.first?
+      = link_to_topic(@post.topic, :class => 'breadhead')
 
+- content_for :form do
+  - if post.editable_by?(current_reader)
+    = render :partial => 'form', :locals => {:post => @post}
+  - else
+    = render :partial => 'ineditable', :locals => {:post => @post}
+  
+= render :partial => 'shared/standard_forum_parts'
 
-#forum
-  = yield :form
+.forum
+  = yield :form

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

@@ -1,9 +1,4 @@
-- 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
+- @searching = !@term.blank? || @reader || @forum || @topic
 
 - feed_url_parts = {:format => :rss}
 - if @searching
@@ -12,17 +7,12 @@
   - 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
-  = t('posts_heading')
+  = t('forum_extension.posts_heading')
 
 - content_for :introduction do
   %p
-    - if @searching
-      = summary.join(' ') + ":"
-    - else
-      = t('posts_introduction')
+    = render :partial => 'search_summary'
   
 - content_for :sidebar do
   - unless @searching && @posts.empty?
@@ -30,11 +20,11 @@
   = render :partial => "topics/latest"
 
 - content_for :pagination do
-  = pagination_and_summary_for(@posts, t('post'))
+  = pagination_and_summary_for(@posts, t('forum_extension.post'))
 
 - content_for :breadcrumbs do
-  = link_to t('forum').titlecase, topics_url
-  = t('separator')
+  = link_to t('forum_extension.forum').titlecase, topics_url
+  = t('reader_extension.separator')
   = yield :title
 
 - content_for :feedurl do
@@ -47,15 +37,18 @@
   - if @posts.empty?
     - if @searching
       %p.has_error
-        = t('no_search_results')
+        = t('forum_extension.no_search_results')
       = render :partial => 'posts/search_form'
     - else
       %p 
-        = t('no_posts')
+        = t('forum_extension.no_posts')
   - else
     = yield :pagination if @posts.previous_page
     = render :partial => 'posts/post', :collection => @posts, :locals => {:with_context => true, :headless => false}
     = yield :pagination if @posts.next_page
 
-#forum
+= render :partial => 'shared/standard_forum_parts'
+
+.forum
   = yield :messages
+

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

@@ -7,15 +7,15 @@ xml.channel do
   }
 
   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
+    summary = [t('forum_extension.topics_and_posts')]
+    summary << t('forum_extension.matching') + " '#{@term}'" unless @term.blank?
+    summary << t('forum_extension.posted_by') + " #{@reader.name}" if @reader
+    summary << t('forum_extension.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')
+    xml.title Radiant::Config['site.name'] + ': ' + t('forum_extension.latest_posts')
+    xml.description t('forum_extension.latest_posts_description')
   end
   
   url_parts = {}

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

@@ -1,34 +1,31 @@
-= render :partial => 'forums/standard_parts'
-
-- content_for :form do
-  .post
-    .wrapper
-      .post_header
-        .speaker
-          = standard_gravatar_for(current_reader)
-        %h2.person
-          = current_reader.name
-        %p.context
-          = t('if_you_not', :name => current_reader.name)
-          = link_to(t('log_out'), reader_logout_url) + '.'
-      = render :partial => 'form', :locals => {:post => @post}
-
 - content_for :person do
-  - standard_gravatar_for(current_reader)
+  = standard_gravatar_for(current_reader)
+  
+- content_for :context do
+  %p.context
+    = t('forum_extension.if_you_not', :name => current_reader.name)
+    = link_to(t('reader_extension.log_out'), reader_logout_url) + '.'
 
 - content_for :title do
   - if @page
-    = t('new_comment')
+    = t('forum_extension.new_comment')
   - elsif @topic 
-    = t('new_reply')
+    = t('forum_extension.new_reply')
   - else
-    = t('new_topic')
+    = t('forum_extension.new_topic')
 
 - content_for :breadhead do
   - if @page
     = link_to @page.title, @page.url, :class => 'breadhead'
   - elsif @topic 
-    = link_to @topic.name, forum_topic_url(@topic.forum, @topic), :class => 'breadhead'
+    = link_to_topic(@topic, :class => 'breadhead')
+
+- content_for :form do
+  = yield :context
+  = render :partial => 'form', :locals => {:post => @post}
+
+= render :partial => 'shared/standard_forum_parts'
+
+.forum
+  = yield :form
 
-#forum
-  = yield :form

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

@@ -1,27 +1,27 @@
-= render :partial => 'forums/standard_parts'
-
-- content_for :messages do
-  = render :partial => 'confirm_delete', :locals => {:post => @post}
-
 - content_for :parent do
-  = link_to @post.topic.name, forum_topic_url(@post.topic, @post.topic.forum)
+  = link_to_topic(@post.topic)
 
 - content_for :breadhead do
-  = link_to t('forum').titlecase + t('separator'), topics_url
-  = link_to @post.topic.forum.name + t('separator'), forum_url(@post.topic.forum)
-  = yield :parent
+  %span.breadhead
+    = link_to t('forum_extension.forum').titlecase + t('reader_extension.separator'), topics_url
+    = link_to @post.topic.forum.name + t('reader_extension.separator'), forum_url(@post.topic.forum)
+    = yield :parent
+
+- content_for :context do
+  %p.context
+    = render :partial => 'posts/context'
 
 - content_for :person do
   = standard_gravatar_for(@post.reader)
 
 - content_for :title do
   - if @post.page
-    = t('confirm_remove_comment')
+    = t('forum_extension.confirm_remove_comment')
   - elsif @post.first?
-    = t('confirm_remove_topic')
+    = t('forum_extension.confirm_remove_topic')
   - else
-    = t('confirm_remove_post')
+    = t('forum_extension.confirm_remove_post')
+
+= render :partial => 'shared/standard_forum_parts'
 
-  
-#forum
-  = yield :messages
+= render :partial => 'confirm_delete', :locals => {:post => @post}

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

@@ -1,31 +1,37 @@
-= render :partial => 'forums/standard_parts'
-
 - content_for :messages do
   = render :partial => 'post', :object => @post
 
+- content_for :context do
+  %p.context
+    = render :partial => 'posts/context'
+
 - content_for :parent do
-  = link_to @post.topic.name, forum_topic_url(@post.topic, @post.topic.forum)
+  = link_to_topic(@post.topic)
 
 - content_for :breadhead do
-  = link_to t('forum').titlecase + t('separator'), topics_url
-  = link_to @post.topic.forum.name + t('separator'), forum_url(@post.topic.forum)
-  = yield :parent
+  %span.breadhead
+    = link_to t('forum').titlecase, topics_url
+    = t('reader_extension.separator')
+    = link_to @post.topic.forum.name, forum_url(@post.topic.forum)
+    = t('reader_extension.separator')
+    = yield :parent
 
 - content_for :person do
   = standard_gravatar_for(@post.reader)
 
 - content_for :title do
   -if @post.page
-    = t('comment_on') + @post.page.title
+    = t('forum_extension.comment_on') + @post.page.title
   - elsif @post.first?
     = @post.topic.name
   - else
-    = t('reply_to') + @post.topic.name
+    = t('forum_extension.reply_to') + @post.topic.name
 
 - content_for :sidebar do
   = render :partial => 'topics/latest'
 
+= render :partial => 'shared/standard_forum_parts'
 
+.forum
+  = yield :messages
 
-#forum
-  = yield :messages

data/app/views/readers/_forum_messages.html.haml

@@ -1,15 +1,18 @@
+- add_reader_css '/stylesheets/forum.css'
+- add_reader_js '/javascripts/forum.js'
+
 - reader ||= @reader
 - posts ||= reader.posts.paginate(pagination_parameters)
 
-#forum
-  %h2
-    =t('forum_messages', :name => reader.name)
+.forum
+  %h3
+    =t('forum_extension.forum_messages', :name => reader.name)
 
   - if posts.empty?
     %p 
-      = t('no_posts')
+      = t('forum_extension.no_posts')
   - else
-    = pagination_and_summary_for(posts, t('post')) if posts.previous_page
+    = pagination_and_summary_for(posts, t('forum_extension.post')) if posts.previous_page
     - posts.each do |post|
       - if post.comment?
         = render :partial => 'posts/post', :object => post, :locals => {:with_context => true}
@@ -17,4 +20,4 @@
         = render :partial => 'topics/topic', :object => post.topic
       - else
         = render :partial => 'posts/post', :object => post, :locals => {:with_context => true}
-    = pagination_and_summary_for(posts, t('post')) if posts.next_page
+    = pagination_and_summary_for(posts, t('forum_extension.post')) if posts.next_page

data/app/views/readers/_messages_summary.html.haml

@@ -1,3 +1,3 @@
 - if reader.posts.any?
   = reader.posts.count
-  = t('posts') + '.'
+  = t('forum_extension.posts') + '.'

data/app/views/shared/_standard_forum_parts.html.haml

@@ -0,0 +1,41 @@
+- content_for :section_navigation do
+  = link_to t('forum_extension.navigation.forum'), topics_url, :class => 'section'
+  - if using_forums?
+    = link_to t('forum_extension.navigation.forums'), forums_url
+  = link_to t('forum_extension.navigation.search'), posts_url
+  - if current_reader
+    = link_to t('forum_extension.navigation.new_topic'), new_post_url
+  - if Radiant::Config['forum.help_url']
+    = link_to t('forum_extension.navigation.forum_help'), Radiant::Config['forum.help_url']
+
+- content_for :header do
+  .header
+    = yield :person
+    %h1.title
+      = yield :breadhead
+      = yield :title
+
+- content_for :footer do
+  .footer
+    = yield :controls
+
+- content_for :search do
+  = render :partial => 'posts/search_form', :locals => {:minimal => true}
+
+- content_for :latest do
+  = render :partial => 'topics/latest'
+
+- content_for :busiest do
+  = render :partial => 'topics/busiest'
+
+- content_for :forums do
+  = render :partial => 'forums/latest'
+
+- content_for :newtopic do
+  .newmessage
+    - if using_forums? && @forum
+      = link_to t('forum_extension.new_topic_here'), new_post_url(:forum_id => @forum.id), :class => "post"
+    - else
+      = link_to t('forum_extension.new_topic'), new_post_url(), :class => "post"
+
+= render :partial => 'shared/standard_reader_parts'

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

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

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

@@ -1,12 +1,15 @@
 - topic ||= @topic
 - post = topic.posts.first
 
-= t('new_topic_started')
-= t('on_date', :date => friendly_date(post.created_at))
-- if topic.reader
-  = t('by')
-  = link_to post.reader.name, reader_url(post.reader), :class => 'person'
-- if topic.forum
-  = t('under')
-  = link_to(topic.forum.name, forum_url(topic.forum), :class => 'forum')
+%p.context
+  - if topic.reader
+    = t('forum_extension.started_by')
+    = link_to post.reader.name, reader_url(post.reader), :class => 'person'
+  = friendly_date(post.created_at)
+
+  - if topic.forum
+    = t('forum_extension.under')
+    = link_to(topic.forum.name, forum_url(topic.forum), :class => 'forum')
+
+  = render :partial => 'posts/edit_links', :locals => {:post => post}
 

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

@@ -1,5 +1,5 @@
 %h2
-  = t('recent_topics')
+  = t('forum_extension.recent_topics')
 %ul
-  - Topic.latest(5).each do |topic|
+  - Topic.visible_to(current_reader).latest(5).each do |topic|
     = render :partial => 'topics/minimal', :locals => {:topic => topic}

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

@@ -1,2 +1,2 @@
 %p
-  = t('topic_locked')
+  = t('forum_extension.topic_locked')

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

@@ -6,10 +6,10 @@
   %span.context
     - if topic.has_replies?
       - if topic.replied_by
-        = t('new_reply_from')
+        = t('forum_extension.new_reply_from')
         = link_to topic.replied_by.name, reader_url(topic.replied_by)
         = friendly_date(topic.replied_at)
     - else
-      = t('started_by')
+      = t('forum_extension.started_by')
       = link_to topic.reader.name, reader_url(topic.reader)
       = friendly_date(topic.created_at)

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

@@ -1,6 +1,7 @@
 - topic ||= @topic
 
 - if topic.replied_by
-  = t('post_count_from', :count => topic.posts.count - 1)
-  = link_to topic.replied_by.name, reader_url(topic.replied_by)
-  = t('on_date', :date => friendly_date(topic.replied_at))
+  - reply_count = topic.posts.count - 1
+  = t('forum_extension.post_count', :count => reply_count) + ','
+  = link_to "#{t('forum_extension.most_recently') if reply_count > 1} #{t('forum_extension.from')} #{topic.replied_by.name}" , post_url(topic.posts.last)
+  = friendly_date(topic.replied_at)

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

@@ -2,22 +2,27 @@
 
 - if topic.locked?
   %p.administrative
-    = t("topic_locked")
+    = t("forum_extension.topic_locked")
+
+- elsif Radiant.config['forum.cached?'] && !@inline
+  .new_post
+    .wrapper
+      = link_to t("forum_extension.add_reply"), new_topic_post_url(topic), :class => 'remote post'
+
 - else
   - if current_reader
     - if current_reader.activated?
       .post.replyform
         .wrapper
           .post_header
-            .speaker
-              = standard_gravatar_for(current_reader)
+            = standard_gravatar_for(current_reader)
             %h2.person
-              = t("add_reply")
+              = t("forum_extension.add_reply")
             %p.context
-              = t('if_you_not', :name => current_reader.name)
-              = link_to(t('log_out'), reader_logout_url) + '.'
+              = t('forum_extension.if_you_not', :name => current_reader.name)
+              = link_to(t('reader_extension.log_out'), reader_logout_url) + '.'
           = render :partial => 'posts/form', :locals => {:post => topic.posts.build, :omit_label => true}
     - else
-      = render :partial => 'reader_activations/activation_required', :locals => {:purpose => t('to_reply')}
+      = render :partial => 'reader_activations/activation_required', :locals => {:purpose => t('forum_extension.to_reply')}
   - else
-    = render :partial => 'reader_sessions/login_form', :locals => {:purpose => t('to_reply')}
+    = render :partial => 'reader_sessions/login_form', :locals => {:purpose => t('forum_extension.to_reply')}