From e5220956e1fba2afb839760c41aa195abe05d54d Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Fri, 22 Jul 2011 17:49:34 +0200
Subject: [PATCH] SONAR-2547 display metric domains

---
 .../app/controllers/manual_measures_controller.rb        | 3 ++-
 .../WEB-INF/app/views/manual_measures/new.html.erb       | 9 +++------
 sonar-server/src/main/webapp/stylesheets/style.css       | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/manual_measures_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/manual_measures_controller.rb
index 255a436722a..c30fa98c1ad 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/manual_measures_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/manual_measures_controller.rb
@@ -22,7 +22,8 @@ class ManualMeasuresController < ApplicationController
   SECTION=Navigation::SECTION_RESOURCE
   before_filter :load_resource
   verify :method => :post, :only => [:save, :delete], :redirect_to => {:action => :index}
-
+  helper MetricsHelper
+  
   def index
     load_measures()
   end
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/new.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/new.html.erb
index 5492e84df4c..e3974c5f06e 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/new.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/new.html.erb
@@ -8,7 +8,7 @@
     return true;
   }
 </script>
-
+<h1 class="marginbottom10">Add manual measure</h1>
 <form action="<%= url_for :action => (@measure ? 'save' : 'new') -%>" method="POST" id="createForm">
   <input type="hidden" name="id" value="<%= @resource.id -%>"/>
   <table class="width100 form">
@@ -19,12 +19,9 @@
       </td>
       <td>
         <select name="metric" onchange="changeMetric();" id="metricSelect">
-          <option value="">Select metric</option>
-          <% Metric.all.select { |m| m.user_managed? }.sort.each do |metric| %>
-            <option value="<%= metric.key -%>" <%= 'selected' if @metric && @metric.id==metric.id -%>><%= metric.short_name -%></option>
-          <% end %>
+          <%= options_grouped_by_domain(Metric.all.select { |m| m.user_managed? }, (@metric ? @metric.key : nil), :include_empty => true) -%>
         </select>
-        <%= link_to 'Manage metrics', :controller => 'metrics', :action => 'index' -%>
+        <%= link_to 'Manage metrics', :controller => 'metrics', :action => 'index' if has_role?(:admin)-%>
 
         <% if @metric && @metric.description %>
           <br/>
diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index 49d3332679c..39f88114558 100644
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -1330,7 +1330,7 @@ option.sev_BLOCKER {
 /* ------------------- HELP ------------------- */
 .help {
   border: 1px solid #DDD;
-  background-color: #ECECEC;
+  background-color: #F4F4F4;
   color: #444;
   padding: 5px;
 }
-- 
2.39.5