diff options
14 files changed, 48 insertions, 34 deletions
diff --git a/config/environment/ui-test.php b/config/environment/ui-test.php index b5ef0fede4..6d9235ed21 100644 --- a/config/environment/ui-test.php +++ b/config/environment/ui-test.php @@ -54,7 +54,7 @@ return array( $result = str_replace(realpath(PIWIK_INCLUDE_PATH), '', $result); }), - array('Controller.ExampleRssWidget.rssPiwik.end', function (&$result, $parameters) { + array('Controller.RssWidget.rssPiwik.end', function (&$result, $parameters) { $result = ""; }), )), diff --git a/config/global.ini.php b/config/global.ini.php index 1cdf1cb302..61f5045a63 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -777,7 +777,7 @@ Plugins[] = VisitFrequency Plugins[] = VisitTime Plugins[] = VisitorInterest Plugins[] = ExampleAPI -Plugins[] = ExampleRssWidget +Plugins[] = RssWidget Plugins[] = Feedback Plugins[] = Monolog diff --git a/core/Updates/3.0.0-b1.php b/core/Updates/3.0.0-b1.php index 9fe4e11d40..6d3a61ad65 100644 --- a/core/Updates/3.0.0-b1.php +++ b/core/Updates/3.0.0-b1.php @@ -66,6 +66,12 @@ class Updates_3_0_0_b1 extends Updates // added .woff and woff2 whitelisted file for apache webserver ServerFilesGenerator::deleteHtAccessFiles(); ServerFilesGenerator::createHtAccessFiles(); + + // Renamed plugin ExampleRssWidget -> RssWidget + try { + \Piwik\Plugin\Manager::getInstance()->activatePlugin('RssWidget'); + } catch (\Exception $e) { + } } private function migratePluginEmailUpdateSetting() diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php index 56f65e8fb9..e2ded0aa2b 100644 --- a/plugins/Dashboard/Dashboard.php +++ b/plugins/Dashboard/Dashboard.php @@ -165,7 +165,7 @@ class Dashboard extends \Piwik\Plugin {"uniqueId":"widgetUserCountryMapvisitorMap","parameters":{"module":"UserCountryMap","action":"visitorMap"}}, {"uniqueId":"widgetDevicesDetectiongetBrowsers","parameters":{"module":"DevicesDetection","action":"getBrowsers"}}, {"uniqueId":"widgetReferrersgetSearchEngines","parameters":{"module":"Referrers","action":"getSearchEngines"}}, - {"uniqueId":"widgetExampleRssWidgetrssPiwik","parameters":{"module":"ExampleRssWidget","action":"rssPiwik"}} + {"uniqueId":"widgetRssWidgetrssPiwik","parameters":{"module":"RssWidget","action":"rssPiwik"}} ] ]'; } diff --git a/plugins/ExampleRssWidget/RssRenderer.php b/plugins/RssWidget/RssRenderer.php index 7990b1acb8..51c831cd4c 100644 --- a/plugins/ExampleRssWidget/RssRenderer.php +++ b/plugins/RssWidget/RssRenderer.php @@ -7,7 +7,7 @@ * */ -namespace Piwik\Plugins\ExampleRssWidget; +namespace Piwik\Plugins\RssWidget; use Piwik\Http; /** diff --git a/plugins/ExampleRssWidget/ExampleRssWidget.php b/plugins/RssWidget/RssWidget.php index 3fd348f80d..03f2af97d9 100644 --- a/plugins/ExampleRssWidget/ExampleRssWidget.php +++ b/plugins/RssWidget/RssWidget.php @@ -6,12 +6,12 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * */ -namespace Piwik\Plugins\ExampleRssWidget; +namespace Piwik\Plugins\RssWidget; /** * */ -class ExampleRssWidget extends \Piwik\Plugin +class RssWidget extends \Piwik\Plugin { /** * @see Piwik\Plugin::registerEvents @@ -19,12 +19,20 @@ class ExampleRssWidget extends \Piwik\Plugin public function registerEvents() { return array( - 'AssetManager.getStylesheetFiles' => 'getStylesheetFiles' + 'AssetManager.getStylesheetFiles' => 'getStylesheetFiles', + 'Request.getRenamedModuleAndAction' => 'renameExampleRssWidgetModule', ); } public function getStylesheetFiles(&$stylesheets) { - $stylesheets[] = "plugins/ExampleRssWidget/stylesheets/rss.less"; + $stylesheets[] = "plugins/RssWidget/stylesheets/rss.less"; + } + + public function renameExampleRssWidgetModule(&$module, &$action) + { + if ($module == 'ExampleRssWidget') { + $module = 'RssWidget'; + } } } diff --git a/plugins/ExampleRssWidget/Widgets/RssChangelog.php b/plugins/RssWidget/Widgets/RssChangelog.php index d42737b3fa..bdd02843ef 100644 --- a/plugins/ExampleRssWidget/Widgets/RssChangelog.php +++ b/plugins/RssWidget/Widgets/RssChangelog.php @@ -6,11 +6,11 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * */ -namespace Piwik\Plugins\ExampleRssWidget\Widgets; +namespace Piwik\Plugins\RssWidget\Widgets; use Piwik\Piwik; use Piwik\Widget\WidgetConfig; -use Piwik\Plugins\ExampleRssWidget\RssRenderer; +use Piwik\Plugins\RssWidget\RssRenderer; class RssChangelog extends \Piwik\Widget\Widget { diff --git a/plugins/ExampleRssWidget/Widgets/RssPiwik.php b/plugins/RssWidget/Widgets/RssPiwik.php index 489b703656..41ee915292 100644 --- a/plugins/ExampleRssWidget/Widgets/RssPiwik.php +++ b/plugins/RssWidget/Widgets/RssPiwik.php @@ -6,11 +6,11 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * */ -namespace Piwik\Plugins\ExampleRssWidget\Widgets; +namespace Piwik\Plugins\RssWidget\Widgets; use Piwik\Piwik; use Piwik\Widget\WidgetConfig; -use Piwik\Plugins\ExampleRssWidget\RssRenderer; +use Piwik\Plugins\RssWidget\RssRenderer; class RssPiwik extends \Piwik\Widget\Widget { diff --git a/plugins/ExampleRssWidget/plugin.json b/plugins/RssWidget/plugin.json index 6775022287..ba44ad733c 100644 --- a/plugins/ExampleRssWidget/plugin.json +++ b/plugins/RssWidget/plugin.json @@ -1,5 +1,5 @@ { - "name": "ExampleRssWidget", + "name": "RssWidget", "description": "Piwik Platform showcase: how to create a new widget that displays a user submitted RSS feed.", "version": "1.0", "keywords": ["example", "feed", "widget"], diff --git a/plugins/ExampleRssWidget/stylesheets/rss.less b/plugins/RssWidget/stylesheets/rss.less index 11f4d9dbbe..11f4d9dbbe 100644 --- a/plugins/ExampleRssWidget/stylesheets/rss.less +++ b/plugins/RssWidget/stylesheets/rss.less diff --git a/plugins/Widgetize/tests/System/WidgetTest.php b/plugins/Widgetize/tests/System/WidgetTest.php index 919556ed34..ebc5a5a7bd 100644 --- a/plugins/Widgetize/tests/System/WidgetTest.php +++ b/plugins/Widgetize/tests/System/WidgetTest.php @@ -174,18 +174,18 @@ class WidgetTest extends SystemTestCase ), ),array ( 'name' => 'Piwik Changelog', - 'uniqueId' => 'widgetExampleRssWidgetrssChangelog', + 'uniqueId' => 'widgetRssWidgetrssChangelog', 'parameters' => array ( - 'module' => 'ExampleRssWidget', + 'module' => 'RssWidget', 'action' => 'rssChangelog', ), ),array ( 'name' => 'Piwik.org Blog', - 'uniqueId' => 'widgetExampleRssWidgetrssPiwik', + 'uniqueId' => 'widgetRssWidgetrssPiwik', 'parameters' => array ( - 'module' => 'ExampleRssWidget', + 'module' => 'RssWidget', 'action' => 'rssPiwik', ), ),array ( @@ -1343,19 +1343,19 @@ class WidgetTest extends SystemTestCase ), array ( 'name' => 'Piwik.org Blog', - 'uniqueId' => 'widgetExampleRssWidgetrssPiwik', + 'uniqueId' => 'widgetRssWidgetrssPiwik', 'parameters' => array ( - 'module' => 'ExampleRssWidget', + 'module' => 'RssWidget', 'action' => 'rssPiwik', ), ), array ( 'name' => 'Piwik Changelog', - 'uniqueId' => 'widgetExampleRssWidgetrssChangelog', + 'uniqueId' => 'widgetRssWidgetrssChangelog', 'parameters' => array ( - 'module' => 'ExampleRssWidget', + 'module' => 'RssWidget', 'action' => 'rssChangelog', ), ), diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml index 1443e8873d..69e163bc02 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml @@ -2650,14 +2650,14 @@ <icon /> </category> <subcategory /> - <module>ExampleRssWidget</module> + <module>RssWidget</module> <action>rssChangelog</action> <order>99</order> <parameters> - <module>ExampleRssWidget</module> + <module>RssWidget</module> <action>rssChangelog</action> </parameters> - <uniqueId>widgetExampleRssWidgetrssChangelog</uniqueId> + <uniqueId>widgetRssWidgetrssChangelog</uniqueId> </row> <row> <name>System Summary</name> @@ -2704,14 +2704,14 @@ <icon /> </category> <subcategory /> - <module>ExampleRssWidget</module> + <module>RssWidget</module> <action>rssPiwik</action> <order>99</order> <parameters> - <module>ExampleRssWidget</module> + <module>RssWidget</module> <action>rssPiwik</action> </parameters> - <uniqueId>widgetExampleRssWidgetrssPiwik</uniqueId> + <uniqueId>widgetRssWidgetrssPiwik</uniqueId> </row> <row> <name>Latest Piwik Plugin Updates</name> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata_day.xml index fa3b20ac00..87044426b1 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata_day.xml @@ -1873,14 +1873,14 @@ <id>Example Widgets</id> </category> <subcategory /> - <module>ExampleRssWidget</module> + <module>RssWidget</module> <action>rssChangelog</action> <order>99</order> <parameters> - <module>ExampleRssWidget</module> + <module>RssWidget</module> <action>rssChangelog</action> </parameters> - <uniqueId>widgetExampleRssWidgetrssChangelog</uniqueId> + <uniqueId>widgetRssWidgetrssChangelog</uniqueId> </row> <row> <name>Movers and Shakers</name> @@ -1941,14 +1941,14 @@ <id>Example Widgets</id> </category> <subcategory /> - <module>ExampleRssWidget</module> + <module>RssWidget</module> <action>rssPiwik</action> <order>99</order> <parameters> - <module>ExampleRssWidget</module> + <module>RssWidget</module> <action>rssPiwik</action> </parameters> - <uniqueId>widgetExampleRssWidgetrssPiwik</uniqueId> + <uniqueId>widgetRssWidgetrssPiwik</uniqueId> </row> <row> <name>Welcome!</name> diff --git a/tests/resources/screenshot-override/override.css b/tests/resources/screenshot-override/override.css index a332017bdb..59b296f8e3 100644 --- a/tests/resources/screenshot-override/override.css +++ b/tests/resources/screenshot-override/override.css @@ -42,7 +42,7 @@ body > .widget { } /* do not display RSS feed widget's contents */ -#widgetExampleRssWidgetrssPiwik .rss { +#widgetRssWidgetrssPiwik .rss { display:none; } |