commontator 5.1.0 → 6.0.0.pre.1

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

@@ -1,10 +1,11 @@
-<% # Clients of this partial must supply the following variables:
-   # comments
-   # user
+<%#
+  Controllers that use this partial must supply the following variables:
+  comments
+  user
+  per_page
 %>
 
 <% comments.includes(:creator, :editor).each do |comment| %>
   <%= render partial: 'commontator/comments/show',
-             locals: { comment: comment,
-                          user: user } %>
+             locals: { comment: comment, user: user, per_page: per_page } %>
 <% end %>

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

@@ -0,0 +1,15 @@
+<%
+  # Controllers that use this partial must supply the following variables:
+  # comment
+  # user
+
+  thread = comment.thread
+%>
+
+<% if thread.config.comment_reply_style != :n && !thread.is_closed? && user %>
+  <%=
+    link_to t('commontator.comment.actions.reply'), commontator.new_thread_comment_path(
+      thread, comment: { parent_id: comment.id }, per_page: per_page
+    ), remote: true
+  %>
+<% end %>

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

@@ -1,6 +1,8 @@
-<% # Clients of this partial must supply the following variables:
-   # comment
-   # user
+<%#
+  Controllers that use this partial must supply the following variables:
+  comment
+  user
+  per_page
 %>
 
 <% creator = comment.creator
@@ -9,40 +11,44 @@
    avatar = Commontator.commontator_avatar(creator, self) || ''
 %>
 
-<div id="comment_<%= comment.id.to_s %>_div" class="comment">
-  <div id="comment_<%= comment.id.to_s %>_top_div" class="comment_div">
-    <span id="comment_<%= comment.id.to_s %>_commontator_span" class="comment_commontator">
+<div id="commontator-comment-<%= comment.id %>" class="comment">
+  <div id="commontator-comment-<%= comment.id %>-section-top" class="section top">
+    <span id="commontator-comment-<%= comment.id %>-author" class="author">
       <%= link.blank? ? name : link_to(name, link) %>
     </span>
-    <span id="comment_<%= comment.id.to_s %>_actions_span" class="comment_actions">
+
+    <span id="commontator-comment-<%= comment.id %>-actions" class="actions">
       <%= render partial: 'commontator/comments/actions',
-                 locals: { comment: comment,
-                              user: user } %>
+                 locals: { comment: comment, user: user } %>
     </span>
   </div>
-  <div id="comment_<%= comment.id.to_s %>_middle_div" class="comment_div">
-    <span id="comment_<%= comment.id.to_s %>_avatar_span" class="comment_avatar">
+
+  <div id="commontator-comment-<%= comment.id %>-section-middle" class="section middle">
+    <span id="commontator-comment-<%= comment.id %>-avatar" class="avatar">
       <%= avatar %>
     </span>
-    <span id="comment_<%= comment.id.to_s %>_votes_span" class="comment_votes">
-      <%= render partial: 'commontator/comments/votes',
-                 locals: { comment: comment,
-                              user: user } %>
+
+    <span id="commontator-comment-<%= comment.id %>-votes" class="votes">
+      <%= render partial: 'commontator/comments/votes', locals: { comment: comment, user: user } %>
     </span>
-    <div id="comment_<%= comment.id.to_s %>_body_div" class="comment_body">
-      <%= render partial: 'commontator/comments/body',
-                 locals: { comment: comment } %>
+
+    <div id="commontator-comment-<%= comment.id %>-body" class="body">
+      <%= render partial: 'commontator/comments/body', locals: { comment: comment } %>
     </div>
   </div>
-  <div id="comment_<%= comment.id.to_s %>_bottom_div" class="comment_div">
-    <span id="comment_<%= comment.id.to_s %>_created_timestamp_span" class="comment_timestamp">
+
+  <div id="commontator-comment-<%= comment.id %>-section-bottom" class="section bottom">
+    <span id="commontator-comment-<%= comment.id %>-reply" class="reply">
+      <%= render partial: 'commontator/comments/reply',
+                 locals: { comment: comment, user: user, per_page: per_page } %>
+    </span>
+
+    <span id="commontator-comment-<%= comment.id %>-created-timestamp" class="timestamp">
       <%= comment.created_timestamp %>
     </span>
-    <br/>
-    <span id="comment_<%= comment.id.to_s %>_updated_timestamp_span" class="comment_timestamp">
-    <% if comment.is_modified? %>
-      <%= comment.updated_timestamp %>
-    <% end %>
+
+    <span id="commontator-comment-<%= comment.id %>-updated-timestamp" class="timestamp">
+      <%= comment.updated_timestamp if comment.is_modified? %>
     </span>
   </div>
 </div>

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

@@ -1,17 +1,19 @@
-<% # Clients of this partial must provide the following variables:
-   # comment
-   # user
+<%
+  # Controllers that use this partial must provide the following variables:
+  # comment
+  # user
+
+  thread = comment.thread
 %>
 
 <% if comment.can_be_voted_on? %>
   <% can_vote = comment.can_be_voted_on_by?(user) %>
   <% vote = comment.get_vote_by(user) %>
-  <% comment_voting = comment.thread.config.comment_voting.to_sym %>
+  <% comment_voting = thread.config.comment_voting.to_sym %>
 
   <% if comment_voting == :ld || comment_voting == :l %>
   <% vtype = (comment_voting == :ld) ? 'upvote' : 'like' %>
-  <span id="comment_<%= comment.id %>_<%= vtype %>_span"
-        class="comment_<%= vtype %>">
+  <span id="commontator-comment-<%= comment.id %>-<%= vtype %>" class="<%= vtype %>">
     <% if can_vote && (vote.blank? || !vote.vote_flag) %>
       <%= form_tag commontator.upvote_comment_path(comment),
             method: :put,
@@ -35,14 +37,13 @@
   </span>
   <% end %>
 
-  <span id="comment_<%= comment.id %>_vote_count_span" class="comment_vote_count">
-    <% config = comment.thread.config %>
-    <%= config.vote_count_proc.call(comment.thread,
-          comment.get_upvotes.size, comment.get_downvotes.size) %>
+  <span id="commontator-comment-<%= comment.id %>-vote-count" class="vote-count">
+    <% config = thread.config %>
+    <%= config.vote_count_proc.call(thread, comment.get_upvotes.size, comment.get_downvotes.size) %>
   </span>
 
   <% if comment_voting == :ld %>
-  <span id="comment_<%= comment.id %>_downvote_span" class="comment_downvote">
+  <span id="commontator-comment-<%= comment.id %>-downvote" class="downvote">
     <% if can_vote && (vote.blank? || vote.vote_flag) %>
       <%= form_tag commontator.downvote_comment_path(comment),
             method: :put,

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

@@ -1,19 +1,11 @@
-<% unless @comment.try(:id).blank? %>
-  <% @comment.reload %>
-  $("#comment_<%= @comment.id.to_s %>_body_div").html("<%= escape_javascript(
-    render partial: 'body', locals: { comment: @comment }) %>");
-<% end %>
+<% if @comment.nil? || !@comment.persisted? %>
+  $("#commontator-thread-<%= @commontator_thread.id %>-new-comment").hide();
 
-<% unless @new_comment.nil? %>
-  $("#thread_<%= @thread.id %>_new_comment_form_div").html("<%= escape_javascript(
-    render partial: 'form',
-           locals: { comment: @new_comment,
-                        thread: @thread,
-                        per_page: @per_page }) %>");
+  $("#commontator-thread-<%= @commontator_thread.id %>-new-comment-link").fadeIn();
 <% else %>
-  $("#thread_<%= @thread.id %>_new_comment_form_div").hide();
-
-  $("#thread_<%= @thread.id %>_new_comment_link_div").fadeIn();
+  $("#commontator-comment-<%= @comment.id %>-body").html("<%= escape_javascript(
+    render partial: 'body', locals: { comment: @comment }
+  ) %>");
 <% end %>
 
 <%= javascript_proc %>

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

@@ -1,21 +1,27 @@
-<%= render partial: 'commontator/threads/show',
-           locals: { thread: @thread,
-                        user: @user,
-                        page: @thread.new_comment_page(@per_page),
-                        per_page: @per_page } %>
+<%=
+  render partial: 'commontator/threads/show', locals: {
+    thread: @commontator_thread,
+    user: @commontator_user,
+    per_page: @commontator_per_page,
+    page: @commontator_thread.new_comment_page(@commontator_per_page),
+    show_all: @commontator_show_all
+  }
+%>
 
-<% unless @new_comment.nil? %>
-  $("#thread_<%= @thread.id %>_new_comment_form_div").html("<%= escape_javascript(
-    render partial: 'form',
-           locals: { comment: @new_comment,
-                        thread: @thread,
-                        per_page: @per_page }) %>");
+<% unless @commontator_new_comment.nil? %>
+  $("#commontator-thread-<%= @commontator_thread.id %>-new-comment").html("<%= escape_javascript(
+    render partial: 'form', locals: {
+      comment: @commontator_new_comment,
+      thread: @commontator_thread,
+      per_page: @commontator_per_page
+    }
+  ) %>");
 <% else %>
-  $("#thread_<%= @thread.id %>_new_comment_form_div").hide();
+  $("#commontator-thread-<%= @commontator_thread.id %>-new-comment").hide();
 
-  $("#thread_<%= @thread.id %>_new_comment_link_div").fadeIn();
+  $("#commontator-thread-<%= @commontator_thread.id %>-new-comment-link").fadeIn();
 <% end %>
 
-$("#comment_<%= @comment.id.to_s %>_div").hide().fadeIn()[0].scrollIntoView();
+$("#commontator-comment-<%= @comment.id %>").hide().fadeIn()[0].scrollIntoView();
 
 <%= javascript_proc %>

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

@@ -1,17 +1,17 @@
-$("#comment_<%= @comment.id.to_s %>_body_div").html("<%= escape_javascript(
-  render partial: 'body', locals: { comment: @comment }) %>");
+$("#commontator-comment-<%= @comment.id %>-body").html("<%= escape_javascript(
+  render partial: 'body', locals: { comment: @comment }
+) %>");
 
-$("#comment_<%= @comment.id.to_s %>_updated_timestamp_span").html("<%= escape_javascript(
-  @comment.updated_timestamp) %>");
-                                                           
-$("#comment_<%= @comment.id.to_s %>_actions_span").html("<%= escape_javascript(
-  render partial: 'actions',
-         locals: { comment: @comment,
-                      user: @user }) %>");
-         
-$("#comment_<%= @comment.id %>_votes_span").html("<%= escape_javascript(
-  render partial: 'votes',
-         locals: { comment: @comment,
-                      user: @user }) %>");
+$("#commontator-comment-<%= @comment.id %>-updated-timestamp").html("<%= escape_javascript(
+  @comment.updated_timestamp
+) %>");
+
+$("#commontator-comment-<%= @comment.id %>-actions").html("<%= escape_javascript(
+  render partial: 'actions', locals: { comment: @comment, user: @commontator_user }
+) %>");
+
+$("#commontator-comment-<%= @comment.id %>-votes").html("<%= escape_javascript(
+  render partial: 'votes', locals: { comment: @comment, user: @commontator_user }
+) %>");
 
 <%= javascript_proc %>

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

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

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

@@ -1,11 +1,15 @@
-$("#thread_<%= @thread.id %>_new_comment_form_div").html("<%= escape_javascript(
-  render partial: 'form',
-         locals: { comment: @comment,
-                      thread: @thread,
-                      per_page: @per_page }) %>");
+$("#commontator-thread-<%= @commontator_thread.id %>-new-comment").html("<%= escape_javascript(
+  render partial: 'form', locals: {
+    comment: @comment,
+    thread: @commontator_thread,
+    per_page: @commontator_per_page
+  }
+) %>");
 
-$("#thread_<%= @thread.id %>_new_comment_form_div").fadeIn()[0].scrollIntoView();
+$("#commontator-thread-<%= @commontator_thread.id %>-new-comment").fadeIn()[0].scrollIntoView();
 
-$("#thread_<%= @thread.id %>_new_comment_link_div").hide();
+$("#commontator-thread-<%= @commontator_thread.id %>-new-comment-link").hide();
+
+$('#commontator-thread-<%= @commontator_thread.id %>-new-comment-body').focus();
 
 <%= javascript_proc %>

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

@@ -1,7 +1,9 @@
-$("#comment_<%= @comment.id.to_s %>_body_div").html("<%= escape_javascript(
-  render partial: 'body', locals: { comment: @comment }) %>");
+$("#commontator-comment-<%= @comment.id %>-body").html("<%= escape_javascript(
+  render partial: 'body', locals: { comment: @comment }
+) %>");
 
-$("#comment_<%= @comment.id.to_s %>_updated_timestamp_span").html("<%= escape_javascript(
-  @comment.updated_timestamp) %>");
+$("#commontator-comment-<%= @comment.id %>-updated-timestamp").html("<%= escape_javascript(
+  @comment.updated_timestamp
+) %>");
 
 <%= javascript_proc %>

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

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

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

@@ -1,19 +1,31 @@
-<% # Clients of this partial must supply the following variables:
-   # thread
-   # user
+<%
+  # Controllers that use this partial must supply the following variables:
+  # thread
+  # user
+  # per_page
+  # page
+  # show_all
+  # Additionally, they may override the following variable:
+  @commontator_thread_show ||= false
 %>
 
-<% if thread.can_be_read_by?(user) %>
-  <div id="thread_<%= thread.id %>_div" class="thread" style="display: none;">
+<% if !thread.nil? && thread.can_be_read_by?(user) %>
+  <div id="commontator-thread-<%= thread.id %>" class="commontator thread">
     <% if @commontator_thread_show %>
-      <%= render partial: 'commontator/threads/show',
-                 locals: { thread: thread,
-                              user: user,
-                              page: @commontator_page,
-                              per_page: @commontator_per_page } %>
+      <%=
+        render partial: 'commontator/threads/show', locals: {
+          thread: thread,
+          user: user,
+          page: page,
+          per_page: per_page,
+          show_all: show_all
+        }
+      %>
     <% else %>
       <% subscription = thread.subscription_for(user) %>
-      <%= link_to "#{t 'commontator.thread.actions.show'} (#{(subscription.unread_comments.count.to_s + '/') if subscription}#{thread.filtered_comments.count.to_s})",
+      <%= link_to "#{t 'commontator.thread.actions.show'} (#{
+                    (subscription.unread_comments.count.to_s + '/') if subscription
+                  }#{thread.filtered_comments.count.to_s})",
                   commontator.thread_path(thread),
                   remote: true %>
     <% end %>

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

@@ -1,15 +1,14 @@
-<% # Clients of this partial must supply the following variables:
-   # thread
-   # user
+<%#
+  Views that use this partial must supply the following variables:
+  thread
+  user
 %>
 
 <% is_subscribed = !!thread.subscription_for(user) %>
-<% sub_string = is_subscribed ? "unsubscribe" : "subscribe" %>
+<% sub_string = is_subscribed ? 'unsubscribe' : 'subscribe' %>
 <%= link_to t("commontator.subscription.actions.#{sub_string}"),
             commontator.polymorphic_path([sub_string, thread]),
-            confirm: (is_subscribed ? t('commontator.subscription.actions.confirm_unsubscribe') : \
-                          nil),
             method: :put,
-            id: "thread_#{thread.id.to_s}_#{sub_string}_link",
-            class: "thread_#{sub_string}_link",
+            id: "commontator-thread-#{thread.id}-#{sub_string}",
+            class: sub_string,
             remote: true %>

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

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

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

@@ -1,10 +1,11 @@
-<h4><%= t 'commontator.email.comment_created.body',
-          creator_name: @creator_name,
-          commontable_name: @commontable_name %></h4>
+<h4>
+  <%= t 'commontator.email.comment_created.body',
+        creator_name: @creator_name, commontable_name: @commontable_name %>
+</h4>
 
-<%= render partial: 'commontator/comments/body',
-           locals: { comment: @comment } %>
+<%= render partial: 'commontator/comments/body', locals: { comment: @comment } %>
 
-<p><%= t 'commontator.email.thread_link_html',
-         comment_url: @comment_url,
-         commontable_name: @commontable_name %></p>
+<p>
+  <%= t 'commontator.email.thread_link_html',
+         comment_url: @comment_url, commontable_name: @commontable_name %>
+</p>

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

@@ -1,17 +1,18 @@
-<% # Clients of this partial must supply the following variables:
-   # thread
+<%#
+  Views that use this partial must supply the following variables:
+  thread
 %>
 
-$("#thread_<%= thread.id %>_hide_link").click(function() {
-  $("#thread_<%= thread.id %>_span").hide();
+$("#commontator-thread-<%= thread.id %>-hide-link").click(function() {
+  $("#commontator-thread-<%= thread.id %>-content").hide();
 
-  $("#thread_<%= thread.id %>_show_span").fadeIn()[0].scrollIntoView();
+  $("#commontator-thread-<%= thread.id %>-show").fadeIn()[0].scrollIntoView();
 });
 
-$("#thread_<%= thread.id %>_show_link").click(function() {
-  $("#thread_<%= thread.id %>_span").fadeIn()[0].scrollIntoView();
+$("#commontator-thread-<%= thread.id %>-show-link").click(function() {
+  $("#commontator-thread-<%= thread.id %>-content").fadeIn()[0].scrollIntoView();
 
-  $("#thread_<%= thread.id %>_show_span").hide();
+  $("#commontator-thread-<%= thread.id %>-show").hide();
 });
 
-$("#thread_<%= thread.id %>_hide_span").show();
+$("#commontator-thread-<%= thread.id %>-hide").show();