radiant-forum-extension 1.1.2 → 1.2.1

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

@@ -7,68 +7,71 @@
       %tr
         - render_region :thead do |thead|
           - thead.title_header do
-            %th.forum Forum
+            %th.forum 
+              =t('forum').titlecase
+          - thead.description_header do
+            %th.description
+              =t('description').titlecase
           - thead.latest_header do
-            %th.forum_latest Latest activity
+            %th.forum_latest 
+              =t('latest_activity').titlecase
           - thead.modify_header do
-            %th.action Action
+            %th.action
     %tbody
       - @forums.each do |forum|
-        %tr.node.level-1
+        %tr
           - render_region :tbody do |tbody|
-
             - tbody.title_cell do
-              %td.forum
-                %h3
-                  = link_to forum.name, edit_admin_forum_url(:id => forum)
+              %td.name
+                = link_to forum.name, edit_admin_forum_url(:id => forum)
                 -if forum.for_comments
                   %p.context
-                    (comments forum)
+                    = t('for_comments')
+                    
+            - tbody.description_cell do
+              %td.forum_description
                 = textilize(forum.description)
-                %p
-                  - if forum.respond_to?(:site)
-                    = link_to "→ browse discussions", 'http://' + forum.site.base_domain + forum_path(forum)
-                  - else
-                    = link_to "→ browse discussions", forum_path(forum)
 
             - tbody.latest_cell do
               %td.forum_latest
                 - if forum.posts_count > 0
                   %ul.latest
-                    - forum.recent_topics.latest.each do |topic|
+                    - forum.topics.latest(1).each do |topic|
                       %li.topic
+                        = friendly_date(topic.replied_at) + ":"
                         - if topic.page
+                          - t('comment_on')
                           = link_to topic.page.title, "#{topic.page.url}", {:class => 'topic'}
-                        - else
-                          = link_to topic.name, forum_topic_url(topic.forum, topic, :page => 'last'), {:class => 'topic'}
-                        %br
-                        %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
-                            = 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)
+                          = t('from_reader', :name => topic.replied_by.name)
+                        - elsif topic.replied_by
+                          = t('new_reply_to')
+                          = link_to topic.name, forum_topic_url(topic.forum, topic), {:class => 'topic'}
+                          = t('from_reader', :name => topic.replied_by.name)
+                        - else 
+                          = t('new_topic')
+                          = link_to topic.name, forum_topic_url(topic.forum, topic), {:class => 'topic'}
+                          = t('from_reader', :name => topic.reader.name)
                 -else
                   %p
-                    No topics yet.
+                    = t('no_topics')
+
             - tbody.modify_cell do
-              %td.remove
+              %td.actions
                 -if forum.for_comments
-                  = image('noremove', :alt => 'Remove Forum')
+                  %span.action.disabled
+                    = image('minus_disabled')
+                    = " " + t('remove')
                 -else
                   - if admin?
-                    = link_to image('remove', :alt => 'Remove Forum'), remove_admin_forum_url(:id => forum) 
+                    = link_to image('minus') + ' ' + t('remove'), remove_admin_forum_url(:id => forum) , :class => 'action'
                   - else
-                    = image('noremove', :alt => 'only admin can remove forums')
+                    %span.action.disabled
+                      = image('minus_disabled')
+                      = " " + t('remove')
 
 - render_region :bottom do |bottom|
-  - bottom.new_button do
-    - if admin?
-      %p
-        = link_to image('new-forum', :alt => 'New Forum'), new_admin_forum_url
+  - bottom.buttons do
+    #actions
+      = pagination_for @forums
+      %ul
+        %li= link_to image('plus') + " " + t("new_forum"), new_admin_forum_url

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

@@ -0,0 +1,25 @@
+- form_for [:admin, @post] do |f|
+  = hidden_field 'forum', 'lock_version'
+  = render_region :form_top
+  .form-area
+    - render_region :form do |form|
+      - form.show_name do
+        %p.title
+          %label
+            = t('topic_name') + ":"
+          = @post.topic.name
+
+      - form.edit_body do
+        %p.content
+          = f.label :body, t('post_body')
+          = f.text_area :body, :class => "textarea", :style => "width: 100%"
+  
+  - render_region :form_bottom do |form_bottom|
+    - form_bottom.edit_timestamp do
+      = updated_stamp @post  
+    - form_bottom.edit_buttons do
+      %p.buttons
+        = save_model_button(@post)
+        = save_model_and_continue_editing_button(@post)
+        or
+        = link_to 'Cancel', admin_posts_url

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

@@ -0,0 +1,6 @@
+- render_region :main do |main|
+  - main.edit_header do
+    %h1 
+      = t('edit_post').titlecase
+  - main.edit_form do
+    = render :partial => 'form'

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

@@ -0,0 +1,49 @@
+- include_stylesheet('admin/forum')
+= render_region :top 
+
+#posts_table.outset
+  %table#posts.index{:cellspacing=>"0", :border=>"0", :cellpadding=>"0"}
+    %thead
+      %tr
+        - render_region :thead do |thead|
+          - thead.body_header do
+            %th.body
+              = t('body')
+          - thead.author_header do
+            %th.author 
+              = t('author')
+          - thead.date_header do
+            %th.date 
+          - thead.topic_header do
+            %th.topic
+              = t('topic')
+          - thead.modify_header do
+            %th.action
+    %tbody
+      - @posts.each do |post|
+        %tr
+          - render_region :tbody do |tbody|
+            - tbody.body_cell do
+              %td.post_body
+                = link_to truncate(post.body, :length => 64), edit_admin_post_url(post)
+
+            - tbody.author_cell do
+              %td.post_author
+                = link_to post.reader.name, admin_reader_url(post.reader)
+                    
+            - tbody.date_cell do
+              %td.post_date
+                = friendly_date(post.created_at)
+
+            - tbody.topic_cell do
+              %td.post_topic
+                = link_to post.topic.name, forum_topic_url(post.topic.forum, post.topic), :class => 'external'
+
+            - tbody.modify_cell do
+              %td.actions
+                = link_to image('minus') + ' ' + t('remove'), remove_admin_post_url(:id => post) , :class => 'action'
+
+- render_region :bottom do |bottom|
+  - bottom.buttons do
+    #actions
+      = pagination_for @posts

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

@@ -9,8 +9,8 @@
   %p
     = edit_config 'forum.allow_page_comments?'
   %p
-    = edit_config 'forum.comments_have_attachments?'
+    = edit_config 'forum.allow_attachments?'
   %p
-    = edit_config 'forum.attachment_content_types'
+    = edit_config 'forum.attachment.content_types'
   %p
-    = edit_config 'forum.max_attachment_size'
+    = edit_config 'forum.attachment.max_size'

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

@@ -1,14 +1,19 @@
-%p.ruled
-  = show_config 'forum.layout'
-%p.ruled
-  = show_config 'forum.editable_period'
-%p.ruled
-  = 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'
+#forum_settings.box
+  %h3
+    .actions
+      = button_to t("edit"), edit_admin_reader_configuration_url, :method => :get
+    =t("forum_configuration")
+  %p.ruled
+    = show_config 'forum.layout'
+  %p.ruled
+    = show_config 'forum.editable_period'
+  %p.ruled
+    = show_config 'forum.public?'
+  %p.ruled
+    = show_config 'forum.allow_page_comments?'
+  %p.ruled
+    = show_config 'forum.allow_attachments?'
+  %p.ruled
+    = show_config 'forum.attachment.content_types'
+  %p.ruled
+    = show_config 'forum.attachment.max_size'

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

@@ -0,0 +1,24 @@
+- form_for [:admin, @topic] do |f|
+  = render_region :form_top
+  .form-area
+    - render_region :form do |form|
+      - form.edit_name do
+        %p.title
+          = f.label :name, t('topic_name')
+          = f.text_field :name, :class => 'textbox', :maxlength => 100
+
+      - form.edit_body do
+        - f.fields_for :posts, @topic.first_post do |pf|
+          %p.body
+            = pf.label :body, t('topic_body')
+            = pf.text_area :body, :class => "textarea", :style => "width: 100%"
+  
+  - render_region :form_bottom do |form_bottom|
+    - form_bottom.edit_timestamp do
+      = updated_stamp @topic  
+    - form_bottom.edit_buttons do
+      %p.buttons
+        = save_model_button(@topic)
+        = save_model_and_continue_editing_button(@topic)
+        or
+        = link_to 'Cancel', admin_topics_url

data/app/views/admin/topics/edit.html.haml

@@ -0,0 +1,6 @@
+- render_region :main do |main|
+  - main.edit_header do
+    %h1 
+      = t('edit_topic').titlecase
+  - main.edit_form do
+    = render :partial => 'form'

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

@@ -0,0 +1,49 @@
+- include_stylesheet('admin/forum')
+= render_region :top 
+
+#topics_table.outset
+  %table#topics.index{:cellspacing=>"0", :border=>"0", :cellpadding=>"0"}
+    %thead
+      %tr
+        - render_region :thead do |thead|
+          - thead.title_header do
+            %th.topic 
+              = t('topic')
+          - thead.date_header do
+            %th.date 
+          - thead.author_header do
+            %th.author 
+              = t('author')
+          - thead.body_header do
+            %th.body
+              = t('body')
+          - thead.modify_header do
+            %th.action
+    %tbody
+      - @topics.each do |topic|
+        %tr
+          - render_region :tbody do |tbody|
+            - tbody.title_cell do
+              %td.name
+                = link_to topic.name, edit_admin_topic_url(:id => topic)
+
+            - tbody.date_cell do
+              %td.topic_date
+                = friendly_date(topic.created_at)
+
+            - tbody.author_cell do
+              %td.topic_author
+                = link_to topic.reader.name, admin_reader_url(topic.reader)
+                    
+            - tbody.body_cell do
+              %td.topic_body
+                = truncate(topic.first_post.body, :length => 64)
+
+            - tbody.modify_cell do
+              %td.actions
+                = link_to image('minus') + ' ' + t('remove'), remove_admin_topic_url(:id => topic) , :class => 'action'
+
+- render_region :bottom do |bottom|
+  - bottom.buttons do
+    #actions
+      = pagination_for @topics

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

@@ -4,11 +4,6 @@
 - content_for :title do
   = t('forums')
 
-- content_for :preamble do
-  %p
-    = t('forums_introduction')
-    = link_to t('latest_topics'), topics_url
-
 - content_for :new_topic do
   .newmessage
     = link_to t('new_topic'), new_topic_url
@@ -42,8 +37,6 @@
   = 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

@@ -4,7 +4,10 @@
 - content_for :title do
   = @forum.name
 
-- content_for :preamble do
+- content_for :thing_title do
+  = @forum.name
+
+- content_for :introduction do
   = clean_textilize(@forum.description)
 
 - content_for :new_topic do
@@ -46,8 +49,6 @@
 
 
 #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,5 +1,9 @@
+- af ||= false
 %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}"
+  - if af
+    = af.check_box :_destroy, :class => 'checkbox'
+    

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

@@ -1,4 +1,2 @@
 = form.text_area :body, :rows => 10
-
-- if Radiant::Config['forum.comments_have_attachments?'] && !@topic.page
-  = render :partial => 'posts/uploader'
+= render :partial => 'posts/uploader', :locals => {:post => @post, :f => form}

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

@@ -1,70 +1,69 @@
 - post ||= @post
+- first ||= false
+- with_topic ||= false
 - with_context ||= false
 - without_author ||= false
+- with_conversation ||= false
 - preview ||= false
 
-%div.post{:id => post.dom_id}
-  %div{:class => post.first? ? 'first_post' : 'reply'}
-    .post_header
-      - if admin?
-        .post_control
-          %p.post_admin
-            = link_to t("edit"), edit_topic_post_url(post.topic, post), :class => 'edit_post', :id => "revise_post_#{post.id}"
-            %span.separator |
-            = 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?"
+%div{:id => post.dom_id, :class => first ? 'post first' : 'post reply'} 
+  .speaker
+    = link_to gravatar_for(post.reader, {:size => 40}, {:alt => post.reader.name, :class => 'gravatar offset', :width => '40', :height => '40'}), forum_topic_url(post.topic.forum, post.topic, :anchor => "post_#{post.id}")
 
+  .post_wrapper
+    .post_header
       %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 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 offset', :width => '40', :height => '40'})
-            = post.reader.name
-
-        - if with_context
-          = link_to post.reader.name, reader_url(post.reader)
           - if post.first?
-            = t('started_topic_on', :date => friendly_date(post.created_at))
+            = t('new_topic')
+            = link_to post.topic.name, forum_topic_url(post.topic.forum, post.topic)
+            = t('started_on', :date => friendly_date(post.created_at))
+            = t('in')
+            = link_to post.topic.forum.name, forum_url(post.topic.forum)
+            = t('by')
+            = link_to post.reader.name, search_posts_url(:reader_id => post.reader.id), :class => 'person'
           - else
-            = t('replied_on', :date => friendly_date(post.created_at))
-
+            = t('a_reply_to')
+            = link_to post.topic.name, forum_topic_url(post.topic.forum, post.topic)
+            = t('posted_on', :date => friendly_date(post.created_at))
+            = t('by')
+            = link_to post.reader.name, search_posts_url(:reader_id => post.reader.id), :class => 'person'
         - else
-          - 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 
+          - if post.first?
+            = t('started_on', :date => friendly_date(post.created_at))
+          - else
             = t('posted_on', :date => friendly_date(post.created_at))
+          = t('by')
+          = link_to post.reader.name, search_posts_url(:reader_id => post.reader.id), :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(post.topic, post), :class => 'edit_post', :id => "revise_post_#{post.id}"
-          
-    .post_wrapper
-      .post_body
-        - if post.frozen?
-          %p 
-            = t('post_removed')
-        - elsif preview
-          = truncate_and_textilize(post.body, 100)
-        - else
-          = clean_textilize(post.body)
-        
-        - 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}"
+        - elsif admin?
+          = link_to t("edit_minimal"), edit_topic_post_url(post.topic, post), :class => 'edit_post', :id => "revise_post_#{post.id}"
+          = link_to t("remove_minimal"), 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?"
+    
+    .post_body
+      - if post.frozen?
+        %p 
+          = t('post_removed')
+      - elsif preview
+        = truncate_and_textilize(post.body, 100)
+      - else
+        = clean_textilize(post.body)
+
+      - if Radiant::Config['forum.allow_attachments?'] && post.attachments.any?
+        .post_attachments
+          %h4 
+            = t('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}"
 
-