Width of treemap is not required anymore

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/components_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/components_controller.rb
index 9e8e23cc0f890eb8042372d360fb0b6681c7f898..8c412ab8db471845d2cb778f8de4586b0b05d82b 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/components_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/components_controller.rb
@@ -44,7 +44,7 @@ class ComponentsController < ApplicationController
     measures = component_measures(@snapshots, metrics)
     @measures_by_snapshot = measures_by_snapshot(@snapshots, measures)
     if @components_configuration.treemap_enabled? && @snapshots.size>1
-      @treemap = Sonar::Treemap.new(1, default_treemap_size_metric, TREEMAP_SIZE, TREEMAP_SIZE, {
+      @treemap = Sonar::Treemap.new(1, default_treemap_size_metric, TREEMAP_SIZE, {
         :color_metric => default_treemap_color_metric,
         :root_snapshot => @snapshot
       })

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/treemap_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/treemap_controller.rb
index fe34259e080f343909ca293c34c261a72763d802..ea63d4387476ad3e69291f0f07c5b9f30835ee73 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/treemap_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/treemap_controller.rb
@@ -26,10 +26,6 @@ class TreemapController < ApplicationController
     html_id = params[:id]
     bad_request('Missing required property: id') if html_id.blank?
 
-    width = params[:width]
-    bad_request('Missing required property: width') if width.blank?
-    bad_request('Bad width') if width.to_i<=0
-
     height = params[:height]
     bad_request('Missing required property: height') if height.blank?
     bad_request('Bad height') if height.to_i<=0
@@ -57,7 +53,7 @@ class TreemapController < ApplicationController
       bad_request('Missing parameter: resource or filter')
     end
 
-    treemap = Sonar::Treemap.new(html_id, size_metric, width.to_i, height.to_i, {
+    treemap = Sonar::Treemap.new(html_id, size_metric, height.to_i, {
       :color_metric => color_metric,
       :root_snapshot => (resource ? resource.last_snapshot : nil),
       :measures_by_snapshot => (filter_context ? filter_context.measures_by_snapshot : nil),

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/treemap.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/treemap.rb
index ceea573b8d80bdf19b1c358541026b58fc598727..63ae871374b6004850c02b4166c2c272418da1ed 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/treemap.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/treemap.rb
@@ -20,14 +20,13 @@
 class Sonar::Treemap
   include ActionView::Helpers::UrlHelper
 
-  attr_accessor :size_metric, :color_metric, :width, :height, :root_snapshot, :period_index,
+  attr_accessor :size_metric, :color_metric, :height, :root_snapshot, :period_index,
                 :id, :components_size, :measures
 
-  def initialize(id, size_metric, width, height, options={})
+  def initialize(id, size_metric, height, options={})
     @components_size = 0
     @id = id
     @size_metric = size_metric
-    @width = width
     @height = height
 
     @color_metric = options[:color_metric]
@@ -55,7 +54,7 @@ class Sonar::Treemap
     build_tree(root)
 
     output = Sonar::HtmlOutput.new do |o|
-      o.width = @width
+      o.width = 100
       o.height = @height
       o.full_html = false
       o.details_at_depth = 1
@@ -148,8 +147,8 @@ class Sonar::HtmlOutput < Treemap::HtmlOutput
     html = ''
     html += "<div style=\""
     html += "overflow:hidden;position:absolute;"
-    html += "left:#{node.bounds.x1}px; top:#{node.bounds.y1}px;"
-    html += "width:#{node.bounds.width}px;height: #{node.bounds.height}px;"
+    html += "left:#{node.bounds.x1}%; top:#{node.bounds.y1}px;"
+    html += "width:#{node.bounds.width}%;height: #{node.bounds.height}px;"
     html += "background-color:#FFF;\">"
     html += "<div rid='#{node.rid}' id=\"tm-node-#{node.id}\" style='margin: 1px;background-color: #{node.color}; height: #{node.bounds.height-4}px;
 border: 1px solid #{node.color};' alt=\"#{node.tooltip}\" title=\"#{node.tooltip}\""

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/components/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/components/index.html.erb
index d2dbf67ae625b16d8b62e2508c75b47ffbe25cd4..447b3c3d9d18ff76590953c591eac71962436d8a 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/components/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/components/index.html.erb
@@ -71,7 +71,7 @@
       </td>
       <% if @treemap %>
         <td width="10px">&nbsp;</td>
-        <td width="<%= @treemap.width -%>" valign="top">
+        <td width="280px" valign="top">
           <script>
             new Treemap(1, '<%= @treemap.size_metric ? @treemap.size_metric.key : '' -%>', '<%= @treemap.color_metric ? @treemap.color_metric.key : '' -%>', 100.0).init('resource',
               <%= @resource.id -%>);

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_treemap.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_treemap.html.erb
index e416740a27e72e74c086b4f46a8b254bbdd1fc97..52ced24fb64f7eb1c76b740eb898d995e3ab6e48 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_treemap.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_treemap.html.erb
@@ -1,3 +1,3 @@
-<div class="treemap" style="width: <%= treemap.width -%>px; height:<%= treemap.height %>px;">
+<div class="treemap" style="width: 100%; height:<%= treemap.height %>px;">
   <%= treemap.generate_html() -%>
 </div>
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_treemap_container.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_treemap_container.html.erb
index 24f9dab2f3ebba0ae6b26dd8ddc775f8cdaf5fa6..457a263fe216877136ad659ab2b820ae527d1aca 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_treemap_container.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_treemap_container.html.erb
@@ -33,7 +33,4 @@
       <%= height_in_percents -%>);
   treemap.init('<%= context_type -%>', <%= context_id -%>).load();
 
-  autoResize(200, function() {
-    treemap.load();
-  });
 </script>

diff --git a/sonar-server/src/main/webapp/javascripts/application.js b/sonar-server/src/main/webapp/javascripts/application.js
index 579609ebdcdb74d24c2e24e884d42aac085f8e74..eb635f67831bf6c7af058ecd562621ac3c090a9e 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/application.js
+++ b/sonar-server/src/main/webapp/javascripts/application.js
@@ -195,7 +195,7 @@ Treemap.prototype.currentContext = function () {
   return null;
 };
 Treemap.prototype.width = function () {
-  return $('tm-' + this.id).getWidth() - 10;
+  return $('tm-' + this.id).getWidth();
 };
 Treemap.prototype.load = function () {
   var context = this.currentContext();
@@ -215,7 +215,7 @@ Treemap.prototype.load = function () {
   }
 
   new Ajax.Request(
-      baseUrl + '/treemap/index?id=' + this.id + '&width=' + width + '&height=' + height + '&size_metric=' + this.sizeMetric + '&color_metric=' + this.colorMetric + '&' + context.type + '=' + context.id,
+      baseUrl + '/treemap/index?id=' + this.id + '&height=' + height + '&size_metric=' + this.sizeMetric + '&color_metric=' + this.colorMetric + '&' + context.type + '=' + context.id,
       {
         asynchronous:true,
         evalScripts:true