radiant-forum-extension 0.6.1 → 1.1.0

data/app/views/admin/reader_configuration/_forum.html.haml

@@ -6,3 +6,9 @@
   = show_config 'forum.public?'
 %p.ruled
   = show_config 'forum.allow_page_comments?'
+%p.ruled
+  = show_config 'forum.comments_have_attachments?'
+%p.ruled
+  = show_config 'forum.attachment_content_types'
+%p.ruled
+  = show_config 'forum.max_attachment_size'

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

@@ -1,7 +1,6 @@
 %li.forum{:id => forum.dom_id}
   %span.subject
-    %a{:href => forum_url(forum), :class => 'main'}
-      = forum.name
+    = link_to forum.name, forum_url(forum), :class => 'main'
   - if topic = forum.recent_topics.first
     %span.context
       = forum.topics.count

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

@@ -1,44 +1,46 @@
-= render :partial => 'readers/flasher'
+- content_for :signals do
+  = render :partial => 'readers/flasher'
 
-#forum
-  #forum_preamble
-    %p
-      These are the broad filing areas we use to organise the forum. 
-      You can also see a list of 
-      = link_to "all the most recent discussion", topics_url
-      in any category.
+- content_for :title do
+  = t('forums')
 
-    %p
-      = link_to "start a new discussion", new_topic_url, :class => 'newmessage'
+- content_for :preamble do
+  %p
+    = t('forums_introduction')
+    = link_to t('latest_topics'), topics_url in any category.
 
-  - if @forums.empty?
-    %p No categories defined here yet.
+- content_for :new_topic do
+  .newmessage
+    = link_to t('new_topic'), new_topic_url
 
+- content_for :messages do
+  - if @forums.empty?
+    %p 
+      = t('no_forums')
   - else
-    - if @forums.previous_page
-      = paginate_and_summarise @forums, 'forums'
-
     %ul.main
       = render :partial => 'forums/forum', :collection => @forums
 
-    = paginate_and_summarise @forums, 'forums'
-
-- content_for :pagetitle do
-  Discussion Categories
+- content_for :pagination do
+  = pagination_and_summary_for(@forums, t('forum'))
 
 - content_for :feed do
-  = feed_link(formatted_forums_path(:rss))
+  = feed_link(forums_path(:format => :rss))
 
 - content_for :controls do
   = render :partial => 'readers/controls'
   
 - content_for :breadhead do
-  = link_to "Forum", topics_url, :class => 'breadhead'
+  = link_to t("forum"), forum_home_url
 
 - content_for :breadcrumbs do
   = link_to 'Forum', topics_url
   \>
-  Categories
-
-- content_for :help do
-  = render :partial => 'topics/help'
+  = t('forums')
+  
+#forum
+  = yield :new_topic
+  = yield :preamble
+  = yield :pagination if @forums.previous_page
+  = yield :messages
+  = yield :pagination if @forums.next_page

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

@@ -1,38 +1,50 @@
-= render :partial => 'readers/flasher'
+- content_for :signals do
+  = render :partial => 'readers/flasher'
 
-#forum
-  #forum_preamble
-    = clean_textilize(@forum.description)
+- content_for :title do
+  = @forum.name
+
+- content_for :preamble do
+  = clean_textilize(@forum.description)
 
+- content_for :new_topic do
   - unless @forum.for_comments?
-    %p
-      = link_to "start a new discussion here", new_forum_topic_url(@forum), :class => 'newmessage'
+    .newmessage
+      = link_to t('new_topic_here'), new_forum_topic_url(@forum)
 
+- content_for :messages do
   - if @topics.empty?
-    %p No talk here yet.
-
+    %p 
+      = t('no_topics')
   - else
-    - unless @topics.current_page == 1
-      = paginate_and_summarise @topics, 'topics'
-
     %ul.main
       = render :partial => 'topics/topic', :collection => @topics, :locals => { :with_context => false }
 
-    = paginate_and_summarise @topics, 'topics'
-
-- content_for :pagetitle do
-  = @forum.name
+- content_for :pagination do
+  = pagination_and_summary_for @topics, 'topics'
 
 - content_for :feed do
-  = feed_link(formatted_forum_path(@forum, :rss))
+  = feed_link(forum_path(@forum, :format => :rss))
 
 - content_for :breadhead do
-  = link_to 'Categories', forums_url, :class => 'breadhead'
+  = link_to t("forum"), forum_home_url
+  = t('separator')
+  = link_to t('forums'), forums_url
 
 - content_for :breadcrumbs do
-  = link_to 'Discussion Categories', forums_url
-  \>
+  = link_to t("forum"), forum_home_url
+  = t('separator')
+  = link_to t('categories'), forums_url
+  = t('separator')
   = link_to @forum.name, forum_url(@forum) 
 
 - content_for :controls do
   = render :partial => 'readers/controls'
+
+
+#forum
+  = yield :new_topic
+  = yield :preamble
+  = yield :pagination if @topics.previous_page
+  = yield :messages
+  = yield :pagination if @topics.next_page

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

@@ -1,2 +1,5 @@
-%li.attachment
-  = link_to attachment.filename, attachment.file.url, :class => "attachment #{attachment.extension}"
+%li
+  - if attachment.image?
+    = link_to image_tag(attachment.thumbnail), attachment.file.url
+  - else
+    = link_to attachment.filename, attachment.file.url, :class => "attachment #{attachment.extension}"

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

@@ -1,6 +1,4 @@
-.post_wrapper
-  .post_body
-    = form.text_area :body, :rows => 10, :class => 'post_body'
+= form.text_area :body, :rows => 10
 
-    - unless @topic.page && !Radiant::Config['forum.comments_have_attachments']
-      = render :partial => 'posts/uploader'
+- if Radiant::Config['forum.comments_have_attachments?'] && !@topic.page
+  = render :partial => 'posts/uploader'

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

@@ -1,5 +1,4 @@
 - post ||= @post
-- first_post ||= nil
 - with_context ||= false
 - without_author ||= false
 - preview ||= false
@@ -10,40 +9,47 @@
       - if admin?
         .post_control
           %p.post_admin
-            = link_to "edit", edit_topic_post_url(post.topic, post), :class => 'edit_post', :id => "revise_post_#{post.id}"
+            = link_to t("edit"), edit_topic_post_url(post.topic, post), :class => 'edit_post', :id => "revise_post_#{post.id}"
             %span.separator |
-            = link_to "delete", topic_post_url(post.topic, post), :method => 'delete', :class => 'delete_post', :id => "delete_post_#{post.id}", :title => "remove post", :confirm => "Are you sure you want to delete this message?"
-      %h2
+            = link_to t("remove"), topic_post_url(post.topic, post), :method => 'delete', :class => 'delete_post', :id => "delete_post_#{post.id}", :title => "remove post", :confirm => "Are you sure you want to delete this message?"
+
+      %p.context
         - if with_context
           %a{:href => forum_topic_url(post.topic.forum, post.topic, :anchor => "post_#{post.id}"), :class => post.first? ? 'speaker begun' : 'speaker replied'}
-            = gravatar_for(post.reader, {:size => 40}, {:alt => post.reader.name, :class => 'gravatar', :width => '40', :height => '40'})
+            = gravatar_for(post.reader, {:size => 40}, {:alt => post.reader.name, :class => 'gravatar offset', :width => '40', :height => '40'})
             = post.topic.name
         - else
           %a{:href => reader_url(post.reader), :class => 'speaker'}
-            = gravatar_for(post.reader, {:size => 40}, {:alt => post.reader.name, :class => 'gravatar', :width => '40', :height => '40'})
+            = gravatar_for(post.reader, {:size => 40}, {:alt => post.reader.name, :class => 'gravatar offset', :width => '40', :height => '40'})
             = post.reader.name
-      %p.context
+
         - if with_context
           = link_to post.reader.name, reader_url(post.reader)
           - if post.first?
-            started a new discussion in 
-            = link_to(post.topic.forum.name, forum_url(post.topic.forum))
+            = t('started_topic_on', :date => friendly_date(post.created_at))
           - else
-            replied
+            = t('replied_on', :date => friendly_date(post.created_at))
+
         - else
-          posted
-        = friendly_date(post.created_at)
-        - if post.updated_at && post.updated_at > post.created_at
-          and updated
-          - if post.updated_by && post.updated_by != post.created_by
-            (by 
-            = post.updated_by.name + ')'
-          = friendly_date(post.updated_at)
+          - if post.updated_at && post.updated_at > post.created_at
+            = t('posted_and_updated_on', :posted => friendly_date(post.created_at), :updated => friendly_date(post.updated_at))
+            - if post.updated_by != post.created_by
+              = t('by')
+              = post.updated_by.name
+          - else 
+            = t('posted_on', :date => friendly_date(post.created_at))
+        - if post.editable_by?(current_reader)
+          %br
+          %span.still_editable
+            - if post.editable_interval
+              = t('time_remaining_to_edit', :time => distance_of_time_in_words(post.still_editable_for))
+            = link_to t('edit_your_post'), edit_topic_post_url(post.topic, post), :class => 'edit_post', :id => "revise_post_#{post.id}"
           
     .post_wrapper
       .post_body
         - if post.frozen?
-          %p Post removed
+          %p 
+            = t('post_removed')
         - elsif preview
           = truncate_and_textilize(post.body, 100)
         - else
@@ -53,15 +59,12 @@
           .post_attachments
             %h4 
               attached:
-            %ul 
-              = render :partial => 'posts/attachment', :collection => post.attachments, :locals => {:removable => false}
+            - post.attachments.images.each do |att|
+              = link_to image_tag(att.thumbnail), att.file.url, :class => :thumbnail
+            - if post.attachments.non_images.any?
+              %ul.attachments
+                - post.attachments.non_images.each do |att|
+                  %li
+                    = link_to att.filename, att.file.url, :class => "attachment #{att.extension}"
 
-        - if post.editable_by?(current_reader)
-          .post_control
-            %p
-            - if post.editable_interval
-              You have
-              = distance_of_time_in_words(post.still_editable_for)
-              to 
-            = link_to "edit your post", edit_topic_post_url(post.topic, post), :class => 'edit_post', :id => "revise_post_#{post.id}"
               

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

@@ -1,14 +1,13 @@
 - post ||= @post
 
-.upload_handler
+.upload_stack
   %ul.attachments
     = hidden_field_tag "post[attachment_ids][]", ""
     - post.attachments.each do |attachment|
       %li.attachment
         = check_box_tag "post[attachment_ids][]", attachment.id, true, {:id => "post_attachment_#{attachment.id}", :class => 'choose_attachment'}
         = link_to attachment.filename, attachment.file.url, :class => "attachment #{attachment.extension}"
-        = link_to 'remove', '#', :class => 'remove', :id => "remove_attachment_#{attachment.id}" 
-  .uploads
+  %ul.uploads
   .selector
     = file_field_tag "files[]", :class => "filefield"
     .addfile

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

@@ -1,25 +1,33 @@
-= render :partial => 'readers/flasher'
+- content_for :signals do
+  = render :partial => 'readers/flasher'
 
-#forum
+- content_for :title do
+  = t('latest_posts')
+
+- content_for :preamble do
+  %p
+    = t('posts_introduction')
+  
+- content_for :messages do
   - if @posts.empty?
-    %p No talk here yet.
+    %p 
+      = t('no_posts')
   - else
-    - if @posts.previous_page
-      = paginate_and_summarise @posts, 'posts'
-
     %ul.main
       = render :partial => 'posts/post', :collection => @posts, :locals => {:with_context => true}
 
-    = paginate_and_summarise @posts, 'posts'
+- content_for :new_topic do
+  .newmessage
+    = link_to t('new_topic'), new_topic_url
+
+- content_for :pagination do
+  = pagination_and_summary_for(@posts, t('post'))
 
 - content_for :breadcrumbs do
   = link_to 'Forum', topics_url
   \>
   = @title
 
-- content_for :pagetitle do
-  Posts
-
 - content_for :breadhead do
   = link_to "Forum", topics_url, :class => 'breadhead'
 
@@ -30,4 +38,12 @@
   = render :partial => 'readers/controls'
 
 - content_for :help do
-  = render :partial => 'topics/help'
+  = render :partial => 'topics/help'
+
+
+#forum
+  = yield :new_topic
+  = yield :preamble
+  = yield :pagination if @posts.previous_page
+  = yield :messages
+  = yield :pagination if @posts.next_page

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

@@ -1,4 +1,4 @@
-- with_error_report(@topic.errors.on(:name)) do
+%p.title
   = form.label :name, 'Discussion title', :class => 'required'
   %br
   = form.text_field :name, :class => 'titular'
@@ -10,7 +10,7 @@
       = form.check_box :locked
       %label{:for => 'topic_locked', :class => 'admin'} Locked
 
-- with_error_report(@topic.errors.on(:body)) do
+%p.body
   = form.label :name, 'Opening message'
   %br
   = form.text_area :body, :class=> 'standard', :rows => 12
@@ -19,7 +19,7 @@
   = render :partial => 'posts/uploader', :locals => {:post => @topic.first_post}
 
 - if @topic.new_record? || admin?
-  - with_error_report(@topic.errors.on(:forum)) do
+  %p.forum
     = form.label :forum_id, 'File in category:'
     %br
     = form.select :forum_id, Forum.visible.collect {|f| [ f.name, f.id ] }, :class=> 'standard'

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

@@ -7,29 +7,28 @@
   %li{:id => topic.dom_id, :class => cssclass.join(' ')}
     %span.context
       - if with_context
-        = link_to(topic.forum.name, forum_url(topic.forum)) + ':'
+        = link_to topic.forum.name, forum_url(topic.forum)
     %span.subject
       %a{:href => forum_topic_url(topic.forum, topic), :class => 'main'}
-        = gravatar_for(topic.reader, {:size => 40}, {:alt => topic.reader.name, :class => 'gravatar'})
+        - if topic.reader
+          = gravatar_for(topic.reader, {:size => 40}, {:alt => topic.reader.name, :class => 'gravatar'})
         = topic.name
     %span.context
-      from
-      - if topic.posts.count > 1
-        = link_to topic.reader.name + '.', reader_url(topic.reader)
-        = topic.posts.count
-        = pluralize(topic.posts.count, 'comment') + ','
-        most recently from
+      = t('posted_by')
+      = link_to topic.reader.name + '.', reader_url(topic.reader)
+      = t('post_count_from', :count => topic.posts.count - 1)
+      - if topic.has_posts?
         = link_to topic.replied_by.name, reader_url(topic.replied_by)
         = friendly_date(topic.replied_at)
       - else 
-        = link_to topic.reader.name, reader_url(topic.reader)
         = friendly_date(topic.created_at)
         
-    %div.preview
+    .post_wrapper
       - if topic.page
         = truncate_words(topic.page.render_part(:body), 50)
       - elsif topic.first_post
         = truncate_and_textilize(topic.first_post.body, 50)
       - else
-        %p Topic empty!
+        %p 
+          = t('topic_empty')
     

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

@@ -1,35 +1,34 @@
-= render :partial => 'readers/flasher'
+- content_for :signals do
+  = render :partial => 'readers/flasher'
 
-#forum
-  #forum_preamble
-    %p
-      This is a list of all the discussions going on here, with the most recently updated first. 
-      You can also see a more organised list of 
-      = link_to("discussions by category", forums_url) + '.'
-    
-    %p
-      = link_to "Start a new discussion", new_topic_url, :class => 'newmessage'
+- content_for :preamble do
+  %p
+    = t('topics_introduction')
+    = link_to( t('categories'), forums_url) + '.'
 
+- content_for :messages do
   - if @topics.empty?
-    %p No talk here yet.
-
+    %p 
+      = t('no_topics')
   - else
-    - if @topics.previous_page
-      = paginate_and_summarise @topics, 'topics'
-      
     %ul.main
       = render :partial => 'topics/topic', :collection => @topics, :locals => {:with_context => true}
 
-    = paginate_and_summarise @topics, 'topics'
+- content_for :new_topic do
+  .newmessage
+    = link_to t('new_topic'), new_topic_url
+
+- content_for :pagination do
+  = pagination_and_summary_for(@topics, t('topics'))
 
 - content_for :breadhead do
-  = home_page_link(:class => 'breadhead')
+  = home_page_link
 
 - content_for :breadcrumbs do
-  Forum
+  = t('forum').titlecase
 
-- content_for :pagetitle do
-  Latest discussion
+- content_for :title do
+  = t('latest_discussion')
 
 - content_for :feed do
   = feed_link(topics_path(:format => :rss))
@@ -37,5 +36,12 @@
 - content_for :controls do
   = render :partial => 'readers/controls'
 
-- content_for :help do
-  = render :partial => 'topics/help'
+#forum
+  = yield :new_topic
+  = yield :preamble
+  = yield :pagination if @topics.previous_page
+  = yield :messages
+  = yield :pagination if @topics.next_page
+
+
+