Improve layout.css

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index e76e1e232cd7478f45e16867cc6a54127bd92125..bb78ed8c5e9543a8eb8e297c20c21914313be434 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -306,7 +306,7 @@ layout.user_panel.anonymous_user=Anonymous
 sidebar.tools=Tools
 sidebar.tools.comparison=Comparison
 sidebar.tools.dependency=Dependency
-sidebar.tools.review=Review
+sidebar.tools.reviews=Reviews
 sidebar.project_settings=Configuration
 sidebar.security=Security
 sidebar.system=System

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb
index ce19f9f89823c2f654bba58d906c8158e2860509..100abce9db2cbc1cdc6c8a6bd3d5a663754868d1 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb
@@ -35,7 +35,7 @@ class MeasuresController < ApplicationController
       add_breadcrumbs({:name => @filter.name, :url => {:action => 'filter', :id => @filter.id}})
     else
       @filter = MeasureFilter.new
-      add_breadcrumbs(message('search_verb'))
+      add_breadcrumbs(:name => message('search_verb'), :url => {:action => 'index'})
     end
     @filter.criteria=(params)
     @filter.enable_default_display

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb
index fc9ea5318f5e6820e0bb4babac49c7082a2a3982..a1998eb13e470303200b80d7b53e295ba03be273 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb
@@ -31,7 +31,7 @@ class ReviewsController < ApplicationController
     init_params()
     search_reviews()
     
-    add_breadcrumbs message('sidebar.tools'), {:name => message('sidebar.tools.review'), :url => {:controller => 'reviews', :action => 'index'}}
+    add_breadcrumbs message('sidebar.tools'), {:name => message('sidebar.tools.reviews'), :url => {:controller => 'reviews', :action => 'index'}}
   end
 
   # Used for the "OLD" permalink "http://localhost:9000/reviews/view/1"

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter.rb
index 85ad47178fe788fdf7aa7bf84ec7abd60b75fac4..878feb6b2496568b526ce3dbf7efe7de8a6bad52 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter.rb
@@ -110,6 +110,7 @@ class MeasureFilter < ActiveRecord::Base
 
   # API used by Displays
   def set_criteria_value(key, value)
+    @criteria ||= {}
     if key
       if value && !value.empty? && value!=['']
         @criteria[key.to_s]=value

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb
index 4293e203b7ccb75b7071d59276b56ae3e8374140..682fa9162b033b978768845817f63e94a64b4011 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb
@@ -1,3 +1,4 @@
+<% if logged_in? || @snapshot %>
 <div class="line-block">
   <% if logged_in? %>
     <ul class="operations">
@@ -33,3 +34,4 @@
     </div>
   <% end %>
 </div>
+<% end %>
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
index 1ae072d79b699cda2ef7f23c234a00a3cd3b2cbc..71e2ab2fc76fd0a8ba95837859393240e587063e 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
@@ -7,48 +7,47 @@
    period_param = "period=#{params[:period]}" if params[:period]
 %>
 <div id="container">
-<%= yield :header -%>
-<div id="hd">
-  <div id="nav-left">
-    <ul>
-      <li>
-        <a href="<%= ApplicationController.root_context -%>/"><%= message('layout.dashboards') -%></a>
-      </li>
-      <li>
-        <a href="<%= ApplicationController.root_context -%>/measures"><%= message('layout.measures') -%></a>
-      </li>
-      <li>
-        <a href="<%= ApplicationController.root_context -%>/profiles"><%= message('quality_profiles.page') -%></a>
-      </li>
-      <%= render 'layouts/tools' -%>
-    </ul>
-  </div>
-  <div id="nav">
-    <ul>
-      <li>
-        <input type="text" size="15" name="search" id="searchInput" onFocus="autocompleteResources()" value="<%= message('search_verb') -%>"/>
-        <img src="<%= ApplicationController.root_context -%>/images/loading-small.gif" id="searchingResources" style="display:none">
-      </li>
-      <li>
-        <a href="<%= ApplicationController.root_context -%>/settings/index"><img src="<%= ApplicationController.root_context -%>/images/actions.png" alt="<%= message('layout.configuration') -%>" title="<%= message('layout.configuration') -%>"/></a>
-      </li>
-      <% unless logged_in? %>
-        <li><a href="<%= ApplicationController.root_context -%>/sessions/new?return_to=<%= u (request.request_uri) -%>"><%= message('layout.login') -%></a></li>
-      <% end %>
-      <%= render 'layouts/user_panel' -%>
-    </ul>
+  <%= yield :header -%>
+  <div id="hd">
+    <div id="nav-left">
+      <ul>
+        <li>
+          <a href="<%= ApplicationController.root_context -%>/"><%= message('layout.dashboards') -%></a>
+        </li>
+        <li>
+          <a href="<%= ApplicationController.root_context -%>/measures"><%= message('layout.measures') -%></a>
+        </li>
+        <li>
+          <a href="<%= ApplicationController.root_context -%>/profiles"><%= message('quality_profiles.page') -%></a>
+        </li>
+        <%= render 'layouts/tools' -%>
+      </ul>
+    </div>
+    <div id="nav">
+      <ul>
+        <li>
+          <input type="text" size="15" name="search" id="searchInput" onFocus="autocompleteResources()" value="<%= message('search_verb') -%>"/>
+          <img src="<%= ApplicationController.root_context -%>/images/loading-small.gif" id="searchingResources" style="display:none">
+        </li>
+        <li>
+          <a href="<%= ApplicationController.root_context -%>/settings/index"><img src="<%= ApplicationController.root_context -%>/images/actions.png" alt="<%= message('layout.configuration') -%>" title="<%= message('layout.configuration') -%>"/></a>
+        </li>
+        <% unless logged_in? %>
+          <li><a href="<%= ApplicationController.root_context -%>/sessions/new?return_to=<%= u (request.request_uri) -%>"><%= message('layout.login') -%></a></li>
+        <% end %>
+        <%= render 'layouts/user_panel' -%>
+      </ul>
+    </div>
+    <div id="searchResourcesResults" class="autocomplete" style="display:none"></div>
   </div>
-  <div id="searchResourcesResults" class="autocomplete" style="display:none"></div>
-</div>
-<%= render 'layouts/breadcrumb' if @breadcrumbs || selected_section==Navigation::SECTION_RESOURCE -%>
-<div id="body">
-  <% if selected_section || @sidebar %>
-    <div id="sb">
+  <%= render 'layouts/breadcrumb' if @breadcrumbs || selected_section==Navigation::SECTION_RESOURCE -%>
+  <div id="body">
+    <% if selected_section %>
       <div id="sidebar">
-        <ul>
+        <ul class="sidebar blue-sidebar">
           <% if selected_section==Navigation::SECTION_HOME %>
             <% ActiveDashboard.user_dashboards(current_user, true).each do |active_dashboard| %>
-              <li class="<%= 'selected' if @dashboard && controller.controller_path=='dashboard' && active_dashboard.dashboard_id==@dashboard.id -%>">
+              <li class="<%= 'active' if @dashboard && controller.controller_path=='dashboard' && active_dashboard.dashboard_id==@dashboard.id -%>">
                 <a href="<%= ApplicationController.root_context -%>/dashboard/?did=<%= active_dashboard.dashboard_id -%>"><%= active_dashboard.dashboard.name(true) -%></a>
               </li>
             <% end %>
@@ -57,77 +56,78 @@
               page_url = (page.isController() ? page.getId() : "/plugins/home/#{page.getId()}")
               selected=request.request_uri.include?("/plugins/home/#{page_url}")
             %>
-              <li class="<%= 'selected' if selected -%>">
+              <li class="<%= 'active' if selected -%>">
                 <a href="<%= ApplicationController.root_context -%><%= page_url -%>"><%= message(page.getId() + '.page', :default => page.getTitle()) -%></a></li>
             <% end %>
 
           <% elsif selected_section==Navigation::SECTION_RESOURCE %>
             <% ActiveDashboard.user_dashboards(current_user, false).each do |active_dashboard| %>
-              <li class="<%= 'selected' if @dashboard && controller.controller_path=='dashboard' && active_dashboard.dashboard_id==@dashboard.id -%>">
+              <li class="<%= 'active' if @dashboard && controller.controller_path=='dashboard' && active_dashboard.dashboard_id==@dashboard.id -%>">
                 <a href="<%= ApplicationController.root_context -%>/dashboard/index/<%= @project.id -%>?did=<%= active_dashboard.dashboard_id -%><%= "&"+period_param if period_param -%>"><%= active_dashboard.dashboard.name(true) -%></a>
               </li>
             <% end %>
-
-            <li class="h2"><%= message('sidebar.tools') -%></li>
-            <li class="<%= 'selected' if request.request_uri.include?('/components/index') -%>">
+            <li class="spacer"></li>
+            <li class="sidebar-title"><%= message('sidebar.tools') -%></li>
+            <li class="<%= 'active' if request.request_uri.include?('/components/index') -%>">
               <a href="<%= ApplicationController.root_context -%>/components/index/<%= @project.id -%>"><%= message('components.page') -%></a></li>
-            <li class="<%= 'selected' if request.request_uri.include?('/drilldown/violations') -%>">
+            <li class="<%= 'active' if request.request_uri.include?('/drilldown/violations') -%>">
               <a href="<%= ApplicationController.root_context -%>/drilldown/violations/<%= @project.id -%><%= "?"+period_param if period_param -%>"><%= message('violations_drilldown.page') -%></a>
-            <% if controller.java_facade.getResourceTypeBooleanProperty(@project.qualifier, 'comparable') %>
-            <li class="<%= 'selected' if request.request_uri.include?('/comparison/index') -%>">
-              <a href="<%= ApplicationController.root_context -%>/comparison/index?resource=<%= @project.key -%>"><%= message('comparison.page') -%></a></li>
+              <% if controller.java_facade.getResourceTypeBooleanProperty(@project.qualifier, 'comparable') %>
+              <li class="<%= 'active' if request.request_uri.include?('/comparison/index') -%>">
+                <a href="<%= ApplicationController.root_context -%>/comparison/index?resource=<%= @project.key -%>"><%= message('comparison.page') -%></a></li>
             <% end %>
-            <li class="<%= 'selected' if request.request_uri.include?('/cloud/index') -%>">
+            <li class="<%= 'active' if request.request_uri.include?('/cloud/index') -%>">
               <a href="<%= ApplicationController.root_context -%>/cloud/index/<%= @project.id -%>"><%= message('clouds.page') -%></a></li>
             <% controller.java_facade.getPages(Navigation::SECTION_RESOURCE, @project.scope, @project.qualifier, @project.language, @project.last_snapshot.metric_keys.to_java(:string)).each do |page|
               page_url = (page.isController() ? "#{page.getId()}?id=#{@project.id}" : "/plugins/resource/#{@project.id}?page=#{page.getId()}")
             %>
-              <li class="<%= 'selected' if request.request_uri.include?(page_url) -%>">
+              <li class="<%= 'active' if request.request_uri.include?(page_url) -%>">
                 <a href="<%= ApplicationController.root_context -%><%= page_url -%>"><%= message(page.getId() + '.page', :default => page.getTitle()) %></a>
               </li>
             <% end %>
 
             <% if has_role?(:admin, @project) %>
-              <li class="h2"><%= message('sidebar.project_settings') -%></li>
+              <li class="spacer"></li>
+              <li class="sidebar-title"><%= message('sidebar.project_settings') -%></li>
               <% if (@project.project?) %>
-                <li class="<%= 'selected' if request.request_uri.include?('/project/profile') -%>">
+                <li class="<%= 'active' if request.request_uri.include?('/project/profile') -%>">
                   <a href="<%= ApplicationController.root_context -%>/project/profile/<%= @project.id -%>"><%= message('project_quality_profiles.page') -%></a></li>
               <% end %>
-              <li class="<%= 'selected' if request.request_uri.include?('/manual_measures') -%>">
+              <li class="<%= 'active' if request.request_uri.include?('/manual_measures') -%>">
                 <a href="<%= ApplicationController.root_context -%>/manual_measures/index/<%= @project.id -%>"><%= message('manual_measures.page') -%></a></li>
               <% if (@project.project?) %>
-                <li class="<%= 'selected' if request.request_uri.include?('/action_plans') -%>">
+                <li class="<%= 'active' if request.request_uri.include?('/action_plans') -%>">
                   <a href="<%= ApplicationController.root_context -%>/action_plans/index/<%= @project.id -%>"><%= message('action_plans.page') -%></a></li>
               <% end %>
               <% if (@project.project? || @project.module?) %>
-                <li class="<%= 'selected' if request.request_uri.include?('/project/settings') -%>">
+                <li class="<%= 'active' if request.request_uri.include?('/project/settings') -%>">
                   <a href="<%= ApplicationController.root_context -%>/project/settings/<%= @project.id -%>"><%= message('project_settings.page') -%></a>
                 </li>
               <% end %>
               <% if (@project.project?) %>
-                <li class="<%= 'selected' if request.request_uri.include?('/project/links') -%>">
+                <li class="<%= 'active' if request.request_uri.include?('/project/links') -%>">
                   <a href="<%= ApplicationController.root_context -%>/project/links/<%= @project.id -%>"><%= message('project_links.page') -%></a></li>
               <% end %>
               <%
                  # NOTE: we keep "@project.view? || @project.subview?" in the test for backward compatibility with the Views plugin
                  if (controller.java_facade.getResourceTypeBooleanProperty(@project.qualifier, 'hasRolePolicy') || @project.view? || @project.subview?)
               %>
-                <li class="<%= 'selected' if request.request_uri.include?('/project_roles') -%>">
+                <li class="<%= 'active' if request.request_uri.include?('/project_roles') -%>">
                   <a href="<%= ApplicationController.root_context -%>/project_roles/index?resource=<%= @project.id -%>"><%= message('roles.page') -%></a></li>
               <% end %>
               <%
                  # NOTE: we keep "@project.view? || @project.subview?" in the test for backward compatibility with the Views plugin
                  if (controller.java_facade.getResourceTypeBooleanProperty(@project.qualifier, 'modifiable_history') || @project.view? || @project.subview?)
               %>
-                <li class="<%= 'selected' if request.request_uri.include?('/project/history') -%>">
+                <li class="<%= 'active' if request.request_uri.include?('/project/history') -%>">
                   <a href="<%= ApplicationController.root_context -%>/project/history/<%= @project.id -%>"><%= message('project_history.page') -%></a></li>
               <% end %>
               <% if controller.java_facade.getResourceTypeBooleanProperty(@project.qualifier, 'updatable_key') %>
-                <li class="<%= 'selected' if request.request_uri.include?('/project/key') -%>">
+                <li class="<%= 'active' if request.request_uri.include?('/project/key') -%>">
                   <a href="<%= ApplicationController.root_context -%>/project/key/<%= @project.id -%>"><%= message('update_key.page') -%></a></li>
               <% end %>
               <% if controller.java_facade.getResourceTypeBooleanProperty(@project.qualifier, 'deletable') %>
-                <li class="<%= 'selected' if request.request_uri.include?('/project/deletion') -%>">
+                <li class="<%= 'active' if request.request_uri.include?('/project/deletion') -%>">
                   <a href="<%= ApplicationController.root_context -%>/project/deletion/<%= @project.id -%>"><%= message('resource_deletion.page', :params => message('qualifier.' + @project.qualifier)) -%></a>
                 </li>
               <% end %>
@@ -135,79 +135,74 @@
 
           <% elsif selected_section==Navigation::SECTION_CONFIGURATION && is_admin? %>
 
-            <li class="h2" style="padding-top: 0px;"><%= message('sidebar.project_settings') -%></li>
-            <li class="<%= 'selected' if request.request_uri.include?('/settings') -%>">
+            <li class="sidebar-title"><%= message('sidebar.project_settings') -%></li>
+            <li class="<%= 'active' if request.request_uri.include?('/settings') -%>">
               <a href="<%= ApplicationController.root_context -%>/settings/index"><%= message('settings.page') -%></a></li>
-            <li class="<%= 'selected' if controller.controller_path=='metrics' -%>">
+            <li class="<%= 'active' if controller.controller_path=='metrics' -%>">
               <a href="<%= ApplicationController.root_context -%>/metrics/index"><%= message('manual_metrics.page') -%></a></li>
-            <li class="<%= 'selected' if controller.controller_path=='manual_rules' -%>">
+            <li class="<%= 'active' if controller.controller_path=='manual_rules' -%>">
               <a href="<%= ApplicationController.root_context -%>/manual_rules/index"><%= message('manual_rules.page') -%></a></li>
-            <li class="<%= 'selected' if controller.controller_path=='admin_dashboards' -%>">
+            <li class="<%= 'active' if controller.controller_path=='admin_dashboards' -%>">
               <a href="<%= ApplicationController.root_context -%>/admin_dashboards/index"><%= message('default_dashboards.page') -%></a></li>
             <% controller.java_facade.getPages(Navigation::SECTION_CONFIGURATION, nil, nil, nil, nil).each do |page|
               page_url = (page.isController() ? page.getId() : "/plugins/configuration/#{page.getId()}")
             %>
-              <li class="<%= 'selected' if request.request_uri.include?(page_url) -%>">
+              <li class="<%= 'active' if request.request_uri.include?(page_url) -%>">
                 <a href="<%= ApplicationController.root_context -%><%= page_url -%>"><%= message(page.getId() + '.page', :default => page.getTitle()) %></a>
               </li>
             <% end %>
-
-            <li class="h2"><%= message('sidebar.security') -%></li>
-            <li class="<%= 'selected' if request.request_uri.include?('/users') -%>"><a href="<%= ApplicationController.root_context -%>/users"><%= message('users.page') -%></a>
+            <li class="spacer"></li>
+            <li class="sidebar-title"><%= message('sidebar.security') -%></li>
+            <li class="<%= 'active' if request.request_uri.include?('/users') -%>"><a href="<%= ApplicationController.root_context -%>/users"><%= message('users.page') -%></a>
             </li>
-            <li class="<%= 'selected' if request.request_uri.include?('/groups') -%>">
+            <li class="<%= 'active' if request.request_uri.include?('/groups') -%>">
               <a href="<%= ApplicationController.root_context -%>/groups/index"><%= message('user_groups.page') -%></a></li>
-            <li class="<%= 'selected' if request.request_uri.include?('/roles/global') -%>">
+            <li class="<%= 'active' if request.request_uri.include?('/roles/global') -%>">
               <a href="<%= ApplicationController.root_context -%>/roles/global"><%= message('system_administrators.page') -%></a></li>
-            <li class="<%= 'selected' if request.request_uri.include?('/roles/projects') -%>">
+            <li class="<%= 'active' if request.request_uri.include?('/roles/projects') -%>">
               <a href="<%= ApplicationController.root_context -%>/roles/projects"><%= message('roles.page') -%></a></li>
 
-            <li class="h2"><%= message('sidebar.system') -%></li>
-            <li class="<%= 'selected' if controller.controller_path=='backup' -%>"><a href="<%= ApplicationController.root_context -%>/backup"><%= message('backup.page') -%></a>
+            <li class="spacer"></li>
+            <li class="sidebar-title"><%= message('sidebar.system') -%></li>
+            <li class="<%= 'active' if controller.controller_path=='backup' -%>"><a href="<%= ApplicationController.root_context -%>/backup"><%= message('backup.page') -%></a>
             </li>
-            <li class="<%= 'selected' if controller.controller_path=='bulk_deletion' -%>">
+            <li class="<%= 'active' if controller.controller_path=='bulk_deletion' -%>">
               <a href="<%= ApplicationController.root_context -%>/bulk_deletion"><%= message('bulk_deletion.page') -%></a>
             </li>
             <% update_center_activated = controller.java_facade.getSettings().getBoolean('sonar.updatecenter.activate')
                if update_center_activated %>
-              <li class="<%= 'selected' if controller.controller_path=='updatecenter' -%>">
+              <li class="<%= 'active' if controller.controller_path=='updatecenter' -%>">
                 <a href="<%= ApplicationController.root_context -%>/updatecenter"><%= message('update_center.page') -%></a></li>
-              <li class="<%= 'selected' if controller.controller_path=='system' -%>">
+              <li class="<%= 'active' if controller.controller_path=='system' -%>">
                 <a href="<%= ApplicationController.root_context -%>/system"><%= message('system_info.page') -%></a></li>
             <% end %>
 
           <% end %>
-        </ul>
+
         <%= yield :sidebar %>
         <div id="logo">
           <center><a href="http://www.sonarsource.org/" target="SonarSource"><%= image_tag('sonar.png', :alt => message('layout.sonar.slogan'), :class => 'png') -%></a></center>
         </div>
+        </ul>
       </div>
-
-      <% if @sidebar %>
-        <div id="sidebarconf"><%= render :partial => @sidebar %></div>
-      <% else %>
-        <div id="sidebarconf" class="hidden"></div>
-      <% end %>
-    </div>
-  <% end %>
-  <div <%= "id='content' class='with_sidebar'" if selected_section -%>>
-    <% if @project %>
-      <div class="print"><h2><%= @project.name(true) %></h2></div>
     <% end %>
-    <div class="error" id="error" style="display:none">
-      <span id="errormsg"></span> &nbsp;&nbsp;[<a href="#" onclick="javascript:$('error').hide();return false;"><%= message('hide').downcase -%></a>]
-    </div>
-    <div class="notice" id="info" style="display:none">
-      <span id="infomsg"></span> &nbsp;&nbsp;[<a href="#" onclick="javascript:$('info').hide();return false;"><%= message('hide').downcase -%></a>]
-    </div>
-    <div class="warning" id="warning" style="display:none">
-      <span id="warningmsg"></span> &nbsp;&nbsp;[<a href="#" onclick="javascript:$('warning').hide();return false;"><%= message('hide').downcase -%></a>]
+    <div <%= "id='content' class='with_sidebar'" if selected_section -%>>
+      <% if @project %>
+        <div class="print"><h2><%= @project.name(true) %></h2></div>
+      <% end %>
+      <div class="error" id="error" style="display:none">
+        <span id="errormsg"></span> &nbsp;&nbsp;[<a href="#" onclick="javascript:$('error').hide();return false;"><%= message('hide').downcase -%></a>]
+      </div>
+      <div class="notice" id="info" style="display:none">
+        <span id="infomsg"></span> &nbsp;&nbsp;[<a href="#" onclick="javascript:$('info').hide();return false;"><%= message('hide').downcase -%></a>]
+      </div>
+      <div class="warning" id="warning" style="display:none">
+        <span id="warningmsg"></span> &nbsp;&nbsp;[<a href="#" onclick="javascript:$('warning').hide();return false;"><%= message('hide').downcase -%></a>]
+      </div>
+      <%= yield %>
     </div>
-    <%= yield %>
   </div>
 </div>
-</div>
 
 <% unless params[:hd]=='false' %>
   <%= yield :footer %>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_tools.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_tools.html.erb
index 2e358d6751fdc071fb0d5be1291dc981afd269d8..d0f369f2cc503ce78bf0e8a33d0572c1a795d6be 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_tools.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_tools.html.erb
@@ -5,7 +5,7 @@
     <ul>
       <li><a href="<%= ApplicationController.root_context -%>/dependencies/index"><%= message('sidebar.tools.dependency') -%></a></li>
       <li><a href="<%= ApplicationController.root_context -%>/comparison/index"><%= message('sidebar.tools.comparison') -%></a></li>
-      <li><a href="<%= ApplicationController.root_context -%>/reviews/index"><%= message('sidebar.tools.review') -%></a></li>
+      <li><a href="<%= ApplicationController.root_context -%>/reviews/index"><%= message('sidebar.tools.reviews') -%></a></li>
     </ul>
   </div>
 </li>
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/index.html.erb
index 9a7831cd11cb5d40eebca16642844eab3359677f..e1db0ced33dbd2533bd37f32a24aeece11fcd183 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/index.html.erb
@@ -29,7 +29,7 @@
         <li>
           <%= message('status') -%>:
           <br/>
-          <select size="6" name="statuses[]" multiple="multiple" id="statuses" class="withIcons large-input">
+          <select size="5" name="statuses[]" multiple="multiple" id="statuses" class="withIcons large-input">
             <option <%= 'selected' if @statuses.include?('') -%> value=""><%= message('any') -%></option>
             <option value="<%= Review::STATUS_OPEN -%>" class="status_open" <%= 'selected' if @statuses.include?(Review::STATUS_OPEN) -%>><%= message('reviews.status.OPEN') -%></option>
             <option value="<%= Review::STATUS_REOPENED -%>" class="status_reopened" <%= 'selected' if @statuses.include?(Review::STATUS_REOPENED) -%>><%= message('reviews.status.REOPENED') -%></option>

diff --git a/sonar-server/src/main/webapp/stylesheets/dashboard.css b/sonar-server/src/main/webapp/stylesheets/dashboard.css
index 4572c090454b4adae62ca271d77a95c6c3c6a1aa..4579e3373da997089e19f1292e6adabb049ba480 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/dashboard.css
+++ b/sonar-server/src/main/webapp/stylesheets/dashboard.css
@@ -46,10 +46,9 @@
 #dashboard .widget-title {
   background-color: #4B9FD5;
   color: #FEFEFE;
-  padding: 5px;
-  height: 16px;
-  line-height: 16px;
-  vertical-align: middle;
+  padding: 0 5px;
+  height: 24px;
+  line-height: 24px;
 }
 
 #dashboard .widget-title a {

diff --git a/sonar-server/src/main/webapp/stylesheets/layout.css b/sonar-server/src/main/webapp/stylesheets/layout.css
index 3fd78010772087f5bd22cd3fe23e173893400c5b..240cbc0f254ec79a42055c484c5a571e908ce773 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/layout.css
+++ b/sonar-server/src/main/webapp/stylesheets/layout.css
@@ -19,7 +19,7 @@
     left: 0;
   }
 
-  #hd, #sb {
+  #hd {
     display: none;
   }
 
@@ -53,7 +53,7 @@ body, a {
 #hd {
   color: #FFF;
   background: #262626;
-  padding: 0 8px 0 18px;
+  padding: 0 10px 0 21px;
   height: 30px;
   line-height: 30px;
   font-size: 93%;
@@ -77,7 +77,7 @@ body, a {
 
 #nav {
   float: right;
-  padding: 0 0 0 10px;
+  padding: 0 0 0 20px;
   vertical-align: middle;
 }
 
@@ -110,7 +110,7 @@ body, a {
   line-height: 26px;
   font-size: 93%;
   margin: 0;
-  padding: 0 8px 0 18px;
+  padding: 0 10px 0 21px;
   border-bottom: 1px solid #CCC;
 }
 
@@ -120,15 +120,10 @@ body, a {
 
 #bc li {
   float: left;
-  margin: 0;
-  background: #EFEFEF url("../images/bc-gray.png") no-repeat left;
+  background: #EFEFEF url("../images/bc-gray.png") no-repeat right;
   border-bottom: 1px solid #CCC;
-  padding: 0 10px 0 25px;
-}
-
-#bc li.first {
-  background: #EFEFEF;
-  padding: 0 10px 0 0;
+  padding: 0 20px 0 0;
+  margin: 0 10px 0 0;
 }
 
 #bc li img {
@@ -215,71 +210,31 @@ body, a {
 }
 
 .with_sidebar {
-  margin: 0 8px 0 168px;
+  margin: 0 0 0 160px;
 }
 
 .wo_sidebar {
   margin: 0 8px;
 }
 
-#sb {
+#sidebar {
   width: 150px;
   position: absolute;
-  margin: 0 8px;
+  margin: 0 0 0 10px;
   top: 0;
   left: 0;
 }
 
-#sidebar {
-  background-color: #CAE3F2;
-  color: #262626;
-  text-align: left;
-  line-height: 1.1em;
-  border: 2px solid #4b9fd5;
-  border-top: none;
-  padding: 10px 0;
-}
-
-#sidebar li {
-  list-style-type: none;
-  padding: 3px 0 3px 8px;
-}
-
-#sidebar li.h2 {
-  color: #003366;
-  padding: 20px 0 3px 8px;
-  text-transform: uppercase;
-  font-size: 100% !important;
-  font-weight: bold;
-}
-
-#sidebar .selected {
-  background-color: #4b9fd5;
-}
-
-#sidebar a, #sidebarpages a:visited {
-  text-decoration: none;
-  border-bottom: 0;
-}
-
-#sidebar a:hover {
-  text-decoration: underline;
-}
-
-#sidebar .selected a, #sidebar .selected a:hover, #sidebar.selected a:visited {
-  color: #FEFEFE;
-}
-
 ul.sidebar {
   text-align: left;
-  line-height: 1.1em;
   border-top: none;
   padding: 10px 0;
 }
 
 ul.sidebar li {
   list-style-type: none;
-  padding: 3px 10px 3px 10px;
+  line-height: 1.1em;
+  padding: 3px 10px;
 }
 
 ul.sidebar li a {
@@ -298,7 +253,7 @@ ul.sidebar li.active a, ul.sidebar li.active a:hover {
   color: #FFF;
 }
 
-.sidebar-title {
+li.sidebar-title {
   text-transform: uppercase;
   font-size: 93%;
   font-weight: bold;
@@ -325,15 +280,6 @@ ul.sidebar li.spacer {
   display: block;
 }
 
-#sidebarconf {
-  background-color: #EFEFEF;
-  border: 2px solid #CCC;
-  color: #666;
-  line-height: 1.1em;
-  margin-top: 10px;
-  padding: 10px;
-}
-
 .nolayout {
   padding: 10px;
 }
@@ -346,6 +292,7 @@ ul.sidebar li.spacer {
   vertical-align: top;
   border-top: none;
   border-left: none;
+  padding-left: 10px;
 }
 
 .page-split-right {
@@ -362,5 +309,11 @@ ul.sidebar li.spacer {
   border: 1px solid #CCC;
   color: #666;
   border-top: none;
-  border-left: none;
+}
+
+.blue-sidebar {
+  background-color: #CAE3F2;
+  color: #262626;
+  border: 2px solid #4b9fd5;
+  border-top: none;
 }

diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index e96f52f5e513bd81ef2a623ee02ae991eda4ac63..e2f3cf9511b89bc24bbcc11dbde199100d59aece 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -2122,13 +2122,14 @@ table.nowrap td, td.nowrap, th.nowrap {
   min-width: 160px;
   padding: 0;
   position: absolute;
-  line-height: 20px;
   z-index: 1000;
 }
 
 .dropdown-menu li {
   list-style-type: none !important;
-  padding: 2px 8px !important;
+  line-height: 24px;
+  height: 24px;
+  padding: 0 8px;
   cursor: pointer !important;
   color: red !important;
 }