From b7389adced4b0217ce2b884be9a2a0a02b2799d6 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Thu, 22 Dec 2011 18:29:43 +0100
Subject: [PATCH] SONAR-3086 improve usability of review forms

---
 .../app/views/project_reviews/_review.html.erb       |  4 ++--
 .../WEB-INF/app/views/resource/_violation.html.erb   | 11 -----------
 sonar-server/src/main/webapp/javascripts/resource.js | 12 ++----------
 sonar-server/src/main/webapp/stylesheets/style.css   |  9 ++++++---
 4 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project_reviews/_review.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project_reviews/_review.html.erb
index dfae7b2a1ee..66832ee83dd 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project_reviews/_review.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project_reviews/_review.html.erb
@@ -59,9 +59,9 @@
         <%= message('status') -%>:
       </td>
       <td class="val">
-        <%= image_tag "status/#{review.status}.png" -%> <%= message("reviews.status.#{review.status}") -%>
+        <%= image_tag "status/#{review.status}.png" -%> <span class="reviewStatus<%= @review.status -%>"><%= message("reviews.status.#{review.status}") -%></span>
         <% if @review.resolution.present? %>
-          <span class="reviewResolution<%= @review.resolution -%>">(<%= message("reviews.resolution.#{@review.resolution}") -%>)</span>
+          (<span class="reviewResolution<%= @review.resolution -%>"><%= message("reviews.resolution.#{@review.resolution}") -%></span>)
         <% end %>
       </td>
       <td class="key">
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_violation.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_violation.html.erb
index 5eb274529cd..b58a030aa0d 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_violation.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_violation.html.erb
@@ -11,11 +11,6 @@
 
       <img src="<%= ApplicationController.root_context -%>/images/priority/<%= violation.failure_level -%>.png">
       &nbsp;
-      <% if violation.review && violation.review.manual_severity && violation.review.severity!=violation.severity %>
-        <img src="<%= ApplicationController.root_context -%>/images/priority/<%= violation.review.severity -%>.png">
-        &nbsp;
-      <% end %>
-
       <img src="<%= ApplicationController.root_context -%>/images/sep12.png">
       &nbsp;
       <span class="rulename">
@@ -41,12 +36,6 @@
         <span class="reviewResolved"><%= message('reviews.status.RESOLVED') -%></span>
         &nbsp;
       <% end %>
-      <% if violation.review && violation.review.reopened? %>
-        <img src="<%= ApplicationController.root_context -%>/images/sep12.png">
-        &nbsp;
-        <span class="reviewReopened"><%= message('reviews.status.REOPENED') -%></span>
-        &nbsp;
-      <% end %>
       <% if violation.review && violation.review.assignee_id %>
         <img src="<%= ApplicationController.root_context -%>/images/sep12.png">
         &nbsp;
diff --git a/sonar-server/src/main/webapp/javascripts/resource.js b/sonar-server/src/main/webapp/javascripts/resource.js
index 11e8627b59f..88b6dffd7e2 100644
--- a/sonar-server/src/main/webapp/javascripts/resource.js
+++ b/sonar-server/src/main/webapp/javascripts/resource.js
@@ -22,11 +22,7 @@ function loadGWT(gwtId, resourceId, resourceKey, resourceName, resourceScope, re
 
 // show violation actions
 function sVA(violation_id) {
-  var elt = $('vMsg' + violation_id);
-  if (elt != null) {
-    elt.hide();
-  }
-  elt = $('vActions' + violation_id);
+  var elt = $('vActions' + violation_id);
   if (elt != null) {
     elt.show();
   }
@@ -35,11 +31,7 @@ function sVA(violation_id) {
 
 // hide violation actions
 function hVA(violation_id) {
-  var elt = $('vMsg' + violation_id);
-  if (elt != null) {
-    elt.show();
-  }
-  elt = $('vActions' + violation_id);
+  var elt = $('vActions' + violation_id);
   if (elt != null) {
     elt.hide();
   }
diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index e4e0dac9717..631cd09921f 100644
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -856,6 +856,7 @@ ul.operations li img {
   background-color: #FFF;
   margin: 0;
   border: 1px solid #DDD;
+  font-size: 12px;
 }
 
 .sources2 div.violation .actions, #global_violations div.violation .actions {
@@ -913,7 +914,6 @@ span.rulename, span.rulename a {
 div.review_permalink {
   float: right;
   color: #333333;
-  font-size: 12px;
   font-weight: bold;
   margin: 0;
   padding: 0 10px;
@@ -921,16 +921,19 @@ div.review_permalink {
 }
 
 div.vActions {
+  position: absolute;
   line-height: 1.5em;
   height: 1.5em;
+  padding-right: 10px;
   max-height: 1.5em;
+  background-color: #F4F4F4;
+  box-shadow: 10px 10px 10px #EFEFEF;
 }
 
 span.review_permalink a {
   color: #777;
-  font-size: 90%;
+  font-size: 11px;
   padding: 0 0 0 20px;
-  background: url('../images/zoom.png') no-repeat left;
 }
 
 span.rulename a:hover {
-- 
2.39.5