From 1271b4ce66d4251f8f038d8d339fbecbab2d0900 Mon Sep 17 00:00:00 2001
From: Riyad Preukschas <riyad@informatik.uni-bremen.de>
Date: Sat, 8 Sep 2012 03:30:41 +0200
Subject: [PATCH] Update display of merge requests and issues to also show
 downvotes

---
 app/assets/stylesheets/common.scss            | 20 ++++++++++++++-----
 app/views/issues/_show.html.haml              |  2 ++
 app/views/issues/show.html.haml               |  6 ++++--
 .../merge_requests/_merge_request.html.haml   |  2 ++
 .../merge_requests/show/_mr_title.html.haml   |  6 ++++--
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index aa27a280..d52cb1fc 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -406,13 +406,23 @@ p.time {
   }
 }
 
-.upvotes {
+.votes {
   font-size: 14px;
   font-weight: bold;
-  color: #468847;
-  text-align: right;
-  padding: 4px;
-  margin: 2px;
+  padding: 4px 0;
+  margin: 2px 0;
+  .upvotes {
+    display: inline-block;
+    color: #468847;
+    padding: 0 4px;
+    margin: 0 2px;
+  }
+  .downvotes {
+    display: inline-block;
+    color: #B94A48;
+    padding: 0 4px;
+    margin: 0 2px;
+  }
 }
 
 /* Fix for readme code (stopped it from being yellow) */
diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml
index 8500cd40..e37ea3df 100644
--- a/app/views/issues/_show.html.haml
+++ b/app/views/issues/_show.html.haml
@@ -36,3 +36,5 @@
 
     - if issue.upvotes > 0
       %span.badge.badge-success= "+#{issue.upvotes}"
+    - if issue.downvotes > 0
+      %span.badge.badge-important= "-#{issue.downvotes}"
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index dce8cf6a..36af1f49 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -17,8 +17,10 @@
         Edit
 
     %br
-    - if @issue.upvotes > 0
-      .upvotes#upvotes= "+#{pluralize @issue.upvotes, 'upvote'}"
+      .votes#votes
+        Votes:
+        .upvotes#upvotes= "#{@issue.upvotes} up"
+        .downvotes#downvotes= "#{@issue.downvotes} down"
 
 .back_link
   = link_to project_issues_path(@project) do
diff --git a/app/views/merge_requests/_merge_request.html.haml b/app/views/merge_requests/_merge_request.html.haml
index 74996090..8d0a6dcf 100644
--- a/app/views/merge_requests/_merge_request.html.haml
+++ b/app/views/merge_requests/_merge_request.html.haml
@@ -25,3 +25,5 @@
     ago
     - if merge_request.upvotes > 0
       %span.badge.badge-success= "+#{merge_request.upvotes}"
+    - if merge_request.downvotes > 0
+      %span.badge.badge-important= "-#{merge_request.downvotes}"
diff --git a/app/views/merge_requests/show/_mr_title.html.haml b/app/views/merge_requests/show/_mr_title.html.haml
index 3ae1050d..f8ab6c19 100644
--- a/app/views/merge_requests/show/_mr_title.html.haml
+++ b/app/views/merge_requests/show/_mr_title.html.haml
@@ -24,8 +24,10 @@
           Edit
 
     %br
-    - if @merge_request.upvotes > 0
-      .upvotes#upvotes= "+#{pluralize @merge_request.upvotes, 'upvote'}"
+      .votes#votes
+        Votes:
+        .upvotes#upvotes= "#{@merge_request.upvotes} up"
+        .downvotes#downvotes= "#{@merge_request.downvotes} down"
 
 
 .back_link