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

3 files changed, 51 insertions, 15 deletions

diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php
index 1804ca4a07..81402e5f2d 100644
--- a/plugins/Actions/API.php
+++ b/plugins/Actions/API.php
@@ -129,9 +129,11 @@ class API
      *
      * @return DataTable|DataTable\Map
      */
-    public function getPageUrls($idSite, $period, $date, $segment = false, $expanded = false, $idSubtable = false)
+    public function getPageUrls($idSite, $period, $date, $segment = false, $expanded = false, $idSubtable = false,
+                                $depth = false)
     {
-        $dataTable = Archive::getDataTableFromArchive('Actions_actions_url', $idSite, $period, $date, $segment, $expanded, $idSubtable);
+        $dataTable = Archive::getDataTableFromArchive(
+            'Actions_actions_url', $idSite, $period, $date, $segment, $expanded, $idSubtable, $depth);
         $this->filterPageDatatable($dataTable);
         $this->filterActionsDataTable($dataTable, $expanded);
         return $dataTable;
@@ -295,7 +297,12 @@ class API
         return $dataTable;
     }
 
-    //Visitors can search, and then click "next" to view more results. This is the average number of search results pages viewed for this keyword.
+    /**
+     * Visitors can search, and then click "next" to view more results. This is the average number of search results pages viewed for this keyword.
+     *
+     * @param DataTable|DataTable\Simple|DataTable\Map $dataTable
+     * @param string $columnToRead
+     */
     protected function addPagesPerSearchColumn($dataTable, $columnToRead = 'nb_hits')
     {
         $dataTable->filter('ColumnCallbackAddColumnQuotient', array('nb_pages_per_search', $columnToRead, 'nb_visits', $precision = 1));
@@ -469,6 +476,8 @@ class API
 
     /**
      * Common filters for Page URLs and Page Titles
+     *
+     * @param DataTable|DataTable\Simple|DataTable\Map $dataTable
      */
     protected function filterPageDatatable($dataTable)
     {
@@ -513,7 +522,10 @@ class API
     }
 
     /**
-     * Common filters for all Actions API getters
+     * Common filters for all Actions API
+     *
+     * @param DataTable|DataTable\Simple|DataTable\Map $dataTable
+     * @param bool $expanded
      */
     protected function filterActionsDataTable($dataTable, $expanded = false)
     {
diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index 665e0511f1..1fd74b5efe 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -61,10 +61,16 @@ class Actions extends \Piwik\Plugin
             'API.getReportMetadata'                    => 'getReportMetadata',
             'API.getSegmentsMetadata'                  => 'getSegmentsMetadata',
             'ViewDataTable.getReportDisplayProperties' => 'getReportDisplayProperties',
+            'AssetManager.getCssFiles'                 => 'getCssFiles',
         );
         return $hooks;
     }
 
+    public function getCssFiles(&$cssFiles)
+    {
+        $cssFiles[] = "plugins/Actions/stylesheets/dataTableActions.less";
+    }
+    
     public function getSegmentsMetadata(&$segments)
     {
         $sqlFilter = array($this, 'getIdActionFromSegment');
@@ -648,9 +654,9 @@ class Actions extends \Piwik\Plugin
 
     private function addBaseDisplayProperties(&$result)
     {
-        $result['datatable_css_class'] = 'dataTableActions';
         $result['datatable_js_type'] = 'actionDataTable';
-        $result['subtable_template'] = '@CoreHome/_dataTableActions_subDataTable.twig';
+        $result['visualization_properties']['table']['subtable_template'] =
+            '@CoreHome/_dataTableActions_subDataTable.twig';
         $result['search_recursive'] = true;
         $result['show_all_views_icons'] = false;
         $result['show_table_all_columns'] = false;
@@ -661,16 +667,26 @@ class Actions extends \Piwik\Plugin
         $result['custom_parameters'] = array('flat' => 0);
 
         if (ViewDataTable::shouldLoadExpanded()) {
-            $result['show_expanded'] = true;
-
+            $result['visualization_properties']['table']['show_expanded'] = true;
+            
             $result['filters'][] = function ($dataTable) {
                 Actions::setDataTableRowLevels($dataTable);
             };
         }
 
+        $result['filters'][] = function ($dataTable, $view) {
+            if ($view->getViewDataTableId() == 'table') {
+                $view->datatable_css_class = 'dataTableActions';
+            }
+        };
+
         return $result;
     }
 
+    /**
+     * @param \Piwik\DataTable $dataTable
+     * @param int $level
+     */
     public static function setDataTableRowLevels($dataTable, $level = 0)
     {
         foreach ($dataTable->getRows() as $row) {
@@ -777,7 +793,7 @@ class Actions extends \Piwik\Plugin
             'filter_sort_column' => 'entry_nb_visits',
             'filter_sort_order'  => 'desc',
             'title'              => Piwik_Translate('Actions_SubmenuPagesEntry'),
-            'relatedReports'     => array(
+            'related_reports'    => array(
                 'Actions.getEntryPageTitles' => Piwik_Translate('Actions_EntryPageTitles')
             ),
             'self_url'           => $reportUrl
@@ -805,7 +821,7 @@ class Actions extends \Piwik\Plugin
             'filter_sort_column' => 'exit_nb_visits',
             'filter_sort_order'  => 'desc',
             'title'              => Piwik_Translate('Actions_SubmenuPagesExit'),
-            'relatedReports'     => array(
+            'related_reports'    => array(
                 'Actions.getExitPageTitles' => Piwik_Translate('Actions_ExitPageTitles')
             ),
             'self_url'           => $reportUrl,
@@ -863,7 +879,11 @@ class Actions extends \Piwik\Plugin
             'columns_to_display'     => array('label', 'nb_visits', 'nb_pages_per_search'),
             'show_table_all_columns' => false,
             'show_bar_chart'         => false,
-            'disable_row_evolution'  => false,
+            'visualization_properties' => array(
+                'table' => array(
+                    'disable_row_evolution'  => false,
+                )
+            )
         );
     }
 
@@ -888,7 +908,7 @@ class Actions extends \Piwik\Plugin
             'filter_sort_order'           => 'desc',
             'show_exclude_low_population' => false,
             'title'                       => $title,
-            'relatedReports'              => $relatedReports
+            'related_reports'             => $relatedReports
         );
 
         $this->addExcludeLowPopDisplayProperties($result);
@@ -911,7 +931,7 @@ class Actions extends \Piwik\Plugin
             'columns_to_display' => array('label', 'nb_hits', 'nb_visits', 'bounce_rate',
                                           'avg_time_on_page', 'exit_rate', 'avg_time_generation'),
             'title'              => Piwik_Translate('Actions_SubmenuPageTitles'),
-            'relatedReports'     => array(
+            'related_reports'    => array(
                 'Actions.getEntryPageTitles' => Piwik_Translate('Actions_EntryPageTitles'),
                 'Actions.getExitPageTitles'  => Piwik_Translate('Actions_ExitPageTitles'),
             ),
@@ -937,7 +957,7 @@ class Actions extends \Piwik\Plugin
             ),
             'columns_to_display' => array('label', 'entry_nb_visits', 'entry_bounce_count', 'bounce_rate'),
             'title'              => Piwik_Translate('Actions_EntryPageTitles'),
-            'relatedReports'     => array(
+            'related_reports'    => array(
                 'Actions.getPageTitles'       => Piwik_Translate('Actions_SubmenuPageTitles'),
                 "Actions.$entryPageUrlAction" => Piwik_Translate('Actions_SubmenuPagesEntry')
             ),
@@ -961,7 +981,7 @@ class Actions extends \Piwik\Plugin
             ),
             'columns_to_display' => array('label', 'exit_nb_visits', 'nb_visits', 'exit_rate'),
             'title'              => Piwik_Translate('Actions_ExitPageTitles'),
-            'relatedReports'     => array(
+            'related_reports'    => array(
                 'Actions.getPageTitles'      => Piwik_Translate('Actions_SubmenuPageTitles'),
                 "Actions.$exitPageUrlAction" => Piwik_Translate('Actions_SubmenuPagesExit'),
             ),
diff --git a/plugins/Actions/stylesheets/dataTableActions.less b/plugins/Actions/stylesheets/dataTableActions.less
new file mode 100644
index 0000000000..7c059d948b
--- /dev/null
+++ b/plugins/Actions/stylesheets/dataTableActions.less
@@ -0,0 +1,4 @@
+.dataTableActions > .dataTableWrapper {
+    width: 500px;
+    min-height: 1px;
+}
\ No newline at end of file