From cbc56a96ace7f89c1eca260ca0a29ad140d27a99 Mon Sep 17 00:00:00 2001
From: Ariejan de Vroom <ariejan@ariejan.net>
Date: Thu, 15 Mar 2012 13:03:56 +0200
Subject: [PATCH] Updated upvotes view for issue and merge request show

---
 app/assets/stylesheets/common.scss      | 9 +++++++++
 app/views/issues/show.html.haml         | 4 ++--
 app/views/merge_requests/show.html.haml | 4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 6be40104b6e..ee06ca6d250 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -926,3 +926,12 @@ p.time {
   font-style: italic;
   color: #999;
 }
+
+.upvotes {
+  font-size: 14px;
+  font-weight: bold;
+  color: #468847;
+  text-align: right;
+  padding: 4px;
+  margin: 2px;
+}
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 7399697198d..ab0e82c6b98 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -14,9 +14,9 @@
       = link_to edit_project_issue_path(@project, @issue), :class => "btn" do 
         Edit
 
+    %br
     - if @issue.upvotes > 0
-      = link_to "#notes", :class => "btn success" do
-        +#{@issue.upvotes}
+      .upvotes#upvotes= "+#{pluralize @issue.upvotes, 'upvote'}"
       
 
 .back_link
diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml
index 77bb6120ec7..6b9ade455b2 100644
--- a/app/views/merge_requests/show.html.haml
+++ b/app/views/merge_requests/show.html.haml
@@ -18,9 +18,9 @@
       = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn" do 
         Edit
 
+    %br
     - if @merge_request.upvotes > 0
-      = link_to "#notes", :class => "btn success" do
-        +#{@merge_request.upvotes}
+      .upvotes#upvotes= "+#{pluralize @merge_request.upvotes, 'upvote'}"
 
 .back_link
   = link_to project_merge_requests_path(@project) do