Gerharddiller85 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/305200

Change subject: Dashboards: using extension.json
......................................................................

Dashboards: using extension.json

Change-Id: I5e1427f6e4e5a90767a15edfb3e73ac8f2b13536
---
M Dashboards/Dashboards.class.php
M Dashboards/Dashboards.setup.php
A Dashboards/extension.json
3 files changed, 100 insertions(+), 122 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/00/305200/1

diff --git a/Dashboards/Dashboards.class.php b/Dashboards/Dashboards.class.php
index 3dccd08..aaa094f 100644
--- a/Dashboards/Dashboards.class.php
+++ b/Dashboards/Dashboards.class.php
@@ -37,38 +37,6 @@
  * @subpackage Dashboards
  */
 class Dashboards extends BsExtensionMW {
-
-       /**
-        * Contructor of the Dashboards class
-        */
-       public function __construct() {
-               wfProfileIn( 'BS::'.__METHOD__ );
-
-               $this->mExtensionFile = __FILE__;
-               $this->mExtensionType = EXTTYPE::SPECIALPAGE;
-               $this->mInfo = array(
-                       EXTINFO::NAME        => 'Dashboards',
-                       EXTINFO::DESCRIPTION => 'bs-dashboards-desc',
-                       EXTINFO::AUTHOR      => 'Robert Vogel, Stephan Muggli',
-                       EXTINFO::VERSION     => 'default',
-                       EXTINFO::STATUS      => 'default',
-                       EXTINFO::PACKAGE     => 'default',
-                       EXTINFO::URL         => 
'https://help.bluespice.com/index.php/DashBoards',
-                       EXTINFO::DEPS        => array(
-                               'bluespice'    => '2.22.0'
-                       )
-               );
-               $this->mExtensionKey = 'MW::Dashboards';
-
-               WikiAdmin::registerModuleClass( 'SpecialAdminDashboard', array(
-                       'image' => 
'/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_dashboard_v1.png',
-                       'level' => 'wikiadmin',
-                       'message' => 'bs-specialadmindashboard-label'
-               ) );
-
-               wfProfileOut( 'BS::'.__METHOD__ );
-       }
-
        /**
         * Initialization of Dashboards extension
         */
diff --git a/Dashboards/Dashboards.setup.php b/Dashboards/Dashboards.setup.php
index 732ab16..58d4554 100644
--- a/Dashboards/Dashboards.setup.php
+++ b/Dashboards/Dashboards.setup.php
@@ -1,91 +1,2 @@
 <?php
-
-BsExtensionManager::registerExtension('Dashboards', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
-
-$wgMessagesDirs['Dashboards'] = __DIR__ . '/i18n';
-
-$wgExtensionMessagesFiles['DashboardsAlias'] = 
__DIR__.'/languages/Dashboards.alias.php';
-
-$wgAutoloadClasses['Dashboards'] = __DIR__ . '/Dashboards.class.php';
-$wgAutoloadClasses['Dashboards'] = __DIR__ . '/Dashboards.class.php';
-$wgAutoloadClasses['SpecialAdminDashboard'] = 
__DIR__.'/includes/specials/SpecialAdminDashboard.php';
-$wgAutoloadClasses['SpecialUserDashboard'] = 
__DIR__.'/includes/specials/SpecialUserDashboard.php';
-$wgAutoloadClasses['BSApiDashboardTasks'] = __DIR__ . 
'/includes/api/BSApiDashboardTasks.php';
-$wgAutoloadClasses['BSApiDashboardStore'] = __DIR__ . 
'/includes/api/BSApiDashboardStore.php';
-$wgAutoloadClasses['BSApiDashboardWidgetsTasks'] = __DIR__ . 
'/includes/api/BSApiDashboardWidgetsTasks.php';
-
-$wgSpecialPages['AdminDashboard'] = 'SpecialAdminDashboard';
-$wgSpecialPages['UserDashboard']  = 'SpecialUserDashboard';
-
-$wgAPIModules['bs-dashboards-tasks'] = 'BSApiDashboardTasks';
-$wgAPIModules['bs-dashboards-store'] = 'BSApiDashboardStore';
-$wgAPIModules['bs-dashboards-widgets-tasks'] = 'BSApiDashboardWidgetsTasks';
-
-$wgHooks['LoadExtensionSchemaUpdates'][] = 'Dashboards::getSchemaUpdates';
-
-$aResourceModuleTemplate = array(
-       'localBasePath' => 
$IP.'/extensions/BlueSpiceExtensions/Dashboards/resources',
-       'remoteExtPath' => 'BlueSpiceExtensions/Dashboards/resources',
-);
-
-$wgResourceModules['ext.bluespice.dashboards'] = array(
-       'scripts' => array(
-               'bluespice.dashboards.main.js',
-       ),
-       'messages' => array(
-               'tooltip-p-logo'
-       )
-) + $aResourceModuleTemplate;
-
-$wgResourceModules['ext.bluespice.dashboards.portletCatalog'] = array(
-       'scripts' => array(
-               'bluespice.dashboards.portletcatalog.js'
-       ),
-       'styles' => array(
-               'bluespice.dashboards.css'
-       ),
-       'dependencies' => array(
-               'ext.bluespice.extjs.BS.portal'
-       ),
-       'messages' => array(
-               'bs-dashboards-addportlet',
-               'bs-dashboards-portlets',
-               'bs-extjs-rssfeeder-rss-title',
-               'bs-dashboard-userportlet-wikipage-wiki-article'
-       )
-) + $aResourceModuleTemplate;
-
-$wgResourceModules['ext.bluespice.dashboards.userDashboard'] = array(
-       'scripts' => array(
-               'bluespice.dashboards.userDashboard.js',
-       ),
-       'styles' => array(
-               
//'extensions/BlueSpiceExtensions/Dashboards/resources/bluespice.dashboards.css',
-       ),
-       'dependencies' => array(
-               'ext.bluespice.dashboards.portletCatalog'
-       ),
-       'messages' => array(
-               //Default portlets user
-               'bs-dashboard-userportlet-calendar-title',
-               'bs-dashboard-userportlet-calendar-description',
-               'bs-dashboard-userportlet-article-title',
-               'bs-dashboard-userportlet-article-description',
-       )
-) + $aResourceModuleTemplate;
-
-$wgResourceModules['ext.bluespice.dashboards.adminDashboard'] = array(
-       'scripts' => array(
-               'bluespice.dashboards.adminDashboard.js',
-       ),
-       'styles' => array(
-               
//'extensions/BlueSpiceExtensions/Dashboards/resources/bluespice.dashboards.css',
-       ),
-       'dependencies' => array(
-               'ext.bluespice.dashboards.portletCatalog'
-       ),
-       'messages' => array(
-       )
-) + $aResourceModuleTemplate;
-
-unset( $aResourceModuleTemplate );
+wfLoadExtension( 'BlueSpiceExtensions/Dashboards' );
\ No newline at end of file
diff --git a/Dashboards/extension.json b/Dashboards/extension.json
new file mode 100644
index 0000000..925440f
--- /dev/null
+++ b/Dashboards/extension.json
@@ -0,0 +1,99 @@
+{
+       "name": "Dashboards",
+       "version": "2.27.0",
+       "url": "https://help.bluespice.com/index.php/DashBoards";,
+       "author": "Robert Vogel, Stephan Muggli",
+       "descriptionmsg": "bs-dashboards-desc",
+       "type": "bluespice",
+       "bsgExtensions": {
+               "Dashboards": {
+                       "className": "Dashboards",
+                       "extPath": "/BlueSpiceExtensions/Dashboards"
+               }
+       },
+        "SpecialPages": {
+               "AdminDashboard": "SpecialAdminDashboard",
+               "UserDashboard": "SpecialUserDashboard"
+       },
+       "APIModules": {
+               "bs-dashboards-tasks": "BSApiDashboardTasks",
+               "bs-dashboards-store": "BSApiDashboardStore",
+               "bs-dashboards-widgets-tasks": "BSApiDashboardWidgetsTasks"
+       },
+       "MessagesDirs": {
+               "Dashboards": [
+                       "i18n"
+               ]
+       },
+       "ExtensionMessagesFiles": {
+               "DashboardsAlias": "languages/Dashboards.alias.php"
+       },
+       "AutoloadClasses": {
+               "Dashboards": "Dashboards.class.php",
+               "SpecialAdminDashboard": 
"includes/specials/SpecialAdminDashboard.php",
+               "SpecialUserDashboard": 
"includes/specials/SpecialUserDashboard.php",
+               "BSApiDashboardTasks": "includes/api/BSApiDashboardTasks.php",
+               "BSApiDashboardStore": "includes/api/BSApiDashboardStore.php",
+               "BSApiDashboardWidgetsTasks": 
"includes/api/BSApiDashboardWidgetsTasks.php"
+       },
+       "ResourceModules": {
+               "ext.bluespice.dashboards": {
+                       "scripts": [
+                               "bluespice.dashboards.main.js"
+                       ],
+                       "messages": [
+                               "tooltip-p-logo"
+                       ]
+               },
+               "ext.bluespice.dashboards.portletCatalog": {
+                       "scripts": [
+                               "bluespice.dashboards.portletcatalog.js"
+                       ],
+                       "styles": [
+                               "bluespice.dashboards.css"
+                       ],
+                       "dependencies": [
+                               "ext.bluespice.extjs.BS.portal"
+                       ],
+                       "messages": [
+                               "bs-dashboards-addportlet",
+                               "bs-dashboards-portlets",
+                               "bs-extjs-rssfeeder-rss-title",
+                               "bs-dashboard-userportlet-wikipage-wiki-article"
+                       ]
+               },
+               "ext.bluespice.dashboards.userDashboard": {
+                       "scripts": [
+                               "bluespice.dashboards.userDashboard.js"
+                       ],
+                       "styles": [],
+                       "dependencies": [
+                               "ext.bluespice.dashboards.portletCatalog"
+                       ],
+                       "messages": [
+                               "bs-dashboard-userportlet-calendar-title",
+                               "bs-dashboard-userportlet-calendar-description",
+                               "bs-dashboard-userportlet-article-title",
+                               "bs-dashboard-userportlet-article-description"
+                       ]
+               },
+               "ext.bluespice.dashboards.adminDashboard": {
+                       "scripts": [
+                               "bluespice.dashboards.adminDashboard.js"
+                       ],
+                       "styles": [],
+                       "dependencies": [
+                               "ext.bluespice.dashboards.portletCatalog"
+                       ],
+                       "messages": []
+               }
+       },
+       "ResourceFileModulePaths": {
+               "localBasePath": 
"/extensions/BlueSpiceExtensions/Dashboards/resources",
+               "remoteExtPath": "BlueSpiceExtensions/Dashboards/resources"
+       },
+       "Hooks": {
+               "LoadExtensionSchemaUpdates": "Dashboards::getSchemaUpdates"
+       },
+       "manifest_version": 1
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/305200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e1427f6e4e5a90767a15edfb3e73ac8f2b13536
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Gerharddiller85 <gerharddil...@icloud.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to