radiant-forum-extension 1.2.1 → 2.0.0

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

@@ -1,11 +1,13 @@
 %fieldset
   %h3 Forum
+  %p
+    = edit_config 'forum.public?'
   %p
     = edit_config 'forum.layout'
   %p
-    = edit_config 'forum.editable_period'
+    = edit_config 'forum.toolbar?'
   %p
-    = edit_config 'forum.public?'
+    = edit_config 'forum.editable_period'
   %p
     = edit_config 'forum.allow_page_comments?'
   %p

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

@@ -3,14 +3,18 @@
     .actions
       = button_to t("edit"), edit_admin_reader_configuration_url, :method => :get
     =t("forum_configuration")
+  %p.ruled
+    = show_config 'forum.public?'
   %p.ruled
     = show_config 'forum.layout'
   %p.ruled
-    = show_config 'forum.editable_period'
+    = show_config 'forum.toolbar?'
   %p.ruled
-    = show_config 'forum.public?'
+    = show_config 'forum.editable_period'
   %p.ruled
     = show_config 'forum.allow_page_comments?'
+  %p.ruled
+    = show_config 'forum.commentable_period'
   %p.ruled
     = show_config 'forum.allow_attachments?'
   %p.ruled

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

@@ -1,21 +1,15 @@
-%li.forum{:id => forum.dom_id}
-  %span.subject
-    = link_to forum.name, forum_url(forum), :class => 'main'
-  - if topic = forum.recent_topics.first
-    %span.context
-      = forum.topics.count
-      = pluralize forum.topics.count, "discussions"
-      containing
-      = forum.posts.count
-      messages,
-      %br
-      most recently in
-      = link_to topic.name, forum_topic_url(forum, topic)
-      = time_ago_in_words(topic.replied_at || topic.created_at)
-      ago.
-  - else 
-    %span.context
-      No posts yet.
-  %div.preview
-    = truncate_and_textilize(forum.description, 40)
+- if forum.visible_to?(current_reader)
+  .forum
+    .forum_wrapper{:id => forum.dom_id}
+      .forum_header
+        %h2
+          = link_to forum.name, forum_url(forum), :class => 'main'
+        %p.context
+          = t("topic_count", :count => forum.topics.count)
+          - if topic = forum.topics.first
+            = link_to topic.name, forum_topic_url(forum, topic)
+            = time_ago_in_words(topic.replied_at || topic.created_at)
+            = t('ago')
+      .forum_description
+        = truncate_and_textilize(forum.description, 40)
     

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

@@ -0,0 +1,12 @@
+%h2
+  = t('forums')
+%ul
+  - Forum.all.each do |forum|
+    - if topic = forum.topics.bydate.first
+      %li
+        = link_to forum.name, forum_url(forum), :class => 'title'
+        %br
+        = forum.topics.count
+        = t('topics') + ','
+        = t('most_recently')
+        = link_to topic.name, forum_topic_url(forum, topic)

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

@@ -0,0 +1,49 @@
+- add_reader_css '/stylesheets/reader.css'
+- if current_reader
+  - if Radiant::Config['forum.toolbar?']
+    - add_reader_js '/punymce/puny_mce_src.js'
+    - add_reader_js '/punymce/plugins/link/link.js'
+    - add_reader_js '/punymce/plugins/image/image.js'
+    - add_reader_js '/punymce/plugins/emoticons/emoticons.js'
+    - add_reader_js '/punymce/plugins/editsource/editsource.js'
+    - add_reader_js '/punymce/plugins/paste.js'
+  - add_reader_js '/javascripts/forum.js'
+
+
+- content_for :section_navigation do
+  = link_to t('navigation.forum'), topics_url, :class => 'section'
+  = link_to t('navigation.topics'), topics_url
+  = link_to t('navigation.forums'), forums_url
+  = link_to t('navigation.readers'), readers_url
+  = link_to t('navigation.new_topic'), new_post_url
+  - if current_reader
+    = link_to t('navigation.your_account'), reader_account_url
+  - else
+    = link_to t('log_in'), reader_login_url
+  - if Radiant::Config['forum.help_url']
+    = link_to t('navigation.forum_help'), Radiant::Config['forum.help_url']
+
+- content_for :controls do
+  = render :partial => 'readers/controls'
+
+- content_for :signals do
+  = render :partial => 'readers/flasher'
+
+- content_for :reader_css do
+  - reader_css_paths.each do |path|
+    %link{:rel => 'stylesheet', :href => path, :type => 'text/css'}
+
+- content_for :reader_js do
+  - reader_js_paths.each do |path|
+    %script{:src => path, :type => 'text/javascript'}
+
+- content_for :person do
+  - if @reader
+    = standard_gravatar_for(@reader)
+
+- content_for :search do
+  = render :partial => 'posts/search_form'
+
+- content_for :newtopic do
+  .newmessage
+    = link_to t('new_topic'), new_post_url

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

@@ -1,42 +1,34 @@
-- content_for :signals do
-  = render :partial => 'readers/flasher'
+= render :partial => 'forums/standard_parts'
 
 - content_for :title do
-  = t('forums')
+  = t('forums_heading')
 
-- content_for :new_topic do
-  .newmessage
-    = link_to t('new_topic'), new_topic_url
+- content_for :introduction do
+  %p
+    = t('forums_introduction')
 
 - content_for :messages do
   - if @forums.empty?
     %p 
       = t('no_forums')
   - else
-    %ul.main
-      = render :partial => 'forums/forum', :collection => @forums
-
-- content_for :sidebar do
-  = render :partial => "topics/latest"
+    = yield :pagination if @forums.previous_page
+    = render :partial => 'forums/forum', :collection => @forums
+    = yield :pagination if @forums.next_page
 
 - content_for :pagination do
   = pagination_and_summary_for(@forums, t('forum'))
 
-- content_for :feed do
+- content_for :feedlink do
   = feed_link(forums_path(:format => :rss))
 
-- content_for :controls do
-  = render :partial => 'readers/controls'
-  
-- content_for :breadhead do
-  = link_to t("forum"), forum_home_url
-
 - content_for :breadcrumbs do
-  = link_to 'Forum', topics_url
-  \>
-  = t('forums')
-  
+  = link_to t('forum').titlecase, topics_url
+  = t('separator')
+  = yield :title
+
+
+
 #forum
-  = yield :pagination if @forums.previous_page
   = yield :messages
-  = yield :pagination if @forums.next_page
+  = yield :newtopic

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

@@ -1,27 +1,14 @@
-- content_for :signals do
-  = render :partial => 'readers/flasher'
+= render :partial => 'forums/standard_parts'
 
 - content_for :title do
   = @forum.name
 
-- content_for :thing_title do
-  = @forum.name
-
 - content_for :introduction do
   = clean_textilize(@forum.description)
 
-- content_for :new_topic do
-  - unless @forum.for_comments?
-    .newmessage
-      = link_to t('new_topic_here'), new_forum_topic_url(@forum)
-
-- content_for :messages do
-  - if @topics.empty?
-    %p 
-      = t('no_topics')
-  - else
-    %ul.main
-      = render :partial => 'topics/topic', :collection => @topics, :locals => { :with_context => false }
+- content_for :newtopic do
+  .newmessage
+    = link_to t('new_topic_here'), new_post_url(:forum_id => @forum.id)
 
 - content_for :sidebar do
   = render :partial => "topics/latest"
@@ -29,26 +16,29 @@
 - content_for :pagination do
   = pagination_and_summary_for @topics, 'topics'
 
-- content_for :feed do
+- content_for :feedlink do
   = feed_link(forum_path(@forum, :format => :rss))
 
 - content_for :breadhead do
-  = link_to t("forum"), forum_home_url
-  = t('separator')
+  = link_to t('forum').titlecase + t('separator'), topics_url
   = link_to t('forums'), forums_url
 
 - content_for :breadcrumbs do
-  = link_to t("forum"), forum_home_url
-  = t('separator')
-  = link_to t('categories'), forums_url
+  = yield :breadhead
   = t('separator')
-  = link_to @forum.name, forum_url(@forum) 
+  = yield :title
+
+- content_for :messages do
+  - if @topics.empty?
+    %p 
+      = t('no_topics')
+  - else
+    = yield :pagination if @topics.previous_page
+    = render :partial => 'topics/topic', :collection => @topics, :locals => { :with_context => false }
+    = yield :pagination if @topics.next_page
 
-- content_for :controls do
-  = render :partial => 'readers/controls'
 
 
 #forum
-  = yield :pagination if @topics.previous_page
   = yield :messages
-  = yield :pagination if @topics.next_page
+  = yield :newtopic

data/app/views/pages/_comment.html.haml

@@ -2,7 +2,7 @@
   %div.post_header
     %h2
       %a{:href => "/readers/#{post.reader.id}", :class => 'main'}
-        %img{:src => post.reader.gravatar_url(:size => 40), :class => 'gravatar'}
+        = gravatar_for(post.reader, {:size => 40}, {:class => 'gravatar'}}
         = post.reader.name
     %p.context
       = post.created_at

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

@@ -0,0 +1,13 @@
+- if Radiant::Config['forum.allow_attachments?'] && !post.frozen? && post.attachments.any?
+  .post_attachments
+    %h4 
+      = t('attached') + ':'
+    - post.attachments.images.each do |att|
+      - display_size = Radiant::Config['forum.image_zoom_size'] || :original
+      = link_to image_tag(att.thumbnail), att.file.url(display_size), :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}"
+

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

@@ -0,0 +1,10 @@
+- post ||= @post
+.post_removal
+  %p.warning
+    = t('confirm_removal_of', :author => post.reader.name)
+  %p.buttons
+    - form_for post, :html => {:method => 'delete', :class => 'friendly'} do |f|
+      = f.submit t('definitely_remove_post')
+      = t('or')
+      = link_to t('cancel'), paginated_post_url(post), :class => 'cancel'
+  

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

@@ -0,0 +1,16 @@
+- post ||= @post
+
+- if post
+  - if post.comment?
+    = t('comment_on')
+    = link_to post.page.title, post.page.url
+    = t('posted')
+  - elsif post.first?
+    = t('new_topic_started')
+  - else
+    = t('reply_posted')
+  - if post.reader
+    = t('by')
+    = link_to post.reader.name, reader_url(post.reader)
+- else
+  No post!

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

@@ -0,0 +1,11 @@
+- post ||= @post
+- unless post.frozen?
+  - if post.editable_by?(current_reader)
+    %div.edit_me
+      - 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 remote', :id => "revise_post_#{post.id}"
+  - elsif admin?
+    %div.edit_me
+      = link_to t("edit_minimal"), edit_topic_post_url(post.topic, post), :class => 'edit_post remote', :id => "revise_post_#{post.id}", :title => "edit post"
+      = link_to t("remove_minimal"), remove_post_url(post), :class => 'delete_post remote', :id => "delete_post_#{post.id}", :title => "remove post"

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

@@ -1,2 +1,40 @@
-= form.text_area :body, :rows => 10
-= render :partial => 'posts/uploader', :locals => {:post => @post, :f => form}
+- post ||= @post
+- omit_label ||= !post.first?
+
+- form_for post, :html => {:multipart => true, :id => "post_form_#{post.id}", :class => 'friendly'} do |f|
+  - if post.page
+    = f.hidden_field :page_id
+  - elsif post.first?
+    - f.fields_for :topic do |tf|
+      %p
+        = tf.label :name, t('label.topic.name'), :class => 'required'
+        %br
+        = tf.text_field :name, :class => 'titular'
+        - if admin?
+          %br
+          %span.quiet
+            = tf.check_box :sticky
+            = tf.label :sticky, t('label.topic.sticky'), :class => 'minor'
+            = tf.check_box :locked
+            = tf.label :locked, t('label.topic.locked'), :class => 'minor'
+      %p
+        = tf.label :forum_id, t('label.topic.forum'), :class => "required"
+        %br
+        = tf.select :forum_id, Forum.all.collect {|forum| [ forum.name, forum.id ] }, :class=> 'standard'
+  - elsif post.topic
+    = f.hidden_field :topic_id
+
+  %p
+    - unless omit_label
+      = f.label :body, t('label.post.body'), :class => 'required'
+      %br
+    = f.text_area :body, :rows => 12, :class => Radiant::Config['forum.toolbar?'] ? 'toolbarred' : ''
+
+  = render :partial => 'posts/uploader', :locals => {:post => post, :f => f}
+
+  %p.buttons
+    = f.submit t('save_post')
+    - unless post.new_record?
+      = t('or')
+      = link_to t("cancel"), paginated_post_url(post), :class => 'cancel'
+

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

@@ -1,17 +1,10 @@
-%h3
-  Latest discussion
-%ul.clean
-  - Post.visible.latest(6).each do |post|
-    %li
-      = gravatar_for(post.reader, {:size => '30'}, {:class => 'gravatar'})
-      = link_to post.topic.name, forum_topic_url(post.topic.forum, post.topic)
-      %br
-        %span.credit
-          - if post.topic.page
-            commented upon by
-          - elsif post.first?
-            started by
-          - else
-            replied to by
-          = post.reader.name
-          = friendly_date(post.created_at)
+%h2
+  = t('recent_posts')
+%ul
+  - Post.latest(10).each do |post|
+    %li.post
+      %span.subject
+        = link_to_post(post, :class => 'title')
+      %span.context
+        = render :partial => 'posts/context', :locals => {:post => post}
+        = friendly_date(post.created_at)

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

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

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

@@ -1,69 +1,34 @@
 - post ||= @post
-- first ||= false
-- with_topic ||= false
+- first ||= post.first?
+- headless ||= first
 - with_context ||= false
-- without_author ||= false
-- with_conversation ||= false
-- preview ||= false
-
-%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}")
 
+- cssclasses = []
+- cssclasses << 'first' if post.first?
+- cssclasses << 'reply' unless post.first?
+- cssclasses << 'deleted' if post.frozen?
+  
+.post{:id => post.dom_id, :class => cssclasses.join(' ')}
   .post_wrapper
+    - unless headless
+      .speaker
+        = standard_gravatar_for(post.reader)
     .post_header
-      %p.context
+      - unless headless
         - if with_context
-          - if post.first?
-            = 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('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'
+          %h2.reply
+            = link_to post.topic.name, paginated_post_url(post)
         - 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}"
-        - 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)
+          %h2
+            = post.reader.name
 
-      - 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}"
+      = 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) + '.'
+
+    .post_body
+      = clean_textilize(post.body)
+      = render :partial => 'posts/attachments', :locals => {:post => post}