diff --git a/plugins/CoreAdminHome/templates/home.twig b/plugins/CoreAdminHome/templates/home.twig
index aaf5afc5baac8c0547ebf1bfa778e2e58f59e3f9..d938a1d80954c78008f1209fa8c7e367ea377861 100644
--- a/plugins/CoreAdminHome/templates/home.twig
+++ b/plugins/CoreAdminHome/templates/home.twig
@@ -35,6 +35,7 @@
{% endif %}
{% if isMarketplaceEnabled %}
+ <div piwik-widget-loader='{"module":"Marketplace","action":"getPremiumFeatures"}'></div>
<div piwik-widget-loader='{"module":"Marketplace","action":"getNewPlugins", "isAdminPage": "1"}'></div>
{% endif %}
diff --git a/plugins/Installation/templates/getSystemCheckWidget.twig b/plugins/Installation/templates/getSystemCheckWidget.twig
index 7f10dc06e1bda1114b8c8583dbfff00d457de7c9..5f1d9f8385333889adc87ae632ef5f19d3e4ae3d 100644
--- a/plugins/Installation/templates/getSystemCheckWidget.twig
+++ b/plugins/Installation/templates/getSystemCheckWidget.twig
@@ -4,7 +4,7 @@
{% endif %}
{% if numErrors %}
- <p class="system-errors"><span class="icon-error"></span> {{ 'General_Errors'|translate }}:</p>
+ <p class="system-errors"><span class="icon-error"></span> {{ 'General_Errors'|translate }}</p>
<ul>
{% for error in errors %}
<li title="{{ error.getLongErrorMessage|e('html_attr') }}">{{ error.getLabel }}</li>
@@ -20,7 +20,7 @@
<br />
{% endif %}
- <span class="icon-warning"></span> {{ 'General_Warnings'|translate }}:
+ <span class="icon-warning"></span> {{ 'General_Warnings'|translate }}
</p>
<ul>
{% for warning in warnings %}
diff --git a/plugins/Marketplace/Widgets/GetNewPlugins.php b/plugins/Marketplace/Widgets/GetNewPlugins.php
index 6079c1a8e8754b3ebb1264e874d40ec8444dbdae..8ffc54b85638d7fd8ff9086e113283d4b97dab82 100644
--- a/plugins/Marketplace/Widgets/GetNewPlugins.php
+++ b/plugins/Marketplace/Widgets/GetNewPlugins.php
@@ -10,6 +10,7 @@ namespace Piwik\Plugins\Marketplace\Widgets;
use Piwik\Common;
use Piwik\Plugins\Marketplace\Api\Client;
+use Piwik\Plugins\Marketplace\Input\PurchaseType;
use Piwik\Plugins\Marketplace\Input\Sort;
use Piwik\Widget\Widget;
use Piwik\Widget\WidgetConfig;
@@ -43,7 +44,7 @@ class GetNewPlugins extends Widget
$template = 'getNewPlugins';
}
- $plugins = $this->marketplaceApiClient->searchForPlugins('', '', Sort::METHOD_LAST_UPDATED, '');
+ $plugins = $this->marketplaceApiClient->searchForPlugins('', '', Sort::METHOD_LAST_UPDATED, PurchaseType::TYPE_ALL);
return $this->renderTemplate($template, array(
'plugins' => array_splice($plugins, 0, 3)
diff --git a/plugins/Marketplace/Widgets/GetPremiumFeatures.php b/plugins/Marketplace/Widgets/GetPremiumFeatures.php
new file mode 100644
index 0000000000000000000000000000000000000000..4e777a218f75ec3c36aa4513c58ce5ed194143ac
--- /dev/null
+++ b/plugins/Marketplace/Widgets/GetPremiumFeatures.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Marketplace\Widgets;
+
+use Piwik\Common;
+use Piwik\Piwik;
+use Piwik\Plugin;
+use Piwik\Plugins\Marketplace\Api\Client;
+use Piwik\Plugins\Marketplace\Input\PurchaseType;
+use Piwik\Plugins\Marketplace\Input\Sort;
+use Piwik\Widget\Widget;
+use Piwik\Widget\WidgetConfig;
+
+class GetPremiumFeatures extends Widget
+{
+ /**
+ * @var Client
+ */
+ private $marketplaceApiClient;
+
+ public function __construct(Client $marketplaceApiClient)
+ {
+ $this->marketplaceApiClient = $marketplaceApiClient;
+ }
+
+ public static function configure(WidgetConfig $config)
+ {
+ $config->setCategoryId('About Piwik');
+ $config->setName(Piwik::translate('Marketplace_PaidPlugins'));
+ $config->setOrder(20);
+ }
+
+ public function render()
+ {
+ $template = 'getPremiumFeatures';
+
+ $plugins = $this->marketplaceApiClient->searchForPlugins('', '', Sort::METHOD_LAST_UPDATED, PurchaseType::TYPE_PAID);
+
+ if (empty($plugins)) {
+ $plugins = array();
+ } else {
+ $plugins = array_splice($plugins, 0, 20);
+ }
+
+ return $this->renderTemplate($template, array(
+ 'plugins' => $plugins
+ ));
+ }
+
+}
\ No newline at end of file
diff --git a/plugins/Marketplace/stylesheets/marketplace-widget.less b/plugins/Marketplace/stylesheets/marketplace-widget.less
index 343898382553253e80fa37a51bd3422d93a28287..33508cdb24320078af879060c4562f37c0a73c25 100644
--- a/plugins/Marketplace/stylesheets/marketplace-widget.less
+++ b/plugins/Marketplace/stylesheets/marketplace-widget.less
@@ -4,6 +4,25 @@
}
}
+.getPremiumFeatures {
+ h3 {
+ margin-top: 0;
+ }
+ .pluginBody {
+ margin-bottom: 32px;
+ display: inline-block;
+
+ .pluginMoreDetails {
+ line-height:3em;
+ }
+ }
+
+ .row {
+ margin-left: -12px;
+ margin-right: -12px;
+ }
+}
+
.getNewPlugins {
.pluginName {
cursor: pointer;
diff --git a/plugins/Marketplace/templates/getNewPlugins.twig b/plugins/Marketplace/templates/getNewPlugins.twig
index 0c68e552e3d92dd73a2b6eb060bc28792fb30461..9808a72ce67ca0e5b5820c7d7964e09dad0892b1 100644
--- a/plugins/Marketplace/templates/getNewPlugins.twig
+++ b/plugins/Marketplace/templates/getNewPlugins.twig
@@ -3,7 +3,7 @@
{% for plugin in plugins %}
<div class="col s12">
- <h3 class="pluginName" piwik-plugin-name="{{ plugin.name|e('html_attr') }}">{{ plugin.name }}</h3>
+ <h3 class="pluginName" piwik-plugin-name="{{ plugin.name|e('html_attr') }}">{{ plugin.displayName }}</h3>
<span>
{{ plugin.description }}
<br />
@@ -16,7 +16,7 @@
</div>
<div class="widgetBody">
- <a href="{{ linkTo({'module': 'CorePluginsAdmin', 'action': 'marketplace'}) }}"
+ <a href="{{ linkTo({'module': 'Marketplace', 'action': 'overview'}) }}"
>{{ 'CorePluginsAdmin_ViewAllMarketplacePlugins'|translate }}</a>
</div>
</div>
\ No newline at end of file
diff --git a/plugins/Marketplace/templates/getNewPluginsAdmin.twig b/plugins/Marketplace/templates/getNewPluginsAdmin.twig
index b929a48430b088d4ff94e860da1c629ea785b9e6..1e3d60f6474a6293e85558b4b3bfba153aca8eb0 100644
--- a/plugins/Marketplace/templates/getNewPluginsAdmin.twig
+++ b/plugins/Marketplace/templates/getNewPluginsAdmin.twig
@@ -5,7 +5,7 @@
<h3 class="pluginName"
title="{{ plugin.description|e('html_attr') }}"
- piwik-plugin-name="{{ plugin.name|e('html_attr') }}">{{ plugin.name }}</h3>
+ piwik-plugin-name="{{ plugin.name|e('html_attr') }}">{{ plugin.displayName }}</h3>
<p class="description"
title="{{ plugin.description|e('html_attr') }}">{{ plugin.description }}</p>
@@ -20,7 +20,7 @@
</div>
<div class="widgetBody">
- <a href="{{ linkTo({'module': 'CorePluginsAdmin', 'action': 'marketplace'}) }}"
+ <a href="{{ linkTo({'module': 'Marketplace', 'action': 'overview'}) }}"
>{{ 'CorePluginsAdmin_ViewAllMarketplacePlugins'|translate }}</a>
</div>
diff --git a/plugins/Marketplace/templates/getPremiumFeatures.twig b/plugins/Marketplace/templates/getPremiumFeatures.twig
new file mode 100644
index 0000000000000000000000000000000000000000..fa0fe83744f259b72c2bae0a2340fecc4080072c
--- /dev/null
+++ b/plugins/Marketplace/templates/getPremiumFeatures.twig
@@ -0,0 +1,23 @@
+<div class="getNewPlugins getPremiumFeatures widgetBody">
+ <div class="row">
+ {% for plugin in plugins %}
+ <div class="col s12 m4">
+
+ <h3 class="pluginName" piwik-plugin-name="{{ plugin.name|e('html_attr') }}">{{ plugin.displayName }}</h3>
+ <span class="pluginBody">
+ {{ plugin.description }}
+ <br />
+ <a href="javascript:;" class="pluginMoreDetails" piwik-plugin-name="{{ plugin.name|e('html_attr') }}">{{ 'General_MoreDetails'|translate }}</a>
+ </span>
+ </div>
+ {% if loop.index % 3 == 0 %}
+ </div><div class="row">
+ {% endif %}
+ {% endfor %}
+ </div>
+
+ <div class="widgetBody">
+ <a href="{{ linkTo({'module': 'Marketplace', 'action': 'overview', 'show': 'premium'}) }}"
+ >{{ 'CorePluginsAdmin_ViewAllMarketplacePlugins'|translate }}</a>
+ </div>
+</div>
\ No newline at end of file
diff --git a/plugins/Widgetize/tests/System/WidgetTest.php b/plugins/Widgetize/tests/System/WidgetTest.php
index af99759c77824773351d37831974b63032499c85..e0ff947bf706416a521b8875a34a0659c8de1142 100644
--- a/plugins/Widgetize/tests/System/WidgetTest.php
+++ b/plugins/Widgetize/tests/System/WidgetTest.php
@@ -12,7 +12,6 @@ use Piwik\Container\StaticContainer;
use Piwik\Http\ControllerResolver;
use Piwik\Piwik;
use Piwik\Plugins\API;
-use Piwik\Plugins\Goals;
use Piwik\Plugins\Widgetize\tests\Fixtures\WidgetizeFixture;
use Piwik\Tests\Framework\TestCase\SystemTestCase;
use Piwik\Widget\WidgetsList;
@@ -992,6 +991,14 @@ class WidgetTest extends SystemTestCase
'module' => 'Marketplace',
'action' => 'getNewPlugins',
),
+ ), array (
+ 'name' => 'Premium Features',
+ 'uniqueId' => 'widgetMarketplacegetPremiumFeatures',
+ 'parameters' =>
+ array (
+ 'module' => 'Marketplace',
+ 'action' => 'getPremiumFeatures',
+ ),
), array (
'name' => 'System Check',
'uniqueId' => 'widgetInstallationgetSystemCheck',
diff --git a/tests/PHPUnit/Integration/WidgetsListTest.php b/tests/PHPUnit/Integration/WidgetsListTest.php
index ed8029314332c7b174f9434e75598a9ede6b05f5..f4c335a037c75064975d2d31040a404ddf6e6f39 100644
--- a/tests/PHPUnit/Integration/WidgetsListTest.php
+++ b/tests/PHPUnit/Integration/WidgetsListTest.php
@@ -49,7 +49,7 @@ class WidgetsListTest extends IntegrationTestCase
'Insights_WidgetCategory' => 2,
'ExampleUI_UiFramework' => 8,
'Referrers_Referrers' => 9,
- 'About Piwik' => 9,
+ 'About Piwik' => 10,
);
// number of main categories
$this->assertEquals(count($numberOfWidgets), count($widgetsPerCategory));
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
index 2607e36f1d32b5423f5350190da561c62a614fe3..aeb906def4a28c584e989716b65d02978bc663f4 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
@@ -822,7 +822,7 @@
<isWide>0</isWide>
</row>
<row>
- <name>Visits per visit duration</name>
+ <name>Visits per number of pages</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
@@ -835,19 +835,19 @@
<order>30</order>
</subcategory>
<module>VisitorInterest</module>
- <action>getNumberOfVisitsPerVisitDuration</action>
- <order>115</order>
+ <action>getNumberOfVisitsPerPage</action>
+ <order>120</order>
<parameters>
<module>VisitorInterest</module>
- <action>getNumberOfVisitsPerVisitDuration</action>
+ <action>getNumberOfVisitsPerPage</action>
</parameters>
- <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerVisitDuration</uniqueId>
+ <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPage</uniqueId>
<isWide>0</isWide>
<viewDataTable>cloud</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Visits per number of pages</name>
+ <name>Visits per visit duration</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
@@ -860,19 +860,19 @@
<order>30</order>
</subcategory>
<module>VisitorInterest</module>
- <action>getNumberOfVisitsPerPage</action>
- <order>120</order>
+ <action>getNumberOfVisitsPerVisitDuration</action>
+ <order>115</order>
<parameters>
<module>VisitorInterest</module>
- <action>getNumberOfVisitsPerPage</action>
+ <action>getNumberOfVisitsPerVisitDuration</action>
</parameters>
- <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPage</uniqueId>
+ <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerVisitDuration</uniqueId>
<isWide>0</isWide>
<viewDataTable>cloud</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Visits per server time</name>
+ <name>Visits by Day of Week</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
@@ -885,13 +885,13 @@
<order>35</order>
</subcategory>
<module>VisitTime</module>
- <action>getVisitInformationPerServerTime</action>
- <order>120</order>
+ <action>getByDayOfWeek</action>
+ <order>125</order>
<parameters>
<module>VisitTime</module>
- <action>getVisitInformationPerServerTime</action>
+ <action>getByDayOfWeek</action>
</parameters>
- <uniqueId>widgetVisitTimegetVisitInformationPerServerTime</uniqueId>
+ <uniqueId>widgetVisitTimegetByDayOfWeek</uniqueId>
<isWide>0</isWide>
<viewDataTable>graphVerticalBar</viewDataTable>
<isReport>1</isReport>
@@ -922,7 +922,7 @@
<isReport>1</isReport>
</row>
<row>
- <name>Visits by Day of Week</name>
+ <name>Visits per server time</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
@@ -935,13 +935,13 @@
<order>35</order>
</subcategory>
<module>VisitTime</module>
- <action>getByDayOfWeek</action>
- <order>125</order>
+ <action>getVisitInformationPerServerTime</action>
+ <order>120</order>
<parameters>
<module>VisitTime</module>
- <action>getByDayOfWeek</action>
+ <action>getVisitInformationPerServerTime</action>
</parameters>
- <uniqueId>widgetVisitTimegetByDayOfWeek</uniqueId>
+ <uniqueId>widgetVisitTimegetVisitInformationPerServerTime</uniqueId>
<isWide>0</isWide>
<viewDataTable>graphVerticalBar</viewDataTable>
<isReport>1</isReport>
@@ -1120,7 +1120,7 @@
<isReport>1</isReport>
</row>
<row>
- <name>Search Keywords with No Results</name>
+ <name>Page Titles Following a Site Search</name>
<category>
<id>General_Actions</id>
<name>Actions</name>
@@ -1133,19 +1133,19 @@
<order>25</order>
</subcategory>
<module>Actions</module>
- <action>getSiteSearchNoResultKeywords</action>
- <order>118</order>
+ <action>getPageTitlesFollowingSiteSearch</action>
+ <order>119</order>
<parameters>
<module>Actions</module>
- <action>getSiteSearchNoResultKeywords</action>
+ <action>getPageTitlesFollowingSiteSearch</action>
</parameters>
- <uniqueId>widgetActionsgetSiteSearchNoResultKeywords</uniqueId>
+ <uniqueId>widgetActionsgetPageTitlesFollowingSiteSearch</uniqueId>
<isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Pages Following a Site Search</name>
+ <name>Search Keywords with No Results</name>
<category>
<id>General_Actions</id>
<name>Actions</name>
@@ -1158,19 +1158,19 @@
<order>25</order>
</subcategory>
<module>Actions</module>
- <action>getPageUrlsFollowingSiteSearch</action>
- <order>116</order>
+ <action>getSiteSearchNoResultKeywords</action>
+ <order>118</order>
<parameters>
<module>Actions</module>
- <action>getPageUrlsFollowingSiteSearch</action>
+ <action>getSiteSearchNoResultKeywords</action>
</parameters>
- <uniqueId>widgetActionsgetPageUrlsFollowingSiteSearch</uniqueId>
+ <uniqueId>widgetActionsgetSiteSearchNoResultKeywords</uniqueId>
<isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Site Search Keywords</name>
+ <name>Pages Following a Site Search</name>
<category>
<id>General_Actions</id>
<name>Actions</name>
@@ -1183,19 +1183,19 @@
<order>25</order>
</subcategory>
<module>Actions</module>
- <action>getSiteSearchKeywords</action>
- <order>115</order>
+ <action>getPageUrlsFollowingSiteSearch</action>
+ <order>116</order>
<parameters>
<module>Actions</module>
- <action>getSiteSearchKeywords</action>
+ <action>getPageUrlsFollowingSiteSearch</action>
</parameters>
- <uniqueId>widgetActionsgetSiteSearchKeywords</uniqueId>
+ <uniqueId>widgetActionsgetPageUrlsFollowingSiteSearch</uniqueId>
<isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Page Titles Following a Site Search</name>
+ <name>Site Search Keywords</name>
<category>
<id>General_Actions</id>
<name>Actions</name>
@@ -1208,13 +1208,13 @@
<order>25</order>
</subcategory>
<module>Actions</module>
- <action>getPageTitlesFollowingSiteSearch</action>
- <order>119</order>
+ <action>getSiteSearchKeywords</action>
+ <order>115</order>
<parameters>
<module>Actions</module>
- <action>getPageTitlesFollowingSiteSearch</action>
+ <action>getSiteSearchKeywords</action>
</parameters>
- <uniqueId>widgetActionsgetPageTitlesFollowingSiteSearch</uniqueId>
+ <uniqueId>widgetActionsgetSiteSearchKeywords</uniqueId>
<isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
@@ -1373,7 +1373,7 @@
<isReport>1</isReport>
</row>
<row>
- <name>Event Actions</name>
+ <name>Event Names</name>
<category>
<id>General_Actions</id>
<name>Actions</name>
@@ -1386,14 +1386,14 @@
<order>40</order>
</subcategory>
<module>Events</module>
- <action>getAction</action>
- <order>101</order>
+ <action>getName</action>
+ <order>102</order>
<parameters>
<module>Events</module>
- <action>getAction</action>
- <secondaryDimension>eventName</secondaryDimension>
+ <action>getName</action>
+ <secondaryDimension>eventAction</secondaryDimension>
</parameters>
- <uniqueId>widgetEventsgetActionsecondaryDimensioneventName</uniqueId>
+ <uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId>
<isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
@@ -1425,7 +1425,7 @@
<isReport>1</isReport>
</row>
<row>
- <name>Event Names</name>
+ <name>Event Actions</name>
<category>
<id>General_Actions</id>
<name>Actions</name>
@@ -1438,20 +1438,20 @@
<order>40</order>
</subcategory>
<module>Events</module>
- <action>getName</action>
- <order>102</order>
+ <action>getAction</action>
+ <order>101</order>
<parameters>
<module>Events</module>
- <action>getName</action>
- <secondaryDimension>eventAction</secondaryDimension>
+ <action>getAction</action>
+ <secondaryDimension>eventName</secondaryDimension>
</parameters>
- <uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId>
+ <uniqueId>widgetEventsgetActionsecondaryDimensioneventName</uniqueId>
<isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Content Piece</name>
+ <name>Content Name</name>
<category>
<id>General_Actions</id>
<name>Actions</name>
@@ -1464,19 +1464,19 @@
<order>45</order>
</subcategory>
<module>Contents</module>
- <action>getContentPieces</action>
- <order>136</order>
+ <action>getContentNames</action>
+ <order>135</order>
<parameters>
<module>Contents</module>
- <action>getContentPieces</action>
+ <action>getContentNames</action>
</parameters>
- <uniqueId>widgetContentsgetContentPieces</uniqueId>
+ <uniqueId>widgetContentsgetContentNames</uniqueId>
<isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Content Piece</name>
+ <name>Content Name</name>
<category>
<id>General_Actions</id>
<name>Actions</name>
@@ -1489,19 +1489,19 @@
<order>45</order>
</subcategory>
<module>Contents</module>
- <action>getContentPieces</action>
- <order>136</order>
+ <action>getContentNames</action>
+ <order>135</order>
<parameters>
<module>Contents</module>
- <action>getContentPieces</action>
+ <action>getContentNames</action>
</parameters>
- <uniqueId>widgetContentsgetContentPieces</uniqueId>
+ <uniqueId>widgetContentsgetContentNames</uniqueId>
<isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Content Name</name>
+ <name>Content Piece</name>
<category>
<id>General_Actions</id>
<name>Actions</name>
@@ -1514,19 +1514,19 @@
<order>45</order>
</subcategory>
<module>Contents</module>
- <action>getContentNames</action>
- <order>135</order>
+ <action>getContentPieces</action>
+ <order>136</order>
<parameters>
<module>Contents</module>
- <action>getContentNames</action>
+ <action>getContentPieces</action>
</parameters>
- <uniqueId>widgetContentsgetContentNames</uniqueId>
+ <uniqueId>widgetContentsgetContentPieces</uniqueId>
<isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Content Name</name>
+ <name>Content Piece</name>
<category>
<id>General_Actions</id>
<name>Actions</name>
@@ -1539,13 +1539,13 @@
<order>45</order>
</subcategory>
<module>Contents</module>
- <action>getContentNames</action>
- <order>135</order>
+ <action>getContentPieces</action>
+ <order>136</order>
<parameters>
<module>Contents</module>
- <action>getContentNames</action>
+ <action>getContentPieces</action>
</parameters>
- <uniqueId>widgetContentsgetContentNames</uniqueId>
+ <uniqueId>widgetContentsgetContentPieces</uniqueId>
<isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
@@ -1651,7 +1651,7 @@
<isReport>1</isReport>
</row>
<row>
- <name>Websites</name>
+ <name>Social Networks</name>
<category>
<id>Referrers_Referrers</id>
<name>Referrers</name>
@@ -1664,19 +1664,19 @@
<order>15</order>
</subcategory>
<module>Referrers</module>
- <action>getWebsites</action>
- <order>105</order>
+ <action>getSocials</action>
+ <order>111</order>
<parameters>
<module>Referrers</module>
- <action>getWebsites</action>
+ <action>getSocials</action>
</parameters>
- <uniqueId>widgetReferrersgetWebsites</uniqueId>
+ <uniqueId>widgetReferrersgetSocials</uniqueId>
<isWide>0</isWide>
- <viewDataTable>table</viewDataTable>
+ <viewDataTable>graphPie</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Social Networks</name>
+ <name>Websites</name>
<category>
<id>Referrers_Referrers</id>
<name>Referrers</name>
@@ -1689,15 +1689,15 @@
<order>15</order>
</subcategory>
<module>Referrers</module>
- <action>getSocials</action>
- <order>111</order>
+ <action>getWebsites</action>
+ <order>105</order>
<parameters>
<module>Referrers</module>
- <action>getSocials</action>
+ <action>getWebsites</action>
</parameters>
- <uniqueId>widgetReferrersgetSocials</uniqueId>
+ <uniqueId>widgetReferrersgetWebsites</uniqueId>
<isWide>0</isWide>
- <viewDataTable>graphPie</viewDataTable>
+ <viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
<row>
@@ -1964,7 +1964,7 @@
<isReport>1</isReport>
</row>
<row>
- <name>Product Name</name>
+ <name>Product Category</name>
<category>
<id>Goals_Ecommerce</id>
<name>Ecommerce</name>
@@ -1977,19 +1977,19 @@
<order>10</order>
</subcategory>
<module>Goals</module>
- <action>getItemsName</action>
- <order>131</order>
+ <action>getItemsCategory</action>
+ <order>132</order>
<parameters>
<module>Goals</module>
- <action>getItemsName</action>
+ <action>getItemsCategory</action>
</parameters>
- <uniqueId>widgetGoalsgetItemsName</uniqueId>
+ <uniqueId>widgetGoalsgetItemsCategory</uniqueId>
<isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Product Category</name>
+ <name>Product Name</name>
<category>
<id>Goals_Ecommerce</id>
<name>Ecommerce</name>
@@ -2002,13 +2002,13 @@
<order>10</order>
</subcategory>
<module>Goals</module>
- <action>getItemsCategory</action>
- <order>132</order>
+ <action>getItemsName</action>
+ <order>131</order>
<parameters>
<module>Goals</module>
- <action>getItemsCategory</action>
+ <action>getItemsName</action>
</parameters>
- <uniqueId>widgetGoalsgetItemsCategory</uniqueId>
+ <uniqueId>widgetGoalsgetItemsName</uniqueId>
<isWide>0</isWide>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
@@ -2533,31 +2533,6 @@
</row>
</widgets>
</row>
- <row>
- <name>Data tables</name>
- <category>
- <id>ExampleUI_UiFramework</id>
- <name>UI Framework</name>
- <order>90</order>
- <icon />
- </category>
- <subcategory>
- <id>ExampleUI_GetTemperaturesDataTable</id>
- <name>Data tables</name>
- <order>99</order>
- </subcategory>
- <module>ExampleUI</module>
- <action>getTemperatures</action>
- <order>210</order>
- <parameters>
- <module>ExampleUI</module>
- <action>getTemperatures</action>
- </parameters>
- <uniqueId>widgetExampleUIgetTemperatures</uniqueId>
- <isWide>0</isWide>
- <viewDataTable>table</viewDataTable>
- <isReport>1</isReport>
- </row>
<row>
<name>Advanced tag cloud: with logos and links</name>
<category>
@@ -2592,22 +2567,20 @@
<icon />
</category>
<subcategory>
- <id>Bar graph</id>
- <name>Bar graph</name>
+ <id>ExampleUI_GetTemperaturesDataTable</id>
+ <name>Data tables</name>
<order>99</order>
</subcategory>
<module>ExampleUI</module>
<action>getTemperatures</action>
<order>210</order>
<parameters>
- <forceView>1</forceView>
- <viewDataTable>graphVerticalBar</viewDataTable>
<module>ExampleUI</module>
<action>getTemperatures</action>
</parameters>
- <uniqueId>widgetExampleUIgetTemperaturesforceView1viewDataTablegraphVerticalBar</uniqueId>
+ <uniqueId>widgetExampleUIgetTemperatures</uniqueId>
<isWide>0</isWide>
- <viewDataTable>graphVerticalBar</viewDataTable>
+ <viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
<row>
@@ -2695,6 +2668,33 @@
<viewDataTable>infoviz-treemap</viewDataTable>
<isReport>1</isReport>
</row>
+ <row>
+ <name>Data tables</name>
+ <category>
+ <id>ExampleUI_UiFramework</id>
+ <name>UI Framework</name>
+ <order>90</order>
+ <icon />
+ </category>
+ <subcategory>
+ <id>Bar graph</id>
+ <name>Bar graph</name>
+ <order>99</order>
+ </subcategory>
+ <module>ExampleUI</module>
+ <action>getTemperatures</action>
+ <order>210</order>
+ <parameters>
+ <forceView>1</forceView>
+ <viewDataTable>graphVerticalBar</viewDataTable>
+ <module>ExampleUI</module>
+ <action>getTemperatures</action>
+ </parameters>
+ <uniqueId>widgetExampleUIgetTemperaturesforceView1viewDataTablegraphVerticalBar</uniqueId>
+ <isWide>0</isWide>
+ <viewDataTable>graphVerticalBar</viewDataTable>
+ <isReport>1</isReport>
+ </row>
<row>
<name>Pie graph</name>
<category>
@@ -2748,7 +2748,7 @@
<isReport>1</isReport>
</row>
<row>
- <name>Piwik.org Blog</name>
+ <name>System Summary</name>
<category>
<id>About Piwik</id>
<name>About Piwik</name>
@@ -2756,14 +2756,33 @@
<icon />
</category>
<subcategory />
- <module>RssWidget</module>
- <action>rssPiwik</action>
+ <module>CoreHome</module>
+ <action>getSystemSummary</action>
+ <order>15</order>
+ <parameters>
+ <module>CoreHome</module>
+ <action>getSystemSummary</action>
+ </parameters>
+ <uniqueId>widgetCoreHomegetSystemSummary</uniqueId>
+ <isWide>0</isWide>
+ </row>
+ <row>
+ <name>Premium Products & Services for Piwik</name>
+ <category>
+ <id>About Piwik</id>
+ <name>About Piwik</name>
+ <order>99</order>
+ <icon />
+ </category>
+ <subcategory />
+ <module>ProfessionalServices</module>
+ <action>promoServices</action>
<order>99</order>
<parameters>
- <module>RssWidget</module>
- <action>rssPiwik</action>
+ <module>ProfessionalServices</module>
+ <action>promoServices</action>
</parameters>
- <uniqueId>widgetRssWidgetrssPiwik</uniqueId>
+ <uniqueId>widgetProfessionalServicespromoServices</uniqueId>
<isWide>0</isWide>
</row>
<row>
@@ -2786,26 +2805,26 @@
<isWide>0</isWide>
</row>
<row>
- <name>SEO Rankings</name>
+ <name>Piwik Changelog</name>
<category>
- <id>SEO</id>
- <name>SEO</name>
+ <id>About Piwik</id>
+ <name>About Piwik</name>
<order>99</order>
<icon />
</category>
<subcategory />
- <module>SEO</module>
- <action>getRank</action>
+ <module>RssWidget</module>
+ <action>rssChangelog</action>
<order>99</order>
<parameters>
- <module>SEO</module>
- <action>getRank</action>
+ <module>RssWidget</module>
+ <action>rssChangelog</action>
</parameters>
- <uniqueId>widgetSEOgetRank</uniqueId>
+ <uniqueId>widgetRssWidgetrssChangelog</uniqueId>
<isWide>0</isWide>
</row>
<row>
- <name>System Check</name>
+ <name>Welcome!</name>
<category>
<id>About Piwik</id>
<name>About Piwik</name>
@@ -2813,18 +2832,18 @@
<icon />
</category>
<subcategory />
- <module>Installation</module>
- <action>getSystemCheck</action>
- <order>16</order>
+ <module>CoreHome</module>
+ <action>getPromoVideo</action>
+ <order>10</order>
<parameters>
- <module>Installation</module>
- <action>getSystemCheck</action>
+ <module>CoreHome</module>
+ <action>getPromoVideo</action>
</parameters>
- <uniqueId>widgetInstallationgetSystemCheck</uniqueId>
+ <uniqueId>widgetCoreHomegetPromoVideo</uniqueId>
<isWide>0</isWide>
</row>
<row>
- <name>Support Piwik!</name>
+ <name>Latest Marketplace Updates</name>
<category>
<id>About Piwik</id>
<name>About Piwik</name>
@@ -2832,18 +2851,18 @@
<icon />
</category>
<subcategory />
- <module>CoreHome</module>
- <action>getDonateForm</action>
- <order>5</order>
+ <module>Marketplace</module>
+ <action>getNewPlugins</action>
+ <order>19</order>
<parameters>
- <module>CoreHome</module>
- <action>getDonateForm</action>
+ <module>Marketplace</module>
+ <action>getNewPlugins</action>
</parameters>
- <uniqueId>widgetCoreHomegetDonateForm</uniqueId>
+ <uniqueId>widgetMarketplacegetNewPlugins</uniqueId>
<isWide>0</isWide>
</row>
<row>
- <name>Piwik Changelog</name>
+ <name>Piwik.org Blog</name>
<category>
<id>About Piwik</id>
<name>About Piwik</name>
@@ -2852,17 +2871,17 @@
</category>
<subcategory />
<module>RssWidget</module>
- <action>rssChangelog</action>
+ <action>rssPiwik</action>
<order>99</order>
<parameters>
<module>RssWidget</module>
- <action>rssChangelog</action>
+ <action>rssPiwik</action>
</parameters>
- <uniqueId>widgetRssWidgetrssChangelog</uniqueId>
+ <uniqueId>widgetRssWidgetrssPiwik</uniqueId>
<isWide>0</isWide>
</row>
<row>
- <name>Premium Products & Services for Piwik</name>
+ <name>Premium Features</name>
<category>
<id>About Piwik</id>
<name>About Piwik</name>
@@ -2870,18 +2889,18 @@
<icon />
</category>
<subcategory />
- <module>ProfessionalServices</module>
- <action>promoServices</action>
- <order>99</order>
+ <module>Marketplace</module>
+ <action>getPremiumFeatures</action>
+ <order>20</order>
<parameters>
- <module>ProfessionalServices</module>
- <action>promoServices</action>
+ <module>Marketplace</module>
+ <action>getPremiumFeatures</action>
</parameters>
- <uniqueId>widgetProfessionalServicespromoServices</uniqueId>
+ <uniqueId>widgetMarketplacegetPremiumFeatures</uniqueId>
<isWide>0</isWide>
</row>
<row>
- <name>System Summary</name>
+ <name>System Check</name>
<category>
<id>About Piwik</id>
<name>About Piwik</name>
@@ -2889,18 +2908,18 @@
<icon />
</category>
<subcategory />
- <module>CoreHome</module>
- <action>getSystemSummary</action>
- <order>15</order>
+ <module>Installation</module>
+ <action>getSystemCheck</action>
+ <order>16</order>
<parameters>
- <module>CoreHome</module>
- <action>getSystemSummary</action>
+ <module>Installation</module>
+ <action>getSystemCheck</action>
</parameters>
- <uniqueId>widgetCoreHomegetSystemSummary</uniqueId>
+ <uniqueId>widgetInstallationgetSystemCheck</uniqueId>
<isWide>0</isWide>
</row>
<row>
- <name>Latest Marketplace Updates</name>
+ <name>Support Piwik!</name>
<category>
<id>About Piwik</id>
<name>About Piwik</name>
@@ -2908,33 +2927,33 @@
<icon />
</category>
<subcategory />
- <module>Marketplace</module>
- <action>getNewPlugins</action>
- <order>19</order>
+ <module>CoreHome</module>
+ <action>getDonateForm</action>
+ <order>5</order>
<parameters>
- <module>Marketplace</module>
- <action>getNewPlugins</action>
+ <module>CoreHome</module>
+ <action>getDonateForm</action>
</parameters>
- <uniqueId>widgetMarketplacegetNewPlugins</uniqueId>
+ <uniqueId>widgetCoreHomegetDonateForm</uniqueId>
<isWide>0</isWide>
</row>
<row>
- <name>Welcome!</name>
+ <name>Insights Overview</name>
<category>
- <id>About Piwik</id>
- <name>About Piwik</name>
+ <id>Insights_WidgetCategory</id>
+ <name>Insights</name>
<order>99</order>
<icon />
</category>
<subcategory />
- <module>CoreHome</module>
- <action>getPromoVideo</action>
- <order>10</order>
+ <module>Insights</module>
+ <action>getInsightsOverview</action>
+ <order>99</order>
<parameters>
- <module>CoreHome</module>
- <action>getPromoVideo</action>
+ <module>Insights</module>
+ <action>getInsightsOverview</action>
</parameters>
- <uniqueId>widgetCoreHomegetPromoVideo</uniqueId>
+ <uniqueId>widgetInsightsgetInsightsOverview</uniqueId>
<isWide>0</isWide>
</row>
<row>
@@ -2957,7 +2976,7 @@
<isWide>0</isWide>
</row>
<row>
- <name>Insights Overview</name>
+ <name>Movers and Shakers</name>
<category>
<id>Insights_WidgetCategory</id>
<name>Insights</name>
@@ -2966,32 +2985,32 @@
</category>
<subcategory />
<module>Insights</module>
- <action>getInsightsOverview</action>
+ <action>getOverallMoversAndShakers</action>
<order>99</order>
<parameters>
<module>Insights</module>
- <action>getInsightsOverview</action>
+ <action>getOverallMoversAndShakers</action>
</parameters>
- <uniqueId>widgetInsightsgetInsightsOverview</uniqueId>
+ <uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId>
<isWide>0</isWide>
</row>
<row>
- <name>Movers and Shakers</name>
+ <name>SEO Rankings</name>
<category>
- <id>Insights_WidgetCategory</id>
- <name>Insights</name>
+ <id>SEO</id>
+ <name>SEO</name>
<order>99</order>
<icon />
</category>
<subcategory />
- <module>Insights</module>
- <action>getOverallMoversAndShakers</action>
+ <module>SEO</module>
+ <action>getRank</action>
<order>99</order>
<parameters>
- <module>Insights</module>
- <action>getOverallMoversAndShakers</action>
+ <module>SEO</module>
+ <action>getRank</action>
</parameters>
- <uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId>
+ <uniqueId>widgetSEOgetRank</uniqueId>
<isWide>0</isWide>
</row>
</result>
\ No newline at end of file