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

2 files changed, 67 insertions, 43 deletions

diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php
index 672e6c475f..17da96fe90 100644
--- a/plugins/Referers/Controller.php
+++ b/plugins/Referers/Controller.php
@@ -264,7 +264,7 @@ class Controller extends \Piwik\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)) {
@@ -280,7 +280,7 @@ class Controller extends \Piwik\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);
@@ -300,7 +300,7 @@ class Controller extends \Piwik\Controller
             $visibleRows = array($label, $total);
             $view->request_parameters_to_modify['rows'] = $label . ',' . $total;
         }
-        $view->row_picker_mach_rows_by = 'label';
+        $view->row_picker_match_rows_by = 'label';
         $view->row_picker_visible_rows = $visibleRows;
 
         $view->documentation = Piwik_Translate('Referers_EvolutionDocumentation') . '<br />'
diff --git a/plugins/Referers/Referers.php b/plugins/Referers/Referers.php
index 1b1efdc7c4..5f6451548b 100644
--- a/plugins/Referers/Referers.php
+++ b/plugins/Referers/Referers.php
@@ -329,15 +329,19 @@ class Referers extends \Piwik\Plugin
         }
 
         return array(
-            'default_view_type'                => 'tableAllColumns',
-            'show_search'                      => false,
-            '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)
+            'default_view_type' => 'tableAllColumns',
+            'show_search' => false,
+            'show_offset_information' => false,
+            'show_pagination_control' => false,
+            'show_exclude_low_population' => false,
+            'show_goals' => true,
+            'filter_limit' => 10,
+            'translations' => array('label' => $labelColumnTitle),
+            'visualization_properties' => array(
+                'table' => array(
+                    'disable_subtable_when_show_goals' => true,
+                )
+            ),
         );
     }
 
@@ -346,11 +350,15 @@ class Referers extends \Piwik\Plugin
         $setGetAllHtmlPrefix = array($this, 'setGetAllHtmlPrefix');
         return array(
             'show_exclude_low_population' => false,
-            'translations'                => array('label' => Piwik_Translate('Referers_Referrer')),
-            'show_goals'                  => true,
-            'filter_limit'                => 20,
-            'custom_parameters'           => array('disable_row_actions' => '1'),
-            'filters'                     => array(
+            'translations' => array('label' => Piwik_Translate('Referers_Referrer')),
+            'show_goals' => true,
+            'filter_limit' => 20,
+            'visualization_properties' => array(
+                'table' => array(
+                    'disable_row_actions' => true
+                )
+            ),
+            'filters' => array(
                 array('MetadataCallbackAddMetadata', array('referrer_type', 'html_label_prefix', $setGetAllHtmlPrefix))
             )
         );
@@ -359,12 +367,16 @@ class Referers extends \Piwik\Plugin
     private function getDisplayPropertiesForGetKeywords()
     {
         return array(
-            'subtable_controller_action'       => 'getSearchEnginesFromKeywordId',
-            'show_exclude_low_population'      => false,
-            'translations'                     => array('label' => Piwik_Translate('Referers_ColumnKeyword')),
-            'show_goals'                       => true,
-            'filter_limit'                     => 25,
-            'disable_subtable_when_show_goals' => true,
+            'subtable_controller_action' => 'getSearchEnginesFromKeywordId',
+            'show_exclude_low_population' => false,
+            'translations' => array('label' => Piwik_Translate('Referers_ColumnKeyword')),
+            'show_goals' => true,
+            'filter_limit' => 25,
+            'visualization_properties' => array(
+                'table' => array(
+                    'disable_subtable_when_show_goals' => true,
+                )
+            ),
         );
     }
 
@@ -380,13 +392,17 @@ class Referers extends \Piwik\Plugin
     private function getDisplayPropertiesForGetSearchEngines()
     {
         return array(
-            'subtable_controller_action'       => 'getKeywordsFromSearchEngineId',
-            'show_search'                      => false,
-            'show_exclude_low_population'      => false,
-            'show_goals'                       => true,
-            'filter_limit'                     => 25,
-            'disable_subtable_when_show_goals' => true,
-            'translations'                     => array('label' => Piwik_Translate('Referers_ColumnSearchEngine'))
+            'subtable_controller_action' => 'getKeywordsFromSearchEngineId',
+            'show_search' => false,
+            'show_exclude_low_population' => false,
+            'show_goals' => true,
+            'filter_limit' => 25,
+            'translations' => array('label' => Piwik_Translate('Referers_ColumnSearchEngine')),
+            'visualization_properties' => array(
+                'table' => array(
+                    'disable_subtable_when_show_goals' => true,
+                )
+            ),
         );
     }
 
@@ -402,25 +418,33 @@ class Referers extends \Piwik\Plugin
     private function getDisplayPropertiesForGetWebsites()
     {
         return array(
-            'subtable_controller_action'       => 'getUrlsFromWebsiteId',
-            'show_exclude_low_population'      => false,
-            'show_goals'                       => true,
-            'filter_limit'                     => 25,
-            'disable_subtable_when_show_goals' => true,
-            'translations'                     => array('label' => Piwik_Translate('Referers_ColumnWebsite'))
+            'subtable_controller_action' => 'getUrlsFromWebsiteId',
+            'show_exclude_low_population' => false,
+            'show_goals' => true,
+            'filter_limit' => 25,
+            'translations' => array('label' => Piwik_Translate('Referers_ColumnWebsite')),
+            'visualization_properties' => array(
+                'table' => array(
+                    'disable_subtable_when_show_goals' => true,
+                )
+            ),
         );
     }
 
     private function getDisplayPropertiesForGetSocials()
     {
         $result = array(
-            'default_view_type'                => 'graphPie',
-            'subtable_controller_action'       => 'getUrlsForSocial',
-            'show_exclude_low_population'      => false,
-            'filter_limit'                     => 10,
-            'show_goals'                       => true,
-            'disable_subtable_when_show_goals' => true,
-            'translations'                     => array('label' => Piwik_Translate('Referers_ColumnSocial'))
+            'default_view_type' => 'graphPie',
+            'subtable_controller_action' => 'getUrlsForSocial',
+            'show_exclude_low_population' => false,
+            'filter_limit' => 10,
+            'show_goals' => true,
+            'translations' => array('label' => Piwik_Translate('Referers_ColumnSocial')),
+            'visualization_properties' => array(
+                'table' => array(
+                    'disable_subtable_when_show_goals' => true,
+                )
+            ),
         );
 
         $widget = Common::getRequestVar('widget', false);