[Piwik-svn] r514 - in trunk: . modules modules/ViewDataTable modules/ViewDataTable/GenerateGraphData modules/ViewDataTable/GenerateGraphHTML plugins/VisitFrequency
svnmaster at piwik.org
svnmaster at piwik.org
Sun Jun 8 21:23:36 CEST 2008
Author: matt
Date: 2008-06-08 21:23:33 +0200 (Sun, 08 Jun 2008)
New Revision: 514
Added:
trunk/modules/ViewDataTable/GenerateGraphData/
trunk/modules/ViewDataTable/GenerateGraphData/ChartEvolution.php
trunk/modules/ViewDataTable/GenerateGraphData/ChartPie.php
trunk/modules/ViewDataTable/GenerateGraphData/ChartVerticalBar.php
trunk/modules/ViewDataTable/GenerateGraphHTML.php
trunk/modules/ViewDataTable/GenerateGraphHTML/
trunk/modules/ViewDataTable/GenerateGraphHTML/ChartEvolution.php
trunk/modules/ViewDataTable/GenerateGraphHTML/ChartPie.php
trunk/modules/ViewDataTable/GenerateGraphHTML/ChartVerticalBar.php
Removed:
trunk/modules/ViewDataTable/Graph.php
Modified:
trunk/TODO
trunk/modules/Controller.php
trunk/modules/ViewDataTable.php
trunk/modules/ViewDataTable/GenerateGraphData.php
trunk/plugins/VisitFrequency/index.tpl
Log:
- cleaning files organization + renaming for graphs (I couldn't figure myself, now much better :))
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2008-06-08 13:32:08 UTC (rev 513)
+++ trunk/TODO 2008-06-08 19:23:33 UTC (rev 514)
@@ -1,3 +1,5 @@
+UPDATE README (license, etc.)
+rename Details > MetaData
ECLIPSE WINDOWS LINE BREAKS
rename $renderExpanded name
test that fresh archive doesn't show expanding when not requested
Modified: trunk/modules/Controller.php
===================================================================
--- trunk/modules/Controller.php 2008-06-08 13:32:08 UTC (rev 513)
+++ trunk/modules/Controller.php 2008-06-08 19:23:33 UTC (rev 514)
@@ -96,11 +96,11 @@
* @param string $currentModuleName
* @param string $currentControllerAction
* @param string $apiMethod
- * @return Piwik_ViewDataTable_Graph_ChartEvolution
+ * @return Piwik_ViewDataTable_GenerateGraphHTML_ChartEvolution
*/
protected function getLastUnitGraph($currentModuleName, $currentControllerAction, $apiMethod)
{
- require_once "ViewDataTable/Graph.php";
+ require_once "ViewDataTable/GenerateGraphHTML.php";
$view = Piwik_ViewDataTable::factory('graphEvolution');
$view->init( $currentModuleName, $currentControllerAction, $apiMethod );
Added: trunk/modules/ViewDataTable/GenerateGraphData/ChartEvolution.php
===================================================================
--- trunk/modules/ViewDataTable/GenerateGraphData/ChartEvolution.php (rev 0)
+++ trunk/modules/ViewDataTable/GenerateGraphData/ChartEvolution.php 2008-06-08 19:23:33 UTC (rev 514)
@@ -0,0 +1,21 @@
+<?php
+require_once "ViewDataTable/GenerateGraphData.php";
+/**
+ * Piwik_ViewDataTable_GenerateGraphData for the Evolution graph (eg. Last 30 days visits) using Piwik_Visualization_ChartEvolution
+ *
+ * @package Piwik_ViewDataTable
+ *
+ */
+class Piwik_ViewDataTable_GenerateGraphData_ChartEvolution extends Piwik_ViewDataTable_GenerateGraphData
+{
+ function __construct()
+ {
+ require_once "Visualization/ChartEvolution.php";
+ $this->view = new Piwik_Visualization_ChartEvolution;
+ }
+
+ protected function generateDataFromDataTable()
+ {
+ return $this->generateDataFromDataTableArray($this->dataTable);
+ }
+}
Added: trunk/modules/ViewDataTable/GenerateGraphData/ChartPie.php
===================================================================
--- trunk/modules/ViewDataTable/GenerateGraphData/ChartPie.php (rev 0)
+++ trunk/modules/ViewDataTable/GenerateGraphData/ChartPie.php 2008-06-08 19:23:33 UTC (rev 514)
@@ -0,0 +1,16 @@
+<?php
+require_once "ViewDataTable/GenerateGraphData.php";
+/**
+ * Piwik_ViewDataTable_GenerateGraphData for the pie chart, using Piwik_Visualization_ChartPie
+ *
+ * @package Piwik_ViewDataTable
+ *
+ */
+class Piwik_ViewDataTable_GenerateGraphData_ChartPie extends Piwik_ViewDataTable_GenerateGraphData
+{
+ function __construct()
+ {
+ require_once "Visualization/ChartPie.php";
+ $this->view = new Piwik_Visualization_ChartPie;
+ }
+}
\ No newline at end of file
Added: trunk/modules/ViewDataTable/GenerateGraphData/ChartVerticalBar.php
===================================================================
--- trunk/modules/ViewDataTable/GenerateGraphData/ChartVerticalBar.php (rev 0)
+++ trunk/modules/ViewDataTable/GenerateGraphData/ChartVerticalBar.php 2008-06-08 19:23:33 UTC (rev 514)
@@ -0,0 +1,16 @@
+<?php
+require_once "ViewDataTable/GenerateGraphData.php";
+/**
+ * Piwik_ViewDataTable_GenerateGraphData for the vertical bar graph, using Piwik_Visualization_ChartVerticalBar
+ *
+ * @package Piwik_ViewDataTable
+ *
+ */
+class Piwik_ViewDataTable_GenerateGraphData_ChartVerticalBar extends Piwik_ViewDataTable_GenerateGraphData
+{
+ function __construct()
+ {
+ require_once "Visualization/ChartVerticalBar.php";
+ $this->view = new Piwik_Visualization_ChartVerticalBar;
+ }
+}
\ No newline at end of file
Modified: trunk/modules/ViewDataTable/GenerateGraphData.php
===================================================================
--- trunk/modules/ViewDataTable/GenerateGraphData.php 2008-06-08 13:32:08 UTC (rev 513)
+++ trunk/modules/ViewDataTable/GenerateGraphData.php 2008-06-08 19:23:33 UTC (rev 514)
@@ -137,52 +137,5 @@
}
}
-/**
- * Piwik_ViewDataTable_GenerateGraphData for the Evolution graph (eg. Last 30 days visits) using Piwik_Visualization_ChartEvolution
- *
- * @package Piwik_ViewDataTable
- *
- */
-class Piwik_ViewDataTable_GenerateGraphData_ChartEvolution extends Piwik_ViewDataTable_GenerateGraphData
-{
- function __construct()
- {
- require_once "Visualization/ChartEvolution.php";
- $this->view = new Piwik_Visualization_ChartEvolution;
- }
-
- protected function generateDataFromDataTable()
- {
- return $this->generateDataFromDataTableArray($this->dataTable);
- }
-}
-/**
- * Piwik_ViewDataTable_GenerateGraphData for the pie chart, using Piwik_Visualization_ChartPie
- *
- * @package Piwik_ViewDataTable
- *
- */
-class Piwik_ViewDataTable_GenerateGraphData_ChartPie extends Piwik_ViewDataTable_GenerateGraphData
-{
- function __construct()
- {
- require_once "Visualization/ChartPie.php";
- $this->view = new Piwik_Visualization_ChartPie;
- }
-}
-/**
- * Piwik_ViewDataTable_GenerateGraphData for the vertical bar graph, using Piwik_Visualization_ChartVerticalBar
- *
- * @package Piwik_ViewDataTable
- *
- */
-class Piwik_ViewDataTable_GenerateGraphData_ChartVerticalBar extends Piwik_ViewDataTable_GenerateGraphData
-{
- function __construct()
- {
- require_once "Visualization/ChartVerticalBar.php";
- $this->view = new Piwik_Visualization_ChartVerticalBar;
- }
-}
Added: trunk/modules/ViewDataTable/GenerateGraphHTML/ChartEvolution.php
===================================================================
--- trunk/modules/ViewDataTable/GenerateGraphHTML/ChartEvolution.php (rev 0)
+++ trunk/modules/ViewDataTable/GenerateGraphHTML/ChartEvolution.php 2008-06-08 19:23:33 UTC (rev 514)
@@ -0,0 +1,31 @@
+<?php
+require_once "ViewDataTable/GenerateGraphHTML.php";
+/**
+ * Generates HTML embed for the Evolution graph
+ *
+ * @package Piwik_ViewDataTable
+ *
+ */
+class Piwik_ViewDataTable_GenerateGraphHTML_ChartEvolution extends Piwik_ViewDataTable_GenerateGraphHTML
+{
+ function __construct()
+ {
+ $this->valueParameterViewDataTable = 'generateDataChartEvolution';
+ $this->width='100%';
+ $this->height=150;
+ // used for the CSS class to apply to the DIV containing the graph
+ $this->graphType = 'evolution';
+ }
+
+ function init($currentControllerName,
+ $currentControllerAction,
+ $moduleNameAndMethod )
+ {
+ parent::init($currentControllerName,
+ $currentControllerAction,
+ $moduleNameAndMethod );
+
+ $this->setParametersToModify(array('date' => 'last30'));
+ $this->doNotShowFooter();
+ }
+}
\ No newline at end of file
Added: trunk/modules/ViewDataTable/GenerateGraphHTML/ChartPie.php
===================================================================
--- trunk/modules/ViewDataTable/GenerateGraphHTML/ChartPie.php (rev 0)
+++ trunk/modules/ViewDataTable/GenerateGraphHTML/ChartPie.php 2008-06-08 19:23:33 UTC (rev 514)
@@ -0,0 +1,15 @@
+<?php
+require_once "ViewDataTable/GenerateGraphHTML.php";
+/**
+ * Generates HTML embed for the Pie chart
+ *
+ * @package Piwik_ViewDataTable
+ *
+ */
+class Piwik_ViewDataTable_GenerateGraphHTML_ChartPie extends Piwik_ViewDataTable_GenerateGraphHTML
+{
+ function __construct()
+ {
+ $this->valueParameterViewDataTable = 'generateDataChartPie';
+ }
+}
\ No newline at end of file
Added: trunk/modules/ViewDataTable/GenerateGraphHTML/ChartVerticalBar.php
===================================================================
--- trunk/modules/ViewDataTable/GenerateGraphHTML/ChartVerticalBar.php (rev 0)
+++ trunk/modules/ViewDataTable/GenerateGraphHTML/ChartVerticalBar.php 2008-06-08 19:23:33 UTC (rev 514)
@@ -0,0 +1,16 @@
+<?php
+require_once "ViewDataTable/GenerateGraphHTML.php";
+/**
+ *
+ * Generates HTML embed for the vertical bar chart
+ *
+ * @package Piwik_ViewDataTable
+ *
+ */
+class Piwik_ViewDataTable_GenerateGraphHTML_ChartVerticalBar extends Piwik_ViewDataTable_GenerateGraphHTML
+{
+ function __construct()
+ {
+ $this->valueParameterViewDataTable = 'generateDataChartVerticalBar';
+ }
+}
\ No newline at end of file
Copied: trunk/modules/ViewDataTable/GenerateGraphHTML.php (from rev 495, trunk/modules/ViewDataTable/Graph.php)
===================================================================
--- trunk/modules/ViewDataTable/GenerateGraphHTML.php (rev 0)
+++ trunk/modules/ViewDataTable/GenerateGraphHTML.php 2008-06-08 19:23:33 UTC (rev 514)
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
+ * @version $Id$
+ *
+ * @package Piwik_ViewDataTable
+ */
+
+/**
+ * This class generates the HTML code to embed to flash graphs in the page.
+ * It doesn't call the API but simply prints the html snippet.
+ *
+ * @package Piwik_ViewDataTable
+ *
+ */
+abstract class Piwik_ViewDataTable_GenerateGraphHTML extends Piwik_ViewDataTable
+{
+ protected $width = '100%';
+ protected $height = 250;
+ protected $graphType = 'standard';
+
+ /**
+ * @see Piwik_ViewDataTable::init()
+ *
+ */
+ function init($currentControllerName,
+ $currentControllerAction,
+ $moduleNameAndMethod )
+ {
+ parent::init($currentControllerName,
+ $currentControllerAction,
+ $moduleNameAndMethod );
+ $this->dataTableTemplate = 'Home/templates/graph.tpl';
+
+ $this->disableOffsetInformation();
+ $this->disableExcludeLowPopulation();
+ $this->disableSearchBox();
+ $this->parametersToModify = array(
+ 'viewDataTable' => $this->valueParameterViewDataTable,
+ // in the case this controller is being executed by another controller
+ // eg. when being widgetized in an IFRAME
+ // we need to put in the URL of the graph data the real module and action
+ 'module' => $currentControllerName,
+ 'action' => $currentControllerAction,
+ );
+ }
+
+ /**
+ * Sets parameters to modify in the future generated URL
+ *
+ * @param array $array array('nameParameter' => $newValue, ...)
+ */
+ public function setParametersToModify($array)
+ {
+ $this->parametersToModify = array_merge($this->parametersToModify, $array);
+ }
+
+ /**
+ * @see Piwik_ViewDataTable::main()
+ *
+ */
+ public function main()
+ {
+ if($this->mainAlreadyExecuted)
+ {
+ return;
+ }
+ $this->mainAlreadyExecuted = true;
+
+ $view = new Piwik_View($this->dataTableTemplate);
+ $this->id = $this->getUniqIdTable();
+ $view->graphType = $this->graphType;
+
+ $this->parametersToModify['action'] = $this->currentControllerAction;
+ $url = Piwik_Url::getCurrentQueryStringWithParametersModified($this->parametersToModify);
+ $view->jsInvocationTag = $this->getFlashInvocationCode($url);
+ $view->urlData = $url;
+
+ $view->formId = "formEmbed".$this->id;
+ $view->codeEmbed = $this->codeEmbed;
+
+ $view->id = $this->id;
+ $view->method = $this->method;
+ $view->javascriptVariablesToSet = $this->getJavascriptVariablesToSet();
+ $view->showFooter = $this->getShowFooter();
+ $this->view = $view;
+ }
+
+ protected function getFlashInvocationCode( $url = 'libs/open-flash-chart/data-files/nodata.txt', $use_swfobject = true )
+ {
+ $width = $this->width;
+ $height = $this->height;
+
+ $libPathInPiwik = 'libs/open-flash-chart/';
+ $currentPath = Piwik_Url::getCurrentUrlWithoutFileName();
+ $pathToLibraryOpenChart = $currentPath . $libPathInPiwik;
+
+ $url = Piwik_Url::getCurrentUrlWithoutQueryString() . $url;
+ // escape the & and stuff:
+ $url = urlencode($url);
+
+ $obj_id = $this->id . "Chart";
+ $div_name = $this->id . "FlashContent";
+
+ $return = '';
+ if( $use_swfobject )
+ {
+ // Using library for auto-enabling Flash object on IE, disabled-Javascript proof
+ $return .= '
+ <div id="'. $div_name .'"></div>
+ <script type="text/javascript">
+ var so = new SWFObject("'.$pathToLibraryOpenChart.'open-flash-chart.swf", "'.$obj_id.'_swf", "'. $width . '", "' . $height . '", "9", "#FFFFFF");
+ so.addVariable("data", "'. $url . '");
+ so.addParam("allowScriptAccess", "sameDomain");
+ so.write("'. $div_name .'");
+ </script>
+ <noscript>
+ ';
+ }
+ $urlGraph = $pathToLibraryOpenChart."open-flash-chart.swf?data=" . $url;
+
+ $this->codeEmbed .= "<div><object classid='clsid:d27cdb6e-ae6d-11cf-96b8-444553540000' codebase='http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0' width='" . $width . "' height='" . $height . "' id='". $obj_id ."' >".
+ "<param name='movie' value='".$urlGraph."' />".
+ "<param name='allowScriptAccess' value='sameDomain' /> ".
+ "<embed src='$urlGraph' allowScriptAccess='sameDomain' quality='high' bgcolor='#FFFFFF' width='". $width ."' height='". $height ."' name='open-flash-chart' type='application/x-shockwave-flash' id='". $obj_id ."' />".
+ "</object></div>";
+ $return .= $this->codeEmbed;
+
+ if ( $use_swfobject ) {
+ $return .= '</noscript>';
+ }
+
+ return $return;
+ }
+}
+
Deleted: trunk/modules/ViewDataTable/Graph.php
===================================================================
--- trunk/modules/ViewDataTable/Graph.php 2008-06-08 13:32:08 UTC (rev 513)
+++ trunk/modules/ViewDataTable/Graph.php 2008-06-08 19:23:33 UTC (rev 514)
@@ -1,196 +0,0 @@
-<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_ViewDataTable
- */
-
-/**
- * This class generates the HTML code to embed to flash graphs in the page.
- * It doesn't call the API but simply prints the html snippet.
- *
- * @package Piwik_ViewDataTable
- *
- */
-abstract class Piwik_ViewDataTable_Graph extends Piwik_ViewDataTable
-{
- protected $width = '100%';
- protected $height = 250;
- protected $graphType = 'standard';
-
- /**
- * @see Piwik_ViewDataTable::init()
- *
- */
- function init($currentControllerName,
- $currentControllerAction,
- $moduleNameAndMethod )
- {
- parent::init($currentControllerName,
- $currentControllerAction,
- $moduleNameAndMethod );
- $this->dataTableTemplate = 'Home/templates/graph.tpl';
-
- $this->disableOffsetInformation();
- $this->disableExcludeLowPopulation();
- $this->disableSearchBox();
- $this->parametersToModify = array(
- 'viewDataTable' => $this->valueParameterViewDataTable,
- // in the case this controller is being executed by another controller
- // eg. when being widgetized in an IFRAME
- // we need to put in the URL of the graph data the real module and action
- 'module' => $currentControllerName,
- 'action' => $currentControllerAction,
- );
- }
-
- /**
- * Sets parameters to modify in the future generated URL
- *
- * @param array $array array('nameParameter' => $newValue, ...)
- */
- public function setParametersToModify($array)
- {
- $this->parametersToModify = array_merge($this->parametersToModify, $array);
- }
-
- /**
- * @see Piwik_ViewDataTable::main()
- *
- */
- public function main()
- {
- if($this->mainAlreadyExecuted)
- {
- return;
- }
- $this->mainAlreadyExecuted = true;
-
- $view = new Piwik_View($this->dataTableTemplate);
- $this->id = $this->getUniqIdTable();
- $view->graphType = $this->graphType;
-
- $this->parametersToModify['action'] = $this->currentControllerAction;
- $url = Piwik_Url::getCurrentQueryStringWithParametersModified($this->parametersToModify);
- $view->jsInvocationTag = $this->getFlashInvocationCode($url);
- $view->urlData = $url;
-
- $view->formId = "formEmbed".$this->id;
- $view->codeEmbed = $this->codeEmbed;
-
- $view->id = $this->id;
- $view->method = $this->method;
- $view->javascriptVariablesToSet = $this->getJavascriptVariablesToSet();
- $view->showFooter = $this->getShowFooter();
- $this->view = $view;
- }
-
- protected function getFlashInvocationCode( $url = 'libs/open-flash-chart/data-files/nodata.txt', $use_swfobject = true )
- {
- $width = $this->width;
- $height = $this->height;
-
- $libPathInPiwik = 'libs/open-flash-chart/';
- $currentPath = Piwik_Url::getCurrentUrlWithoutFileName();
- $pathToLibraryOpenChart = $currentPath . $libPathInPiwik;
-
- $url = Piwik_Url::getCurrentUrlWithoutQueryString() . $url;
- // escape the & and stuff:
- $url = urlencode($url);
-
- $obj_id = $this->id . "Chart";
- $div_name = $this->id . "FlashContent";
-
- $return = '';
- if( $use_swfobject )
- {
- // Using library for auto-enabling Flash object on IE, disabled-Javascript proof
- $return .= '
- <div id="'. $div_name .'"></div>
- <script type="text/javascript">
- var so = new SWFObject("'.$pathToLibraryOpenChart.'open-flash-chart.swf", "'.$obj_id.'_swf", "'. $width . '", "' . $height . '", "9", "#FFFFFF");
- so.addVariable("data", "'. $url . '");
- so.addParam("allowScriptAccess", "sameDomain");
- so.write("'. $div_name .'");
- </script>
- <noscript>
- ';
- }
- $urlGraph = $pathToLibraryOpenChart."open-flash-chart.swf?data=" . $url;
-
- $this->codeEmbed .= "<div><object classid='clsid:d27cdb6e-ae6d-11cf-96b8-444553540000' codebase='http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0' width='" . $width . "' height='" . $height . "' id='". $obj_id ."' >".
- "<param name='movie' value='".$urlGraph."' />".
- "<param name='allowScriptAccess' value='sameDomain' /> ".
- "<embed src='$urlGraph' allowScriptAccess='sameDomain' quality='high' bgcolor='#FFFFFF' width='". $width ."' height='". $height ."' name='open-flash-chart' type='application/x-shockwave-flash' id='". $obj_id ."' />".
- "</object></div>";
- $return .= $this->codeEmbed;
-
- if ( $use_swfobject ) {
- $return .= '</noscript>';
- }
-
- return $return;
- }
-}
-
-/**
- * Generates HTML embed for the Evolution graph
- *
- * @package Piwik_ViewDataTable
- *
- */
-class Piwik_ViewDataTable_Graph_ChartEvolution extends Piwik_ViewDataTable_Graph
-{
- function __construct()
- {
- $this->valueParameterViewDataTable = 'generateDataChartEvolution';
- $this->width='100%';
- $this->height=150;
- // used for the CSS class to apply to the DIV containing the graph
- $this->graphType = 'evolution';
- }
-
- function init($currentControllerName,
- $currentControllerAction,
- $moduleNameAndMethod )
- {
- parent::init($currentControllerName,
- $currentControllerAction,
- $moduleNameAndMethod );
-
- $this->setParametersToModify(array('date' => 'last30'));
- $this->doNotShowFooter();
- }
-}
-/**
- * Generates HTML embed for the Pie chart
- *
- * @package Piwik_ViewDataTable
- *
- */
-class Piwik_ViewDataTable_Graph_ChartPie extends Piwik_ViewDataTable_Graph
-{
- function __construct()
- {
- $this->valueParameterViewDataTable = 'generateDataChartPie';
- }
-}
-
-/**
- *
- * Generates HTML embed for the vertical bar chart
- *
- * @package Piwik_ViewDataTable
- *
- */
-class Piwik_ViewDataTable_Graph_ChartVerticalBar extends Piwik_ViewDataTable_Graph
-{
- function __construct()
- {
- $this->valueParameterViewDataTable = 'generateDataChartVerticalBar';
- }
-}
Modified: trunk/modules/ViewDataTable.php
===================================================================
--- trunk/modules/ViewDataTable.php 2008-06-08 13:32:08 UTC (rev 513)
+++ trunk/modules/ViewDataTable.php 2008-06-08 19:23:33 UTC (rev 514)
@@ -206,18 +206,18 @@
break;
case 'graphPie':
- require_once "ViewDataTable/Graph.php";
- return new Piwik_ViewDataTable_Graph_ChartPie();
+ require_once "ViewDataTable/GenerateGraphHTML/ChartPie.php";
+ return new Piwik_ViewDataTable_GenerateGraphHTML_ChartPie();
break;
case 'graphVerticalBar':
- require_once "ViewDataTable/Graph.php";
- return new Piwik_ViewDataTable_Graph_ChartVerticalBar();
+ require_once "ViewDataTable/GenerateGraphHTML/ChartVerticalBar.php";
+ return new Piwik_ViewDataTable_GenerateGraphHTML_ChartVerticalBar();
break;
case 'graphEvolution':
- require_once "ViewDataTable/Graph.php";
- return new Piwik_ViewDataTable_Graph_ChartEvolution();
+ require_once "ViewDataTable/GenerateGraphHTML/ChartEvolution.php";
+ return new Piwik_ViewDataTable_GenerateGraphHTML_ChartEvolution();
break;
case 'sparkline':
@@ -226,17 +226,17 @@
break;
case 'generateDataChartVerticalBar':
- require_once "ViewDataTable/GenerateGraphData.php";
+ require_once "ViewDataTable/GenerateGraphData/ChartVerticalBar.php";
return new Piwik_ViewDataTable_GenerateGraphData_ChartVerticalBar();
break;
case 'generateDataChartPie':
- require_once "ViewDataTable/GenerateGraphData.php";
+ require_once "ViewDataTable/GenerateGraphData/ChartPie.php";
return new Piwik_ViewDataTable_GenerateGraphData_ChartPie();
break;
case 'generateDataChartEvolution':
- require_once "ViewDataTable/GenerateGraphData.php";
+ require_once "ViewDataTable/GenerateGraphData/ChartEvolution.php";
return new Piwik_ViewDataTable_GenerateGraphData_ChartEvolution();
break;
Modified: trunk/plugins/VisitFrequency/index.tpl
===================================================================
--- trunk/plugins/VisitFrequency/index.tpl 2008-06-08 13:32:08 UTC (rev 513)
+++ trunk/plugins/VisitFrequency/index.tpl 2008-06-08 19:23:33 UTC (rev 514)
@@ -4,6 +4,7 @@
<a name="evolutionGraph" graphId="VisitFrequencygetLastVisitsReturningGraph"></a>
<h2>{'VisitFrequency_Evolution'|translate}</h2>
{$graphEvolutionVisitFrequency}
+<br>
{include file=VisitFrequency/sparklines.tpl}
More information about the Piwik-svn
mailing list