Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenaka Moorthi <benaka.moorthi@gmail.com>2013-08-05 02:46:23 +0400
committerBenaka Moorthi <benaka.moorthi@gmail.com>2013-08-05 02:46:23 +0400
commit2615404eab2e96048583caccf86248af2dd90d9b (patch)
tree0d85d6b4dcc2bb61bd244d29b99aaf2378fbc131 /plugins/Referers
parentcf8d0a51591e39ecf8aa8f4c09b5672ec2d312cd (diff)
Refs #4040, #4041, move visualization only view properties to separate visualizations, changed JavaScript properties to 'client side parameters' and 'overridable properties' to 'client side properties', changed keep_summary_row from a JavaScript property to a client side property, allowed visualization properties to be inherited, fixed system that allowed visualizations to set custom defaults for property values, modified behavior of datatable_css_class viewdatatable property, allow view properties to be customized in metadata based on the visualization used, and tweaks to UI Integration tests.
Diffstat (limited to 'plugins/Referers')
-rw-r--r--plugins/Referers/Controller.php4
-rw-r--r--plugins/Referers/Referers.php44
2 files changed, 36 insertions, 12 deletions
diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php
index c9362f4a01..4375b46891 100644
--- a/plugins/Referers/Controller.php
+++ b/plugins/Referers/Controller.php
@@ -263,7 +263,7 @@ class Piwik_Referers_Controller extends Controller
{
$view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, 'Referers.getRefererType');
- $view->add_total_row = true;
+ $view->visualization_properties->add_total_row = true;
// configure displayed columns
if (empty($columns)) {
@@ -279,7 +279,7 @@ class Piwik_Referers_Controller extends Controller
} else {
$selectable = array('nb_visits', 'nb_actions');
}
- $view->selectable_columns = $selectable;
+ $view->visualization_properties->selectable_columns = $selectable;
// configure displayed rows
$visibleRows = Common::getRequestVar('rows', false);
diff --git a/plugins/Referers/Referers.php b/plugins/Referers/Referers.php
index 4f72e81d93..36c4b85d08 100644
--- a/plugins/Referers/Referers.php
+++ b/plugins/Referers/Referers.php
@@ -332,10 +332,14 @@ class Piwik_Referers extends Plugin
'show_offset_information' => false,
'show_pagination_control' => false,
'show_exclude_low_population' => false,
- 'disable_subtable_when_show_goals' => true,
'show_goals' => true,
'filter_limit' => 10,
- 'translations' => array('label' => $labelColumnTitle)
+ 'translations' => array('label' => $labelColumnTitle),
+ 'visualization_properties' => array(
+ 'HtmlTable' => array(
+ 'disable_subtable_when_show_goals' => true,
+ )
+ ),
);
}
@@ -347,7 +351,11 @@ class Piwik_Referers extends Plugin
'translations' => array('label' => Piwik_Translate('Referers_Referrer')),
'show_goals' => true,
'filter_limit' => 20,
- 'custom_parameters' => array('disable_row_actions' => '1'),
+ 'visualization_properties' => array(
+ 'HtmlTable' => array(
+ 'disable_row_actions' => true
+ )
+ ),
'filters' => array(
array('MetadataCallbackAddMetadata', array('referrer_type', 'html_label_prefix', $setGetAllHtmlPrefix))
)
@@ -362,7 +370,11 @@ class Piwik_Referers extends Plugin
'translations' => array('label' => Piwik_Translate('Referers_ColumnKeyword')),
'show_goals' => true,
'filter_limit' => 25,
- 'disable_subtable_when_show_goals' => true,
+ 'visualization_properties' => array(
+ 'HtmlTable' => array(
+ 'disable_subtable_when_show_goals' => true,
+ )
+ ),
);
}
@@ -383,8 +395,12 @@ class Piwik_Referers extends Plugin
'show_exclude_low_population' => false,
'show_goals' => true,
'filter_limit' => 25,
- 'disable_subtable_when_show_goals' => true,
- 'translations' => array('label' => Piwik_Translate('Referers_ColumnSearchEngine'))
+ 'translations' => array('label' => Piwik_Translate('Referers_ColumnSearchEngine')),
+ 'visualization_properties' => array(
+ 'HtmlTable' => array(
+ 'disable_subtable_when_show_goals' => true,
+ )
+ ),
);
}
@@ -404,8 +420,12 @@ class Piwik_Referers extends Plugin
'show_exclude_low_population' => false,
'show_goals' => true,
'filter_limit' => 25,
- 'disable_subtable_when_show_goals' => true,
- 'translations' => array('label' => Piwik_Translate('Referers_ColumnWebsite'))
+ 'translations' => array('label' => Piwik_Translate('Referers_ColumnWebsite')),
+ 'visualization_properties' => array(
+ 'HtmlTable' => array(
+ 'disable_subtable_when_show_goals' => true,
+ )
+ ),
);
}
@@ -417,8 +437,12 @@ class Piwik_Referers extends Plugin
'show_exclude_low_population' => false,
'filter_limit' => 10,
'show_goals' => true,
- 'disable_subtable_when_show_goals' => true,
- 'translations' => array('label' => Piwik_Translate('Referers_ColumnSocial'))
+ 'translations' => array('label' => Piwik_Translate('Referers_ColumnSocial')),
+ 'visualization_properties' => array(
+ 'HtmlTable' => array(
+ 'disable_subtable_when_show_goals' => true,
+ )
+ ),
);
$widget = Common::getRequestVar('widget', false);