radiant-forum-extension 1.1.2 → 1.2.1

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

@@ -1,5 +1,4 @@
-- message_type = @page ? 'comment' : 'reply'
-- purpose = @page ? 'To add a comment' : 'To reply'
+- message_type = @page ? 'comment' : 'post'
 
 - if @topic.locked?
   %p.administrative
@@ -12,25 +11,25 @@
       - @post ||= @topic.posts.build
 
       %div.reply#replyform
-        - form_for :post, :url => formurl, :html => {:id => 'reply_form', :multipart => true, :class => 'friendly inline'} do |f|
+        %div.speaker
+          %a{:href => reader_url(current_reader), :class => 'main'}
+            = gravatar_for(current_reader, {:size => 40}, {:alt => current_reader.name, :class => 'gravatar', :width => '40', :height => '40'})
+        .post_wrapper
           .post_header
             %h2
-              %a{:href => reader_url(current_reader), :class => 'main'}
-                = gravatar_for(current_reader, {:size => 40}, {:alt => current_reader.name, :class => 'gravatar', :width => '40', :height => '40'})
-              Add a 
-              = message_type
-        
+              = t('add_post', :message_type => message_type)
             %p.context
-              You are currently logged in as 
-              = link_to(current_reader.name, reader_url(current_reader)) + '.'
-              If that's not you, please 
-              = link_to("log out", reader_logout_url) + '.'
+              = t('logged_in_as', :name => current_reader.name)
+              = t('if_not_you')
+              = link_to(t('log_out'), reader_logout_url) + '.'
+
+          - form_for :post, :url => formurl, :html => {:id => 'reply_form', :multipart => true, :class => 'friendly inline'} do |f|
+            = render :partial => 'posts/form', :object => f
+            %p.buttons
+              = f.submit t('post_post', :message_type => message_type)
 
-          = render :partial => 'posts/form', :object => f
-          %p.buttons
-            = f.submit "Post #{message_type}"
     - else
-      = render :partial => 'reader_activations/activation_required', :locals => {:purpose => purpose}
+      = render :partial => 'reader_activations/activation_required', :locals => {:purpose => t('to_add_post', :message_type => message_type)}
       
   - else
-    = render :partial => 'reader_sessions/login_form', :locals => {:purpose => purpose}
+    = render :partial => 'reader_sessions/login_form', :locals => {:purpose => t('to_add_post', :message_type => message_type)}

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

@@ -1,28 +1,24 @@
 %form.friendly{:action => search_posts_url}
-  %h2 
-    Forum Search
-
   %p
     %label{:for => "q"}
-      Look for this text
+      = t('search_form.query_label')
     = text_field_tag "q", params[:q], :class => 'standard'
 
   %p
     %label{:for => "forum_id"}
-      In this discussion category
+      = t('search_form.forum_label')
+      
     %select{:name => "forum_id"}
-      %option{:value => ""}
-        anywhere
+      %option{:value => ""}= t('anywhere')
       = options_from_collection_for_select(Forum.find(:all), "id", "name", params[:forum_id].to_i)
 
-  -if Radiant::Config['forum.search_by_reader']
-    %p
-      %label{:for => "reader_id"}
-        From this person
-      %select{:name => "reader_id"}
-        %option{:value => ""}
-          anyone
-        = options_from_collection_for_select(Reader.find(:all), "id", "name", params[:reader_id].to_i)
-
   %p
-    = submit_tag "search"
+    %label{:for => "reader_id"}
+      = t('search_form.person_label')
+    %select{:name => "reader_id"}
+      %option{:value => ""}
+        =t('anyone')
+      = options_from_collection_for_select(Reader.find(:all), "id", "name", params[:reader_id].to_i)
+
+  %p.buttons
+    = submit_tag t("search")

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

@@ -0,0 +1,2 @@
+- if uf
+  = uf.file_field :file, :class => 'filefield'

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

@@ -1,15 +1,15 @@
-- post ||= @post
-
-.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}"
-  %ul.uploads
-  .selector
-    = file_field_tag "files[]", :class => "filefield"
-    .addfile
-      = link_to "attach a file", '#'
-      
+- if Radiant::Config['forum.allow_attachments?'] && f
+  - post ||= f.object
+  
+  .upload_stack
+    %ul.attachments
+      - post.attachments.each do |att|
+        - f.fields_for :attachments, att do |af|
+          = render :partial => 'posts/attachment', :object => att, :locals => {:af => af}
+    %ul.uploads
+    .selector
+      - new_attachment = post.attachments.build
+      - f.fields_for :attachments, new_attachment do |uf|
+        = render :partial => 'posts/upload', :object => new_attachment, :locals => {:uf => uf}
+      .addfile
+        = link_to t('attach_file'), "#"

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

@@ -1,17 +1,15 @@
 / this form is usually brought in by a remote call to sit on the page in the place of the post itself.
 
-- message_type = @topic.page ? 'comment' : 'message'
-
-- form_for :post, :url  => topic_post_path(@topic, @post), :html => {:method => 'put', :multipart => true, :id => "post_form_#{@post.id}", :class => 'friendly'} do |f|
+- form_for :post, @post, :url  => topic_post_path(@topic, @post), :html => {:method => 'put', :multipart => true, :id => "post_form_#{@post.id}", :class => 'friendly'} do |f|
   = render :partial => 'posts/form', :object => f
   %p.buttons
-    = f.submit "Save changes"
+    = f.submit t('save_changes')
     or
-    = link_to "cancel", topic_post_path(@topic, @post), :class => 'cancel'
+    = link_to t('cancel'), topic_post_path(@topic, @post), :class => 'cancel'
 
 - content_for :pagetitle do
-  Edit
-  = message_type
+  = t('edit')
+  = @topic.page ? t('comment') : t('post')
 
 - content_for :breadhead do
   = link_to @post.topic.name, forum_topic_url(@post.topic.forum, @post.topic), {:class => 'breadhead'}

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

@@ -3,18 +3,13 @@
 
 - content_for :title do
   = t('latest_posts')
-
-- content_for :preamble do
-  %p
-    = t('posts_introduction')
   
 - content_for :messages do
   - if @posts.empty?
     %p 
       = t('no_posts')
   - else
-    %ul.main
-      = render :partial => 'posts/post', :collection => @posts, :locals => {:with_context => true}
+    = render :partial => 'posts/post', :collection => @posts, :locals => {:with_context => true}
 
 - content_for :sidebar do
   = render :partial => "topics/latest"
@@ -45,8 +40,6 @@
 
 
 #forum
-  = yield :new_topic
-  = yield :preamble
   = yield :pagination if @posts.previous_page
   = yield :messages
   = yield :pagination if @posts.next_page

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

@@ -1,54 +1,63 @@
-= render :partial => 'readers/flasher'
+- content_for :signals do
+  = render :partial => 'readers/flasher'
 
-#forum
-  #search
-
-  - if @searching
-    - if @posts.empty?
-      %p No messages found.
-
-    - else
-      %p
-        We found
-        = @posts.total_entries
-        = @description + ':'
-
-      - if @posts.previous_page
-        = paginate_and_summarise @posts, 'posts'
-
-      %ul.main
-        = render :partial => 'posts/post', :collection => @posts, :locals => {:with_context => true, :hide_author => false, :preview => true}
+- content_for :messages do
+  = render :partial => 'posts/post', :collection => @posts, :locals => {:with_context => true, :hide_author => false, :preview => true}
 
-      = paginate_and_summarise @posts, 'posts'
-
-  - else
-    = render :partial => 'posts/search'
+- content_for :pagination do
+  = pagination_and_summary_for @posts, t('post')
 
 - content_for :breadcrumbs do
-  = link_to 'Forum', topics_url
-  - if @searching
-    \>
-    = link_to "Posts", posts_url
-    \>
-    = @title
-  - else
-    \>
-    Search
+  = link_to t('forum').titlecase, '/forum'
+  = t('separator')
+  = link_to t('posts').titlecase, '/forum/posts'
 
 - content_for :breadhead do
-  - if @searching
-    = link_to "Posts", posts_url, :class => 'breadhead'
-  - else
-    = link_to "Posts", topics_url, :class => 'breadhead'
+  = link_to t("Posts"), posts_url, :class => 'breadhead'
+
+- if @searching
+  - content_for :title do
+    = t('search_results')
+    
+  - content_for :thing_title do
+    = t('search_results')
+      
+  - content_for :introduction do
+    - if @posts.empty?
+      %p 
+        =t('no_posts_found')
+    - else
+      %p
+        = t('posts_found', :count => @posts.total_entries)
+        - unless params[:q].blank?
+          = t('matching')
+          %strong
+            = params[:q]
+        - if @reader
+          = t('from_reader', :name => @reader.name)
+        - if @topic
+          = t('filed_in', :name => @topic.name)
+        - elsif @forum
+          = t('filed_in', :name => @forum.name)
+          
+  - content_for :feed do
+    = feed_link(search_posts_url(params.merge(:format => :rss)))
+
+- else
+  - content_for :title do
+    = t('search')
+  - content_for :introduction do
+    = t('search_introduction')
+
+- content_for :search do
+  = render :partial => 'search'
 
-- content_for :pagetitle do
-  - if @searching
-    = @title || 'Search results'
-  - else
-    Search
 
-- content_for :feed do
-  = feed_link(search_posts_url(params.merge(:format => :rss))) if @searching
 
-- content_for :controls do
-  = render :partial => 'readers/controls'
+#forum
+  #search
+    = yield :search
+  - if @searching
+    = yield :pagination if @posts.previous_page
+    = yield :messages
+    = yield :pagination if @posts.next_page

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

@@ -1,10 +1,18 @@
-= render :partial => 'post', :object => @post
+- content_for :messages do
+  = render :partial => 'post', :object => @post, :locals => {:with_context => true}
 
-- content_for :breadhead do
-  = link_to @post.topic.name, forum_topic_url(@post.topic.forum, @post.topic), {:class => 'breadhead'}
+- content_for :parent do
+  = link_to @post.topic.name, forum_topic_url(@post.topic, @post.topic.forum)
 
-- content_for :controls do
-  = render :partial => 'readers/controls'
+- content_for :breadhead do
+  = link_to @post.topic.name + ':', forum_topic_url(@post.topic.forum, @post.topic), {:class => 'breadhead'}
 
-- content_for :mugshot do
+- content_for :speaker do
   = gravatar_for(@post.reader, {:size => 42}, {:alt => @post.reader.name, :class => 'gravatar'})
+
+- content_for :thing_title do
+  = t('reply_to')
+  = @post.topic.name
+
+#forum
+  = yield :messages

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

@@ -1,26 +1,30 @@
 %p.title
-  = form.label :name, 'Discussion title', :class => 'required'
+  = form.label :name, t('label.topic_name'), :class => 'required'
   %br
   = form.text_field :name, :class => 'titular'
   - if admin?
     %br
     %span.quiet
       = form.check_box :sticky
-      %label{:for => 'topic_sticky', :class => 'admin'} Sticky
+      %label{:for => 'topic_sticky', :class => 'admin'}
+        = t('sticky')
       = form.check_box :locked
-      %label{:for => 'topic_locked', :class => 'admin'} Locked
+      %label{:for => 'topic_locked', :class => 'admin'} 
+        = t('locked')
 
-%p.body
-  = form.label :name, 'Opening message'
-  %br
-  = form.text_area :body, :class=> 'standard', :rows => 12
-
-- unless @topic.page && !Radiant::Config['forum.comments_have_attachments']
-  = render :partial => 'posts/uploader', :locals => {:post => @topic.first_post}
+- @topic.first_post ||= @topic.posts.build
+- form.fields_for :first_post, @topic.first_post do |fp|
+  %p.body
+    = fp.label :body, t('label.topic_body')
+    %br
+    = fp.text_area :body, :class=> 'standard', :rows => 12
+    
+  - unless @topic.page && !Radiant::Config['forum.comments_have_attachments']
+    = render :partial => 'posts/uploader', :locals => {:f => fp}
 
 - if @topic.new_record? || admin?
   %p.forum
-    = form.label :forum_id, 'File in category:'
+    = form.label :forum_id, t('label.topic_category')
     %br
     = form.select :forum_id, Forum.visible.collect {|f| [ f.name, f.id ] }, :class=> 'standard'
   

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

@@ -6,8 +6,6 @@
       %li.topic
         %span.subject
           %a{:href => forum_topic_url(topic.forum, topic)}
-            - if topic.reader
-              = gravatar_for(topic.reader, {:size => 40}, {:alt => topic.reader.name, :class => 'gravatar'})
             = topic.name
         %span.context
           = t('posted_by')

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

@@ -1,2 +1,2 @@
-%p  
-  Sorry: this topic is locked.
+%p
+  = t('sorry_locked')

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

@@ -1,34 +1,53 @@
 - if topic.visible_to?(current_reader)
-  - with_context ||= false
-  - cssclass = ['topic']
-  - cssclass << 'sticky' if topic.sticky?
-  - cssclass << 'locked' if topic.locked?
+  - post = topic.first_post
+  %div.post{:id => post.dom_id} 
+    .speaker
+      = link_to gravatar_for(topic.reader, {:size => 40}, {:alt => topic.reader.name, :class => 'gravatar offset', :width => '40', :height => '40'}), forum_topic_url(topic.forum, topic)
 
-  %li{:id => topic.dom_id, :class => cssclass.join(' ')}
-    %span.context
-      - if with_context
-        = link_to topic.forum.name, forum_url(topic.forum)
-    %span.subject
-      %a{:href => forum_topic_url(topic.forum, topic), :class => 'main'}
-        - if topic.reader
-          = gravatar_for(topic.reader, {:size => 40}, {:alt => topic.reader.name, :class => 'gravatar'})
-        = topic.name
-    %span.context
-      = 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 
-        = friendly_date(topic.created_at)
-        
     .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 
-          = t('topic_empty')
-    
+      .post_header
+        %h2.subject
+          %a{:href => forum_topic_url(topic.forum, topic), :class => 'main'}
+            = topic.name
+
+        %p.context
+          = t('begun_on', :date => friendly_date(topic.created_at))
+          = t('in')
+          = link_to topic.forum.name, forum_url(topic.forum)
+          = t('by')
+          = link_to post.reader.name, reader_url(topic.reader), :class => 'person'
+
+          - 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(topic, post), :class => 'edit_post', :id => "revise_post_#{post.id}"
+          - elsif admin?
+            = link_to t("edit_minimal"), edit_topic_post_url(topic, post), :class => 'edit_post', :id => "revise_post_#{post.id}"
+            = link_to t("remove_minimal"), topic_post_url(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?"
+
+      .post_body
+        = truncate_and_textilize(post.body, 100)
+
+        - unless post.attachments.empty?
+          .post_attachments
+            %h4 
+              attached:
+            - 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 topic.has_posts?
+          %p.voices
+            - topic.other_voices.each do |reader|
+              = gravatar_for(reader, {:size => 16}, {:alt => reader.name, :class => 'gravatar tiny', :width => '16', :height => '16'})
+          %p.replies
+            = t('post_count_from', :count => topic.posts.count - 1)
+            = link_to topic.replied_by.name, reader_url(topic.replied_by)
+            = friendly_date(topic.replied_at)
+