From ceace96010ebf0f6defba7fda8c7a5696d32ee7d Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Tue, 29 Oct 2013 15:26:06 +0100
Subject: SONAR-4817 Fix timeline widget for IT

---
 .../resources/org/sonar/plugins/core/widgets/timeline.html.erb    | 2 +-
 sonar-server/src/main/webapp/javascripts/widgets/timeline.js      | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb
index dae64bfef9d..343971faa1e 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb
@@ -167,7 +167,7 @@
 <%   else %>
   <% timeline = 'timeline' + widget.id.to_s %>
 
-  <div id="timeline-chart-<%= widget.id -%>"></div>
+  <div id="timeline-chart-<%= widget.id -%>" style="height: <%= chartHeight -%>px;"></div>
   <script>
     function d(y, m, d, h, min, s) {
       return new Date(y, m, d, h, min, s);
diff --git a/sonar-server/src/main/webapp/javascripts/widgets/timeline.js b/sonar-server/src/main/webapp/javascripts/widgets/timeline.js
index cc70e097367..282cc9abcc0 100644
--- a/sonar-server/src/main/webapp/javascripts/widgets/timeline.js
+++ b/sonar-server/src/main/webapp/javascripts/widgets/timeline.js
@@ -148,13 +148,7 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets;
     this.timeAxis = d3.svg.axis()
         .scale(this.time)
         .orient('bottom')
-        .tickFormat(function(d) {
-          var format = d.getMonth() === 0 ?
-              d3.time.format('%Y') :
-              d3.time.format('%b');
-
-          return format(d);
-        });
+        .ticks(5);
 
 
     // Configure lines and points
-- 
cgit v1.2.3