SONAR-6196 Update UI of measures page

5 files changed, 15 insertions, 21 deletions

diff --git a/server/sonar-web/src/main/less/components/navigator/base.less b/server/sonar-web/src/main/less/components/navigator/base.less
index 9b448f74e4b..29f7d7f2dba 100644
--- a/server/sonar-web/src/main/less/components/navigator/base.less
+++ b/server/sonar-web/src/main/less/components/navigator/base.less
@@ -21,7 +21,6 @@
 
 .navigator-filters {
   position: relative;
-  margin: @navigatorPadding;
   border: 1px solid @navigatorBorderLightColor;
   .box-sizing(border-box);
 }
@@ -72,7 +71,7 @@
 
 .navigator-details {
   position: relative;
-  margin: 0 @navigatorPadding @navigatorPadding;
+  margin: @navigatorPadding 0 0 0;
 }
 
 .navigator-resizer {
@@ -95,7 +94,6 @@
 
 .measures-page {
   .navigator-details { overflow: visible; }
-  .page { padding: 0 0 0 @navigatorPadding; }
 }
 
 
diff --git a/server/sonar-web/src/main/less/components/navigator/filters.less b/server/sonar-web/src/main/less/components/navigator/filters.less
index 7c56f015d96..67fbac25279 100644
--- a/server/sonar-web/src/main/less/components/navigator/filters.less
+++ b/server/sonar-web/src/main/less/components/navigator/filters.less
@@ -312,9 +312,7 @@
 }
 
 .navigator-filter-favorite {
-  position: absolute;
-  top: -@navigatorPadding - @navigatorFiltersHeight;
-  left: 0;
+  position: relative;
 }
 
 .navigator-filter-favorite-toggle {
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_search_body.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_search_body.html.erb
index d1370ecc8b8..ac365ce8836 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_search_body.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_search_body.html.erb
@@ -6,7 +6,5 @@
       <p class="notes"><%= message('results_not_display_due_to_security') -%></p>
     <% end %>
 
-    <div class="page">
-      <%= render :partial => 'measures/display', :locals => {:filter => @filter, :edit_mode => edit_mode, :widget_id => nil} -%>
-    </div>
+  <%= render :partial => 'measures/display', :locals => {:filter => @filter, :edit_mode => edit_mode, :widget_id => nil} -%>
 <% end %>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_search_header.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_search_header.html.erb
index de527f0ed81..fa098e97750 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_search_header.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_search_header.html.erb
@@ -46,20 +46,20 @@
         <% end %>
       <% end %>
     </div>
-  </div>
 
-  <% unless edit_mode %>
-    <% if @filter.display %>
-      <div class="navigator-header-actions button-group">
-        <button id="change-display" onclick="window.location='<%= url_for @filter.criteria.merge({:action => 'search', :edit => true, :id => @filter.id}) -%>';"><%= message("measure_filter.#{@filter.display.key}.change") -%></button>
-      </div>
+    <% unless edit_mode %>
+      <% if @filter.display %>
+        <div class="button-group">
+          <button id="change-display" onclick="window.location='<%= url_for @filter.criteria.merge({:action => 'search', :edit => true, :id => @filter.id}) -%>';"><%= message("measure_filter.#{@filter.display.key}.change") -%></button>
+        </div>
+      <% end %>
     <% end %>
-  <% end %>
+  </div>
 
   <% if @filter.description.present? %>
-    <div id="filter-description" class="navigator-header-description"><%= h @filter.description -%></div>
+    <div id="filter-description" class="page-description"><%= h @filter.description -%></div>
   <% end %>
 
 <% else %>
-  <h1 class="navigator-header-title"><%= message('layout.measures') -%></h1>
+  <h1 class="page-title"><%= message('layout.measures') -%></h1>
 <% end %>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/search.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
index bf9ad6c0345..bbdaaeb8b22 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
@@ -3,10 +3,10 @@
 <% end %>
 
 
-<div class="navigator">
-  <div class="navigator-header">
+<div class="page">
+  <header class="page-header">
     <%= render :partial => 'search_header' -%>
-  </div>
+  </header>
 
   <div class="navigator-filters"></div>