diff --git a/plugins/Insights/API.php b/plugins/Insights/API.php
index 08eedc1f5573ed743a5e5671075cf7a0ff4358a8..f29d301c7ad1d47388c15e02ae6c0446d74dafb9 100644
--- a/plugins/Insights/API.php
+++ b/plugins/Insights/API.php
@@ -39,10 +39,13 @@ class API extends \Piwik\Plugin\API
$reports = array(
'Actions_getPageUrls',
'Actions_getPageTitles',
+ 'Actions_getDownloads',
+ 'Referrers_getAll',
'Referrers_getKeywords',
'Referrers_getCampaigns',
- 'Referrers_getAll',
- 'Referrers_getSearchEngines'
+ 'Referrers_getSocials',
+ 'Referrers_getSearchEngines',
+ 'UserCountry_getCountry',
);
// post event to add other reports?
@@ -75,7 +78,7 @@ class API extends \Piwik\Plugin\API
}
public function getInsightOverview($idSite, $period, $date, $reportUniqueId, $segment = false, $limitIncreaser = 4,
- $limitDecreaser = 4, $minVisitsPercent = 2, $minGrowthPercent = 20, $orderBy = 'absolute',
+ $limitDecreaser = 4, $minVisitsPercent = 3, $minGrowthPercent = 25, $orderBy = 'absolute',
$considerMovers = true, $considerNew = true, $considerDisappeared = false)
{
Piwik::checkUserHasViewAccess(array($idSite));
@@ -161,7 +164,6 @@ class API extends \Piwik\Plugin\API
'idSite' => $idSite,
'period' => $period,
'date' => $date,
- 'flat' => 0,
'filter_limit' => 1000,
'showColumns' => $metric
);
diff --git a/plugins/Insights/Insights.php b/plugins/Insights/Insights.php
index dacd4d2cd34f64922b20627d92ba10eb3fb2f423..1753b32aa8cf6faf97dc2aca660f648a8461d974 100644
--- a/plugins/Insights/Insights.php
+++ b/plugins/Insights/Insights.php
@@ -22,6 +22,7 @@ class Insights extends \Piwik\Plugin
return array(
'WidgetsList.addWidgets' => 'addWidgets',
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
+ 'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
'ViewDataTable.addViewDataTable' => 'getAvailableVisualizations'
);
}
@@ -36,6 +37,11 @@ class Insights extends \Piwik\Plugin
WidgetsList::add('Insights_Category', 'Insights_OverviewWidgetTitle', 'Insights', 'getInsightOverview');
}
+ public function getStylesheetFiles(&$stylesheets)
+ {
+ $stylesheets[] = "plugins/Insights/stylesheets/insightVisualization.less";
+ }
+
public function getJsFiles(&$jsFiles)
{
$jsFiles[] = "plugins/Insights/javascripts/insightsDataTable.js";
diff --git a/plugins/Insights/lang/en.json b/plugins/Insights/lang/en.json
index e56aa7a470b7cc1981cbfca5d40b5c96bda43d2e..acc356241a8c378d50e4abb5f4a426d4bc2b0af1 100644
--- a/plugins/Insights/lang/en.json
+++ b/plugins/Insights/lang/en.json
@@ -1,6 +1,7 @@
{
"Insights": {
"OverviewWidgetTitle": "Insights Overview",
- "Category": "Insights"
+ "Category": "Insights",
+ "NoResultMatchesCriteria": "No rows match the criteria"
}
}
\ No newline at end of file
diff --git a/plugins/Insights/stylesheets/insightVisualization.less b/plugins/Insights/stylesheets/insightVisualization.less
new file mode 100644
index 0000000000000000000000000000000000000000..b559c9e36a7de70bb6e995064c70df74503b62af
--- /dev/null
+++ b/plugins/Insights/stylesheets/insightVisualization.less
@@ -0,0 +1,28 @@
+.dataTableVizInsight {
+ th.orderBy {
+ cursor:pointer;
+ }
+}
+
+.insightsDataTable {
+ th.orderBy {
+ width: 20%;
+ }
+
+ .title {
+ word-break: break-all;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ width: inherit;
+ padding-right: 10px;
+ display: block;
+ }
+
+ .grown {
+ color:green;
+ }
+
+ .notGrown {
+ color:red;
+ }
+}
\ No newline at end of file
diff --git a/plugins/Insights/templates/insightVisualization.twig b/plugins/Insights/templates/insightVisualization.twig
index 3ff3466a220bf4daa2e0ecf77a05f9fb3cd85ce3..9c9f72c479cf1366f587e4a24d03cb7729516fc4 100644
--- a/plugins/Insights/templates/insightVisualization.twig
+++ b/plugins/Insights/templates/insightVisualization.twig
@@ -1,18 +1,17 @@
-<div>
+<div class="insightsDataTable">
{% if dataTable.getRowsCount > 0 %}
<table class="dataTable">
<thead>
- <tr title="based on {{ dataTable.getMetadata('totalValue') }} {{ dataTable.getMetadata('metricName') }}, rows less than {{ dataTable.getMetadata('minVisits') }} {{ dataTable.getMetadata('metricName') }} were ignored">
- <th class="label" style="width:60%;">
+ <tr title="Based on {{ dataTable.getMetadata('totalValue') }} {{ dataTable.getMetadata('metricName') }}, rows less than {{ dataTable.getMetadata('minVisits') }} {{ dataTable.getMetadata('metricName') }} were ignored">
+ <th class="label">
{{ dataTable.getMetadata('reportName') }}
</th>
- <th class="label" name="orderBy" value="absolute"
- style="width:20%;cursor:pointer;{% if 'absolute' == properties.order_by %}font-weight:bold;{% endif %}"
- >
+ <th class="label orderBy" name="orderBy" value="absolute"
+ style="{% if 'absolute' == properties.order_by %}font-weight:bold;{% endif %}">
{{ dataTable.getMetadata('metricName') }}
</th>
- <th class="label" name="orderBy" value="relative"
- style="width:20%;cursor:pointer;{% if 'relative' == properties.order_by %}font-weight:bold;{% endif %}">
+ <th class="label orderBy" name="orderBy" value="relative"
+ style="{% if 'relative' == properties.order_by %}font-weight:bold;{% endif %}">
{{ 'MultiSites_Evolution'|translate }}
</th>
</tr>
@@ -22,19 +21,19 @@
{% for row in dataTable.getRows %}
<tr title="{{ dataTable.getMetadata('metricName') }} changed from {{ row.getColumn('value_old') }} ({{ dataTable.getMetadata('lastDate') }}) to {{ row.getColumn('value_new') }} ({{ dataTable.getMetadata('date') }})">
<td>
- <span style="word-break: break-all;overflow: hidden;text-overflow: ellipsis;width: inherit;padding-right: 10px;display: block;"
+ <span class="title"
title="{{ row.getColumn('label') }}">
{{ row.getColumn('label') }}
</span>
</td>
{% if row.getColumn('grown') %}
<td>+{{ row.getColumn('difference') }}</td>
- <td style="color:green">
+ <td class="grown">
+{{ row.getColumn('growth_percent') }}
</td>
{% else %}
<td>{{ row.getColumn('difference') }}</td>
- <td style="color:red">
+ <td class="notGrown">
{{ row.getColumn('growth_percent') }}
</td>
{% endif %}
@@ -45,7 +44,7 @@
</table>
{% elseif showNoDataMessage %}
<div class="pk-emptyDataTable">
- No rows match the criteria
+ {{ 'Insights_NoResultMatchesCriteria'|translate }}
</div>
{% endif %}