radiant-forum-extension 2.1.6 → 3.0.0.rc3

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

@@ -12,6 +12,18 @@
           %label{:for=>"forum_description"} Description
           ~ text_area "forum", "description", :class => "textarea", :style => "width: 100%"
 
+      - form.edit_group do
+        - if @group && @forum.new_record?
+          - @forum.groups = [@group]
+
+        .set
+          %p
+            = t('allowed_groups')
+            - Group.find(:all).each do |group|
+              = check_box_tag "forum[group_ids][]", group.id, @forum.has_group?(group), :id => "forum_group_#{group.id}"
+              %label.checkbox{:for => "forum_group_#{group.id}"}
+                = group.name
+
   = javascript_tag "$('forum_name').activate()"
   
   - render_region :form_bottom do |form_bottom|

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

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

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

@@ -8,13 +8,13 @@
         - render_region :thead do |thead|
           - thead.title_header do
             %th.forum 
-              =t('forum').titlecase
+              =t('forum_extension.forum').titlecase
           - thead.description_header do
             %th.description
-              =t('description').titlecase
+              =t('forum_extension.description').titlecase
           - thead.latest_header do
             %th.forum_latest 
-              =t('latest_activity').titlecase
+              =t('forum_extension.latest_activity').titlecase
           - thead.modify_header do
             %th.action
     %tbody
@@ -31,22 +31,18 @@
 
             - tbody.latest_cell do
               %td.forum_latest
-                - if forum.posts_count > 0
-                  %ul.latest
-                    - forum.topics.latest(1).each do |topic|
-                      %li.topic
-                        = friendly_date(topic.replied_at) + ":"
-                        - if 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
-                    = t('no_topics')
+                %ul.latest
+                  - forum.topics.latest(1).each do |topic|
+                    %li.topic
+                      = friendly_date(topic.replied_at) + ":"
+                      - if topic.replied_by
+                        = t('forum_extension.new_reply_to')
+                        = link_to_topic(topic, :class => 'topic')
+                        = t('forum_extension.from_reader', :name => topic.replied_by.name)
+                      - else 
+                        = t('forum_extension.new_topic')
+                        = link_to_topic(topic, :class => 'topic')
+                        = t('forum_extension.from_reader', :name => topic.reader.name)
 
             - tbody.modify_cell do
               %td.actions
@@ -62,4 +58,4 @@
     #actions
       = pagination_for @forums
       %ul
-        %li= link_to image('plus') + " " + t("new_forum"), new_admin_forum_url
+        %li= link_to image('plus') + " " + t("forum_extension.new_forum"), new_admin_forum_url

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

@@ -6,12 +6,12 @@
       - form.show_name do
         %p.title
           %label
-            = t('topic_name') + ":"
+            = t('forum_extension.topic_name') + ":"
           = @post.topic.name
 
       - form.edit_body do
         %p.content
-          = f.label :body, t('post_body')
+          = f.label :body, t('forum_extension.post_body')
           = f.text_area :body, :class => "textarea", :style => "width: 100%"
   
   - render_region :form_bottom do |form_bottom|

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

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

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

@@ -8,15 +8,15 @@
         - render_region :thead do |thead|
           - thead.body_header do
             %th.body
-              = t('body')
+              = t('forum_extension.body')
           - thead.author_header do
             %th.author 
-              = t('author')
+              = t('forum_extension.author')
           - thead.date_header do
             %th.date 
           - thead.topic_header do
             %th.topic
-              = t('topic')
+              = t('forum_extension.topic')
           - thead.modify_header do
             %th.action
     %tbody
@@ -25,7 +25,7 @@
           - render_region :tbody do |tbody|
             - tbody.body_cell do
               %td.post_body
-                = link_to truncate(post.body, :length => 64), edit_admin_post_url(post)
+                = link_to truncate_words(scrub_html(post.body), 8), edit_admin_post_url(post)
 
             - tbody.author_cell do
               %td.post_author
@@ -37,7 +37,7 @@
 
             - tbody.topic_cell do
               %td.post_topic
-                = link_to post.topic.name, forum_topic_url(post.topic.forum, post.topic), :class => 'external'
+                = link_to_topic(post.topic, :class => 'external')
 
             - tbody.modify_cell do
               %td.actions

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

@@ -2,6 +2,8 @@
   %h3 Forum
   %p
     = edit_config 'forum.public?'
+  %p
+    = edit_config 'forum.cached?'
   %p
     = edit_config 'forum.layout'
   %p
@@ -10,8 +12,12 @@
     = edit_config 'forum.editable_period'
   %p
     = edit_config 'forum.allow_page_comments?'
+  %p
+    = edit_config 'forum.commentable_period'
   %p
     = edit_config 'forum.allow_attachments?'
+  %p
+    = edit_config 'forum.offer_rss?'
   %p
     = edit_config 'forum.attachment.content_types'
   %p

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

@@ -2,9 +2,11 @@
   %h3
     .actions
       = button_to t("edit"), edit_admin_reader_configuration_url, :method => :get
-    =t("forum_configuration")
+    =t("forum_extension.forum_configuration")
   %p.ruled
     = show_config 'forum.public?'
+  %p.ruled
+    = show_config 'forum.cached?'
   %p.ruled
     = show_config 'forum.layout'
   %p.ruled
@@ -17,6 +19,8 @@
     = show_config 'forum.commentable_period'
   %p.ruled
     = show_config 'forum.allow_attachments?'
+  %p.ruled
+    = show_config 'forum.offer_rss?'
   %p.ruled
     = show_config 'forum.attachment.content_types'
   %p.ruled

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

@@ -4,18 +4,16 @@
     - render_region :form do |form|
       - form.edit_name do
         %p.title
-          = f.label :name, t('topic_name')
+          = f.label :name, t('forum_extension.topic_name')
           = f.text_field :name, :class => 'textbox', :maxlength => 100
 
       - form.edit_body do
-        - f.fields_for :posts, @topic.first_post do |pf|
+        - f.fields_for :posts, @topic.posts.first do |pf|
           %p.body
-            = pf.label :body, t('topic_body')
+            = pf.label :body, t('forum_extension.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)

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

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

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

@@ -8,15 +8,15 @@
         - render_region :thead do |thead|
           - thead.title_header do
             %th.topic 
-              = t('topic')
+              = t('forum_extension.topic')
           - thead.date_header do
             %th.date 
           - thead.author_header do
             %th.author 
-              = t('author')
+              = t('forum_extension.author')
           - thead.body_header do
             %th.body
-              = t('body')
+              = t('forum_extension.body')
           - thead.modify_header do
             %th.action
     %tbody
@@ -33,11 +33,11 @@
 
             - tbody.author_cell do
               %td.topic_author
-                = link_to topic.reader.name, admin_reader_url(topic.reader)
+                = link_to topic.reader.name, edit_admin_reader_url(topic.reader)
                     
             - tbody.body_cell do
               %td.topic_body
-                = truncate(topic.first_post.body, :length => 64)
+                = truncate_words(scrub_html(topic.body), 12)
 
             - tbody.modify_cell do
               %td.actions

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

@@ -4,13 +4,14 @@
       .forum_header
         %h2
           = link_to forum.name, forum_url(forum), :class => 'main'
-        %p.context
-          = forum.description
+        - if forum.description
+          %p.context
+            = forum.description
       .forum_contents
         - if forum.topics.any?
           %ul
             - forum.topics.latest(3).each do |topic|
               = render :partial => 'topics/minimal', :locals => {:topic => topic}
-
-
-    
+        - else
+          %p.note
+            = t('forum_extension.no_topics')

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

@@ -1,12 +1,14 @@
-%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)
+- if using_forums?
+  %h2
+    = t('forum_extension.forums')
+  %ul
+    - Forum.visible_to(current_reader).each do |forum|
+      - if topic = forum.topics.bydate.first
+        %li
+          = link_to forum.name, forum_url(forum), :class => 'title'
+          %br
+          %span.context
+            = forum.topics.count
+            = t('forum_extension.topics') + ','
+            = t('forum_extension.most_recently')
+            = link_to_topic(topic)

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

@@ -1,12 +1,12 @@
 %h2
-  = t('busy_readers')
+  = t('forum_extension.busy_readers')
 %ul
   - Reader.most_commenting(10).each do |reader|
     %li
       = link_to reader.name, reader_url(reader), :class => 'title'
       = reader.posts.count
-      = t('posts') + ','
+      = t('forum_extension.posts') + ','
       %br
-      = t('last_seen')
+      = t('forum_extension.last_seen')
       = time_ago_in_words(reader.posts.first.created_at)
-      = t('ago')
+      = t('forum_extension.ago')

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

@@ -1,11 +1,9 @@
-= render :partial => 'forums/standard_parts'
-
 - content_for :title do
-  = t('forums_heading')
+  = t('forum_extension.forums_heading')
 
 - content_for :introduction do
   %p
-    = t('forums_introduction')
+    = t('forum_extension.forums_introduction')
 
 - content_for :sidebar do
   = render :partial => 'posts/search_form', :locals => {:minimal => true}
@@ -15,14 +13,14 @@
 - content_for :messages do
   - if @forums.empty?
     %p 
-      = t('no_forums')
+      = t('forum_extension.no_forums')
   - else
     = 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'))
+  = pagination_and_summary_for(@forums, t('forum_extension.forum'))
 
 - content_for :feedurl do
   = forums_path(:format => :rss)
@@ -31,12 +29,12 @@
   = feed_link(forums_path(:format => :rss))
 
 - content_for :breadcrumbs do
-  = link_to t('forum').titlecase, topics_url
-  = t('separator')
+  = link_to t('forum_extension.forum').titlecase, topics_url
+  = t('reader_extension.separator')
   = yield :title
 
+= render :partial => 'shared/standard_forum_parts'
 
-
-#forum
+.forum
   = yield :messages
   = yield :newtopic

data/app/views/forums/index.rss.builder

@@ -4,8 +4,8 @@ xml.channel do
     :rel => 'self', :type => 'application/rss+xml'
   }
 
-  xml.title "#{@site_title} : #{t('forums')}"
-  xml.description t('forums')
+  xml.title "#{@site_title} : #{t('forum_extension.forums')}"
+  xml.description t('forum_extension.forums')
   xml.link forums_url
   xml.language I18n.locale.to_s
   xml.ttl "60"

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

@@ -1,17 +1,10 @@
-= render :partial => 'forums/standard_parts'
-
 - content_for :title do
   = @forum.name
 
 - content_for :introduction do
-  = clean_textilize(@forum.description)
-
-- content_for :newtopic do
-  .newmessage
-    = link_to t('new_topic_here'), new_post_url(:forum_id => @forum.id)
+  = clean_html(@forum.description)
 
 - content_for :sidebar do
-  = render :partial => 'posts/search_form'
   = render :partial => "topics/latest"
 
 - content_for :pagination do
@@ -24,25 +17,29 @@
   = feed_link(forum_path(@forum, :format => :rss))
 
 - content_for :breadhead do
-  = link_to t('forum').titlecase + t('separator'), topics_url
-  = link_to t('forums'), forums_url
+  %span.breadhead
+    = link_to t('forum_extension.forum').titlecase, topics_url
+    = t('reader_extension.separator')
+    = link_to t('forum_extension.forums'), forums_url
 
 - content_for :breadcrumbs do
-  = yield :breadhead
-  = t('separator')
+  = link_to t('forum_extension.forum').titlecase, topics_url
+  = t('reader_extension.separator')
+  = link_to t('forum_extension.forums'), forums_url
+  = t('reader_extension.separator')
   = yield :title
 
 - content_for :messages do
   - if @topics.empty?
     %p 
-      = t('no_topics')
+      = t('forum_extension.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
 
+= render :partial => 'shared/standard_forum_parts'
 
-
-#forum
+.forum
   = yield :messages
   = yield :newtopic

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

@@ -6,18 +6,19 @@
       .post.replyform
         .wrapper
           .post_header
-            .speaker
-              = standard_gravatar_for(current_reader)
+            = standard_gravatar_for(current_reader)
             %h2.person
-              = t("add_comment")
+              = t("forum_extension.add_comment")
             %p.context
-              = t('if_you_not', :name => current_reader.name)
-              = link_to(t('log_out'), reader_logout_url) + '.'
+              = t('forum_extension.if_you_not', :name => current_reader.name)
+              = link_to(t('reader_extension.log_out'), reader_logout_url) + '.'
           = render :partial => 'posts/form', :locals => {:post => page.posts.build, :omit_label => true}
+          
+          
     - else
-      = render :partial => 'reader_activations/activation_required', :locals => {:purpose => t('to_reply')}
+      = render :partial => 'reader_activations/activation_required', :locals => {:purpose => t('forum_extension.to_reply')}
   - else
-    = render :partial => 'reader_sessions/login_form', :locals => {:purpose => t('to_reply')}
+    = render :partial => 'reader_sessions/login_form', :locals => {:purpose => t('forum_extension.to_reply')}
 - else
   %p.administrative
-    = t("page_locked")
+    = t("forum_extension.page_locked")

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

@@ -1,13 +1,13 @@
 - posts ||= @posts
 - page ||= @page
 
-#forum
+.forum
   %h2
-    = t('comments_on')
+    = t('forum_extension.comments_on')
     = page.title
 
 - if posts.empty?
   %p 
-    = t('none_yet')
+    = t('forum_extension.none_yet')
 - else
   = render :partial => 'posts/post', :collection => posts

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

@@ -1,7 +1,7 @@
 - if Radiant::Config['forum.allow_attachments?'] && !post.frozen? && post.attachments.any?
   .post_attachments
     %h4 
-      = t('attached') + ':'
+      = t('forum_extension.attached') + ':'
     - post.attachments.images.each do |att|
       - display_size = Radiant::Config['forum.image_zoom_size'] || :original
       = link_to image_tag(post_attachment_url(att, :size => :thumbnail)), post_attachment_url(att, :size => display_size), :class => :thumbnail, :rel => post_attachment_url(att, :size => :original)

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

@@ -1,10 +1,15 @@
 - post ||= @post
 .post_removal
   %p.warning
-    = t('confirm_removal_of', :author => post.reader.name)
+    - if post.comment?
+      = t('forum_extension.confirm_removal_of_comment', :author => post.reader.name)
+    - elsif post.first?
+      = t('forum_extension.confirm_removal_of_topic', :author => post.reader.name)
+    - else
+      = t('forum_extension.confirm_removal_of_post', :author => post.reader.name)
   %p.buttons
     - form_for post, :html => {:method => 'delete', :class => 'friendly'} do |f|
-      = f.submit t('definitely_remove_post')
+      = f.submit t('forum_extension.definitely_remove_post')
       = t('or')
       = link_to t('cancel'), paginated_post_url(post), :class => 'cancel'
   

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

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

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

@@ -2,8 +2,8 @@
 - unless post.frozen?
   - if post.editable_by?(current_reader)
     - 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 => 'remote', :id => "revise_post_#{post.id}"
+      = t('forum_extension.time_remaining_to_edit', :time => distance_of_time_in_words(post.still_editable_for))
+    = link_to t('forum_extension.edit_your_post'), edit_topic_post_url(post.topic, post), :class => 'remote', :id => "revise_post_#{post.id}"
   - elsif admin?
-    = 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"
+    = link_to t("forum_extension.edit_minimal"), edit_topic_post_url(post.topic, post), :class => 'edit_post remote', :id => "revise_post_#{post.id}", :title => "edit post"
+    = link_to t("forum_extension.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

@@ -7,34 +7,37 @@
   - elsif post.first?
     - f.fields_for :topic do |tf|
       %p
-        = tf.label :name, t('label.topic.name'), :class => 'required'
+        = tf.label :name, nil, :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.label :sticky, nil, :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'
+            = tf.label :locked, nil, :class => 'minor'
+
+      - if using_forums?
+        %p
+          = tf.label :forum_id, nil, :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'
+      = f.label :body, nil, :class => 'required'
       %br
-    = f.text_area :body, :rows => 12, :class => Radiant::Config['forum.toolbar?'] ? 'toolbarred' : ''
+    = f.text_area :body, :rows => 12, :class => Radiant::Config['forum.toolbar?'] ? 'rte' : ''
 
   = render :partial => 'posts/uploader', :locals => {:post => post, :f => f}
 
   %p.buttons
-    = f.submit t('save_post')
-    - unless post.new_record?
+    = f.submit t('forum_extension.save_post')
+    - if @inline
       = t('or')
-      = link_to t("cancel"), paginated_post_url(post), :class => 'cancel'
+      = link_to t("cancel"), '#', :class => 'cancel'
 

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

@@ -0,0 +1,7 @@
+- post ||= @post
+.ineditable
+  %p.warning
+    = t('forum_extension.sorry_cannot_edit')
+  %p.buttons
+    = link_to t('cancel'), paginated_post_url(post), :class => 'cancel'
+  

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

@@ -1,10 +1,5 @@
 %h2
-  = t('recent_posts')
+  = t('forum_extension.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)
+  - Post.visible_to(current_reader).latest(10).each do |post|
+    = render :partial => 'posts/minimal', :locals => {:post => post}

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

@@ -0,0 +1,7 @@
+%li.post
+  = link_to_post(minimal, :class => 'title')
+  %br
+  %span.context
+    = render :partial => 'posts/context', :locals => {:post => minimal}
+  %br
+  = truncate_words(scrub_html(minimal.body), 12)