From dfef40f18642685837b4e00e02669454cfe0ef3c Mon Sep 17 00:00:00 2001
From: Fabrice Bellingard <bellingard@gmail.com>
Date: Mon, 6 Feb 2012 16:23:35 +0100
Subject: [PATCH] SONAR-3242 The review buttons should not hide the violation
 title

---
 .../app/views/resource/_violation.html.erb    |  62 ++++++++++--------
 .../src/main/webapp/images/actions.png        | Bin 0 -> 657 bytes
 .../src/main/webapp/javascripts/resource.js   |  18 -----
 .../src/main/webapp/stylesheets/style.css     |  49 +++++++++++---
 4 files changed, 74 insertions(+), 55 deletions(-)
 create mode 100644 sonar-server/src/main/webapp/images/actions.png

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 cc4854d90b9..afd11c3d8ce 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
@@ -1,6 +1,4 @@
-<div id="vId<%= violation.id -%>"
-     <% if current_user -%>onmouseover="sVA(<%= violation.id -%>)" onmouseout="hVA(<%= violation.id -%>)"
-     <% end -%>>
+<div id="vId<%= violation.id -%>">
   <div class="violation">
     <div class="vtitle">
       <% if violation.review %>
@@ -18,7 +16,7 @@
       <img src="<%= ApplicationController.root_context -%>/images/sep12.png">
       &nbsp;
       <span class="rulename">
-        <a onclick="window.open(this.href,'rule','height=800,width=900,scrollbars=1,resizable=1');return false;" href="<%= url_for :controller => 'rules', :action => 'show', :id => violation.rule.key, :resource_id => @resource.id, :layout => 'false' -%>"><%= h(violation.rule.name) -%></a>
+        <a onclick="window.open(this.href,'rule','height=800,width=900,scrollbars=1,resizable=1');return false;" href="<%= url_for :controller => 'rules', :action => 'show', :id => violation.rule.key, :layout => 'false' -%>"><%= h(violation.rule.name) -%></a>
       </span>
       &nbsp;
       <img src="<%= ApplicationController.root_context -%>/images/sep12.png">
@@ -56,33 +54,43 @@
     </div>
 
     <div class="discussionComment first" id="vBody<%= violation.id -%>">
-      <% if current_user %>
-        <div style="display: none" class="vActions" id="vActions<%= violation.id -%>">
-          <%= button_to_function message('reviews.comment'), "sCF(#{violation.id})", :name => 'bComment' -%>
+      <div id="vMsg<%= violation.id -%>">
+        
+        <% if current_user %>
+          <img src="<%= ApplicationController.root_context -%>/images/actions.png" onclick="$('vActions<%= violation.id -%>').toggle();">
+          <div style="display: none" class="popup-menu" id="vActions<%= violation.id -%>" onmouseout="this.hide();"  onmouseover="this.show();">
+              <ul>
+                <li><%= link_to_function message('reviews.comment'), "sCF(#{violation.id})", :name => 'bComment' -%></li>
 
-          <% unless violation.review && violation.review.resolved? %>
-            <%= button_to_function message('reviews.assign'), "sAF(#{violation.id})", :name => 'bAssign' -%>
-          <% end %>
+                <% unless violation.review && violation.review.resolved? %>
+                <li><%= link_to_function message('reviews.assign'), "sAF(#{violation.id})", :name => 'bAssign' -%></li>
+                <% end %>
 
-          <% if !violation.switched_off? %>
-            <%= button_to_function (violation.review && violation.review.resolved? ? message('reviews.reopen') : message('reviews.resolved')),
-                                   "sCStF(#{violation.id})", :name => (violation.review && violation.review.resolved? ? 'bReopen' : 'bResolved') -%>
-          <% end %>
+                <% if !violation.switched_off? %>
+                <li><%= link_to_function (violation.review && violation.review.resolved? ? message('reviews.reopen') : message('reviews.resolved')),
+                                        "sCStF(#{violation.id})", :name => (violation.review && violation.review.resolved? ? 'bReopen' : 'bResolved') -%></li>
+                <% end %>
 
-          <% if violation.review.nil? || violation.review.can_change_false_positive_flag? %>
-            <%= button_to_function message(violation.switched_off? ? 'reviews.unflag_as_false_positive' : 'reviews.flag_as_false_positive'),
-                                   "sFPF(#{violation.id})",
-                                   :name => 'bFalsePositive' -%>
-          <% end %>
+                <% if violation.review.nil? || violation.review.can_change_false_positive_flag? %>
+                <li><%= link_to_function message(violation.switched_off? ? 'reviews.unflag_as_false_positive' : 'reviews.flag_as_false_positive'),
+                                       "sFPF(#{violation.id})",
+                                       :name => 'bFalsePositive' -%></li>
+                <% end %>
+  
+                <% unless violation.review && violation.review.resolved? %>
+                <li><%= link_to_function message('reviews.change_severity'), "sCSF(#{violation.id})", :name => 'bChangeSeverity' -%></li>
 
-          <% unless violation.review && violation.review.resolved? %>
-            <%= button_to_function message('reviews.change_severity'), "sCSF(#{violation.id})", :name => 'bChangeSeverity' -%>
-
-            <%= button_to_function message('reviews.link_to_action_plan'), "sAPF(#{violation.id})", :name => 'bLinkActionPlan' -%>
-          <% end %>
-        </div>
-      <% end %>
-      <div id="vMsg<%= violation.id -%>"><%= violation.html_message || '&nbsp;' -%></div>
+                <li><%= link_to_function message('reviews.link_to_action_plan'), "sAPF(#{violation.id})", :name => 'bLinkActionPlan' -%></li>
+                <% end %>
+              </ul>
+          </div>
+          &nbsp;
+          <%= image_tag 'sep12.png' -%>
+          &nbsp;
+        <% end %>
+      
+        <%= violation.html_message || '&nbsp;' -%>
+      </div>
     </div>
 
     <div class="discussionComment" id="reviewForm<%= violation.id -%>" style="display:none"></div>
diff --git a/sonar-server/src/main/webapp/images/actions.png b/sonar-server/src/main/webapp/images/actions.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0c364053bbf46067403c0e262905af596db09bd
GIT binary patch
literal 657
zcmV;C0&e|@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00075Nkl<Zc$|Hb
zKWLs+7{!0*=6yrc!8%BmHsVkeg(@OV(N0;Um_S=Z2mdS?#Y{z~Od({Aki{|3<)ek*
zAdv=><%16GP)PqMg@P3qL80;`^?UDo?>!E_U;7D?XSwIz=bZCA_qi92h<?9+vfuBY
zIEth3&EDQ#kThlc>BPjud{tH70mHU!XG$qgBpsidn>!rWgb~=;**PKU2T6~B4@xN)
z+qMmD+fJ2I-UpT?{l2@q`_=z;u)V$gMqStYooN9gaI8!J4NL(BeruZMm4$@`15^N8
zTU%<H=I2t%JxOnNCdZ!FVG6*uY+p+$sWU^pUhi~W*VlkU;5A7vb)u(|ZrYv(&H%Cv
z@Dp%g`%#SX(<-I(VJYRU@#{#sFKMBws$T(8N*~$2YP$wr?`ZGjoUc?((|j-KW8iH`
z_}?;D78e&Ej|?|AH?Nmc=7G<<Bip_XJgJ7m;RE1;q`Sa$m)#$q^k6U`gs?9?Yx0Ke
z&wx@5hr@G{dShZrDenPWBlf|;0h5!H?~WN<0Cs@ORgCex?U_-=wt#O|R#tv#+xCv6
zkW%`hlyZ5@0N{KGVX{go^>WT<Z3o-ufEnATfZM=B+b_l#r}bQYOVVRW59_-AQvl1$
z%POTP=llS8l_NsZw;_Zt*VfhwbYFROb=5J(Gcm@~F-BsH!x-aV9VW*3N4L6ZnoDil
zdSo~;0<*KTgOt*#obwB|=X1^>=RBKpw(U<!DL<x^&H`VrudhFQrT<I?U}<Sdw#hlq
r<(zK-gQ}`t4j~*$Vq;^&<NSXBQh-V-ERmUZ00000NkvXXu0mjfKXE%B

literal 0
HcmV?d00001

diff --git a/sonar-server/src/main/webapp/javascripts/resource.js b/sonar-server/src/main/webapp/javascripts/resource.js
index 88b6dffd7e2..d9c49459e7e 100644
--- a/sonar-server/src/main/webapp/javascripts/resource.js
+++ b/sonar-server/src/main/webapp/javascripts/resource.js
@@ -20,24 +20,6 @@ function loadGWT(gwtId, resourceId, resourceKey, resourceName, resourceScope, re
   modules[gwtId]();
 }
 
-// show violation actions
-function sVA(violation_id) {
-  var elt = $('vActions' + violation_id);
-  if (elt != null) {
-    elt.show();
-  }
-  return false;
-}
-
-// hide violation actions
-function hVA(violation_id) {
-  var elt = $('vActions' + violation_id);
-  if (elt != null) {
-    elt.hide();
-  }
-  return false;
-}
-
 // cancel action : hide form and refresh violation
 function cancelViolationAction(violation_id) {
   new Ajax.Updater(
diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index 2620e09769a..9aad013c58e 100644
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -419,6 +419,45 @@ button[disabled], .button[disabled], input[type="submit"][disabled], input[type=
   cursor: default;
 }
 
+.popup-menu {
+  background-clip: padding-box;
+  background-color: #FFFFFF;
+  border-color: rgba(0, 0, 0, 0.2);
+  border-style: solid;
+  border-width: 1px;
+  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -o-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  float: left;
+  margin: 0;
+  max-width: 220px;
+  min-width: 160px;
+  padding: 0px;
+  position: absolute;
+}
+
+.popup-menu li {
+  list-style-type: none !important;
+  padding: 2px 5px !important;
+  cursor: pointer !important;
+  color: red  !important;
+}
+
+.popup-menu li:hover {
+  background-color: #4b9fd5 !important;
+}
+
+.popup-menu li:hover a {
+  color: #fff !important;
+  font-weight: bold !important;
+}
+
+.popup-menu a {
+  text-decoration: none !important;
+  display: block !important;
+}
+
 /* ------------------- PAGE ------------------- */
 h1 {
   color: #444;
@@ -928,16 +967,6 @@ div.review_permalink {
   text-shadow: 1px 1px 0 #FFFFFF;
 }
 
-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: 11px;
-- 
2.39.5