diff --git a/core/DataTable/Renderer/Php.php b/core/DataTable/Renderer/Php.php
index 9c671c12016d1dac5d5dddf5e34465faf7ee7813..cd2e7659fbd206514fdbf95ec7cf34a1e948cb79 100644
--- a/core/DataTable/Renderer/Php.php
+++ b/core/DataTable/Renderer/Php.php
@@ -88,7 +88,7 @@ class Piwik_DataTable_Renderer_Php extends Piwik_DataTable_Renderer
*
* @return string
*/
- function renderException()
+ public function renderException()
{
$this->renderHeader();
diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php
index 087819db45e2c6170f1f562ddb3f1a6e4f385bc1..3a5ce83b749e54de44adb08a6717f35d75def501 100644
--- a/core/ViewDataTable.php
+++ b/core/ViewDataTable.php
@@ -164,13 +164,6 @@ abstract class Piwik_ViewDataTable
*/
protected $columnsToDisplay = array();
- /**
- * Variable that is used as the DIV ID in the rendered HTML
- *
- * @var string
- */
- protected $uniqIdTable = null;
-
/**
* Method to be implemented by the ViewDataTable_*.
* This method should create and initialize a $this->view object @see Piwik_View_Interface
@@ -285,6 +278,7 @@ abstract class Piwik_ViewDataTable
$this->controllerActionCalledWhenRequestSubTable = $controllerActionCalledWhenRequestSubTable;
$this->idSubtable = Piwik_Common::getRequestVar('idSubtable', false, 'int');
+ $this->viewProperties['report_id'] = $currentControllerName . '.' . $currentControllerAction;
$this->viewProperties['show_goals'] = false;
$this->viewProperties['show_ecommerce'] = false;
$this->viewProperties['show_search'] = Piwik_Common::getRequestVar('show_search', true);
@@ -306,7 +300,6 @@ abstract class Piwik_ViewDataTable
$this->viewProperties['show_footer_icons'] = ($this->idSubtable == false);
$this->viewProperties['show_related_reports'] = Piwik_Common::getRequestVar('show_related_reports', true);
$this->viewProperties['apiMethodToRequestDataTable'] = $this->apiMethodToRequestDataTable;
- $this->viewProperties['uniqueId'] = $this->getUniqueIdViewDataTable();
$this->viewProperties['exportLimit'] = Piwik_Config::getInstance()->General['API_datatable_default_limit'];
$this->viewProperties['highlight_summary_row'] = false;
@@ -625,54 +618,6 @@ abstract class Piwik_ViewDataTable
{
}
- /**
- * Returns a unique ID for this ViewDataTable.
- * This unique ID is used in the Javascript code:
- * Any ajax loaded data is loaded within a DIV that has id=$unique_id
- * The jquery code then replaces the existing html div id=$unique_id in the code with this data.
- *
- * @see datatable.js
- * @return string
- */
- protected function loadUniqueIdViewDataTable()
- {
- // if we request a subDataTable the $this->currentControllerAction DIV ID is already there in the page
- // we make the DIV ID really unique by appending the ID of the subtable requested
- if ($this->idSubtable != 0 // parent DIV has a idSubtable = 0 but the html DIV must have the name of the module.action
- && $this->idSubtable !== false // case there is no idSubtable
- ) {
- // see also datatable.js (the ID has to match with the html ID created to be replaced by the result of the ajax call)
- $uniqIdTable = 'subDataTable_' . $this->idSubtable;
- } else {
- // the $uniqIdTable variable is used as the DIV ID in the rendered HTML
- // we use the current Controller action name as it is supposed to be unique in the rendered page
- $uniqIdTable = $this->currentControllerName . $this->currentControllerAction;
- }
- return $uniqIdTable;
- }
-
- /**
- * Sets the $uniqIdTable variable that is used as the DIV ID in the rendered HTML
- * @param $uniqIdTable
- */
- public function setUniqueIdViewDataTable($uniqIdTable)
- {
- $this->viewProperties['uniqueId'] = $uniqIdTable;
- $this->uniqIdTable = $uniqIdTable;
- }
-
- /**
- * Returns current value of $uniqIdTable variable that is used as the DIV ID in the rendered HTML
- * @return null|string
- */
- public function getUniqueIdViewDataTable()
- {
- if ($this->uniqIdTable == null) {
- $this->uniqIdTable = $this->loadUniqueIdViewDataTable();
- }
- return $this->uniqIdTable;
- }
-
/**
* Returns array of properties, eg. "show_footer", "show_search", etc.
*
diff --git a/core/ViewDataTable/GenerateGraphHTML.php b/core/ViewDataTable/GenerateGraphHTML.php
index 39dd0bf167f7b5fd76ce51ad772599451faa8def..8c17e37d8dab1e25e43e8781ae3fd04c4e689889 100644
--- a/core/ViewDataTable/GenerateGraphHTML.php
+++ b/core/ViewDataTable/GenerateGraphHTML.php
@@ -114,7 +114,6 @@ abstract class Piwik_ViewDataTable_GenerateGraphHTML extends Piwik_ViewDataTable
$originalViewDataTable = $original['viewDataTable'];
$result = $this->parametersToModify + $original;
- ;
$result['viewDataTable'] = $originalViewDataTable;
return $result;
@@ -153,7 +152,6 @@ abstract class Piwik_ViewDataTable_GenerateGraphHTML extends Piwik_ViewDataTable
$view->width = $this->width;
$view->height = $this->height;
- $view->chartDivId = $this->getUniqueIdViewDataTable() . "Chart";
$view->graphType = $this->graphType;
$view->data = $this->graphData;
diff --git a/core/ViewDataTable/GenerateGraphHTML/ChartEvolution.php b/core/ViewDataTable/GenerateGraphHTML/ChartEvolution.php
index 2a3f9214059534d1affdc9c2e55358005dd9ae7c..4381b758552bdcaa3b369f4a9d07ebf67e9ef774 100644
--- a/core/ViewDataTable/GenerateGraphHTML/ChartEvolution.php
+++ b/core/ViewDataTable/GenerateGraphHTML/ChartEvolution.php
@@ -72,20 +72,6 @@ class Piwik_ViewDataTable_GenerateGraphHTML_ChartEvolution extends Piwik_ViewDat
return $result;
}
- /**
- * We ensure that the graph for a given Goal has a different ID than the 'Goals Overview' graph
- * so that both can display on the dashboard at the same time
- * @return null|string
- */
- public function getUniqueIdViewDataTable()
- {
- $id = parent::getUniqueIdViewDataTable();
- if (!empty($this->parametersToModify['idGoal'])) {
- $id .= $this->parametersToModify['idGoal'];
- }
- return $id;
- }
-
/**
* Sets the columns that will be displayed on output evolution chart
* By default all columns are displayed ($columnsNames = array() will display all columns)
diff --git a/core/ViewDataTable/HtmlTable.php b/core/ViewDataTable/HtmlTable.php
index f1b2cca44c1d5b94a51e199db83c88a3e6cf5b4d..97f02e3595c6fa68d114099a774d723e6395e06e 100644
--- a/core/ViewDataTable/HtmlTable.php
+++ b/core/ViewDataTable/HtmlTable.php
@@ -83,11 +83,17 @@ class Piwik_ViewDataTable_HtmlTable extends Piwik_ViewDataTable
Piwik::log("Failed to get data from API: " . $e->getMessage());
$this->isDataAvailable = false;
+ $this->loadingError = array('message' => $e->getMessage());
}
$this->postDataTableLoadedFromAPI();
$this->view = $this->buildView();
}
+
+ public function getDataTableType()
+ {
+ return 'dataTableNormal';
+ }
/**
* @return Piwik_View with all data set
@@ -95,6 +101,12 @@ class Piwik_ViewDataTable_HtmlTable extends Piwik_ViewDataTable
protected function buildView()
{
$view = new Piwik_View($this->dataTableTemplate);
+
+ $view->dataTableType = $this->getDataTableType();
+
+ if (!empty($this->loadingError)) {
+ $view->error = $this->loadingError;
+ }
if (!$this->isDataAvailable) {
$view->arrayDataTable = array();
diff --git a/core/ViewDataTable/HtmlTable/AllColumns.php b/core/ViewDataTable/HtmlTable/AllColumns.php
index dcd754de49493166d32d23ada73580e8f53d34aa..18e5b19e6025a321a4822569b593f0eaadb9b046 100644
--- a/core/ViewDataTable/HtmlTable/AllColumns.php
+++ b/core/ViewDataTable/HtmlTable/AllColumns.php
@@ -62,4 +62,9 @@ class Piwik_ViewDataTable_HtmlTable_AllColumns extends Piwik_ViewDataTable_HtmlT
return true;
}
+
+ public function getDataTableType()
+ {
+ return 'dataTableAllColumns';
+ }
}
diff --git a/core/ViewDataTable/HtmlTable/Goals.php b/core/ViewDataTable/HtmlTable/Goals.php
index 2ceb8e88c3accb41881a7c839d947f4f4544698b..fab237e890a682198d5fd26901263edc3509a016 100644
--- a/core/ViewDataTable/HtmlTable/Goals.php
+++ b/core/ViewDataTable/HtmlTable/Goals.php
@@ -256,4 +256,9 @@ class Piwik_ViewDataTable_HtmlTable_Goals extends Piwik_ViewDataTable_HtmlTable
}
return true;
}
+
+ public function getDataTableType()
+ {
+ return 'dataTableGoals';
+ }
}
diff --git a/plugins/CoreHome/stylesheets/datatable.css b/plugins/CoreHome/stylesheets/datatable.css
index 11757a0ac07a80d44bf0e45e2bb18f1fb1a4e23e..c658b5022a9aeb067325de574cc112ba99c42e11 100644
--- a/plugins/CoreHome/stylesheets/datatable.css
+++ b/plugins/CoreHome/stylesheets/datatable.css
@@ -1,6 +1,5 @@
/*Overriding some dataTable css for better dashboard display*/
.widget .dataTableWrapper,
-.widget .dataTableAllColumnsWrapper,
.widget .dataTableGraphWrapper,
.widget .dataTableActionsWrapper,
.widget .dataTableGraphEvolutionWrapper {
@@ -16,20 +15,16 @@
}
/* container of each table */
-.dataTableWrapper {
+.dataTableNormal > .dataTableWrapper {
width: 450px;
/* not more than 450px to make sure 2 tables can fit horizontally on a 1024 screen */
}
-.dataTableAllColumnsWrapper {
+.dataTableAllColumns > .dataTableWrapper {
width: 535px;
}
-.subdataTableWrapper {
- width: 95%;
-}
-
-.subdataTableAllColumnsWrapper {
+.subDataTable > .dataTableWrapper {
width: 95%;
}
@@ -806,4 +801,4 @@ a.tableConfigurationIcon.highlighted {
table.dataTable span.cell-tooltip {
cursor: default;
-}
\ No newline at end of file
+}
diff --git a/plugins/CoreHome/templates/_dataTable.twig b/plugins/CoreHome/templates/_dataTable.twig
index 9548d3d9efb857d5a9adbb8ca5e154f3eed20b3c..8caf5b82da7bb18a32b999bf5dd2d979b4dcda95 100644
--- a/plugins/CoreHome/templates/_dataTable.twig
+++ b/plugins/CoreHome/templates/_dataTable.twig
@@ -1,23 +1,26 @@
-<div class="dataTable" data-table-type="dataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode }}">
+{% set isSubtable = javascriptVariablesToSet.idSubtable is defined and javascriptVariablesToSet.idSubtable != 0 %}
+<div class="dataTable {{ dataTableType }} {% if isSubtable %}subDataTable{% endif %}"
+ data-table-type="dataTable"
+ data-report="{{ properties.report_id }}"
+ data-params="{{ javascriptVariablesToSet|json_encode }}">
<div class="reportDocumentation">
- {% if reportDocumentation is not empty %}<p>{{ reportDocumentation|raw }}</p>{% endif %}
+ {% if reportDocumentation|default is not empty %}<p>{{ reportDocumentation|raw }}</p>{% endif %}
{% if properties.metadata.archived_date is defined %}<span class='helpDate'>{{ properties.metadata.archived_date }}</span>{% endif %}
</div>
- {% set class %}
- {% if javascriptVariablesToSet.idSubtable is defined and javascriptVariablesToSet.idSubtable != 0 %}sub {% endif %}{% if javascriptVariablesToSet.viewDataTable=='tableAllColumns' %}dataTableAllColumnsWrapper{% elseif javascriptVariablesToSet.viewDataTable=='tableGoals' %}dataTableAllColumnsWrapper {% else %}dataTableWrapper{% endif %}
- {% endset %}
- <div class="{{ class }}">
- {% if arrayDataTable.result is defined and arrayDataTable.result == 'error' %}
- {{ arrayDataTable.message }}
+ <div class="dataTableWrapper">
+ {% if error is defined %}
+ {{ error.message }}
{% else %}
{% if arrayDataTable|length == 0 %}
+ <div class="pk-emptyDataTable">
{% if showReportDataWasPurgedMessage is defined and showReportDataWasPurgedMessage %}
- <div class="pk-emptyDataTable">{{ 'CoreHome_DataForThisReportHasBeenPurged'|translate(deleteReportsOlderThan) }}</div>
+ {{ 'CoreHome_DataForThisReportHasBeenPurged'|translate(deleteReportsOlderThan) }}
{% else %}
- <div class="pk-emptyDataTable">{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}</div>
+ {{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}
{% endif %}
+ </div>
{% else %}
- <table cellspacing="0" class="dataTable" id="{{ properties.uniqueId }}">
+ <table cellspacing="0" class="dataTable">
{% include "@CoreHome/_dataTableHead.twig" %}
<tbody>
diff --git a/plugins/CoreHome/templates/_dataTableActions.twig b/plugins/CoreHome/templates/_dataTableActions.twig
index 996d6c3c9ea910017071b34805b821eeb2d054eb..2d167d56f48a97a764245358ec830f68f7d0332d 100644
--- a/plugins/CoreHome/templates/_dataTableActions.twig
+++ b/plugins/CoreHome/templates/_dataTableActions.twig
@@ -1,4 +1,4 @@
-<div class="dataTable" data-table-type="actionDataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode }}">
+<div class="dataTable" data-table-type="actionDataTable" data-report="{{ properties.report_id }}" data-params="{{ javascriptVariablesToSet|json_encode }}">
<div class="reportDocumentation">
{% if reportDocumentation is not empty %}<p>{{ reportDocumentation|raw }}</p>{% endif %}
{% if properties.metadata.archived_date is defined %}<span class='helpDate'>{{ properties.metadata.archived_date }}</span>{% endif %}
diff --git a/plugins/CoreHome/templates/_dataTableActions_recursive.twig b/plugins/CoreHome/templates/_dataTableActions_recursive.twig
index 3426dd11ed663e7b151a1ad608070552067b9771..a5db06db7c4d92eb948da30b2c18a39abce61aa8 100644
--- a/plugins/CoreHome/templates/_dataTableActions_recursive.twig
+++ b/plugins/CoreHome/templates/_dataTableActions_recursive.twig
@@ -1,4 +1,4 @@
-<div class="dataTable" data-table-type="actionDataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode }}">
+<div class="dataTable" data-table-type="actionDataTable" data-report="{{ properties.report_id }}" data-params="{{ javascriptVariablesToSet|json_encode }}">
<div class="dataTableActionsWrapper">
{% if arrayDataTable.result is defined and arrayDataTable.result == 'error' %}
{{ arrayDataTable.message }}
diff --git a/plugins/CoreHome/templates/_dataTableActions_subDataTable.twig b/plugins/CoreHome/templates/_dataTableActions_subDataTable.twig
index 71d7fe7a4ddcc1b26e771587e2d5a4fb8af01a43..35a880f5ced2e38df18491fdae36d76029d07d33 100644
--- a/plugins/CoreHome/templates/_dataTableActions_subDataTable.twig
+++ b/plugins/CoreHome/templates/_dataTableActions_subDataTable.twig
@@ -1,4 +1,4 @@
-<tr id="{{ properties.uniqueId }}"></tr>
+<tr id="subDataTable_{{ javascriptVariablesToSet.idSubtable }}"></tr>
{% if arrayDataTable.result is defined and arrayDataTable.result == 'error' %}
{{ arrayDataTable.message }}
{% else %}
diff --git a/plugins/CoreHome/templates/_dataTableCloud.twig b/plugins/CoreHome/templates/_dataTableCloud.twig
index 1e0a465a5ac614cff9b5014883cba1a7bc62bae5..4c70887307a741f3741f78534f219537e73b9413 100644
--- a/plugins/CoreHome/templates/_dataTableCloud.twig
+++ b/plugins/CoreHome/templates/_dataTableCloud.twig
@@ -1,4 +1,4 @@
-<div class="dataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode }}">
+<div class="dataTable" data-report="{{ properties.report_id }}" data-params="{{ javascriptVariablesToSet|json_encode }}">
{% if reportDocumentation is not empty and javascriptVariablesToSet.viewDataTable != 'tableGoals' %}
<div class="reportDocumentation"><p>{{ reportDocumentation|raw }}</p></div>
{% endif %}
diff --git a/plugins/CoreHome/templates/_dataTableGraph.twig b/plugins/CoreHome/templates/_dataTableGraph.twig
index 1e076d021b69218528d5b8b1910936785ebeb88d..2ebd65795996eb7f5187226830595884b479a260 100644
--- a/plugins/CoreHome/templates/_dataTableGraph.twig
+++ b/plugins/CoreHome/templates/_dataTableGraph.twig
@@ -1,4 +1,4 @@
-<div class="dataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode }}">
+<div class="dataTable" data-report="{{ properties.report_id }}" data-params="{{ javascriptVariablesToSet|json_encode }}">
<div class="reportDocumentation">
{% if reportDocumentation is not empty %}<p>{{ reportDocumentation|raw }}</p>{% endif %}
diff --git a/plugins/Live/templates/getVisitorLog.twig b/plugins/Live/templates/getVisitorLog.twig
index bdb5574d6e70ec9e3cef2251aab8e97b6ea818ea..d7f439b7351d1ab941d16cf6c8fd30fffdf96165 100644
--- a/plugins/Live/templates/getVisitorLog.twig
+++ b/plugins/Live/templates/getVisitorLog.twig
@@ -1,4 +1,4 @@
-<div class="visitorLog dataTable" data-report="{{ properties.uniqueId }}" data-params="{{ javascriptVariablesToSet|json_encode }}">
+<div class="visitorLog dataTable" data-report="{{ properties.report_id }}" data-params="{{ javascriptVariablesToSet|json_encode }}">
{% if not isWidget %}
<h2>{% if javascriptVariablesToSet.filterEcommerce %}{{ 'Goals_EcommerceLog'|translate }}{% else %}{{ 'Live_VisitorLog'|translate }}{% endif %}</h2>
@@ -14,9 +14,9 @@
{{ arrayDataTable.message }}
{% else %}
{% if arrayDataTable|length == 0 %}
- <div class="pk-emptyDataTable" id="{{ properties.uniqueId }}">{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}</div>
+ <div class="pk-emptyDataTable">{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}</div>
{% else %}
- <table id="{{ properties.uniqueId }}" class="dataTable" cellspacing="0" width="100%" style="width:100%;">
+ <table class="dataTable" cellspacing="0" width="100%" style="width:100%;">
<thead>
<tr>
<th style="display:none"></th>