Fixed issues with d3dendrogram

Added random,horizontal and vertical layour to wordcloud

lib/Haanga/lib/Haanga/Extension/Filter/D3dendrogram.php

@@ -35,7 +35,7 @@ class Haanga_Extension_Filter_D3Dendrogram{
   	}
   	//options
   	$options = array();
-  	$options['width'] = 960;
+  	$options['width'] = 600;
   	$options['height'] = 500;
   	$options['color'] = '#aec7e8';
   	$options['highlightedColor'] = '#00477f';
@@ -88,8 +88,8 @@ class Haanga_Extension_Filter_D3Dendrogram{
 <script>
 // Based on http://bost.ocks.org/mike/treemap/ 
 function initD3TreeMaps'.$randId.'(json){
-var width = 600,
-    height = 500;
+var width = '.$options['width'].',
+    height = '.$options['height'].';
   
   var cluster = d3.layout.cluster()
       .size([height, width - 200]);

lib/Haanga/lib/Haanga/Extension/Filter/D3wordcloud.php

@@ -77,6 +77,7 @@ function D3WordCloud'.$randId.'(words, newcfg){
              font: "sans-serif",
              minsize: 10,
              maxsize: 100,
+             wordOrientation: "random",
              color: "black",
              stopwords: ["of", "the", "a", "or", "to", "and", "for", "at", "with", "without", "in", "from", "is", "are", "were", "was", "this", "that", "these", "those", "in", "on"]
   };
@@ -112,7 +113,7 @@ function D3WordCloud'.$randId.'(words, newcfg){
       .words(totalWords.map(function(d) {
               return {text: d.name, size: parseInt(cfg.minsize + (cfg.maxsize-cfg.minsize)*(d.total/maxValue))};
       }))
-      .rotate(function() { return ~~(Math.random() * 2) * 90; })
+      .rotate(function() { var x=~~(Math.random() * 2) * 90; if(cfg.wordOrientation == "horizontal"){x = 0;}if(cfg.wordOrientation == "vertical"){x = 90;} return x; })
       .padding(1)
       .font("arial")
       .fontSize(function(d) { return d.size; })
@@ -127,7 +128,7 @@ function D3WordCloud'.$randId.'(words, newcfg){
         .attr("transform", "translate("+cfg.width/2+","+cfg.height/2+")");
         
         g.selectAll("text").data(words)
-      .enter().append("a").attr("xlink:href", function(d){console.log(d);return wordLinks[d.text]}).append("text")
+      .enter().append("a").attr("xlink:href", function(d){return wordLinks[d.text]}).append("text")
         .style("font-family", cfg.font)
         .style("font-size", function(d) { return d.size + "px"; })
         .style("fill", cfg.color)