diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-08-11 13:19:59 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-08-11 13:19:59 +0400 |
| commit | f9b15e948fc9639ada0f925a5d450e6e158b5f56 (patch) | |
| tree | 3d6a25c8a271deee7d1136a11c11926be1d33529 /plugins/DBStats/DBStats.php | |
| parent | a96ec40e983a8b64f4c25def541a519ff3670e6a (diff) | |
| parent | 64ca5d548c0cf0c4eef9f5f104901fbf14800127 (diff) | |
Merge remote-tracking branch 'origin/master' into plugin_namespaces
Conflicts:
core/Tracker/Request.php
core/ViewDataTable.php
core/ViewDataTable/HtmlTable/Goals.php
plugins/Actions/Actions.php
plugins/Annotations/API.php
plugins/CoreHome/CoreHome.php
plugins/DBStats/DBStats.php
plugins/DevicesDetection/DevicesDetection.php
plugins/Goals/Goals.php
plugins/Live/Live.php
plugins/Referers/Referers.php
plugins/UserSettings/UserSettings.php
plugins/UsersManager/API.php
plugins/VisitTime/VisitTime.php
plugins/VisitorInterest/VisitorInterest.php
Diffstat (limited to 'plugins/DBStats/DBStats.php')
| -rw-r--r-- | plugins/DBStats/DBStats.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/DBStats/DBStats.php b/plugins/DBStats/DBStats.php index 433f682c9f..e3821800cc 100644 --- a/plugins/DBStats/DBStats.php +++ b/plugins/DBStats/DBStats.php @@ -107,7 +107,7 @@ class DBStats extends \Piwik\Plugin $result['show_offset_information'] = false; $result['show_pagination_control'] = false; - $result['show_all_ticks'] = true; + $result['visualization_properties']['jqplot_graph']['show_all_ticks'] = true; // translate the labels themselves $valueToTranslationStr = array( @@ -148,8 +148,8 @@ class DBStats extends \Piwik\Plugin $this->addPresentationFilters($result); $result['title'] = Piwik_Translate('DBStats_MetricTables'); - $result['relatedReports'] = array( - 'DBStats.getMetricDataSummaryByYear' => Piwik_Translate('DBStats_MetricDataByYear') + $result['related_reports'] = array( + 'DBStats.getMetricDataSummaryByYear' => Piwik_Translate('DBStats_MetricDataByYear') ); return $result; @@ -163,8 +163,8 @@ class DBStats extends \Piwik\Plugin $result['translations']['label'] = Piwik_Translate('CoreHome_PeriodYear'); $result['title'] = Piwik_Translate('DBStats_MetricDataByYear'); - $result['relatedReports'] = array( - 'DBStats.getMetricDataSummary' => Piwik_Translate('DBStats_MetricTables') + $result['related_reports'] = array( + 'DBStats.getMetricDataSummary' => Piwik_Translate('DBStats_MetricTables') ); return $result; @@ -177,7 +177,7 @@ class DBStats extends \Piwik\Plugin $this->addPresentationFilters($result); $result['title'] = Piwik_Translate('DBStats_ReportTables'); - $result['relatedReports'] = array( + $result['related_reports'] = array( 'DBStats.getReportDataSummaryByYear' => Piwik_Translate('DBStats_ReportDataByYear') ); @@ -192,8 +192,8 @@ class DBStats extends \Piwik\Plugin $result['translations']['label'] = Piwik_Translate('CoreHome_PeriodYear'); $result['title'] = Piwik_Translate('DBStats_ReportDataByYear'); - $result['relatedReports'] = array( - 'DBStats.getReportDataSummary' => Piwik_Translate('DBStats_ReportTables') + $result['related_reports'] = array( + 'DBStats.getReportDataSummary' => Piwik_Translate('DBStats_ReportTables') ); return $result; @@ -258,7 +258,7 @@ class DBStats extends \Piwik\Plugin $properties['show_tag_cloud'] = false; $properties['show_table_all_columns'] = false; $properties['keep_summary_row'] = true; - $properties['disable_row_evolution'] = true; + $properties['visualization_properties']['table']['disable_row_evolution'] = true; $properties['translations'] = array( 'label' => Piwik_Translate('DBStats_Table'), 'year' => Piwik_Translate('CoreHome_PeriodYear'), |