merge branch changeable-votes

app/views/comment_votes/create.js.erb

@@ -4,6 +4,7 @@
   <% if @comment_vote.is_negative? %>
     $(".comment[data-comment-id=<%= @comment.id %>]").remove();
   <% end %>
-  $("#comment-vote-up-link-for-<%= @comment.id %>").remove();
-  $("#comment-vote-down-link-for-<%= @comment.id %>").remove();
 <% end %>
+$("#comment-vote-up-link-for-<%= @comment.id %>").hide();
+$("#comment-vote-down-link-for-<%= @comment.id %>").hide();
+$("#comment-unvote-link-for-<%= @comment.id %>").show();

app/views/comments/partials/show/_comment.html.erb

@@ -24,6 +24,7 @@
           <% end %>
           <li id="comment-vote-up-link-for-<%= comment.id %>"><%= link_to "Vote up", comment_votes_path(:comment_id => comment.id, :score => "up"), :method => :post, :remote => true %></li>
           <li id="comment-vote-down-link-for-<%= comment.id %>"><%= link_to "Vote down", comment_votes_path(:comment_id => comment.id, :score => "down"), :method => :post, :remote => true %></li>
+          <li id="comment-unvote-link-for-<%= comment.id %>" class="unvote-comment-link"><%= link_to "Unvote", unvote_comment_path(comment.id), :method => :put, :remote => true %></li>
         <% end %>
       </menu>
       <% if comment.editable_by?(CurrentUser.user) %>

app/views/comments/unvote.js.erb

@@ -0,0 +1,7 @@
+<% if @error %>
+  Danbooru.error("<%= j @error.to_s %>");
+<% else %>
+  $("#comment-vote-up-link-for-<%= @comment.id %>").show();
+  $("#comment-vote-down-link-for-<%= @comment.id %>").show();
+  $("#comment-unvote-link-for-<%= @comment.id %>").hide();
+<% end %>

app/views/post_votes/create.js.erb

@@ -4,3 +4,5 @@
   Danbooru.notice("Vote saved");
   $("#score-for-post-<%= @post.id %>").html(<%= @post.score %>);
 <% end %>
+$("#vote-links-for-post-<%= @post.id %>").hide();
+$("#unvote-link-for-post-<%= @post.id %>").show();

app/views/posts/partials/show/_information.html.erb

@@ -13,7 +13,7 @@
   </li>
   <li>Source: <%= post_source_tag(post) %></li>
   <li>Rating: <%= post.pretty_rating %></li>
-  <li>Score: <span id="score-for-post-<%= post.id %>"><%= post.score %></span> <% if CurrentUser.is_gold? %>(vote <%= link_to "up", post_votes_path(:post_id => post.id, :score => "up"), :remote => true, :method => :post %>/<%= link_to "down", post_votes_path(:post_id => post.id, :score => "down"), :remote => true, :method => :post %>)<% end %></li>
+  <li>Score: <span id="score-for-post-<%= post.id %>"><%= post.score %></span> <% if CurrentUser.is_gold? %>(<span id="vote-links-for-post-<%= post.id %>">vote <%= link_to "up", post_votes_path(:post_id => post.id, :score => "up"), :remote => true, :method => :post %>/<%= link_to "down", post_votes_path(:post_id => post.id, :score => "down"), :remote => true, :method => :post %></span><%= link_to "unvote", unvote_post_path(post), :remote => true, :method => :put, :id => "unvote-link-for-post-#{post.id}", :class => "unvote-post-link" %>)<% end %></li>
   <li>Favorites: <span id="favcount-for-post-<%= post.id %>"><%= post.fav_count %></span>
   <% if CurrentUser.is_gold? %>
     <%= link_to "&raquo;".html_safe, "#", :id => "show-favlist-link" %>

app/views/posts/unvote.js.erb

@@ -0,0 +1,8 @@
+<% if @error %>
+  Danbooru.notice("<%= j @error.to_s %>");
+<% else %>
+  Danbooru.notice("Unvoted successfully");
+  $("#score-for-post-<%= @post.id %>").html(<%= @post.score %>);
+<% end %>
+$("#vote-links-for-post-<%= @post.id %>").show();
+$("#unvote-link-for-post-<%= @post.id %>").hide();