commontator 0.2.4 → 0.3.10

data/app/views/commontator/comments/create.js.erb~

@@ -1,4 +1,4 @@
-<% @thread.comments.each do |comment|
+<% @thread.comments.each do |comment| %>
   $("#comment_<%= comment.id.to_s %>_actions_span").html("<%= escape_javascript(
     render :partial => 'actions',
            :locals => {:comment => comment}) %>");
@@ -12,4 +12,4 @@ $("#thread_<%= @thread.id %>_new_comment_div").hide();
 
 $("#thread_<%= @thread.id %>_new_comment_link_span").show();
 
-<%= javascript_callback %>
+<%= javascript_proc(self) %>

data/app/views/commontator/comments/delete.js.erb

@@ -12,4 +12,4 @@ $("#comment_<%= @comment.id %>_votes_span").html("<%= escape_javascript(
   render :partial => 'votes',
          :locals => {:comment => @comment}) %>");
 
-<%= javascript_callback %>
+<%= javascript_proc %>

data/app/views/commontator/comments/delete.js.erb~

@@ -6,10 +6,10 @@ $("#comment_<%= @comment.id.to_s %>_timestamp_span").html("<%= escape_javascript
                                                            
 $("#comment_<%= @comment.id.to_s %>_actions_span").html("<%= escape_javascript(
   render :partial => 'actions',
-         :locals => {:comment => comment}) %>");
+         :locals => {:comment => @comment}) %>");
          
 $("#comment_<%= @comment.id %>_votes_span").html("<%= escape_javascript(
   render :partial => 'votes',
          :locals => {:comment => @comment}) %>");
 
-<%= javascript_callback %>
+<%= javascript_proc(self) %>

data/app/views/commontator/comments/edit.js.erb

@@ -2,4 +2,4 @@ $("#comment_<%= @comment.id.to_s %>_body_div").html("<%= escape_javascript(
   render :partial => 'form',
          :locals => {:comment => @comment}) %>");
          
-<%= javascript_callback %>
+<%= javascript_proc %>

data/app/views/commontator/comments/edit.js.erb~

@@ -1,5 +1,5 @@
-$("#comment_<%= @comment.id.to_s %>_div").html("<%= escape_javascript(
+$("#comment_<%= @comment.id.to_s %>_body_div").html("<%= escape_javascript(
   render :partial => 'form',
          :locals => {:comment => @comment}) %>");
          
-<%= javascript_callback %>
+<%= javascript_proc(self) %>

data/app/views/commontator/comments/new.js.erb

@@ -9,4 +9,4 @@ $("#thread_<%= @thread.id %>_new_comment_div").show();
 
 $("#thread_<%= @thread.id %>_new_comment_link_span").hide();
 
-<%= javascript_callback %>
+<%= javascript_proc %>

data/app/views/commontator/comments/new.js.erb~

@@ -5,8 +5,8 @@ $("#thread_<%= @thread.id %>_new_comment_div").html("<%= escape_javascript(
                        :thread => @thread
                     }) %>");
                     
-$("#thread_<%= @thread.id %>_new_comment_div").hide();
+$("#thread_<%= @thread.id %>_new_comment_div").show();
 
 $("#thread_<%= @thread.id %>_new_comment_link_span").hide();
 
-<%= javascript_callback %>
+<%= javascript_proc(self) %>

data/app/views/commontator/comments/update.js.erb

@@ -4,4 +4,4 @@ $("#comment_<%= @comment.id.to_s %>_body_div").html("<%= escape_javascript(
 $("#comment_<%= @comment.id.to_s %>_timestamp_span").html("<%= escape_javascript(
                                                            comment_timestamp(@comment)) %>");
 
-<%= javascript_callback %>
+<%= javascript_proc %>

data/app/views/commontator/comments/update.js.erb~

@@ -1,7 +1,7 @@
-$("#comment_<%= @comment.id.to_s %>_body_span").html("<%= escape_javascript(
+$("#comment_<%= @comment.id.to_s %>_body_div").html("<%= escape_javascript(
   render :partial => 'body', :locals => {:comment => @comment}) %>");
 
 $("#comment_<%= @comment.id.to_s %>_timestamp_span").html("<%= escape_javascript(
                                                            comment_timestamp(@comment)) %>");
 
-<%= javascript_callback %>
+<%= javascript_proc(self) %>

data/app/views/commontator/comments/vote.js.erb

@@ -2,4 +2,4 @@ $("#comment_<%= @comment.id %>_votes_span").html("<%= escape_javascript(
   render :partial => 'votes',
          :locals => {:comment => @comment}) %>");
 
-<%= javascript_callback %>
+<%= javascript_proc %>

data/app/views/commontator/comments/vote.js.erb~

@@ -1,5 +1,5 @@
 $("#comment_<%= @comment.id %>_votes_span").html("<%= escape_javascript(
   render :partial => 'votes',
-         :locals => { :comment => @comment }) %>");
+         :locals => {:comment => @comment}) %>");
 
-<%= javascript_callback %>
+<%= javascript_proc(self) %>

data/app/views/commontator/{commontator/_thread.html.erb~ → shared/_thread_link.html.erb}

@@ -1,13 +1,11 @@
 <% # Clients of this partial must supply the following variable:
-   # commontable
+   # thread
 %>
 
 <% user = send(Commontator.current_user_method) %>
-<% thread = commontable.thread %>
 
 <% if thread.can_be_read_by?(user) %>
   <%= stylesheet_link_tag "commontator/application", :media => "all" %>
-  <%= javascript_include_tag "commontator/application" %>
 
   <div id="thread_<%= thread.id %>_div" class="thread">
     <%= link_to 'View ' + thread.config.comment_name.pluralize, commontator.thread_path(thread), :remote => true %>

data/app/views/commontator/subscriptions/_link.html.erb

@@ -0,0 +1,15 @@
+<% # Clients of this partial must supply the following variable:
+   # thread
+%>
+
+<% is_subscribed = thread.is_subscribed?(@commontator) %>
+<% sub_string = is_subscribed ? "unsubscribe" : "subscribe" %>
+<%= link_to sub_string.capitalize,
+            polymorphic_path([sub_string, thread]),
+            :confirm => (is_subscribed ? \
+                          "Are you sure you want to unsubscribe from this thread?" : \
+                          nil),
+            :method => :put,
+            :id => "thread_#{thread.id.to_s}_#{sub_string}_link",
+            :class => "thread_#{sub_string}_link",
+            :remote => true %>

data/app/views/commontator/subscriptions/_link.html.erb~

@@ -0,0 +1,15 @@
+<% # Clients of this partial must supply the following variable:
+   # thread
+%>
+
+<% is_subscribed = thread.is_subscribed?(@commontator) %>
+<% sub_string = is_subscribed ? "unsubscribe" : "subscribe" %>
+<%= link_to sub_string.capitalize,
+            polymorphic_path([sub_string, thread]),
+            :confirm => (is_subscribed ? \
+                          "Are you sure you want to unsubscribe from this thread?\n" : \
+                          nil),
+            :method => :put,
+            :id => "thread_#{thread.id.to_s}_#{sub_string}_link",
+            :class => "thread_#{sub_string}_link",
+            :remote => true %>

data/app/views/commontator/subscriptions/_subscription_link.html.erb~

@@ -1,12 +1,13 @@
 <% # Clients of this partial must supply the following variable:
-   # comment_commontable_thread
+   # thread
 %>
 
-<% subscription = comment_commontable_thread.is_subscribed?(@user)
-<% sub_string = subscription ? "unsubscribe" : "subscribe" %>
+<% is_subscribed = thread.is_subscribed?(@commontator)
+<% sub_string = is_subscribed ? "unsubscribe" : "subscribe" %>
 <%= link_to sub_string.capitalize,
-            polymorphic_path([sub_string, commontable, :comments]),
-            :confirm => (subscription ? \
-                           "Are you sure you want to unsubscribe from ' + commontable_name(comment_commontable_thread) + '?\n" : \
-                           nil),
+            polymorphic_path([sub_string, thread]),
+            :confirm => (is_subscribed ? \
+                          "Are you sure you want to unsubscribe from ' + \
+                          commontable_name(thread) + '?\n" : nil),
+            :method => :put,
             :remote => true %>

data/app/views/commontator/subscriptions/create.js.erb~

@@ -1,3 +1,5 @@
-$("#subscription_link_span").html("<%= escape_javascript(
+$("#subscription_span").html("<%= escape_javascript(
   render :partial => 'subscription_link',
-         :locals => {:comment_commontable_thread => @comment_commontable_thread}) %>");
+         :locals => {:thread => @thread}) %>");
+
+<%= javascript_callback %>

data/app/views/commontator/subscriptions/subscribe.js.erb

@@ -0,0 +1,5 @@
+$("#thread_<%= @thread.id.to_s %>_subscription_span").html("<%= escape_javascript(
+  render :partial => 'link',
+         :locals => {:thread => @thread}) %>");
+
+<%= javascript_proc %>

data/app/views/commontator/subscriptions/subscribe.js.erb~

@@ -0,0 +1,5 @@
+$("#thread_<%= @thread.id.to_s %>_subscription_span").html("<%= escape_javascript(
+  render :partial => 'link',
+         :locals => {:thread => @thread}) %>");
+
+<%= javascript_proc(self) %>

data/app/views/commontator/subscriptions_mailer/comment_created_email.html.erb

@@ -1,14 +1,6 @@
-<h4><%= @commontator_name %>'s <%= @thread.config.comment_name %> on <%= @commontable_name %> #<%= @commontable_id %></h4>
+<h4><%= @commontator_name %>'s <%= @thread.config.comment_name %> on <%= @commontable_name %> #<%= @commontable_id %>:</h4>
 
-<pre style="white-space: pre-wrap;
-            white-space: -moz-pre-wrap !important;
-            white-space: -pre-wrap;
-            white-space: -o-pre-wrap;
-            word-wrap: break-word;"><%= @comment.body %></pre>
+<%= render :partial => 'commontator/comments/body',
+           :locals => { :comment => @comment } %>
 
-<p>Please use the links below to reply to this message:</p>
-
-<p><%= link_to "Visit " + @commontable_name, main_app.polymorphic_path(@commontable) %></p>
-<p><%= link_to "View " + @thread.config.comment_name.pluralize + " on " + @commontable_name, @thread %></p>
-<p><%= link_to "Post a new " + @thread.config.comment_name, new_thread_comment_path(@thread) %></p>
-<p><%= link_to "Unsubscribe from this thread", unsubscribe_thread_path(@thread) %></p>
+<p><a href="<%= @commontable_url %>">Click here</a> to visit this thread.</p>

data/app/views/commontator/subscriptions_mailer/comment_created_email.html.erb~

@@ -1,14 +1,6 @@
-<h4><%= @commontator_name %>'s <%= @thread.config.comment_name %> on <%= @commontable_name %> #<%= @commontable_id %></h4>
+<h4><%= @commontator_name %>'s <%= @thread.config.comment_name %> on <%= @commontable_name %> #<%= @commontable_id %>:</h4>
 
-<pre style="white-space: pre-wrap;
-            white-space: -moz-pre-wrap !important;
-            white-space: -pre-wrap;
-            white-space: -o-pre-wrap;
-            word-wrap: break-word;"><%= @comment.body %></pre>
+<%= render :partial => 'commontator/comments/body',
+           :locals => { :comment => @comment } %>
 
-<p>Please use the links below to reply to this message:</p>
-
-<p><%= link_to "Visit " + @commontable_name, @commontable %></p>
-<p><%= link_to "View " + @thread.config.comment_name.pluralize + " on " + @commontable_name, @thread %></p>
-<p><%= link_to "Post a new " + @thread.config.comment_name, new_thread_comment_path(@thread) %></p>
-<p><%= link_to "Unsubscribe from this thread", unsubscribe_thread_path(@thread) %></p>
+<p><a href="<%= @commontable_url %>">click here</a> to visit this thread.</p>

data/app/views/commontator/threads/_actions.html.erb~

@@ -0,0 +1,28 @@
+<% # Clients of this partial must supply the following variables:
+   # thread
+%>
+
+<% can_subscribe = thread.can_subscribe?(@commontator) %>
+<% can_edit = thread.can_be_edited_by?(@commontator) %>
+
+<% if can_subscribe %>
+  <span id="thread_<%= thread.id.to_s %>_subscription_span" class="thread_subscription">
+    <%= render :partial => 'commontator/subscriptions/link',
+               :locals => {:thread => thread} %>
+  </span>
+<% end %>
+
+&nbsp;
+
+<% if can_edit %>
+  <% is_closed = thread.is_closed?
+  <% close_string = is_closed ? "reopen" : "close" %>
+  <%= link_to close_string.capitalize,
+              polymorphic_path([close_string, thread]),
+              :confirm => (!is_closed ? \
+                            'Are you sure you want to close this thread' : nil),
+              :method => :put,
+              :id => "thread_#{thread.id.to_s}_#{close_string}_link",
+              :class => "thread_#{close_string}_link",
+              :remote => true %>
+<% end %>

data/app/views/commontator/{commontator/_thread.html.erb → threads/_link.html.erb~}

@@ -1,5 +1,5 @@
 <% # Clients of this partial must supply the following variable:
-   # commontable
+   # thread
 %>
 
 <% user = send(Commontator.current_user_method) %>

data/app/views/commontator/threads/_show.html.erb

@@ -2,11 +2,37 @@
    # thread
 %>
 
-<span id="thread_<%= thread.id %>_header_span" class="thread_header">
+<% can_subscribe = thread.can_subscribe?(@commontator) %>
+<% can_edit = thread.can_be_edited_by?(@commontator) %>
+
+<span id="thread_<%= thread.id.to_s %>_header_span" class="thread_header">
   <%= thread.config.comment_name.capitalize.pluralize %>
 </span>
 
-<div id="thread_<%= thread.id %>_comment_list_div" class="thread_comment_list">
+<span id="thread_<%= thread.id.to_s %>_actions_span" class="thread_actions">
+  <% if can_subscribe %>
+    <span id="thread_<%= thread.id.to_s %>_subscription_span" class="thread_subscription">
+      <%= render :partial => 'commontator/subscriptions/link',
+                 :locals => {:thread => thread} %>
+    </span>
+  <% end %>
+  
+  &nbsp;
+
+  <% if can_edit %>
+    <% is_closed = thread.is_closed? %>
+    <% close_string = is_closed ? "reopen" : "close" %>
+    <%= link_to close_string.capitalize,
+                polymorphic_path([close_string, thread]),
+                :confirm => (!is_closed ? \
+                              'Are you sure you want to close this thread?' : nil),
+                :method => :put,
+                :id => "thread_#{thread.id.to_s}_#{close_string}_link",
+                :class => "thread_#{close_string}_link" %>
+  <% end %>
+</span>
+
+<div id="thread_<%= thread.id.to_s %>_comment_list_div" class="thread_comment_list">
   <% thread.ordered_comments.each do |comment| %>
     <% next unless comment.can_be_read_by?(@commontator) %>
     <%= render :partial => 'commontator/comments/show',
@@ -16,6 +42,8 @@
 
 <% unless thread.is_closed? %>
 
+  <br/>
+
   <div id="thread_<%= thread.id %>_new_comment_div" class="thread_new_comment"></div>
 
   <span id="thread_<%= thread.id %>_new_comment_link_span" class="thread_new_comment_link">

data/app/views/commontator/threads/_show.html.erb~

@@ -2,12 +2,38 @@
    # thread
 %>
 
-<span id="thread_<%= thread.id %>_header_span" class="thread_header">
+<% can_subscribe = thread.can_subscribe?(@commontator) %>
+<% can_edit = thread.can_be_edited_by?(@commontator) %>
+
+<span id="thread_<%= thread.id.to_s %>_header_span" class="thread_header">
   <%= thread.config.comment_name.capitalize.pluralize %>
 </span>
 
-<div id="thread_<%= thread.id %>_comment_list_div" class="thread_comment_list">
-  <% thread.comments.each do |comment| %>
+<span id="thread_<%= thread.id.to_s %>_actions_span" class="thread_actions">
+  <% if can_subscribe %>
+    <span id="thread_<%= thread.id.to_s %>_subscription_span" class="thread_subscription">
+      <%= render :partial => 'commontator/subscriptions/link',
+                 :locals => {:thread => thread} %>
+    </span>
+  <% end %>
+  
+  &nbsp;
+
+  <% if can_edit %>
+    <% is_closed = thread.is_closed? %>
+    <% close_string = is_closed ? "reopen" : "close" %>
+    <%= link_to close_string.capitalize,
+                polymorphic_path([close_string, thread]),
+                :confirm => (!is_closed ? \
+                              'Are you sure you want to close this thread' : nil),
+                :method => :put,
+                :id => "thread_#{thread.id.to_s}_#{close_string}_link",
+                :class => "thread_#{close_string}_link" %>
+  <% end %>
+</span>
+
+<div id="thread_<%= thread.id.to_s %>_comment_list_div" class="thread_comment_list">
+  <% thread.ordered_comments.each do |comment| %>
     <% next unless comment.can_be_read_by?(@commontator) %>
     <%= render :partial => 'commontator/comments/show',
                :locals => {:comment => comment} %>
@@ -16,6 +42,8 @@
 
 <% unless thread.is_closed? %>
 
+  <br/>
+
   <div id="thread_<%= thread.id %>_new_comment_div" class="thread_new_comment"></div>
 
   <span id="thread_<%= thread.id %>_new_comment_link_span" class="thread_new_comment_link">

data/app/views/commontator/threads/close.js.erb~

@@ -0,0 +1,5 @@
+$("#thread_<%= @thread.id.to_s %>_actions_span").html("<%= escape_javascript(
+  render :partial => 'actions',
+         :locals => {:thread => @thread}) %>");
+
+<%= javascript_proc(self) %>

data/app/views/commontator/threads/show.js.erb

@@ -3,4 +3,4 @@ $("#thread_<%= @thread.id %>_div").html(
     render :partial => 'show',
            :locals => {:thread => @thread}) %>");
 
-<%= javascript_callback %>
+<%= javascript_proc %>

data/app/views/commontator/threads/show.js.erb~

@@ -0,0 +1,6 @@
+$("#thread_<%= @thread.id %>_div").html(
+  "<%= escape_javascript(
+    render :partial => 'show',
+           :locals => {:thread => @thread}) %>");
+
+<%= javascript_proc(self) %>

data/config/initializers/commontator.rb

@@ -8,13 +8,12 @@ Commontator.configure do |config|
   # Default: 'current_user'
   config.current_user_method = 'current_user'
 
-  # Proc that is called when a view wants to set the page heading.
-  # Default: nil
-  config.heading_proc = nil
-
-  # Proc that is called after any javascript runs (e.g. to clear flash notices)
-  # Default: nil
-  config.javascript_proc = nil
+  # Proc that is called after any javascript runs (e.g. to clear flash)
+  # It is passed the 'self' object from the view template, so you should be able to
+  # access anything you normally could in a view template (by using, e.g. view.flash)
+  # Should return a string containing JS to be appended to all Commontator JS responses
+  # Default: lambda { |view| '$("#error_explanation").remove();' }
+  config.javascript_proc = lambda { |view| '$("#error_explanation").remove();' }
 
 
   # Commontator (User model) Configuration
@@ -57,14 +56,20 @@ Commontator.configure do |config|
   # as an argument to acts_as_commontable in each one
   # Default: 'commontable'
   config.commontable_name = 'commontable'
+  
+  # Proc that returns the commontable url that contains the thread
+  # (defaults to the commontable show url)
+  # Main application's routes can be accessed using main_app object
+  # Default: lambda { |main_app, commontable| main_app.polymorphic_url(commontable) }
+  config.commontable_url_proc = lambda { |main_app, commontable| main_app.polymorphic_url(commontable) }
 
   # Proc that returns the subscription email subject
   # Default:
-  # Proc.new do |params|
+  # lambda do |params|
   #   "#{params[:commontator_name]} #{params[:config].comment_create_verb_past} a " + \
   #   "#{params[:config].comment_name} on #{params[:commontable_name]} ##{params[:commontable_id]}"
   # end
-  config.subscription_email_subject_proc = Proc.new do |params|
+  config.subscription_email_subject_proc = lambda do |params|
     "#{params[:commontator_name]} #{params[:config].comment_create_verb_past} a " + \
     "#{params[:config].comment_name} on #{params[:commontable_name]} ##{params[:commontable_id]}"
   end
@@ -128,8 +133,9 @@ Commontator.configure do |config|
   config.commontable_id_method = 'id'
 
   # Method called on commontable and passed user as argument
-  # If true, that user is an admin for that particular commontable's thread
-  # Default: '' (no thread-specific admins)
+  # If true, that user is a moderator for that particular commontable's thread
+  # and is given admin-like capabilities for that thread only
+  # Default: '' (no thread-specific moderators)
   config.can_edit_thread_method = ''
 
   # Method called on commontable and passed user as argument