radiant-forum-extension 1.2.1 → 2.0.0

data/app/views/posts/{_search.html.haml → _search_form.html.haml}

@@ -1,4 +1,4 @@
-%form.friendly{:action => search_posts_url}
+%form.friendly{:action => posts_url}
   %p
     %label{:for => "q"}
       = t('search_form.query_label')

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

@@ -9,7 +9,7 @@
     %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}
+      - 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'), "#"

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

@@ -1,18 +1,31 @@
-/ this form is usually brought in by a remote call to sit on the page in the place of the post itself.
+= render :partial => 'forums/standard_parts'
 
-- 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 t('save_changes')
-    or
-    = link_to t('cancel'), topic_post_path(@topic, @post), :class => 'cancel'
+- content_for :form do
+  .post_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 :pagetitle do
-  = t('edit')
-  = @topic.page ? t('comment') : t('post')
+- content_for :title do
+  - if @post.page
+    = t('edit_comment')
+  - elsif @post.first? 
+    = t('edit_topic')
+  - else
+    = t('edit_reply')
 
 - content_for :breadhead do
-  = link_to @post.topic.name, forum_topic_url(@post.topic.forum, @post.topic), {:class => 'breadhead'}
+  - 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'
 
-- content_for :controls do
-  = render :partial => 'readers/controls'
+
+
+#forum
+  = yield :form

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

@@ -1,45 +1,37 @@
-- content_for :signals do
-  = render :partial => 'readers/flasher'
+= render :partial => 'forums/standard_parts'
 
 - content_for :title do
-  = t('latest_posts')
-  
-- content_for :messages do
-  - if @posts.empty?
-    %p 
-      = t('no_posts')
-  - else
-    = render :partial => 'posts/post', :collection => @posts, :locals => {:with_context => true}
+  = t('posts_heading')
 
+- content_for :introduction do
+  = t('posts_introduction')
+  
 - content_for :sidebar do
   = render :partial => "topics/latest"
 
-- content_for :new_topic do
+- content_for :newtopic do
   .newmessage
-    = link_to t('new_topic'), new_topic_url
+    = link_to t('new_topic'), new_post_url
 
 - content_for :pagination do
   = pagination_and_summary_for(@posts, t('post'))
 
 - content_for :breadcrumbs do
-  = link_to 'Forum', topics_url
-  \>
-  = @title
-
-- content_for :breadhead do
-  = link_to "Forum", topics_url, :class => 'breadhead'
+  = link_to t('forum').titlecase, topics_url
+  = t('separator')
+  = yield :title
 
-- content_for :feed do
+- content_for :feedlink do
   = feed_link(posts_path(:format => :rss))
 
-- content_for :controls do
-  = render :partial => 'readers/controls'
-
-- content_for :help do
-  = render :partial => 'topics/help'
-
+- content_for :messages do
+  - if @posts.empty?
+    %p 
+      = t('no_posts')
+  - else
+    = yield :pagination if @posts.previous_page
+    = render :partial => 'posts/post', :collection => @posts, :locals => {:with_context => true}
+    = yield :pagination if @posts.next_page
 
 #forum
-  = yield :pagination if @posts.previous_page
   = yield :messages
-  = yield :pagination if @posts.next_page

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

@@ -1,14 +1,34 @@
-- message_type = @page ? 'comment' : 'reply'
+= render :partial => 'forums/standard_parts'
 
-#forum
-  = render :partial => 'posts/reply'
+- content_for :form do
+  .post
+    .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)
+
+- content_for :title do
+  - if @page
+    = t('new_comment')
+  - elsif @topic 
+    = t('new_reply')
+  - else
+    = t('new_topic')
 
 - content_for :breadhead do
   - if @page
     = link_to @page.title, @page.url, :class => 'breadhead'
-  - else 
+  - elsif @topic 
     = link_to @topic.name, forum_topic_url(@topic.forum, @topic), :class => 'breadhead'
 
-- content_for :pagetitle do
-  Add a
-  = message_type
+#forum
+  = yield :form

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

@@ -0,0 +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)
+
+- 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
+
+- content_for :person do
+  = standard_gravatar_for(@post.reader)
+
+- content_for :title do
+  - if @post.page
+    = t('confirm_remove_comment')
+  - elsif @post.first?
+    = t('confirm_remove_topic')
+  - else
+    = t('confirm_remove_post')
+
+  
+#forum
+  = yield :messages

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

@@ -1,18 +1,31 @@
+= render :partial => 'forums/standard_parts'
+
 - content_for :messages do
-  = render :partial => 'post', :object => @post, :locals => {:with_context => true}
+  = render :partial => 'post', :object => @post
 
 - content_for :parent do
   = link_to @post.topic.name, forum_topic_url(@post.topic, @post.topic.forum)
 
 - content_for :breadhead do
-  = link_to @post.topic.name + ':', forum_topic_url(@post.topic.forum, @post.topic), {:class => 'breadhead'}
+  = link_to t('forum').titlecase + t('separator'), topics_url
+  = link_to @post.topic.forum.name + t('separator'), forum_url(@post.topic.forum)
+  = yield :parent
+
+- content_for :person do
+  = standard_gravatar_for(@post.reader)
+
+- content_for :title do
+  -if @post.page
+    = t('comment_on') + @post.page.title
+  - elsif @post.first?
+    = @post.topic.name
+  - else
+    = t('reply_to') + @post.topic.name
+
+- content_for :sidebar do
+  = render :partial => 'topics/latest'
 
-- 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/readers/_forum_messages.html.haml

@@ -0,0 +1,20 @@
+- reader ||= @reader
+- posts ||= reader.posts.paginate(pagination_parameters)
+
+#forum
+  %h2
+    =t('forum_messages', :name => reader.name)
+
+  - if posts.empty?
+    %p 
+      = t('no_posts')
+  - else
+    = pagination_and_summary_for(posts, t('post')) if posts.previous_page
+    - posts.each do |post|
+      - if post.comment?
+        = render :partial => 'posts/post', :object => post, :locals => {:with_context => true}
+      - elsif post.first?
+        = 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

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

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

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

@@ -0,0 +1,12 @@
+- 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')
+

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

@@ -1,19 +1,17 @@
 %h2
   = t('recent_topics')
-%ul.recently
+%ul
   - Topic.latest(10).each do |topic|
-    - if topic.visible_to?(current_reader)
-      %li.topic
-        %span.subject
-          %a{:href => forum_topic_url(topic.forum, topic)}
-            = 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)
-
+    %li.topic
+      = link_to_post(topic.posts.last, :class => 'title')
+      %br
+      %span.context
+        - if topic.has_replies?
+          = t('new_reply_from')
+          = link_to topic.replied_by.name, reader_url(topic.replied_by)
+          = friendly_date(topic.replied_at)
+        - else
+          = t('started_by')
+          = link_to topic.reader.name, reader_url(topic.reader)
+          = friendly_date(topic.created_at)
+        

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

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

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

@@ -0,0 +1,6 @@
+- 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))

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

@@ -0,0 +1,23 @@
+- topic ||= @topic
+
+- if topic.locked?
+  %p.administrative
+    = t("topic_locked")
+- else
+  - if current_reader
+    - if current_reader.activated?
+      .post
+        .post_wrapper.reply
+          .post_header
+            .speaker
+              = standard_gravatar_for(current_reader)
+            %h2.person
+              = t("add_reply")
+            %p.context
+              = t('if_you_not', :name => current_reader.name)
+              = link_to(t('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')}
+  - else
+    = render :partial => 'reader_sessions/login_form', :locals => {:purpose => t('to_reply')}

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

@@ -1,53 +1,24 @@
-- if topic.visible_to?(current_reader)
-  - 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)
+- post = topic.posts.first
 
+%div{:id => topic.dom_id}
+  .post
     .post_wrapper
+      .speaker
+        = standard_gravatar_for(post.reader, forum_topic_url(topic.forum, topic))
       .post_header
-        %h2.subject
-          %a{:href => forum_topic_url(topic.forum, topic), :class => 'main'}
-            = topic.name
-
+        %h2
+          = link_to topic.name, forum_topic_url(topic.forum, topic)
+        = render :partial => 'posts/edit_links', :locals => {:post => post}
         %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?"
+          = render :partial => "topics/context", :locals => {:topic => topic}
 
       .post_body
         = truncate_and_textilize(post.body, 100)
+        = render :partial => 'posts/attachments', :locals => {:post => post}
 
-        - 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?
+      - if topic.has_replies?
+        .post_replies
           %p.voices
-            - topic.other_voices.each do |reader|
-              = gravatar_for(reader, {:size => 16}, {:alt => reader.name, :class => 'gravatar tiny', :width => '16', :height => '16'})
+            = render :partial => 'topics/voices', :locals => {:topic => topic}
           %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)
-  
+            = render :partial => 'topics/replies', :locals => {:topic => topic}

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

@@ -0,0 +1,5 @@
+- topic ||= @topic
+- topic.other_voices.each do |reader|
+  - if reader
+    - gravatar = gravatar_for(reader, {:size => 16, :default => "#{request.protocol}#{request.host_with_port}/images/furniture/no_gravatar.png"}, {:alt => reader.name, :class => 'gravatar tiny', :width => '16', :height => '16'})
+    = link_to gravatar, reader_url(reader)

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

@@ -1,45 +1,32 @@
-- content_for :signals do
-  = render :partial => 'readers/flasher'
+= render :partial => 'forums/standard_parts'
 
 - content_for :messages do
   - if @topics.empty?
     %p 
       = t('no_topics')
   - else
-    = render :partial => 'topics/topic', :collection => @topics, :locals => {:with_context => true}
+    = render :partial => 'topics/topic', :collection => @topics
 
 - content_for :sidebar do
-  %h2
-    = t('forums')
-  %ul
-    - Forum.all.each do |forum|
-      %li
-        = link_to forum.name, forum_url(forum)
-        %br
-        = forum.topics.count
-        = t('topics')
-
-- content_for :new_topic do
-  .newmessage
-    = link_to t('new_topic'), new_topic_url
+  = render :partial => 'forums/latest'
 
 - content_for :pagination do
   = pagination_and_summary_for(@topics, t('topics'))
 
-- content_for :breadhead do
-  = home_page_link
-
 - content_for :breadcrumbs do
-  = t('forum').titlecase
+  = link_to t('forum').titlecase, topics_url
+  = t('separator')
+  = yield :title
 
 - content_for :title do
-  = t('latest_discussion')
+  = t('topics_heading')
 
-- content_for :feed do
+- content_for :feedlink do
   = feed_link(topics_path(:format => :rss))
 
-- content_for :controls do
-  = render :partial => 'readers/controls'
+- content_for :introduction do
+  %p
+    =t('topics_introduction')
 
 #forum
   = yield :pagination if @topics.previous_page