jenkins-bot has submitted this change and it was merged.

Change subject: WidgetBar: using extension.json
......................................................................


WidgetBar: using extension.json

Patch Set 2: license, resource path

Change-Id: I92da8a5eb439d2e0628167e6c0c45d2a709ce597
---
M WidgetBar/WidgetBar.class.php
M WidgetBar/WidgetBar.setup.php
A WidgetBar/extension.json
3 files changed, 45 insertions(+), 50 deletions(-)

Approvals:
  Mglaser: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/WidgetBar/WidgetBar.class.php b/WidgetBar/WidgetBar.class.php
index 2e1e9ad..0d824fa 100644
--- a/WidgetBar/WidgetBar.class.php
+++ b/WidgetBar/WidgetBar.class.php
@@ -40,28 +40,6 @@
        protected $aKeywords = array();
 
        /**
-        * Contructor of the WidgetBar class
-        */
-       public function __construct() {
-               wfProfileIn( 'BS::'.__METHOD__ );
-               // Base settings
-               $this->mExtensionFile = __FILE__;
-               $this->mExtensionType = EXTTYPE::OTHER;
-               $this->mInfo = array(
-                       EXTINFO::NAME        => 'WidgetBar',
-                       EXTINFO::DESCRIPTION => 'bs-widgetbar-desc',
-                       EXTINFO::AUTHOR      => 'Robert Vogel',
-                       EXTINFO::VERSION     => 'default',
-                       EXTINFO::STATUS      => 'default',
-                       EXTINFO::PACKAGE     => 'default',
-                       EXTINFO::URL         => 
'https://help.bluespice.com/index.php/WidgetBar',
-                       EXTINFO::DEPS        => array( 'bluespice' => '2.22.0' )
-               );
-               $this->mExtensionKey = 'MW::WidgetBar';
-               wfProfileOut( 'BS::'.__METHOD__ );
-       }
-
-       /**
         * Initialization of WidgetBar extension
         */
        protected function initExt() {
diff --git a/WidgetBar/WidgetBar.setup.php b/WidgetBar/WidgetBar.setup.php
index 71935db..ffcc6e9 100644
--- a/WidgetBar/WidgetBar.setup.php
+++ b/WidgetBar/WidgetBar.setup.php
@@ -1,29 +1,2 @@
 <?php
-
-BsExtensionManager::registerExtension('WidgetBar', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
-
-$wgAutoloadClasses['WidgetBar'] = __DIR__ . '/WidgetBar.class.php';
-
-$wgMessagesDirs['WidgetBar'] = __DIR__ . '/i18n';
-
-$aResourceModuleTemplate = array(
-       'localBasePath' => __DIR__,
-       'remoteExtPath' => 'BlueSpiceExtensions/WidgetBar'
-);
-
-$wgResourceModules['ext.bluespice.widgetbar.style'] = array(
-       'styles'  => 'resources/bluespice.widgetBar.css',
-       'position' => 'top'
-) + $aResourceModuleTemplate;
-
-$wgResourceModules['ext.bluespice.widgetbar'] = array(
-       'scripts' => 'resources/bluespice.widgetBar.js',
-       'dependencies' => array ( 'jquery.cookie' ),
-       'position' => 'bottom'
-) + $aResourceModuleTemplate;
-
-unset( $aResourceModuleTemplate );
-
-$wgAutoloadClasses['ViewWidgetError'] = __DIR__ . 
'/views/view.WidgetError.php';
-$wgAutoloadClasses['ViewWidgetErrorList'] = __DIR__ . 
'/views/view.WidgetErrorList.php';
-$wgAutoloadClasses['ViewWidgetList'] = __DIR__ . '/views/view.WidgetList.php';
+wfLoadExtension( 'BlueSpiceExtensions/WidgetBar' );
\ No newline at end of file
diff --git a/WidgetBar/extension.json b/WidgetBar/extension.json
new file mode 100644
index 0000000..439338c
--- /dev/null
+++ b/WidgetBar/extension.json
@@ -0,0 +1,44 @@
+{
+       "name": "WidgetBar",
+       "version": "2.27.0",
+       "url": "https://help.bluespice.com/index.php/WidgetBar";,
+       "author": "Robert Vogel",
+       "descriptionmsg": "bs-widgetbar-desc",
+       "type": "bluespice",
+       "license-name": "GPL-2.0+",
+       "bsgExtensions": {
+               "WidgetBar": {
+                       "className": "WidgetBar",
+                       "extPath": "/BlueSpiceExtensions/WidgetBar"
+               }
+       },
+       "MessagesDirs": {
+               "WidgetBar": [
+                       "i18n"
+               ]
+       },
+       "AutoloadClasses": {
+               "WidgetBar": "WidgetBar.class.php",
+               "ViewWidgetError": "views/view.WidgetError.php",
+               "ViewWidgetErrorList": "views/view.WidgetErrorList.php",
+               "ViewWidgetList": "views/view.WidgetList.php"
+       },
+       "ResourceModules": {
+               "ext.bluespice.widgetbar.style": {
+                       "styles": "bluespice.widgetBar.css",
+                       "position": "top"
+               },
+               "ext.bluespice.widgetbar": {
+                       "scripts": "bluespice.widgetBar.js",
+                       "dependencies": [
+                               "jquery.cookie"
+                       ],
+                       "position": "bottom"
+               }
+       },
+       "ResourceFileModulePaths": {
+               "localBasePath": "resources",
+               "remoteExtPath": "BlueSpiceExtensions/WidgetBar/resources"
+       },
+       "manifest_version": 1
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I92da8a5eb439d2e0628167e6c0c45d2a709ce597
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Gerharddiller85 <gerharddil...@icloud.com>
Gerrit-Reviewer: Dvogel hallowelt <daniel.vo...@hallowelt.com>
Gerrit-Reviewer: Ljonka <l.verhovs...@gmail.com>
Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Pwirth <wi...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to