SONAR-5623 Apply feedback

5 files changed, 22 insertions, 22 deletions

diff --git a/server/sonar-web/src/main/coffee/analysis-reports/views/report-view.coffee b/server/sonar-web/src/main/coffee/analysis-reports/views/report-view.coffee
index 9c68875ccf4..9215879a4f4 100644
--- a/server/sonar-web/src/main/coffee/analysis-reports/views/report-view.coffee
+++ b/server/sonar-web/src/main/coffee/analysis-reports/views/report-view.coffee
@@ -15,5 +15,5 @@ define [
       status = @model.get 'status'
       @$el.addClass 'analysis-reports-report-pending' if status is 'PENDING'
       @$el.addClass 'analysis-reports-report-working' if status is 'WORKING'
-      @$el.addClass 'analysis-reports-report-done' if status is 'DONE'
-      @$el.addClass 'analysis-reports-report-failed' if status is 'FAILED'
+      @$el.addClass 'analysis-reports-report-done' if status is 'SUCCESS'
+      @$el.addClass 'analysis-reports-report-failed' if status is 'FAIL'
diff --git a/server/sonar-web/src/main/hbs/analysis-reports/analysis-reports-actions.hbs b/server/sonar-web/src/main/hbs/analysis-reports/analysis-reports-actions.hbs
index b47f7e04014..e8ce9787ee6 100644
--- a/server/sonar-web/src/main/hbs/analysis-reports/analysis-reports-actions.hbs
+++ b/server/sonar-web/src/main/hbs/analysis-reports/analysis-reports-actions.hbs
@@ -1,9 +1,11 @@
 {{#if state.active}}
-  {{t 'analysis_reports.current_activity'}} ({{tp 'analysis_reports.x_reports' total}})
+  {{t 'analysis_reports.current_activity'}}
      
-  <a class="js-show-past-reports">{{t 'analysis_reports.show_past_reports'}}</a>
+  <a class="js-show-past-reports">{{t 'analysis_reports.past_reports'}}</a>
 {{else}}
-  {{t 'analysis_reports.past_reports'}} ({{tp 'analysis_reports.x_reports' total}})
+  <a class="js-show-current-activity">{{t 'analysis_reports.current_activity'}}</a>
   &nbsp;&nbsp;&nbsp;
-  <a class="js-show-current-activity">{{t 'analysis_reports.show_current_activity'}}</a>
+  {{t 'analysis_reports.past_reports'}}
 {{/if}}
+
+<span style="float: right;">{{tp 'analysis_reports.x_reports' total}}</span>
diff --git a/server/sonar-web/src/main/hbs/analysis-reports/analysis-reports-layout.hbs b/server/sonar-web/src/main/hbs/analysis-reports/analysis-reports-layout.hbs
index 399bb422ae9..6f55d7e7e5d 100644
--- a/server/sonar-web/src/main/hbs/analysis-reports/analysis-reports-layout.hbs
+++ b/server/sonar-web/src/main/hbs/analysis-reports/analysis-reports-layout.hbs
@@ -5,9 +5,4 @@
     <div class="navigator-actions"></div>
     <div class="navigator-results"></div>
   </div>
-  <div class="navigator-main">
-    <div class="navigator-details">
-      <i class="spinner analysis-reports-spinner"></i>
-    </div>
-  </div>
 </div>
diff --git a/server/sonar-web/src/main/hbs/analysis-reports/analysis-reports-report.hbs b/server/sonar-web/src/main/hbs/analysis-reports/analysis-reports-report.hbs
index a4088dc16b3..c58a92151d2 100644
--- a/server/sonar-web/src/main/hbs/analysis-reports/analysis-reports-report.hbs
+++ b/server/sonar-web/src/main/hbs/analysis-reports/analysis-reports-report.hbs
@@ -1,21 +1,24 @@
 <div class="line">
   <span class="analysis-reports-project">
     <i class="icon-qualifier-trk"></i>
-    <a href="{{dashboardUrl project}}">{{projectName}}</a>
+    <a href="{{dashboardUrl projectKey}}">{{projectName}}</a>
   </span>
 
-  <span class="analysis-reports-timestamp line-small">
-    {{#if endDate}}
-      Finished: {{dt startDate}}
-    {{else}}
-      Started: {{dt startDate}}
-    {{/if}}
+  {{#if submittedAt}}
+    <span class="analysis-reports-timestamp line-small">
+      Submitted: {{dt submittedAt}}
+    </span>
+  {{/if}}
 
-  </span>
+  {{#if startedAt}}
+    <span class="analysis-reports-timestamp line-small">
+      Started: {{dt startedAt}}
+    </span>
+  {{/if}}
 
-  {{#if duration}}
+  {{#if finishedAt}}
     <span class="analysis-reports-timestamp line-small">
-      Duration: {{duration}}
+      Finished: {{dt finishedAt}}
     </span>
   {{/if}}
 </div>
diff --git a/server/sonar-web/src/main/less/analysis-reports.less b/server/sonar-web/src/main/less/analysis-reports.less
index f17e158776e..e734cb2dd45 100644
--- a/server/sonar-web/src/main/less/analysis-reports.less
+++ b/server/sonar-web/src/main/less/analysis-reports.less
@@ -67,7 +67,7 @@
 .analysis-reports-timestamp {
   display: inline-block;
   vertical-align: middle;
-  width: 180px;
+  width: 220px;
   margin-left: 15px;
 }