small modifs + fixing one error under IE6 (some left but I can't find where they come from)

8 files changed, 5 insertions, 12 deletions

diff --git a/core/Controller.php b/core/Controller.php
index 9d99b2f8ae..22d40ec131 100644
--- a/core/Controller.php
+++ b/core/Controller.php
@@ -129,9 +129,6 @@ abstract class Piwik_Controller
 		require_once "ViewDataTable/GenerateGraphHTML.php";
 		$view = Piwik_ViewDataTable::factory('graphEvolution');
 		$view->init( $currentModuleName, $currentControllerAction, $apiMethod );
-		$view->disableExcludeLowPopulation();
-		$view->disableShowAllViewsIcons();
-		$view->disableShowTable();
 		
 		// if the date is not yet a nicely formatted date range ie. YYYY-MM-DD,YYYY-MM-DD we build it
 		// otherwise the current controller action is being called with the good date format already so it's fine
diff --git a/plugins/CoreHome/templates/datatable_footer.tpl b/plugins/CoreHome/templates/datatable_footer.tpl
index 0921b01523..0d37b9e7aa 100644
--- a/plugins/CoreHome/templates/datatable_footer.tpl
+++ b/plugins/CoreHome/templates/datatable_footer.tpl
@@ -15,7 +15,6 @@
 	<span id="dataTablePrevious">&lsaquo; {'General_Previous'|translate}</span>
 	<span id="dataTableNext">{'General_Next'|translate} &rsaquo;</span>
 {/if}
-
 {if $properties.show_footer_icons}
 	<div>
 		<span id="dataTableFooterIcons">
diff --git a/plugins/CoreHome/templates/graph.tpl b/plugins/CoreHome/templates/graph.tpl
index b0f827dcaf..fcfaeda7cb 100644
--- a/plugins/CoreHome/templates/graph.tpl
+++ b/plugins/CoreHome/templates/graph.tpl
@@ -1,9 +1,11 @@
 <div id="{$properties.uniqueId}">
 	<div class="{if $graphType=='evolution'}dataTableGraphEvolutionWrapper{else}dataTableGraphWrapper{/if}">
+
 	{$jsInvocationTag}
 	{if $properties.show_footer}
 		{include file="CoreHome/templates/datatable_footer.tpl"}
 		{include file="CoreHome/templates/datatable_js.tpl"}
 	{/if}
+	
 	</div>
 </div>
diff --git a/plugins/CoreHome/templates/sparkline.js b/plugins/CoreHome/templates/sparkline.js
index 1d7712516e..e9fef7189f 100644
--- a/plugins/CoreHome/templates/sparkline.js
+++ b/plugins/CoreHome/templates/sparkline.js
@@ -13,7 +13,7 @@ $(document).ready( function(){
 				});
 				if(url != ""){
 					//on click, reload the graph with the new url
-					$(this).click( function() {	
+					$(this).click( function() {
 						//get the main page graph and reload with new data
 						piwikHelper.findSWFGraph(graph.attr('graphId')+"Chart_swf").reload(url);
 						piwikHelper.lazyScrollTo(graph[0], 400);
@@ -22,7 +22,7 @@ $(document).ready( function(){
 						function() { 
 							$(this).css({
 										"cursor": "pointer", 
-										"border-bottom": "1px dashed #C3C3C3",
+										"border-bottom": "1px dashed #C3C3C3"
 									});
 						}, 
 						function(){
diff --git a/plugins/VisitsSummary/templates/index.tpl b/plugins/VisitsSummary/templates/index.tpl
index 7255107589..4cf972d9b5 100644
--- a/plugins/VisitsSummary/templates/index.tpl
+++ b/plugins/VisitsSummary/templates/index.tpl
@@ -1,4 +1,3 @@
-
 <script type="text/javascript" src="plugins/CoreHome/templates/sparkline.js"></script>
 
 <a name="evolutionGraph" graphId="VisitsSummarygetEvolutionGraph"></a>
diff --git a/plugins/Widgetize/templates/index.tpl b/plugins/Widgetize/templates/index.tpl
index cf78a1f1dd..f93d4f1ef9 100644
--- a/plugins/Widgetize/templates/index.tpl
+++ b/plugins/Widgetize/templates/index.tpl
@@ -18,9 +18,6 @@
 <link rel="stylesheet" href="plugins/CoreHome/templates/datatable.css">
 <link rel="stylesheet" href="plugins/Dashboard/templates/dashboard.css">
 <script type="text/javascript" src="plugins/Widgetize/templates/widgetize.js"></script>
-
-{*<script type="text/javascript" src="http://widgets.clearspring.com/launchpad/include.js"></script>
-*}
 <script src="http://cdn.clearspring.com/launchpad/v2/standalone.js" type="text/javascript"></script>
 {literal}
 <style>
diff --git a/tests/core/LanguagesManager.test.php b/tests/core/LanguagesManager.test.php
index 8c6af7651e..8beb78d298 100644
--- a/tests/core/LanguagesManager.test.php
+++ b/tests/core/LanguagesManager.test.php
@@ -25,8 +25,8 @@ class Test_Languages_Manager extends UnitTestCase
 		{
 			ob_start(); 
 			$strings = Piwik_LanguagesManager_API::getTranslationsForLanguage($language);
-			$this->assertTrue(count($strings) > 100); // at least 100 translations in the language file
 			$content = ob_get_flush();
+			$this->assertTrue(count($strings) > 100); // at least 100 translations in the language file
 			$this->assertTrue(strlen($content) == 0, "buffer was ".strlen($content)." long but should be zero. Translation file for '$language' must be buggy.");
 		}
 		$this->pass();
diff --git a/themes/default/common.js b/themes/default/common.js
index 7135e3df3c..a56320f1c1 100644
--- a/themes/default/common.js
+++ b/themes/default/common.js
@@ -37,7 +37,6 @@ piwikHelper.findSWFGraph = function(name) {
 }
 
 piwikHelper.redirectToUrl = function(url) {
-	alert(url);
 	window.location = url;
 }