SONAR-7527 Change metric columns order and layout of provided global dashboard

diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/GlobalDefaultDashboard.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/GlobalDefaultDashboard.java
index e1e22885d52cdbbbbf5b25a5dd1e53d3bbaed264..de06f1c3335b6c852de541e39591290e5b6009b4 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/GlobalDefaultDashboard.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/GlobalDefaultDashboard.java
@@ -47,7 +47,7 @@ public final class GlobalDefaultDashboard extends DashboardTemplate {
   public Dashboard createDashboard() {
     Dashboard dashboard = Dashboard.create()
       .setGlobal(true)
-      .setLayout(DashboardLayout.TWO_COLUMNS);
+      .setLayout(DashboardLayout.TWO_COLUMNS_30_70);
 
     dashboard.addWidget(WelcomeWidget.ID, 1);
     addMyFavouritesWidget(dashboard);

diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/template/ProjectFilter.java b/server/sonar-server/src/main/java/org/sonar/server/measure/template/ProjectFilter.java
index 4b79a70f6656b162c60ff04537273a51297b640e..e352b8b754de23ffebb7a51d31cb6ece511804d5 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/template/ProjectFilter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/measure/template/ProjectFilter.java
@@ -42,15 +42,15 @@ public class ProjectFilter extends FilterTemplate {
   @Override
   public Filter createFilter() {
     return Filter.create()
-        .setDisplayAs(Filter.LIST)
-        .add(Criterion.createForQualifier(Qualifiers.PROJECT))
-        .add(FilterColumn.create("metric", CoreMetrics.ALERT_STATUS_KEY, FilterColumn.DESC, false))
-        .add(FilterColumn.create("name", null, FilterColumn.ASC, false))
-        .add(FilterColumn.create("version", null, FilterColumn.DESC, false))
-        .add(FilterColumn.create("metric", CoreMetrics.NCLOC_KEY, FilterColumn.DESC, false))
-        .add(FilterColumn.create("metric", CoreMetrics.CODE_SMELLS_KEY, FilterColumn.DESC, false))
-        .add(FilterColumn.create("metric", CoreMetrics.BUGS_KEY, FilterColumn.DESC, false))
-        .add(FilterColumn.create("metric", CoreMetrics.VULNERABILITIES_KEY, FilterColumn.DESC, false))
-        .add(FilterColumn.create("date", null, FilterColumn.DESC, false));
+      .setDisplayAs(Filter.LIST)
+      .add(Criterion.createForQualifier(Qualifiers.PROJECT))
+      .add(FilterColumn.create("metric", CoreMetrics.ALERT_STATUS_KEY, FilterColumn.DESC, false))
+      .add(FilterColumn.create("name", null, FilterColumn.ASC, false))
+      .add(FilterColumn.create("version", null, FilterColumn.DESC, false))
+      .add(FilterColumn.create("metric", CoreMetrics.NCLOC_KEY, FilterColumn.DESC, false))
+      .add(FilterColumn.create("metric", CoreMetrics.BUGS_KEY, FilterColumn.DESC, false))
+      .add(FilterColumn.create("metric", CoreMetrics.VULNERABILITIES_KEY, FilterColumn.DESC, false))
+      .add(FilterColumn.create("metric", CoreMetrics.CODE_SMELLS_KEY, FilterColumn.DESC, false))
+      .add(FilterColumn.create("date", null, FilterColumn.DESC, false));
   }
 }