fix SONAR-6041 make page headers consistent

server/sonar-web/src/main/hbs/coding-rules/coding-rules-filters.hbs

@@ -1,8 +1,8 @@
-<div class="search-navigator-filters-header">
-  <span class="search-navigator-filters-name">{{t 'coding_rules.page'}}</span>
-</div>
+<h1 class="page-title">
+  {{t 'coding_rules.page'}}
+</h1>
 
-<div class="search-navigator-filters-actions">
+<div class="page-actions">
   <div class="button-group">
     <button class="js-new-search" id="coding-rules-new-search">{{t 'issue_filter.new_search'}}</button>
     {{#if canWrite}}

server/sonar-web/src/main/hbs/design/design.hbs

@@ -1,46 +1,51 @@
-<div class="dsm-header">
-  <i class="icon-help"></i> <a href="http://redirect.sonarsource.com/doc/dsm.html">{{t 'design.help'}}</a>
-</div>
+<div class="page">
+  <header class="page-header">
+    <h1 class="page-title">{{t 'design.page'}}</h1>
+    <div class="page-actions">
+      <i class="icon-help"></i>&nbsp;<a href="http://redirect.sonarsource.com/doc/dsm.html">{{t 'design.help'}}</a>
+    </div>
+  </header>
 
-<ul class="dsm-legend">
-  <li>
-    <span class="dsm-legend-square gray"></span>
-    <span class="dsm-legend-label">{{t 'design.legend.dependencies'}}</span>
-  </li>
-  <li>
-    <span class="dsm-legend-square red"></span>
-    <span class="dsm-legend-label">{{t 'design.legend.cycles'}}</span>
-  </li>
-  <li>
-    <span class="dsm-legend-square green"></span>
-    <span class="dsm-legend-label">{{t 'design.legend.uses'}}</span>
-    <span class="dsm-legend-square blue"></span>
-    <span class="dsm-legend-label">{{t 'design.legend.uses'}}</span>
-    <span class="dsm-legend-square yellow"></span>
-  </li>
-</ul>
+  <ul class="dsm-legend">
+    <li>
+      <span class="dsm-legend-square gray"></span>
+      <span class="dsm-legend-label">{{t 'design.legend.dependencies'}}</span>
+    </li>
+    <li>
+      <span class="dsm-legend-square red"></span>
+      <span class="dsm-legend-label">{{t 'design.legend.cycles'}}</span>
+    </li>
+    <li>
+      <span class="dsm-legend-square green"></span>
+      <span class="dsm-legend-label">{{t 'design.legend.uses'}}</span>
+      <span class="dsm-legend-square blue"></span>
+      <span class="dsm-legend-label">{{t 'design.legend.uses'}}</span>
+      <span class="dsm-legend-square yellow"></span>
+    </li>
+  </ul>
 
-<div class="dsm-body">
-  <table>
-    <tbody>
-    {{#eachIndex items}}
-      <tr>
-        <td class="dsm-body-title" title="{{t 'design.rowTooltip'}}">
-          {{qualifierIcon q}} {{n}}
-          {{#gt pt 0}}
-            <span class="dsm-body-title-package-tangles" title="{{t 'metric.package_cycles.name'}}">{{pt}}</span>
-          {{/gt}}
-          <span class="dsm-body-title-indicator"></span>
-        </td>
-        {{#eachIndex v}}
-          <td class="dsm-body-cell {{#if status}}dsm-body-cell-{{status}}{{/if}}" title="{{t 'design.cellTooltip'}}">
-            {{#eq index ../index}}–{{else}}{{w}}{{/eq}}
+  <div class="dsm-body">
+    <table>
+      <tbody>
+      {{#eachIndex items}}
+        <tr>
+          <td class="dsm-body-title" title="{{t 'design.rowTooltip'}}">
+            {{qualifierIcon q}} {{n}}
+            {{#gt pt 0}}
+              <span class="dsm-body-title-package-tangles" title="{{t 'metric.package_cycles.name'}}">{{pt}}</span>
+            {{/gt}}
+            <span class="dsm-body-title-indicator"></span>
           </td>
-        {{/eachIndex}}
-      </tr>
-    {{/eachIndex}}
-    </tbody>
-  </table>
-</div>
+          {{#eachIndex v}}
+            <td class="dsm-body-cell {{#if status}}dsm-body-cell-{{status}}{{/if}}" title="{{t 'design.cellTooltip'}}">
+              {{#eq index ../index}}–{{else}}{{w}}{{/eq}}
+            </td>
+          {{/eachIndex}}
+        </tr>
+      {{/eachIndex}}
+      </tbody>
+    </table>
+  </div>
 
-<div class="dsm-info"></div>
+  <div class="dsm-info"></div>
+</div>

server/sonar-web/src/main/hbs/issues/issues-filters.hbs

@@ -6,7 +6,7 @@
   <a class="search-navigator-filters-manage" href="{{link '/issues/manage'}}"><i class="icon-settings"></i> {{t 'manage'}}</a>
 </div>
 
-<div class="search-navigator-filters-header">
+<h1 class="page-title">
   {{#if state.canManageFilters}}
     <a class="search-navigator-filters-show-list js-toggle-filters">
       <i class="icon-list"></i>&nbsp;<span class="issues-filters-name">{{> '_issues-filter-name'}}</span>
@@ -17,9 +17,9 @@
   {{else}}
     <span class="search-navigator-filters-name">{{t 'issues'}}</span>
   {{/if}}
-</div>
+</h1>
 
-<div class="search-navigator-filters-actions">
+<div class="page-actions">
   <div class="button-group">
     <button class="js-new-search" id="issues-new-search">{{t 'issue_filter.new_search'}}</button>
 

server/sonar-web/src/main/hbs/libraries/libraries.hbs

@@ -1,56 +1,62 @@
-<div class="libraries-header">
-  <div class="libraries-header-filter">
-    <label for="libraries-filter">{{t 'libs.filter'}} </label>
-    <input id="libraries-filter" type="text" class="js-libraries-filter">
-  </div>
+<div class="page">
+  <header class="page-header">
+    <h1 class="page-title">{{t 'libraries.page'}}</h1>
+  </header>
 
-  <div class="libraries-header-test">
-    <input type="checkbox" id="display-test-libraries" class="js-test-libraries">
-    <label for="display-test-libraries">{{t 'libs.displayTests'}}</label>
-  </div>
+  <div class="libraries-header">
+    <div class="libraries-header-filter">
+      <label for="libraries-filter">{{t 'libs.filter'}} </label>
+      <input id="libraries-filter" type="text" class="js-libraries-filter">
+    </div>
 
-  <div class="libraries-header-actions">
-    <a class="js-libraries-collapse-all">{{t 'libs.collapse'}}</a>
-    <a class="js-libraries-expand-all">{{t 'libs.expand'}}</a>
-  </div>
+    <div class="libraries-header-test">
+      <input type="checkbox" id="display-test-libraries" class="js-test-libraries">
+      <label for="display-test-libraries">{{t 'libs.displayTests'}}</label>
+    </div>
 
-  <div class="libraries-header-actions">
-    <a href="{{usagesUrl}}">{{t 'libs.usageLink'}}</a>
+    <div class="libraries-header-actions">
+      <a class="js-libraries-collapse-all">{{t 'libs.collapse'}}</a>
+      <a class="js-libraries-expand-all">{{t 'libs.expand'}}</a>
+    </div>
+
+    <div class="libraries-header-actions">
+      <a href="{{usagesUrl}}">{{t 'libs.usageLink'}}</a>
+    </div>
   </div>
-</div>
 
-<div class="libraries-tree">
-  <ul>
-    {{#each items}}
-      <li>
-        {{qualifierIcon qualifier}}
-        <span class="libraries-tree-name">{{lname}}</span>
-        {{#if version}}
-          <span class="libraries-tree-version">{{version}}</span>
-        {{/if}}
-        {{#notEmpty libraries}}
-          <ul>
-            {{#recursive libraries}}
-              <li class="{{#if to}}libraries-tree-with-subtree libraries-tree-subtree-collapsed{{/if}} {{#eq u 'test'}}libraries-tree-test{{/eq}}">
-                {{#if to}}<a>{{/if}}
-                {{qualifierIcon q}}
-                <span class="libraries-tree-name">{{n}}</span>{{#if to}}</a>{{/if}}
-                {{#if v}}
-                  <span class="libraries-tree-version">{{v}}</span>
-                {{/if}}
-                {{#if u}}
-                  <span class="subtitle">({{u}})</span>
-                {{/if}}
-                {{#if to}}
-                  <ul>{{{recursive to}}}</ul>
-                {{/if}}
-              </li>
-            {{/recursive}}
-          </ul>
-        {{else}}
-          {{t 'libs.noLibraries'}}
-        {{/notEmpty}}
-      </li>
-    {{/each}}
-  </ul>
+  <div class="libraries-tree">
+    <ul>
+      {{#each items}}
+        <li>
+          {{qualifierIcon qualifier}}
+          <span class="libraries-tree-name">{{lname}}</span>
+          {{#if version}}
+            <span class="libraries-tree-version">{{version}}</span>
+          {{/if}}
+          {{#notEmpty libraries}}
+            <ul>
+              {{#recursive libraries}}
+                <li class="{{#if to}}libraries-tree-with-subtree libraries-tree-subtree-collapsed{{/if}} {{#eq u 'test'}}libraries-tree-test{{/eq}}">
+                  {{#if to}}<a>{{/if}}
+                  {{qualifierIcon q}}
+                  <span class="libraries-tree-name">{{n}}</span>{{#if to}}</a>{{/if}}
+                  {{#if v}}
+                    <span class="libraries-tree-version">{{v}}</span>
+                  {{/if}}
+                  {{#if u}}
+                    <span class="subtitle">({{u}})</span>
+                  {{/if}}
+                  {{#if to}}
+                    <ul>{{{recursive to}}}</ul>
+                  {{/if}}
+                </li>
+              {{/recursive}}
+            </ul>
+          {{else}}
+            {{t 'libs.noLibraries'}}
+          {{/notEmpty}}
+        </li>
+      {{/each}}
+    </ul>
+  </div>
 </div>

server/sonar-web/src/main/hbs/quality-gates/quality-gate-actions.hbs

@@ -1,6 +1,8 @@
-<h1 class="navigator-header-title">{{t 'quality_gates.page'}}</h1>
+<h1 class="page-title">{{t 'quality_gates.page'}}</h1>
 {{#if canEdit}}
-  <div class="navigator-header-actions button-group">
-    <button id="quality-gate-add">{{t 'create'}}</button>
+  <div class="page-actions">
+    <div class="button-group">
+      <button id="quality-gate-add">{{t 'create'}}</button>
+    </div>
   </div>
-{{/if}}
+{{/if}}

server/sonar-web/src/main/less/components.less

@@ -10,3 +10,4 @@
 @import "components/tooltips";
 @import "components/dropdowns";
 @import "components/menu";
+@import "components/page";

server/sonar-web/src/main/less/components/page.less

@@ -0,0 +1,31 @@
+@import (reference) "../variables";
+@import (reference) "../mixins";
+@import (reference) "../ui";
+
+.page {
+  padding: 10px 0;
+}
+
+.page-header,
+// deprecated
+.page_title {
+  .clearfix;
+  margin-bottom: 10px;
+}
+
+.page-title {
+  float: left;
+  font-size: @bigFontSize;
+  line-height: @formControlHeight;
+}
+
+.page-actions {
+  float: right;
+}
+
+.page-description {
+  float: left;
+  clear: left;
+  font-size: @smallFontSize;
+  line-height: 1.5;
+}

server/sonar-web/src/main/less/init.less

@@ -99,15 +99,6 @@ legend {
   color: #000
 }
 
-/* font */
-body {
-  font: 13px/1.231 arial, helvetica, clean, sans-serif;
-}
-
-select, input, button, textarea {
-  font: 99% arial, helvetica, clean, sans-serif
-}
-
 pre, code, kbd, samp, tt {
   font-family: monospace;
   line-height: 1;

server/sonar-web/src/main/less/layout.less

@@ -48,10 +48,6 @@
   }
 }
 
-body, a {
-  color: #444;
-}
-
 /* LAYOUT */
 #content {
   padding: 0 10px;
@@ -271,28 +267,6 @@ ul.sidebar select, ul.sidebar input {
   display: block;
 }
 
-.page {
-  padding: 10px 0;
-}
-.page-split-left {
-  min-width: 200px;
-  max-width: 200px;
-  width: 200px;
-  margin: 0;
-  display: block;
-  vertical-align: top;
-  border-top: none;
-  border-left: none;
-  float: left;
-}
-
-.page-split-right {
-  display: block;
-  margin: 0;
-  vertical-align: top;
-  padding: 0 0 0 200px;
-}
-
 .gray-sidebar {
   background-color: #EFEFEF;
   border: 1px solid #CCC;

server/sonar-web/src/main/less/navigator/base.less

@@ -140,6 +140,11 @@
   padding: 0 @navigatorPadding;
   background-color: @navigatorBarBackground;
   font-size: 0;
+
+  .page-title,
+  .page-actions {
+    margin: (@navigatorHeaderHeight - @formControlHeight) / 2 0;
+  }
 }
 
 .navigator-header-favorite {
@@ -170,7 +175,7 @@
 }
 
 .navigator-header-actions {
-  margin-left: 20px;
+  margin: 8px 0 8px 20px;
 
   & > a {
     vertical-align: middle;

server/sonar-web/src/main/less/quality-gates.less

@@ -22,7 +22,7 @@
     height: @navigatorHeaderHeight;
     width: @qualityGateSidebarWidth;
     margin: @navigatorPadding;
-    padding: 0 @navigatorPadding;
+    padding: (@navigatorHeaderHeight - @formControlHeight) / 2 @navigatorPadding;
 
     .navigator-header-title {
       color: @baseFontColor;

server/sonar-web/src/main/less/style.less

@@ -1284,10 +1284,6 @@ div.autocompleteNote {
 }
 
 /* ------------------- DASHBOARD ------------------- */
-.page_title {
-  margin: 0 0 7px 0;
-}
-
 .color_OK {
   border: 2px solid #85bb43 !important;
   color: #85bb43 !important;

server/sonar-web/src/main/webapp/WEB-INF/app/views/comparison/index.html.erb

@@ -66,6 +66,9 @@
 
 
   <div id="comparison-page" class="page">
+    <header class="page-header">
+      <h1 class="page-title"><%= h message('comparison.page') -%></h1>
+    </header>
     <form method="GET" id="compare-form" action="<%= ApplicationController.root_context -%>/comparison/index">
       <input type="hidden" name="sids" id="sids" value="<%= @snapshots.map { |s| s.id.to_s }.join(',') -%>">
       <input type="hidden" name="metrics" id="metrics" value="<%= @metrics.map { |m| m.key }.join(',') -%>">

server/sonar-web/src/main/webapp/WEB-INF/app/views/components/index.html.erb

@@ -1,7 +1,10 @@
-<% if is_admin? %>
-  <div id="page-operations">
-    <ul class="operations">
-      <li><%= message('customize') -%>
+<div class="page">
+  <header class="page-header">
+    <h1 class="page-title"><%= h message('components.page') -%></h1>
+
+    <% if is_admin? %>
+      <div class="page-actions">
+        <%= message('customize') -%>
         <% if configuring? %>
           <span class="green"><b><%= message('on').upcase -%></b></span> |
           <a class="action" href="<%= url_for :overwrite_params => {:configuring => nil} -%>" id="configure-off"><%= message('off').upcase -%></a>
@@ -9,66 +12,67 @@
           <a class="action" href="<%= url_for :overwrite_params => {:configuring => 'true'} -%>" id="configure-on"><%= message('on').upcase -%></a>
           | <span class="red"><b><%= message('off').upcase -%></b></span>
         <% end %>
-      </li>
-    </ul>
-  </div>
-<% end %>
+      </div>
+    <% end %>
+  </header>
 
-<% if has_role?(:admin) && configuring? %>
-  <%= render :partial => 'list_edit_mode_controls', :locals => {:configured_columns => @columns, :components_configuration => @components_configuration} %>
-<% end %>
-<% if @snapshots.empty? && @resource.nil? %>
-  <h3><%= message('components.no_projects_have_been_analysed') -%>No projects have been analysed.</h3>
-  <p><%= message('components.explanation_launch_sonar_to_have_results') -%></p>
-<% else %>
-  <table width="100%">
-    <tr>
-      <td align="left" valign="top">
-        <table id="components" class="data sortable">
-          <%= render :partial => 'list_table_header', :locals => {:configured_columns => @columns} if !configuring? || (!is_admin? && configuring?) %>
-          <%= render :partial => 'list_table_header_edit_mode', :locals => {:configured_columns => @columns} if configuring? && is_admin? %>
-          <tbody>
-          <% if @snapshots.empty? %>
-            <tr>
-              <td colspan="<%= @columns.size + 3 -%>">No components</td>
-            </tr>
-          <% else
-               @snapshots.each do |snapshot| %>
-              <% project = snapshot.project %>
-              <tr id="project_<%= project.id -%>">
-                <% alert_status_measure=search_measure(@measures_by_snapshot[snapshot], Metric::ALERT_STATUS)
-                   alert_status_x=(alert_status_measure ? alert_status_measure.data : '')
-                %>
-                <td x="<%= alert_status_x -%>" width="1%" nowrap><%= format_measure(alert_status_measure) %></td>
-                <td width="1%" nowrap>
-                  <% if logged_in? %>
-                    <%= link_to_favourite(project) -%>
-                  <% end %>
-                  <% if snapshot.display_dashboard? %>
-                    <%= link_to image_tag('zoom.png'), {:controller => 'dashboard', :id => snapshot.project.id}, :class => 'link-no-underline' %>
-                  <% else %>
-                    <%= link_to_resource(project, '<i class="icon-detach"></i>') %>
-                  <% end %>
-                </td>
-                <td class="left" x="<%= u(snapshot.project.name) -%>">
-                  <%= qualifier_icon(snapshot) %>
-                  <% if snapshot.display_dashboard? %>
-                    <%= link_to_resource(project, h(snapshot.project.name)) %>
-                  <% else %>
-                    <%= h snapshot.project.name %>
-                  <% end %>
-                </td>
-                <% @columns.each do |column| %>
-                  <%= get_column_content(column, snapshot, @measures_by_snapshot) -%>
-                <% end %>
+  <% if has_role?(:admin) && configuring? %>
+    <%= render :partial => 'list_edit_mode_controls', :locals => {:configured_columns => @columns, :components_configuration => @components_configuration} %>
+  <% end %>
+  <% if @snapshots.empty? && @resource.nil? %>
+    <h3><%= message('components.no_projects_have_been_analysed') -%>No projects have been analysed.</h3>
+
+    <p><%= message('components.explanation_launch_sonar_to_have_results') -%></p>
+  <% else %>
+    <table width="100%">
+      <tr>
+        <td align="left" valign="top">
+          <table id="components" class="data sortable">
+            <%= render :partial => 'list_table_header', :locals => {:configured_columns => @columns} if !configuring? || (!is_admin? && configuring?) %>
+            <%= render :partial => 'list_table_header_edit_mode', :locals => {:configured_columns => @columns} if configuring? && is_admin? %>
+            <tbody>
+            <% if @snapshots.empty? %>
+              <tr>
+                <td colspan="<%= @columns.size + 3 -%>">No components</td>
               </tr>
+            <% else
+                 @snapshots.each do |snapshot| %>
+                <% project = snapshot.project %>
+                <tr id="project_<%= project.id -%>">
+                  <% alert_status_measure=search_measure(@measures_by_snapshot[snapshot], Metric::ALERT_STATUS)
+                     alert_status_x=(alert_status_measure ? alert_status_measure.data : '')
+                  %>
+                  <td x="<%= alert_status_x -%>" width="1%" nowrap><%= format_measure(alert_status_measure) %></td>
+                  <td width="1%" nowrap>
+                    <% if logged_in? %>
+                      <%= link_to_favourite(project) -%>
+                    <% end %>
+                    <% if snapshot.display_dashboard? %>
+                      <%= link_to image_tag('zoom.png'), {:controller => 'dashboard', :id => snapshot.project.id}, :class => 'link-no-underline' %>
+                    <% else %>
+                      <%= link_to_resource(project, '<i class="icon-detach"></i>') %>
+                    <% end %>
+                  </td>
+                  <td class="left" x="<%= u(snapshot.project.name) -%>">
+                    <%= qualifier_icon(snapshot) %>
+                    <% if snapshot.display_dashboard? %>
+                      <%= link_to_resource(project, h(snapshot.project.name)) %>
+                    <% else %>
+                      <%= h snapshot.project.name %>
+                    <% end %>
+                  </td>
+                  <% @columns.each do |column| %>
+                    <%= get_column_content(column, snapshot, @measures_by_snapshot) -%>
+                  <% end %>
+                </tr>
+              <% end %>
             <% end %>
-          <% end %>
-          </tbody>
-        </table>
-        <script>jQuery('#components').sortable();</script>
-        <p>&nbsp;</p>
-      </td>
-    </tr>
-  </table>
-<% end %>
+            </tbody>
+          </table>
+          <script>jQuery('#components').sortable();</script>
+          <p>&nbsp;</p>
+        </td>
+      </tr>
+    </table>
+  <% end %>
+</div>

server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb

@@ -1,34 +1,33 @@
-<% if logged_in? || @snapshot %>
-<div class="line-block">
+<header class="page-header">
+  <h1 class="page-title"><%= h @dashboard.name -%></h1>
 
   <% if logged_in? %>
-    <div class="operations noprint button-group">
-      <% if back %>
-        <%= link_to message('dashboard.back_to_dashboard'), dashboard_action(:index), :class => 'button' -%>
-      <% else %>
-        <% if @dashboard.editable_by?(current_user) %>
-          <%= link_to message('dashboard.configure_widgets'), dashboard_action(:configure), :class => 'button' -%>
+    <div class="page-actions operations noprint">
+      <div class="button-group">
+        <% if back %>
+          <%= link_to message('dashboard.back_to_dashboard'), dashboard_action(:index), :class => 'button' -%>
+        <% else %>
+          <% if @dashboard.editable_by?(current_user) %>
+            <%= link_to message('dashboard.configure_widgets'), dashboard_action(:configure), :class => 'button' -%>
+          <% end %>
         <% end %>
-      <% end %>
-      <%= link_to message('dashboard.manage_dashboards'), {:controller => :dashboards, :action => :index, :resource => (@resource.id if @resource) }, :class => 'button' -%>
+        <%= link_to message('dashboard.manage_dashboards'), {:controller => :dashboards, :action => :index, :resource => (@resource.id if @resource)}, :class => 'button' -%>
+      </div>
     </div>
   <% end %>
 
   <% if @snapshot %>
-    <div id="snapshot_title" class="page_title">
-      <h4>
-        <%= "Version #{@snapshot.version} - " if @snapshot.version.present? -%><%= l @snapshot.created_at -%>
-        <% if @snapshot.project_snapshot.periods? %>
-          <% period_options = period_select_option_tags(@snapshot, 'small') %>
-          <% if period_options %>
-            <form method="GET" action="<%= url_for :controller => :dashboard, :action => :index, :id => @resource.id -%>" style="display: inline" class="spacer-left">
-              <input type="hidden" name="did" value="<%= @dashboard.id -%>"/>
-              <%= dropdown_tag 'period', period_options, {:width => '250px'}, {:id => 'select-comparison', :onchange => 'submit()'} -%>
-            </form>
-          <% end %>
+    <div class="page-description" id="snapshot_title">
+      <%= "Version #{@snapshot.version} - " if @snapshot.version.present? -%><%= l @snapshot.created_at -%>
+      <% if @snapshot.project_snapshot.periods? %>
+        <% period_options = period_select_option_tags(@snapshot, 'small') %>
+        <% if period_options %>
+          <form method="GET" action="<%= url_for :controller => :dashboard, :action => :index, :id => @resource.id -%>" style="display: inline" class="spacer-left">
+            <input type="hidden" name="did" value="<%= @dashboard.id -%>"/>
+            <%= dropdown_tag 'period', period_options, {:width => '250px'}, {:id => 'select-comparison', :onchange => 'submit()'} -%>
+          </form>
         <% end %>
-      </h4>
+      <% end %>
     </div>
   <% end %>
-</div>
-<% end %>
+</header>

server/sonar-web/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb

@@ -26,6 +26,10 @@ padding: 5px;
 </style>
 <% end %>
 <div class="page">
+  <header class="page-header">
+    <h1 class="page-title"><%= h message('dependencies.page') -%></h1>
+  </header>
+
   <form action="<%= ApplicationController.root_context -%>/dependencies/index" id="search_form">
     <input type="text" name="search" value="<%= h params[:search] -%>" id="search_input"> </input>
     <input type="submit" value="<%= message('dependencies.search_library') -%>" id="search_submit"/><br/>

server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_settings.html.erb

@@ -8,6 +8,11 @@
 <script>
   var navbarSpace = 'settings',
       navbarGlobalMenu = [
+        {
+          url: '/',
+          labelLocalized: 'Home',
+          active: false
+        },
         {
           label: 'sidebar.project_settings',
           active: false,

server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_search_header.html.erb

@@ -3,7 +3,7 @@
      edit_mode = (params[:edit]=='true')
 %>
 
-  <h1 id="filter-title" class="navigator-header-title">
+  <h1 id="filter-title" class="page-title">
     <% if @filter.id && @filter.name.present? %>
       <%= h @filter.name -%>
       <span class="navigator-header-title-note">
@@ -22,28 +22,30 @@
     <% end %>
   </h1>
 
-  <div class="navigator-header-actions button-group">
-    <button onclick="window.location='<%= ApplicationController.root_context -%>/measures/search?qualifiers[]=TRK';"><%= message 'measure_filter.new_search' -%></button>
+  <div class="page-actions">
+    <div class="button-group">
+      <button onclick="window.location='<%= ApplicationController.root_context -%>/measures/search?qualifiers[]=TRK';"><%= message 'measure_filter.new_search' -%></button>
 
-    <% unless edit_mode %>
-      <% if logged_in? %>
-        <% if @filter.id %>
-          <button id="copy" onclick="openModalWindow('<%= url_for :action => 'copy_form', :id => @filter.id -%>');"><%= message('copy') -%></button>
-        <% end %>
+      <% unless edit_mode %>
+        <% if logged_in? %>
+          <% if @filter.id %>
+            <button id="copy" onclick="openModalWindow('<%= url_for :action => 'copy_form', :id => @filter.id -%>');"><%= message('copy') -%></button>
+          <% end %>
 
-        <% if !defined?(@unchanged) && @filter.id && @filter.owner?(current_user) %>
-          <button id="save" onclick="var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = '<%= url_for params.merge({:action => 'save', :id => @filter.id}) -%>';f.submit();return false;"><%= message('save') -%></button>
-        <% end %>
+          <% if !defined?(@unchanged) && @filter.id && @filter.owner?(current_user) %>
+            <button id="save" onclick="var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = '<%= url_for params.merge({:action => 'save', :id => @filter.id}) -%>';f.submit();return false;"><%= message('save') -%></button>
+          <% end %>
 
-        <% unless @filter.id %>
-          <button id="save-as" onclick="openModalWindow('<%= url_for params.merge({:action => 'save_as_form', :id => @filter.id}) -%>');"><%= message('save_as') -%></button>
-        <% end %>
+          <% unless @filter.id %>
+            <button id="save-as" onclick="openModalWindow('<%= url_for params.merge({:action => 'save_as_form', :id => @filter.id}) -%>');"><%= message('save_as') -%></button>
+          <% end %>
 
-        <% if @filter.id && @filter.owner?(current_user) %>
-          <button id="edit-filter" onclick="openModalWindow('<%= url_for :action => 'edit_form', :id => @filter.id -%>');"><%= message('edit') -%></button>
+          <% if @filter.id && @filter.owner?(current_user) %>
+            <button id="edit-filter" onclick="openModalWindow('<%= url_for :action => 'edit_form', :id => @filter.id -%>');"><%= message('edit') -%></button>
+          <% end %>
         <% end %>
       <% end %>
-    <% end %>
+    </div>
   </div>
 
   <% unless edit_mode %>

server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb

@@ -1,4 +1,10 @@
 <div class="page">
+  <header class="page-header">
+    <h1 class="page-title"><%= h @profile.name -%></h1>
+    <div class="page-description">
+      <a href="<%= ApplicationController.root_context -%>/profiles">&larr;&nbsp;<%= h message('quality_profiles.page') -%></a>
+    </div>
+  </header>
 <%= render :partial => 'profiles/tabs', :locals => {:selected_tab=>'changelog'} %>
 
 <div class="tabs-panel marginbottom10">

server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/compare.html.erb

@@ -1,4 +1,11 @@
 <div class="page">
+  <header class="page-header">
+    <h1 class="page-title"><%= h message('quality_profiles.compare_profiles') -%></h1>
+    <div class="page-description">
+      <a href="<%= ApplicationController.root_context -%>/profiles">&larr;&nbsp;<%= h message('quality_profiles.page') -%></a>
+    </div>
+  </header>
+
 <form method="GET" class="marginbottom10">
   <select name="id1" class="small">
     <option value=""></option>

server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb

@@ -1,12 +1,19 @@
 <div class="page">
-<div class="line-block marginbottom10">
-  <div style="float: right" class="operations button-group">
-    <a href="profiles/compare" id="compare-link" class="button"><i class="icon-compare"></i> <%= message('quality_profiles.compare_profiles') -%></a>
-    <% if profiles_administrator? %>
-      <a href="profiles/restore_form" class="open-modal button" id="restore-link"><i class="icon-restore"></i> <%= message('quality_profiles.restore_profile') -%></a>
-    <% end %>
+
+  <div class="page-header">
+    <h1 class="page-title"><%= h message('quality_profiles.page') -%></h1>
+
+    <div class="page-actions operations">
+      <div class="button-group">
+        <a href="profiles/compare" id="compare-link" class="button"><i class="icon-compare"></i> <%= message('quality_profiles.compare_profiles') -%>
+        </a>
+        <% if profiles_administrator? %>
+          <a href="profiles/restore_form" class="open-modal button" id="restore-link"><i class="icon-restore"></i> <%= message('quality_profiles.restore_profile') -%>
+          </a>
+        <% end %>
+      </div>
+    </div>
   </div>
-</div>
 
 <%
    Api::Utils.insensitive_sort(languages){|l| l.getName()}.each do |language|

server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/inheritance.html.erb

@@ -1,4 +1,11 @@
 <div class="page">
+  <header class="page-header">
+    <h1 class="page-title"><%= h @profile.name -%></h1>
+    <div class="page-description">
+      <a href="<%= ApplicationController.root_context -%>/profiles">&larr;&nbsp;<%= h message('quality_profiles.page') -%></a>
+    </div>
+  </header>
+
 <%= render :partial => 'profiles/tabs', :locals => {:selected_tab=>'inheritance'} %>
 
 <div class="tabs-panel marginbottom10">

server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/permalinks.html.erb

@@ -1,4 +1,11 @@
 <div class="page">
+  <header class="page-header">
+    <h1 class="page-title"><%= h @profile.name -%></h1>
+    <div class="page-description">
+      <a href="<%= ApplicationController.root_context -%>/profiles">&larr;&nbsp;<%= h message('quality_profiles.page') -%></a>
+    </div>
+  </header>
+
 <%= render :partial => 'profiles/tabs', :locals => {:selected_tab=>'Permalinks'} %>
 
 <div class="tabs-panel marginbottom10 ">

server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/projects.html.erb

@@ -1,4 +1,11 @@
 <div class="page">
+  <header class="page-header">
+    <h1 class="page-title"><%= h @profile.name -%></h1>
+    <div class="page-description">
+      <a href="<%= ApplicationController.root_context -%>/profiles">&larr;&nbsp;<%= h message('quality_profiles.page') -%></a>
+    </div>
+  </header>
+
 <%= render :partial => 'profiles/tabs', :locals => {:selected_tab => 'Projects'} %>
 
 <div class="tabs-panel">

server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/show.html.erb

@@ -1,4 +1,11 @@
 <div class="page">
+  <header class="page-header">
+    <h1 class="page-title"><%= h @profile.name -%></h1>
+    <div class="page-description">
+      <a href="<%= ApplicationController.root_context -%>/profiles">&larr;&nbsp;<%= h message('quality_profiles.page') -%></a>
+    </div>
+  </header>
+
   <%= render :partial => 'profiles/tabs', :locals => {:selected_tab=>'Rules'} %>
 
   <div class="tabs-panel marginbottom10 ">