commontator 4.11.1 → 5.0.0

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

@@ -4,7 +4,7 @@
 %>
 
 <% comments.includes(:creator, :editor).each do |comment| %>
-  <%= render :partial => 'commontator/comments/show',
-             :locals => { :comment => comment,
-                          :user => user } %>
+  <%= render partial: 'commontator/comments/show',
+             locals: { comment: comment,
+                          user: user } %>
 <% end %>

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

@@ -15,9 +15,9 @@
       <%= link.blank? ? name : link_to(name, link) %>
     </span>
     <span id="comment_<%= comment.id.to_s %>_actions_span" class="comment_actions">
-      <%= render :partial => 'commontator/comments/actions',
-                 :locals => { :comment => comment,
-                              :user => user } %>
+      <%= render partial: 'commontator/comments/actions',
+                 locals: { comment: comment,
+                              user: user } %>
     </span>
   </div>
   <div id="comment_<%= comment.id.to_s %>_middle_div" class="comment_div">
@@ -25,13 +25,13 @@
       <%= avatar %>
     </span>
     <span id="comment_<%= comment.id.to_s %>_votes_span" class="comment_votes">
-      <%= render :partial => 'commontator/comments/votes',
-                 :locals => { :comment => comment,
-                              :user => user } %>
+      <%= 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 } %>
+      <%= render partial: 'commontator/comments/body',
+                 locals: { comment: comment } %>
     </div>
   </div>
   <div id="comment_<%= comment.id.to_s %>_bottom_div" class="comment_div">

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

@@ -14,19 +14,19 @@
         class="comment_<%= vtype %>">
     <% if can_vote && (vote.blank? || !vote.vote_flag) %>
       <%= form_tag commontator.upvote_comment_path(comment),
-            :method => :put,
-            :remote => true do %>
+            method: :put,
+            remote: true do %>
         <%= image_submit_tag "commontator/upvote.png",
-              :onmouseover => "this.src='#{image_path("commontator/upvote_hover.png")}'",
-              :onmouseout => "this.src='#{image_path("commontator/upvote.png")}'" %>
+              onmouseover: "this.src='#{image_path("commontator/upvote_hover.png")}'",
+              onmouseout: "this.src='#{image_path("commontator/upvote.png")}'" %>
       <% end %>
     <% elsif can_vote %>
       <%= form_tag commontator.unvote_comment_path(comment),
-            :method => :put,
-            :remote => true do %>
+            method: :put,
+            remote: true do %>
         <%= image_submit_tag "commontator/upvote_active.png",
-              :onmouseover => "this.src='#{image_path("commontator/upvote.png")}'",
-              :onmouseout => "this.src='#{image_path("commontator/upvote_active.png")}'"
+              onmouseover: "this.src='#{image_path("commontator/upvote.png")}'",
+              onmouseout: "this.src='#{image_path("commontator/upvote_active.png")}'"
         %>
       <% end %>
     <% else %>
@@ -45,19 +45,19 @@
   <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 %>
+            method: :put,
+            remote: true do %>
         <%= image_submit_tag "commontator/downvote.png",
-              :onmouseover => "this.src='#{image_path("commontator/downvote_hover.png")}'",
-              :onmouseout => "this.src='#{image_path("commontator/downvote.png")}'" %>
+              onmouseover: "this.src='#{image_path("commontator/downvote_hover.png")}'",
+              onmouseout: "this.src='#{image_path("commontator/downvote.png")}'" %>
       <% end %>
     <% elsif can_vote %>
       <%= form_tag commontator.unvote_comment_path(comment),
-            :method => :put,
-            :remote => true do %>
+            method: :put,
+            remote: true do %>
         <%= image_submit_tag "commontator/downvote_active.png",
-              :onmouseover => "this.src='#{image_path("commontator/downvote.png")}'",
-              :onmouseout => "this.src='#{image_path("commontator/downvote_active.png")}'"
+              onmouseover: "this.src='#{image_path("commontator/downvote.png")}'",
+              onmouseout: "this.src='#{image_path("commontator/downvote_active.png")}'"
         %>
       <% end %>
     <% else %>

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

@@ -1,15 +1,15 @@
 <% unless @comment.try(:id).blank? %>
   <% @comment.reload %>
   $("#comment_<%= @comment.id.to_s %>_body_div").html("<%= escape_javascript(
-    render :partial => 'body', :locals => { :comment => @comment }) %>");
+    render partial: 'body', locals: { comment: @comment }) %>");
 <% end %>
 
 <% 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 }) %>");
+    render partial: 'form',
+           locals: { comment: @new_comment,
+                        thread: @thread,
+                        per_page: @per_page }) %>");
 <% else %>
   $("#thread_<%= @thread.id %>_new_comment_form_div").hide();
 

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

@@ -1,15 +1,15 @@
-<%= 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: @thread,
+                        user: @user,
+                        page: @thread.new_comment_page(@per_page),
+                        per_page: @per_page } %>
 
 <% 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 }) %>");
+    render partial: 'form',
+           locals: { comment: @new_comment,
+                        thread: @thread,
+                        per_page: @per_page }) %>");
 <% else %>
   $("#thread_<%= @thread.id %>_new_comment_form_div").hide();
 

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

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

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

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

@@ -1,8 +1,8 @@
 $("#thread_<%= @thread.id %>_new_comment_form_div").html("<%= escape_javascript(
-  render :partial => 'form',
-         :locals => { :comment => @comment,
-                      :thread => @thread,
-                      :per_page => @per_page }) %>");
+  render partial: 'form',
+         locals: { comment: @comment,
+                      thread: @thread,
+                      per_page: @per_page }) %>");
 
 $("#thread_<%= @thread.id %>_new_comment_form_div").fadeIn()[0].scrollIntoView();
 

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

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

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

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

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

@@ -6,16 +6,16 @@
 <% if thread.can_be_read_by?(user) %>
   <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,
-                              :page => @commontator_page,
-                              :per_page => @commontator_per_page } %>
+      <%= render partial: 'commontator/threads/show',
+                 locals: { thread: thread,
+                              user: user,
+                              page: @commontator_page,
+                              per_page: @commontator_per_page } %>
     <% 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})",
                   commontator.thread_path(thread),
-                  :remote => true %>
+                  remote: true %>
     <% end %>
   </div>
 <% end %>

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

@@ -7,9 +7,9 @@
 <% 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') : \
+            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",
-            :remote => true %>
+            method: :put,
+            id: "thread_#{thread.id.to_s}_#{sub_string}_link",
+            class: "thread_#{sub_string}_link",
+            remote: true %>

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

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

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

@@ -1,10 +1,10 @@
 <h4><%= t 'commontator.email.comment_created.body',
-          :creator_name => @creator_name,
-          :commontable_name => @commontable_name %></h4>
+          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>
+         comment_url: @comment_url,
+         commontable_name: @commontable_name %></p>

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

@@ -14,18 +14,18 @@
     <div id="thread_<%= thread.id %>_new_comment_form_div" class="thread_new_comment_form<%=
     hidden_class %>">
       <% unless @new_comment.nil? %>
-        <%= render :partial => 'commontator/comments/form',
-                   :locals => { :comment => @new_comment,
-                                :thread => thread,
-                                :per_page => per_page } %>
+        <%= render partial: 'commontator/comments/form',
+                   locals: { comment: @new_comment,
+                                thread: thread,
+                                per_page: per_page } %>
       <% end %>
     </div>
 
     <% if @new_comment.nil? %>
       <div id="thread_<%= thread.id %>_new_comment_link_div" class="thread_new_comment_link">
         <%= link_to t('commontator.comment.actions.new'),
-            commontator.new_thread_comment_path(thread, :per_page => per_page),
-            :remote => true %>
+            commontator.new_thread_comment_path(thread, per_page: per_page),
+            remote: true %>
       </div>
     <% end %>
   <% end %>

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

@@ -30,9 +30,9 @@
 
     <% 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 } %>
+        <%= render partial: 'commontator/subscriptions/link',
+                   locals: { thread: thread,
+                                user: user } %>
       </span>
     <% end %>
 
@@ -45,70 +45,70 @@
 
       <% if thread.is_filtered? %>
         <%= link_to t("commontator.thread.actions.#{filter_string}"),
-                    commontator.thread_path(thread, :show_all => (show_all ? nil : true)),
-                    :id => "thread_#{thread.id.to_s}_#{filter_string}_link",
-                    :class => "thread_#{filter_string}_link",
-                    :remote => true %>
+                    commontator.thread_path(thread, show_all: (show_all ? nil : true)),
+                    id: "thread_#{thread.id.to_s}_#{filter_string}_link",
+                    class: "thread_#{filter_string}_link",
+                    remote: true %>
 
         &nbsp;
       <% end %>
 
       <%= link_to t("commontator.thread.actions.#{close_string}"),
                   commontator.polymorphic_path([close_string, thread]),
-                  :confirm => (!is_closed ? t('commontator.thread.actions.confirm_close') : nil),
-                  :method => :put,
-                  :id => "thread_#{thread.id.to_s}_#{close_string}_link",
-                  :class => "thread_#{close_string}_link",
-                  :remote => true %>
+                  confirm: (!is_closed ? t('commontator.thread.actions.confirm_close') : nil),
+                  method: :put,
+                  id: "thread_#{thread.id.to_s}_#{close_string}_link",
+                  class: "thread_#{close_string}_link",
+                  remote: true %>
     <% end %>
   </span>
 
   <span id="thread_<%= thread.id.to_s %>_header_span" class="thread_header">
     <%= t "commontator.thread.status.#{thread.is_closed? ? 'closed' : 'open'}",
-          :closer_name => (thread.is_closed? ? Commontator.commontator_name(thread.closer) : '') %>
+          closer_name: (thread.is_closed? ? Commontator.commontator_name(thread.closer) : '') %>
   </span>
 
   <% if thread.config.comment_order == :l %>
-    <%= render :partial => 'commontator/threads/reply',
-               :locals => { :thread => thread, :user => user, :per_page => per_page } %>
+    <%= render partial: 'commontator/threads/reply',
+               locals: { thread: thread, user: user, per_page: per_page } %>
   <% end %>
 
   <div id="thread_<%= thread.id.to_s %>_comment_list_div" class="thread_comment_list">
     <% comments = show_all ? thread.ordered_comments(true) : \
                              thread.paginated_comments(page, per_page) %>
-    <%= render :partial => 'commontator/comments/list',
-               :locals => { :comments => comments,
-                            :user => user } %>
+    <%= render partial: 'commontator/comments/list',
+               locals: { comments: comments,
+                            user: user } %>
   </div>
 
   <% if thread.will_paginate? && !show_all %>
     <div id="thread_<%= thread.id.to_s %>_pagination_div" class="thread_pagination">
       <div id="thread_<%= thread.id.to_s %>_page_entries_info_div" class="thread_page_entries_info">
         <%= page_entries_info comments,
-                              :params => { :controller => 'commontator/threads',
-                                           :action => 'show',
-                                           :id => thread.id,
-                                           :page => page,
-                                           :per_page => per_page } %>.
+                              params: { controller: 'commontator/threads',
+                                           action: 'show',
+                                           id: thread.id,
+                                           page: page,
+                                           per_page: per_page } %>.
       </div>
 
       <div id="thread_<%= thread.id.to_s %>_will_paginate_div" class="thread_will_paginate">
         <%= will_paginate comments,
-                          :renderer => Commontator::LinkRenderer,
-                          :routes_proxy => commontator,
-                          :remote => true,
-                          :params => { :controller => 'commontator/threads',
-                                       :action => 'show',
-                                       :id => thread.id,
-                                       :page => page,
-                                       :per_page => per_page } %>
+                          renderer: Commontator::LinkRenderer,
+                          routes_proxy: commontator,
+                          remote: true,
+                          params: { controller: 'commontator/threads',
+                                       action: 'show',
+                                       id: thread.id,
+                                       page: page,
+                                       per_page: per_page } %>
       </div>
     </div>
   <% end %>
 
   <% if thread.config.comment_order != :l %>
-    <%= render :partial => 'commontator/threads/reply',
-               :locals => { :thread => thread, :user => user, :per_page => per_page } %>
+    <%= render partial: 'commontator/threads/reply',
+               locals: { thread: thread, user: user, per_page: per_page } %>
   <% end %>
 </span>
 

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

@@ -9,10 +9,10 @@
 
 $("#thread_<%= thread.id %>_div").html(
   "<%= escape_javascript(
-    render :partial => 'commontator/threads/show',
-           :formats => [:html],
-           :locals => { :thread => thread,
-                        :user => user,
-                        :page => page,
-                        :per_page => per_page,
-                        :show_all => show_all }) %>");
+    render partial: 'commontator/threads/show',
+           formats: [:html],
+           locals: { thread: thread,
+                        user: user,
+                        page: page,
+                        per_page: per_page,
+                        show_all: show_all }) %>");

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

@@ -1,8 +1,8 @@
-<%= render :partial => 'show',
-           :locals => { :thread => @thread,
-                        :user => @user,
-                        :page => @commontator_page,
-                        :per_page => @commontator_per_page,
-                        :show_all => @show_all } %>
+<%= render partial: 'show',
+           locals: { thread: @thread,
+                        user: @user,
+                        page: @commontator_page,
+                        per_page: @commontator_per_page,
+                        show_all: @show_all } %>
 
 <%= javascript_proc %>