* Build

 * bug in calendar click 
 * Better legends for ecommerce graphs

git-svn-id: http://dev.piwik.org/svn/trunk@5295 59fd770c-687e-43c8-a1e3-f5a4ff64c105

plugins/CoreHome/templates/broadcast.js

@@ -325,7 +325,7 @@ broadcast.getParamValue = function (param, url)
         }
         var value = url.substring(startStr + param.length +1,endStr);
         // sanitize values
-        var value = value.replace(/[^,0-9a-zA-Z]/gi, '');
+        var value = value.replace(/[^_%\-,0-9a-zA-Z]/gi, '');
         
         return value;
     } else {

plugins/Goals/Controller.php

@@ -297,17 +297,23 @@ class Piwik_Goals_Controller extends Piwik_Controller
 		}
 		$view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, 'Goals.get');
 		$view->setParametersToModify(array('idGoal' => $idGoal));
+	
+		$nameToLabel = $this->goalColumnNameToLabel;
+		if($idGoal == Piwik_Archive::LABEL_ECOMMERCE_ORDER)
+		{
+			$nameToLabel['nb_conversions'] = 'General_EcommerceOrders';
+		}
+		elseif($idGoal == Piwik_Archive::LABEL_ECOMMERCE_CART)
+		{
+			$nameToLabel['nb_conversions'] = Piwik_Translate('General_VisitsWith', Piwik_Translate('Goals_AbandonedCart'));
+			$nameToLabel['conversion_rate'] = $nameToLabel['nb_conversions'];
+			$nameToLabel['revenue'] = Piwik_Translate('Goals_LeftInCart', Piwik_Translate('Goals_ColumnRevenue'));
+			$nameToLabel['items'] = Piwik_Translate('Goals_LeftInCart', Piwik_Translate('Goals_Products'));
+		}
 		
 		foreach($columns as $columnName)
 		{
 			$columnTranslation = '';
-
-			$nameToLabel = $this->goalColumnNameToLabel;
-			if($idGoal == Piwik_Archive::LABEL_ECOMMERCE_ORDER
-				&& $columnName == 'nb_conversions')
-			{
-				$nameToLabel[$columnName] = 'General_EcommerceOrders';
-			}
 			// find the right translation for this column, eg. find 'revenue' if column is Goal_1_revenue
 			foreach($nameToLabel as $metric => $metricTranslation)
 			{

plugins/ImageGraph/API.php

@@ -4,7 +4,7 @@
  * 
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- * @version 0.3.3_a
+ * @version $Id$
  * 
  * @category Piwik_Plugins
  * @package Piwik_ImageGraph
@@ -356,9 +356,12 @@ class Piwik_ImageGraph_API
 				$path = PIWIK_INCLUDE_PATH."/tmp/".$fileName;
 				$graph->Render($path);
 				return $path;
+				
 			case self::GRAPH_OUTPUT_INLINE:
 			default:
 				$graph->Stroke();
+				exit;
+			break;
 		}
 	}
 	

plugins/ImageGraph/Controller.php

@@ -4,7 +4,7 @@
  * 
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- * @version 0.2.6_a
+ * @version $Id$
  * 
  * @category Piwik_Plugins
  * @package Piwik_ImageGraph

plugins/ImageGraph/ImageGraphObject.php

@@ -4,7 +4,7 @@
  * 
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- * @version 0.3.3_a
+ * @version $Id$
  * 
  * @category Piwik_Plugins
  * @package Piwik_ImageGraph

tests/core/ReleaseCheckList.test.php

@@ -127,7 +127,7 @@ class Test_Piwik_ReleaseCheckList extends UnitTestCase
 			}
 
 			// skip files with these file extensions
-			if(preg_match('/\.(bmp|fdf|gif|deflate|gz|ico|jar|jpg|p12|pdf|png|rar|swf|vsd|z|zip)$/', $file))
+			if(preg_match('/\.(bmp|fdf|gif|deflate|gz|ico|jar|jpg|p12|pdf|png|rar|swf|vsd|z|zip|ttf)$/', $file))
 			{
 				continue;
 			}
@@ -178,7 +178,7 @@ class Test_Piwik_ReleaseCheckList extends UnitTestCase
 			}
 			
 			$contents = file_get_contents($file);
-			$this->assertTrue(strpos($contents, '$Id: '.basename($file).' ') !== false, $file ." no Id: keyword");
+			$this->assertTrue(strpos($contents, '$Id: ') !== false, $file ." no Id: keyword");
 		}
 
 		/*