Merge branch 'release-2.9'

Conflicts:
	archetypes/sonar-basic-plugin/pom.xml
	archetypes/sonar-gwt-plugin/pom.xml
	plugins/sonar-checkstyle-plugin/pom.xml
	plugins/sonar-cobertura-plugin/pom.xml
	plugins/sonar-core-gwt/pom.xml
	plugins/sonar-core-plugin/pom.xml
	plugins/sonar-cpd-plugin/pom.xml
	plugins/sonar-dbcleaner-plugin/pom.xml
	plugins/sonar-design-plugin/pom.xml
	plugins/sonar-findbugs-plugin/pom.xml
	plugins/sonar-googleanalytics-plugin/pom.xml
	plugins/sonar-pmd-plugin/pom.xml
	plugins/sonar-squid-java-plugin/pom.xml
	plugins/sonar-surefire-plugin/pom.xml
	pom.xml
	samples/pom.xml
	sonar-application/pom.xml
	sonar-batch-bootstrapper/pom.xml
	sonar-batch-maven-compat/pom.xml
	sonar-batch/pom.xml
	sonar-channel/pom.xml
	sonar-check-api/pom.xml
	sonar-colorizer/pom.xml
	sonar-core-maven-plugin/pom.xml
	sonar-core/pom.xml
	sonar-deprecated/pom.xml
	sonar-duplications/pom.xml
	sonar-graph/pom.xml
	sonar-gwt-api/pom.xml
	sonar-java-api/pom.xml
	sonar-markdown/pom.xml
	sonar-maven-plugin/pom.xml
	sonar-maven3-plugin/pom.xml
	sonar-plugin-api/pom.xml
	sonar-server/pom.xml
	sonar-squid/pom.xml
	sonar-testing-harness/pom.xml
	sonar-ws-client/pom.xml

7 files changed, 52 insertions, 39 deletions

diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml
index 4b3842e9f02..53441136766 100644
--- a/sonar-server/pom.xml
+++ b/sonar-server/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.codehaus.sonar</groupId>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
index 6866a11cd8c..616860899f2 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
@@ -95,10 +95,10 @@ module ApplicationHelper
       if mode=='days'
         label = "over %s days" % mode_param
       elsif mode=='version'
-        if !date.nil?
-          label = "since version %s (%s)" % [mode_param]
+        if date
+          label = "since version %s (%s)" % [mode_param, date.strftime("%Y %b %d")]
         else
-          label = "since version %s" % [mode_param, (date.strftime("%Y %b %d"))]
+          label = "since version %s" % mode_param
         end
       elsif mode=='previous_analysis'
         if !date.nil?
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/cloud/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/cloud/index.html.erb
index 2ce1a913233..609dc6fcff1 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/cloud/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/cloud/index.html.erb
@@ -20,8 +20,8 @@
 <div>
 <form id="cloudform" action="<%= ApplicationController.root_context -%>/cloud/index/<%= @project.id -%>" method="GET">
   <ul class="headerLine">
-    <li class="first">
-      <span class="note">Color:</span>
+    <li>
+      <span>Color:</span>
       <select name="color" onchange="document.forms['cloudform'].submit()">
         <% if @snapshot.measure('coverage') %>
           <option value="coverage" <%= 'selected' if @color_metric.key=='coverage' -%>>Coverage</option>
@@ -29,6 +29,7 @@
         <option value="violations_density" <%= 'selected' if @color_metric.key=='violations_density' -%>>Rules compliance</option>
       </select>
     </li>
+    <li class="sep"> </li>
     <li>
       <input type="radio" name="size" value="ncloc" <%= 'checked' if @size_metric.key=='ncloc' -%> onclick="document.forms['cloudform'].submit()" id="radio-quick">
       <label for="radio-quick">Quick wins</label></option>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb
index 1e6d6f9e9be..6332e6e65be 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb
@@ -1,26 +1,28 @@
 <div id="dashboard">
   <%= render :partial => 'dashboard/header', :locals => {:back => false} %>
-
+<div style="width: 100%;display: block; float: none">
   <%
-    columns=@dashboard.column_layout.split('-')
-    for index in 1..columns.size()
+     columns=@dashboard.column_layout.split('-')
+     for index in 1..columns.size()
   %>
-    <div class="dashboard-column-wrapper" style="width: <%= columns[index-1] -%>; ">
-    <div class="dashboard-column" id="dashboard-column-<%= index -%>" style="margin: 0px <%= index<columns.size() ? "5px" : "0px" -%> 0px <%= index>1 ? "5px" : "0px" -%>;">
-    <%
-      @dashboard.widgets.select{|widget| widget.column_index==index}.sort_by{|widget| widget.row_index}.each do |widget|
-        widget_definition=@widget_definitions.find{|wd| wd.getId()==widget.widget_key }
-        if widget_definition
-    %>
-        <div class="block" id="block_<%= widget.id -%>">
-          <%= render :partial => 'dashboard/widget', :locals => {:widget => widget,  :definition => widget_definition} %>
+
+      <div class="dashboard-column-wrapper" style="width: <%= columns[index-1] -%>; ">
+        <div class="dashboard-column" id="dashboard-column-<%= index -%>" style="margin: 0px <%= index<columns.size() ? "5px" : "0px" -%> 0px <%= index>1 ? "5px" : "0px" -%>;">
+          <%
+             @dashboard.widgets.select { |widget| widget.column_index==index }.sort_by { |widget| widget.row_index }.each do |widget|
+               widget_definition=@widget_definitions.find { |wd| wd.getId()==widget.widget_key }
+               if widget_definition
+          %>
+              <div class="block" id="block_<%= widget.id -%>">
+                <%= render :partial => 'dashboard/widget', :locals => {:widget => widget, :definition => widget_definition} %>
+              </div>
+            <%
+               end
+               end
+            %>
         </div>
-    <%
-        end
-      end
-    %>
       </div>
-    </div>
   <% end %>
+  </div>
   <div style="clear: both;"></div>
 </div>
\ No newline at end of file
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb
index feb41688e90..a3d3cb61ca4 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb
@@ -31,7 +31,7 @@
   <% end %>
 </div>
 &nbsp;<!-- keep &nbsp; for IE6 ! -->
-<table id="drilldown" class="width100">
+<table id="drilldown" class="width100" style="clear:left">
 <% if @highlighted_metric!=@metric %>
 <tr>
 <td colspan="<%= @drilldown.columns.size -%>">Drilldown on <b><%= format_measure(@metric.key, :period => @period) -%> <%= @metric.short_name -%></b></td>
diff --git a/sonar-server/src/main/webapp/stylesheets/dashboard.css b/sonar-server/src/main/webapp/stylesheets/dashboard.css
index d48c406b301..7f2c344f15c 100644
--- a/sonar-server/src/main/webapp/stylesheets/dashboard.css
+++ b/sonar-server/src/main/webapp/stylesheets/dashboard.css
@@ -128,7 +128,6 @@
   float: left;
   margin: 0;
   padding: 0;
-  clear: right;
 }
 
 #dashboard .column-handle {
diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index b0eac2a9067..32347f77aff 100644
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -77,9 +77,13 @@ div#hd {
   color: #fff;
   padding: 0 0 0 10px;
 }
+#crumbs li {
+  height: 30px;
+  line-height: 30px;
+  vertical-align: middle;
+}
 #crumbs li a, #nav li a {
   color: #fff;
-  vertical-align: middle;
 }
 #crumbs li a:link, #crumbs li a:visited, #nav li a:link, #nav li a:visited {
   text-decoration:none;
@@ -94,14 +98,14 @@ div#hd {
   text-align: left;
   margin: 50px 180px 0;
 }
+div#body {
+  position: relative;
+  width: 100%;
+}
 div#footer {
-  padding-top: 10px;
-  margin: 0 10px;
+  margin: 10px;
   clear: both;
 }
-div#body {
-  height: 100%;
-}
 .with_sidebar {
   margin: 0 10px 0 170px;
 }
@@ -114,8 +118,10 @@ div#content {
 }
 div#sb {
   width: 150px;
-  float: left;
+  position: absolute;
   margin: 0 10px;
+  top: 0;
+  left: 0;
 }
 div#sidebar {
   background-color: #CAE3F2;
@@ -1226,7 +1232,7 @@ div.autocomplete strong {
   float: left;
   vertical-align: top;
   text-align: left;
-  min-width: 60px;
+  
   padding: 0 10px 7px 0;
 }
 
@@ -1258,18 +1264,24 @@ table.header1 td {
 	color: #444;
 	border: 1px solid #DDD;
 	margin: 0 0 10px 0;
-  line-height: 30px;
-  height: 30px;
+  line-height: 28px;
+  height: 28px;
 }
 ul.headerLine li {
   float: left;
   display: block;
   padding: 0 10px 0;
-  background: url("../images/sep12.png") no-repeat scroll 0 50% transparent;
+  height: 28px;
+  vertical-align: middle;
 }
-ul.headerLine li.first {
-  background: none;
+ul.headerLine li.sep {
+  background: url("../images/sep12.png") no-repeat scroll 50% 50% transparent;
+  padding: 0 5px 0 5px;
 }
+ul.headerLine select, ul.headerLine input, ul.headerLine button, ul.headerLine textarea, ul.headerLine span {
+  vertical-align: middle;
+}
+
 select.withIcons option {
 	background-repeat: no-repeat;
 	background-position: 2px 0;