commontator 4.0.1 → 4.0.2

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

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

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

@@ -1,8 +0,0 @@
-<% # Clients of this partial must provide the following variable:
-   # comment
-%>
-
-<%= simple_format comment.is_deleted? ? \
-      comment.thread.config.comment_name.capitalize + \
-      ' deleted by ' + commontator_name(comment.deleter) : \
-      comment.body %>

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

@@ -1,38 +0,0 @@
-<% # Clients of this partial must provide the following variables:
-   # comment
-   #
-   # Additionally, they can override the following variables:
-   thread ||= nil
-   no_remote ||= false
-%>
-
-<% config = comment.thread.config %>
-
-<% if comment.errors.any? %>
-  <div class="comment_error_explanation">
-    <h3>This <%= config.comment_name %> could not be
-          <%= comment.id.blank? ? config.comment_create_verb_past : 'updated' %> because of the following error<%= comment.errors.count == 1 ? '' : 's' %>:</h3>
-
-    <ul>
-      <% comment.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-    </ul>
-  </div>
-<% end %>
-
-<%= form_for([commontator, thread, comment],
-             :remote => !no_remote) do |f| %>
-  
-  <div class="comment_form_field">
-    <%= f.text_area :body, :rows => '7' %>
-  </div>
-  
-  <div class="comment_form_actions">
-    <%= f.submit (comment.id.blank? ? \
-                   config.comment_create_verb_present : \
-                   'update').capitalize + \
-          ' ' + config.comment_name %>
-  </div>
-  
-<% end %>

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

@@ -1,44 +0,0 @@
-<% # Clients of this partial must supply the following variables:
-   # comment
-   # user
-%>
-  
-<div id="comment_<%= comment.id.to_s %>_div" class="comment">
-  <span id="comment_<%= comment.id.to_s %>_commontator_span" class="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.creator) %>
-    <% end %>
-    &nbsp;&nbsp;
-    <span id="comment_<%= comment.id.to_s %>_timestamp_span" class="comment_timestamp">
-      <%= comment.timestamp %><%= " by #{commontator_name(comment.editor)}" %>
-    </span>
-  </span>
-  
-  <span id="comment_<%= comment.id.to_s %>_actions_span" class="comment_actions">
-    <%= render :partial => 'commontator/comments/actions',
-               :locals => {:comment => comment,
-                           :user => user} %>
-  </span>
-  
-  <br clear="all"/>
-  
-  <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,
-                           :user => user} %>
-  </span>
-  
-  <div id="comment_<%= comment.id.to_s %>_body_div" class="comment_body">
-    <%= render :partial => 'commontator/comments/body',
-               :locals => {:comment => comment} %>
-  </div>
-
-</div>
-
-<br clear="all"/>

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

@@ -1,57 +0,0 @@
-<% # 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?(user) %>
-  <% vote = comment.get_vote_by(user) %>
-
-  <span id="comment_<%= comment.id %>_upvote_span" class="comment_upvote">
-    <% if can_vote && (vote.blank? || !vote.vote_flag) %>
-      <%= form_tag commontator.upvote_comment_path(comment),
-            :method => :put,
-            :remote => true do %>
-        <%= image_submit_tag "commontator/upvote.png",
-              :onmouseover => "this.src='/assets/commontator/upvote_hover.png'",
-              :onmouseout => "this.src='/assets/commontator/upvote.png'" %>
-      <% end %>
-    <% elsif can_vote %>
-      <%= form_tag commontator.unvote_comment_path(comment),
-            :method => :put,
-            :remote => true do %>
-        <%= image_submit_tag "commontator/upvote_hover.png",
-              :onmouseover => "this.src='/assets/commontator/upvote.png'",
-              :onmouseout => "this.src='/assets/commontator/upvote_hover.png'" %>
-      <% end %>
-    <% else %>
-      <%= image_tag "commontator/upvote_hover.png" %>
-    <% end %>
-  </span>
-
-  <span id="comment_<%= comment.id %>_vote_count_span" class="comment_vote_count">
-    <p>+ <%= comment.upvotes.size %><br><br>- <%= comment.downvotes.size %></p>
-  </span>
-
-  <span id="comment_<%= comment.id %>_downvote_span" class="comment_downvote">
-    <% if can_vote && (vote.blank? || vote.vote_flag) %>
-      <%= form_tag commontator.downvote_comment_path(comment),
-            :method => :put,
-            :remote => true do %>
-        <%= image_submit_tag "commontator/downvote.png",
-              :onmouseover => "this.src='/assets/commontator/downvote_hover.png'",
-              :onmouseout => "this.src='/assets/commontator/downvote.png'" %>
-      <% end %>
-    <% elsif can_vote %>
-      <%= form_tag commontator.unvote_comment_path(comment),
-            :method => :put,
-            :remote => true do %>
-        <%= image_submit_tag "commontator/downvote_hover.png",
-              :onmouseover => "this.src='/assets/commontator/downvote.png'",
-              :onmouseout => "this.src='/assets/commontator/downvote_hover.png'" %>
-      <% end %>
-    <% else %>
-      <%= image_tag "commontator/downvote_hover.png" %>
-    <% end %>
-  </span>
-<% end %>

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

@@ -1,17 +0,0 @@
-$("#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.is_modified? ? " by #{commontator_name(comment.editor)}" : '')) %>");
-                                                           
-$("#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}) %>");
-
-<%= javascript_proc %>

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

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

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

@@ -1,16 +0,0 @@
-<% # Clients of this partial must supply the following variable:
-   # thread
-   # user
-%>
-
-<% is_subscribed = thread.is_subscribed?(user) %>
-<% sub_string = is_subscribed ? "unsubscribe" : "subscribe" %>
-<%= link_to sub_string.capitalize,
-            commontator.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/threads/_show.html.erb~

@@ -1,62 +0,0 @@
-<% # Clients of this partial must supply the following variables:
-   # thread
-   # user
-%>
-
-<% 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.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,
-                             :user => user} %>
-    </span>
-  <% end %>
-  
-  &nbsp;
-
-  <% if can_edit %>
-    <% is_closed = thread.is_closed? %>
-    <% close_string = is_closed ? "reopen" : "close" %>
-    <%= link_to close_string.capitalize,
-                commontator.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 %>
-</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?(user) %>
-    <%= render :partial => 'commontator/comments/show',
-               :locals => {:comment => comment,
-                           :user => user} %>
-  <% end %>
-</div>
-
-<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,
-        commontator.new_thread_comment_path(thread), :remote => true %>
-  </span>
-  
-<% end %>

data/config/initializers/commontator.rb~

@@ -1,171 +0,0 @@
-# Change the settings below to suit your needs
-# All settings are initially set to their default values
-Commontator.configure do |config|
-  # Engine Configuration
-
-  # Name of the ApplicationController helper method that returns the current user
-  # Default: 'current_user'
-  config.current_user_method = 'current_user'
-
-  # Proc that is called after any javascript runs (e.g. to display/clear flash messages)
-  # It is passed the view_context object (self 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)
-  # However, be aware that it does not have access to the main application's helpers
-  # 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();' }
-
-
-  # User (acts_as_commontator) Configuration
-  
-  # The name used if the user's name cannot be retrieved
-  # Default: 'Anonymous'
-  config.user_missing_name = 'Anonymous'
-
-  # Whether the comment creator's name is clickable in the comment view
-  # If enabled, the link will point to the comment creator's show page
-  # Default: false
-  config.user_name_clickable = false
-
-  # The method that returns the user's email address
-  # Default: 'email'
-  config.user_email_method = 'email'
-
-  # The method that returns the user's name
-  # Default: '' (use user_missing_name)
-  config.user_name_method = ''
-
-  # Proc called with user as argument that returns true if the user is an admin
-  # Admins can always delete other users' comments and close threads
-  # Note: user can be nil
-  # Default: lambda { |user| false } (no admins)
-  config.user_admin_proc = lambda { |user| false }
-  
-  # Proc called with user as argument that returns true
-  # if the user should receive subscription emails
-  # Default: lambda { |user| true } (always receive subscription emails)
-  config.subscription_email_enable_proc = lambda { |user| true }
-
-
-  # Commontable (acts_as_commontable) Configuration
-
-  # What a comment is called in your application
-  # Default: 'comment'
-  config.comment_name = 'comment'
-
-  # Verb used when creating comments (present)
-  # Default: 'post'
-  config.comment_create_verb_present = 'post'
-
-  # Verb used when creating comments (past)
-  # Default: 'posted'
-  config.comment_create_verb_past = 'posted'
-
-  # Verb used when editing comments (present)
-  # Default: 'modify'
-  config.comment_edit_verb_present = 'modify'
-
-  # Verb used when editing comments (past)
-  # Default: 'modified'
-  config.comment_edit_verb_past = 'modified'
-
-  # What a commontable is called in your application
-  # If you have multiple commontable models,
-  # you will want to pass this configuration value
-  # as an argument to acts_as_commontable in each one
-  # Default: 'commontable'
-  config.commontable_name = 'commontable'
-
-  # The format of the timestamps used by Commontator
-  # Default: '%b %d %Y, %I:%M %p'
-  config.timestamp_format = '%b %d %Y, %I:%M %p'
-
-  # Whether admins can edit other users' comments
-  # Default: false
-  config.admin_can_edit_comments = false
-
-  # Whether users automatically subscribe to a thread when commenting
-  # Default: false
-  config.auto_subscribe_on_comment = false
-
-  # Whether users can edit their own comments
-  # Default: true
-  config.can_edit_own_comments = true
-
-  # Whether users can edit their own comments
-  # after someone posted a newer comment
-  # Default: false
-  config.can_edit_old_comments = false
-
-  # Whether users can delete their own comments
-  # Default: true
-  config.can_delete_own_comments = true
-
-  # Whether users can delete their own comments
-  # after someone posted a newer comment
-  # Default: false
-  config.can_delete_old_comments = false
-
-  # Whether users can manually subscribe or unsubscribe to threads
-  # Default: true
-  config.can_subscribe_to_thread = true
-
-  # Whether users can vote on other users' comments
-  # Note: requires acts_as_votable gem installed
-  # and configured for your application
-  # Default: false
-  config.can_vote_on_comments = false
-
-  # Whether comments should be ordered by vote score
-  # instead of by order posted
-  # Default: false
-  config.comments_ordered_by_votes = false
-
-  # Whether users can read threads closed by moderators
-  # Default: true
-  config.closed_threads_are_readable = true
-
-  # Whether comments deleted by moderators can be seen
-  # (the content will still be hidden)
-  # Default: true
-  config.deleted_comments_are_visible = true
-
-  # The method which returns the commontable's id, sent to users in email messages
-  # Default: 'id'
-  config.commontable_id_method = 'id'
-
-  # Proc called with thread and user as arguments
-  # If it returns true, that user is a moderator for that particular thread
-  # and is given admin-like capabilities for that thread only
-  # Note: user can be nil
-  # Default: lambda { |thread, user| false } (no thread-specific moderators)
-  config.can_edit_thread_proc = lambda { |thread, user| false }
-
-  # Proc called with thread and user as arguments
-  # If it returns true, that user is allowed to read that thread
-  # Note: user can be nil
-  # Default: lambda { |thread, user| true } (no read restrictions)
-  config.can_read_thread_proc = lambda { |thread, user| true }
-
-  # 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 'from' address
-  # Default:
-  # lambda { |params| 'no-reply@example.com' }
-  config.subscription_email_from_proc = lambda { |params| 'no-reply@example.com' }
-
-  # Proc that returns the subscription email 'subject' string
-  # Default:
-  # lambda do |params|
-  #   "#{params[:creator_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 = lambda do |params|
-    "#{params[:creator_name]} #{params[:config].comment_create_verb_past} a " + \
-    "#{params[:config].comment_name} on #{params[:commontable_name]} #{params[:commontable_id]}"
-  end
-end