commontator 1.0.3 → 1.0.4

data/README.md

@@ -95,6 +95,8 @@ Follow the steps below to add commontator to your models and views:
   Where commontable is an instance of some model that acts_as_commontable.
   Note that model's record must already exist in the database, so do not use this in new.html.erb, _form.html.erb or similar.
   We recommend you use this in the model's show.html.erb.
+  When you do this, it is up to you to ensure that the user has the proper permission
+  to read the thread or else a SecurityTransgression will be raised.
 
 3. Controllers
 

data/app/assets/stylesheets/commontator/comments.css

@@ -47,6 +47,8 @@
 
 .comment_votes {
   float: right;
+  
+  text-align: center;
 }
 
 .comment_votes input,
@@ -54,35 +56,9 @@
   border: none;
   background-color: transparent;
   padding: 0px;
-  margin: 5px;
-}
-
-.comment_upvote {
-  display: table;
-}
-
-.comment_upvote form {
-  display: table-cell;
-}
-
-.comment_downvote {
-  display: table;
+  margin: 0px;
 }
 
-.comment_downvote form {
-  display: table-cell;
-}
-
-.comment_upvote_count {
-  display: table-cell;
-  vertical-align: middle;
-  
-  padding-top: 1px;
-}
-
-.comment_downvote_count {
-  display: table-cell;
-  vertical-align: middle;
-  
-  padding-bottom: 7px;
+.comment_vote_count p {
+  margin: 0px;
 }

data/app/assets/stylesheets/commontator/comments.css~

@@ -15,6 +15,8 @@
   color: #000;
   border-color: #ddd;
   background-color: #fff;
+  
+  clear: both;
 }
 
 .comment_actions {
@@ -45,6 +47,8 @@
 
 .comment_votes {
   float: right;
+  
+  text-align: center;
 }
 
 .comment_votes input,
@@ -52,35 +56,9 @@
   border: none;
   background-color: transparent;
   padding: 0px;
-  margin: 5px;
-}
-
-.comment_upvote {
-  display: table;
-}
-
-.comment_upvote form {
-  display: table-cell;
-}
-
-.comment_downvote {
-  display: table;
-}
-
-.comment_downvote form {
-  display: table-cell;
+  margin: 0px;
 }
 
-.comment_upvote_count {
-  display: table-cell;
-  vertical-align: middle;
-  
-  padding-top: 1px;
-}
-
-.comment_downvote_count {
-  display: table-cell;
-  vertical-align: middle;
-  
-  padding-bottom: 7px;
+.comment_count p {
+  margin: 0px;
 }

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

@@ -27,12 +27,11 @@
     <% else %>
       <%= image_tag "commontator/upvote_hover.png" %>
     <% end %>
-    <span id="comment_<%= comment.id %>_upvote_count_span" class="comment_upvote_count">
-      <%= comment.upvotes.size %>
-    </span>
   </span>
 
-  <br/>
+  <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) %>
@@ -54,8 +53,5 @@
     <% else %>
       <%= image_tag "commontator/downvote_hover.png" %>
     <% end %>
-    <span id="comment_<%= comment.id %>_downvote_count_span" class="comment_downvote_count">
-      <%= comment.downvotes.size %>
-    </span>
   </span>
 <% end %>

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

@@ -0,0 +1,57 @@
+<% # 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.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 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 %> | - <%= 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/lib/commontator/version.rb

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/lib/commontator/version.rb~

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commontator
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -120,6 +120,7 @@ files:
 - app/mailers/commontator/subscriptions_mailer.rb
 - app/views/commontator/comments/_body.html.erb
 - app/views/commontator/comments/_show.html.erb~
+- app/views/commontator/comments/_votes.html.erb~
 - app/views/commontator/comments/_form.html.erb
 - app/views/commontator/comments/delete.js.erb
 - app/views/commontator/comments/vote.js.erb