diff -r 81a605180745 -r c86141a8570d integration/js/treemap.js --- a/integration/js/treemap.js Tue Oct 30 18:04:28 2012 +0100 +++ b/integration/js/treemap.js Tue Nov 27 18:08:06 2012 +0100 @@ -91,6 +91,7 @@ '
'+ ''+ ''+ + '
'+ '
'+ '
'+ '

<%-label%>

'+ @@ -103,44 +104,52 @@ '
'+ '
'+ ''; -var tmpl = _.template(actu); -squarify(data,0,0,760,358); - -document.getElementById('treemap1').innerHTML = _(data).reduce(function(mem, d) { - return mem + tmpl(d); -},""); -//redimensionnement d'image -$(".actu").each(function(k,v){ - var wActu = $(this).width(); - var hActu = $(this).height(); - var img = $(this).find('img'); - var wImg = img.width(); - var hImg = img.height(); +$(function(){ + //treemap + var tmpl = _.template(actu); + var hTreemap = 800;//à définir + $('#treemap').height(hTreemap); + squarify(data,0,0,760,hTreemap); + var treemapHtml = _(data).reduce(function(mem, d) { + return mem + tmpl(d); + },""); + $('#treemap #actus').html(treemapHtml); - var ratioImg = wImg/hImg; - img.css('height',hActu); - img.css('width',hActu*ratioImg); - wImg = img.width(); - hImg = img.height(); + //redimensionnement d'image + $(".actu").each(function(k,v){ + var wActu = $(this).width(); + var hActu = $(this).height(); + var img = $(this).find('img'); + var wImg = img.width(); + var hImg = img.height(); - if(wActu>wImg){ - var ratioImg = hImg/wImg; - img.css('width', wActu); - img.css('height',wActu*ratioImg); + var ratioImg = wImg/hImg; + img.css('height',hActu); + img.css('width',hActu*ratioImg); wImg = img.width(); hImg = img.height(); - } + + if(wActu>wImg){ + var ratioImg = hImg/wImg; + img.css('width', wActu); + img.css('height',wActu*ratioImg); + wImg = img.width(); + hImg = img.height(); + } - if (wImg