commontator 0.4.1 → 0.5.12

data/app/views/commontator/comments/_actions.html.erb

@@ -1,12 +1,13 @@
 <% # Clients of this partial must supply the following variables:
    # comment
+   # user
 %>
 
-<% can_edit = comment.can_be_edited_by?(@commontator)
-   can_delete = comment.can_be_deleted_by?(@commontator) %>
+<% can_edit = comment.can_be_edited_by?(user)
+   can_delete = comment.can_be_deleted_by?(user) %>
 
 <% if can_edit %>
-  <%= link_to 'Edit', edit_comment_path(comment),
+  <%= link_to 'Edit', commontator.edit_comment_path(comment),
                       :id => "comment_#{comment.id.to_s}_edit_link",
                       :class => "comment_edit_link",
                       :remote => true %>
@@ -18,10 +19,10 @@
   <% is_deleted = comment.is_deleted? %>
   <% del_string = is_deleted ? "undelete" : "delete" %>
   <%= link_to del_string.capitalize,
-              polymorphic_path([del_string, comment]),
+              commontator.polymorphic_path([del_string, comment]),
               :confirm => (!is_deleted ? \
                             "Are you sure you want to delete this " + \
-                            "#{@thread.config.comment_name}?" : nil),
+                            "#{comment.thread.config.comment_name}?" : nil),
               :method => :put,
               :id => "comment_#{comment.id.to_s}_#{del_string}_link",
               :class => "comment_#{del_string}_link",

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

@@ -1,12 +1,13 @@
 <% # Clients of this partial must supply the following variables:
    # comment
+   # user
 %>
 
-<% can_edit = comment.can_be_edited_by?(@commontator)
-   can_delete = comment.can_be_deleted_by?(@commontator) %>
+<% can_edit = comment.can_be_edited_by?(user)
+   can_delete = comment.can_be_deleted_by?(user) %>
 
 <% if can_edit %>
-  <%= link_to 'Edit', edit_comment_path(comment),
+  <%= link_to 'Edit', commontator.edit_comment_path(comment),
                       :id => "comment_#{comment.id.to_s}_edit_link",
                       :class => "comment_edit_link",
                       :remote => true %>
@@ -15,10 +16,10 @@
 &nbsp;
 
 <% if can_delete %>
-  <% is_deleted = comment.is_deleted?
+  <% is_deleted = comment.is_deleted? %>
   <% del_string = is_deleted ? "undelete" : "delete" %>
   <%= link_to del_string.capitalize,
-              polymorphic_path([del_string, comment]),
+              commontator.polymorphic_path([del_string, comment]),
               :confirm => (!is_deleted ? \
                             "Are you sure you want to delete this " + \
                             "#{@thread.config.comment_name}?" : nil),

data/app/views/commontator/comments/_body.html.erb

@@ -4,4 +4,5 @@
 
 <%= simple_format comment.is_deleted? ? \
       comment.thread.config.comment_name.capitalize + \
-      ' deleted by ' + deleter_name(comment) : comment.body %>
+      ' deleted by ' + commontator_name(comment.deleter) : \
+      comment.body %>

data/app/views/commontator/comments/_body.html.erb~

@@ -4,5 +4,4 @@
 
 <%= simple_format comment.is_deleted? ? \
       comment.thread.config.comment_name.capitalize + \
-      ' deleted by ' + deleter_name(comment) : comment.body,
-      {:id => "comment_#{comment.id}_body_pre", :class => 'comment_body'} %>
+      ' deleted by ' + commontator_name(comment.deleter) : comment.body %>

data/app/views/commontator/comments/_form.html.erb

@@ -1,12 +1,14 @@
 <% # Clients of this partial must provide the following variables:
    # comment
    #
-   # Additionally, they can override the following variable:
+   # Additionally, they can override the following variables:
    thread ||= nil
    no_remote ||= false
 %>
 
-<%= form_for([thread, comment],
+<% config = comment.thread.config %>
+
+<%= form_for([commontator, thread, comment],
              :remote => !no_remote) do |f| %>
              
   <p>
@@ -14,7 +16,10 @@
   </p>
   
   <p>
-    <%= f.submit %>
+    <%= f.submit (comment.id.blank? ? \
+                   config.comment_create_verb_present : \
+                   'update').capitalize + \
+          ' ' + config.comment_name %>
   </p>
   
 <% end %>

data/app/views/commontator/comments/_form.html.erb~

@@ -1,13 +1,14 @@
 <% # Clients of this partial must provide the following variables:
    # comment
    #
-   # Additionally, they can override the following variable:
+   # Additionally, they can override the following variables:
    thread ||= nil
    no_remote ||= false
 %>
 
-<%= form_for([thread, comment],
-             :id => 'new_comment_form',
+<% config = comment.thread.config %>
+
+<%= form_for([commontator, thread, comment],
              :remote => !no_remote) do |f| %>
              
   <p>
@@ -15,7 +16,9 @@
   </p>
   
   <p>
-    <%= f.submit %>
+    <%= f.submit (comment.id.blank? ? \
+                   config.comment_create_verb_present : \
+                   'update').capitalize + ' ' + config.comment_name %>
   </p>
   
 <% end %>

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

@@ -1,34 +1,37 @@
 <% # Clients of this partial must supply the following variables:
    # comment
+   # user
 %>
   
 <div id="comment_<%= comment.id.to_s %>_div" class="comment" style="clear:both">                 
   <span id="comment_<%= comment.id.to_s %>_commontator_span" class="comment_commontator">
-    <% if !commontator.nil? && commontator.commontator_config.commontator_name_clickable %>
-      <%= link_to commontator_name(comment), main_app.polymorphic_path(comment.commontator) %>
+    <% if !user.nil? && user.commontator_config.user_name_clickable %>
+      <%= link_to commontator_name(comment.creator), main_app.polymorphic_path(comment.creator) %>
     <% else %>
-      <%= commontator_name(comment) %>
+      <%= commontator_name(comment.creator) %>
     <% end %>
     &nbsp;&nbsp;
     <span id="comment_<%= comment.id.to_s %>_timestamp_span" class="comment_timestamp">
-      <%= comment_timestamp(comment) %>
+      <%= comment.timestamp %>
     </span>
   </span>
   
   <span id="comment_<%= comment.id.to_s %>_actions_span" class="comment_actions">
     <%= render :partial => 'commontator/comments/actions',
-               :locals => { :comment => comment } %>
+               :locals => {:comment => comment,
+                           :user => user} %>
   </span>
   
   <br clear="all"/>
   
-  <span id="comment_<%= comment.id.to_s %>_profile_picture_span" class="comment_profile_picture">
-    <%= gravatar_image comment %>
+  <span id="comment_<%= comment.id.to_s %>_gravatar_image_span" class="comment_gravatar_image">
+    <%= commontator_gravatar_image comment.creator %>
   </span>
   
   <span id="comment_<%= comment.id.to_s %>_votes_span" class="comment_votes">
     <%= render :partial => 'commontator/comments/votes',
-               :locals => {:comment => comment} %>
+               :locals => {:comment => comment,
+                           :user => user} %>
   </span>
   
   <div id="comment_<%= comment.id.to_s %>_body_div" class="comment_body">

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

@@ -1,34 +1,37 @@
 <% # Clients of this partial must supply the following variables:
    # comment
+   # user
 %>
   
 <div id="comment_<%= comment.id.to_s %>_div" class="comment" style="clear:both">                 
   <span id="comment_<%= comment.id.to_s %>_commontator_span" class="comment_commontator">
-    <% if !commontator.nil? && commontator.commontator_config.commontator_name_clickable &&  %>
-      <%= link_to commontator_name(comment), main_app.polymorphic_path(comment.commontator) %>
+    <% if !user.nil? && user.commontator_config.user_name_clickable %>
+      <%= link_to commontator_name(comment.creator), main_app.polymorphic_path(comment.creator) %>
     <% else %>
-      <%= commontator_name(comment) %>
+      <%= commontator_name(comment.creator) %>
     <% end %>
     &nbsp;&nbsp;
     <span id="comment_<%= comment.id.to_s %>_timestamp_span" class="comment_timestamp">
-      <%= comment_timestamp(comment) %>
+      <%= comment.timestamp %>
     </span>
   </span>
   
   <span id="comment_<%= comment.id.to_s %>_actions_span" class="comment_actions">
     <%= render :partial => 'commontator/comments/actions',
-               :locals => { :comment => comment } %>
+               :locals => {:comment => comment,
+                           :user => user} %>
   </span>
   
   <br clear="all"/>
   
-  <span id="comment_<%= comment.id.to_s %>_profile_picture_span" class="comment_profile_picture">
-    <%= gravatar_image comment %>
+  <span id="comment_<%= comment.id.to_s %>_gravatar_image_span" class="comment_profile_picture">
+    <%= commontator_gravatar_image comment.creator %>
   </span>
   
   <span id="comment_<%= comment.id.to_s %>_votes_span" class="comment_votes">
     <%= render :partial => 'commontator/comments/votes',
-               :locals => {:comment => comment} %>
+               :locals => {:comment => comment,
+                           :user => user} %>
   </span>
   
   <div id="comment_<%= comment.id.to_s %>_body_div" class="comment_body">

data/app/views/commontator/comments/_votes.html.erb

@@ -1,14 +1,15 @@
 <% # Clients of this partial must provide the following variable:
    # comment
+   # user
 %>
 
 <% if comment.can_be_voted_on? %>
-  <% can_vote = comment.can_be_voted_on_by?(@commontator) %>
-  <% vote = comment.votes.find_by_voter_id_and_voter_type(@commontator.id, @commontator.class.name) %>
+  <% can_vote = comment.can_be_voted_on_by?(user) %>
+  <% vote = comment.votes.find_by_voter_id_and_voter_type(user.id, user.class.name) %>
 
   <span id="comment_<%= comment.id %>_upvote_span" class="comment_upvote">
     <% if can_vote && (vote.blank? || !vote.vote_flag) %>
-      <%= form_tag upvote_comment_path(comment),
+      <%= form_tag commontator.upvote_comment_path(comment),
             :method => :put,
             :remote => true do %>
         <%= image_submit_tag "commontator/upvote.png",
@@ -16,7 +17,7 @@
               :onmouseout => "this.src='/assets/commontator/upvote.png'" %>
       <% end %>
     <% elsif can_vote %>
-      <%= form_tag unvote_comment_path(comment),
+      <%= form_tag commontator.unvote_comment_path(comment),
             :method => :put,
             :remote => true do %>
         <%= image_submit_tag "commontator/upvote_hover.png",
@@ -35,7 +36,7 @@
 
   <span id="comment_<%= comment.id %>_downvote_span" class="comment_downvote">
     <% if can_vote && (vote.blank? || vote.vote_flag) %>
-      <%= form_tag downvote_comment_path(comment),
+      <%= form_tag commontator.downvote_comment_path(comment),
             :method => :put,
             :remote => true do %>
         <%= image_submit_tag "commontator/downvote.png",
@@ -43,7 +44,7 @@
               :onmouseout => "this.src='/assets/commontator/downvote.png'" %>
       <% end %>
     <% elsif can_vote %>
-      <%= form_tag unvote_comment_path(comment),
+      <%= form_tag commontator.unvote_comment_path(comment),
             :method => :put,
             :remote => true do %>
         <%= image_submit_tag "commontator/downvote_hover.png",

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

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

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

@@ -2,14 +2,16 @@ $("#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)) %>");
+                                                           @comment.timestamp) %>");
                                                            
 $("#comment_<%= @comment.id.to_s %>_actions_span").html("<%= escape_javascript(
   render :partial => 'actions',
-         :locals => {:comment => @comment}) %>");
+         :locals => {:comment => @comment,
+                     :user => @user}) %>");
          
 $("#comment_<%= @comment.id %>_votes_span").html("<%= escape_javascript(
   render :partial => 'votes',
-         :locals => {:comment => @comment}) %>");
+         :locals => {:comment => @comment,
+                     :user => @user}) %>");
 
 <%= javascript_proc %>

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

@@ -6,10 +6,12 @@ $("#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,
+                     :user => @user}) %>");
          
 $("#comment_<%= @comment.id %>_votes_span").html("<%= escape_javascript(
   render :partial => 'votes',
-         :locals => {:comment => @comment}) %>");
+         :locals => {:comment => @comment,
+                     :user => @user}) %>");
 
-<%= javascript_proc(self) %>
+<%= javascript_proc %>

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

@@ -2,6 +2,6 @@ $("#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)) %>");
+                                                           @comment.timestamp) %>");
 
 <%= javascript_proc %>

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_proc(self) %>
+<%= javascript_proc %>

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

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

data/app/views/commontator/shared/_thread.html.erb

@@ -0,0 +1,17 @@
+<% # Clients of this partial must supply the following variables:
+   # thread
+   # user
+%>
+
+<% if thread.can_be_read_by?(user) %>
+  <%= stylesheet_link_tag "commontator/application", :media => "all" %>
+
+  <div id="thread_<%= thread.id %>_div" class="thread">
+    <% if @commontator_thread_show %>
+      <%= render :partial => 'commontator/threads/show', :locals => {:thread => thread,
+                                                                     :user => user} %>
+    <% else %>
+      <%= link_to "Show #{thread.config.comment_name.pluralize} (#{thread.comments.count})", commontator.thread_path(thread), :remote => true %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/commontator/shared/_thread.html.erb~

@@ -0,0 +1,16 @@
+<% # Clients of this partial must supply the following variables:
+   # thread
+   # user
+%>
+
+<% if thread.can_be_read_by?(user) %>
+  <%= stylesheet_link_tag "commontator/application", :media => "all" %>
+
+  <div id="thread_<%= thread.id %>_div" class="thread">
+    <% if @commontator_thread_show %>
+      <%= render :partial => 'commontator/threads/show', :locals => {:thread => thread} %>
+    <% else %>
+      <%= link_to "Show #{thread.config.comment_name.pluralize} (#{thread.comments.count})", commontator.thread_path(thread), :remote => true %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/commontator/shared/_thread_link.html.erb~

@@ -0,0 +1,16 @@
+<% # Clients of this partial must supply the following variables:
+   # thread
+   # user
+%>
+
+<% if thread.can_be_read_by?(user) %>
+  <%= stylesheet_link_tag "commontator/application", :media => "all" %>
+
+  <div id="thread_<%= thread.id %>_div" class="thread">
+    <% if @commontator_show_thread %>
+      <%= render :partial => 'commontator/threads/show', :locals => {:thread => thread} %>
+    <% else %>
+      <%= link_to "Show #{thread.config.comment_name.pluralize} (#{thread.comments.count})", commontator.thread_path(thread), :remote => true %>
+    <% end %>
+  </div>
+<% end %>

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

@@ -1,11 +1,12 @@
 <% # Clients of this partial must supply the following variable:
    # thread
+   # user
 %>
 
-<% is_subscribed = thread.is_subscribed?(@commontator) %>
+<% is_subscribed = thread.is_subscribed?(user) %>
 <% sub_string = is_subscribed ? "unsubscribe" : "subscribe" %>
 <%= link_to sub_string.capitalize,
-            polymorphic_path([sub_string, thread]),
+            commontator.polymorphic_path([sub_string, thread]),
             :confirm => (is_subscribed ? \
                           "Are you sure you want to unsubscribe from this thread?" : \
                           nil),

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

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

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

@@ -1,4 +1,4 @@
-<h4><%= @commontator_name %>'s <%= @thread.config.comment_name %> on <%= @commontable_name %> #<%= @commontable_id %>:</h4>
+<h4><%= @creator_name %>'s <%= @thread.config.comment_name %> on <%= @commontable_name %> #<%= @commontable_id %>:</h4>
 
 <%= render :partial => 'commontator/comments/body',
            :locals => { :comment => @comment } %>

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

@@ -1,19 +1,21 @@
-<% # Clients of this partial must supply the following variable:
+<% # Clients of this partial must supply the following variables:
    # thread
+   # user
 %>
 
-<% can_subscribe = thread.can_subscribe?(@commontator) %>
-<% can_edit = thread.can_be_edited_by?(@commontator) %>
+<% can_subscribe = thread.can_subscribe?(user) %>
+<% can_edit = thread.can_be_edited_by?(user) %>
 
 <span id="thread_<%= thread.id.to_s %>_header_span" class="thread_header">
-  <%= thread.config.comment_name.capitalize.pluralize %>
+  <%= thread.config.comment_name.capitalize.pluralize + (thread.is_closed? ? ' (closed)' : '') %>
 </span>
 
 <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} %>
+                 :locals => {:thread => thread,
+                             :user => user} %>
     </span>
   <% end %>
   
@@ -23,7 +25,7 @@
     <% is_closed = thread.is_closed? %>
     <% close_string = is_closed ? "reopen" : "close" %>
     <%= link_to close_string.capitalize,
-                polymorphic_path([close_string, thread]),
+                commontator.polymorphic_path([close_string, thread]),
                 :confirm => (!is_closed ? \
                               'Are you sure you want to close this thread?' : nil),
                 :method => :put,
@@ -34,21 +36,26 @@
 
 <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) %>
+    <% next unless comment.can_be_read_by?(user) %>
     <%= render :partial => 'commontator/comments/show',
-               :locals => {:comment => comment} %>
+               :locals => {:comment => comment,
+                           :user => user} %>
   <% end %>
 </div>
 
-<% unless thread.is_closed? %>
+<br/>
 
-  <br/>
+<% if thread.is_closed? %>
+
+  <p><%= thread.config.comment_name.capitalize.pluralize %> cannot be <%= thread.config.comment_create_verb_past %> at this time.</p>
+
+<% else %>
 
   <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">
     <%= link_to thread.config.comment_create_verb_present.capitalize + ' ' + thread.config.comment_name,
-        new_thread_comment_path(thread), :remote => true %>
+        commontator.new_thread_comment_path(thread), :remote => true %>
   </span>
   
 <% end %>