Ljonka has submitted this change and it was merged.
Change subject: Preferences: using extension.json
......................................................................
Preferences: using extension.json
Patch Set 2: whitespace, authors, resource path.
PREFERENCES ADMIN MODULE DOES NOT WORK
Change-Id: I3b46f9eba5a92e816b098ec0f69672f1cf61aada
---
M Preferences/Preferences.class.php
M Preferences/Preferences.setup.php
A Preferences/extension.json
3 files changed, 52 insertions(+), 43 deletions(-)
Approvals:
Ljonka: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/Preferences/Preferences.class.php
b/Preferences/Preferences.class.php
index a1ea012..ac35064 100644
--- a/Preferences/Preferences.class.php
+++ b/Preferences/Preferences.class.php
@@ -38,36 +38,24 @@
* @subpackage Preferences
*/
class BsPreferences extends BsExtensionMW {
-
- /**
- * contructor of the BsPreferences class
- */
- public function __construct() {
- wfProfileIn( 'BS::'.__METHOD__ );
+public function __construct() {
+ wfProfileIn( 'BS::'.__METHOD__ );
// Base settings
$this->mExtensionFile = __FILE__;
$this->mExtensionType = EXTTYPE::SPECIALPAGE;
- $this->mInfo = array(
- EXTINFO::NAME => 'Preferences',
- EXTINFO::DESCRIPTION => 'bs-preferences-desc',
- EXTINFO::AUTHOR => 'Sebastian Ulbricht, Stephan Muggli',
- EXTINFO::VERSION => 'default',
- EXTINFO::STATUS => 'default',
- EXTINFO::PACKAGE => 'default',
- EXTINFO::URL =>
'https://help.bluespice.com/index.php/Preferences',
- EXTINFO::DEPS => array('bluespice' => '2.22.0')
- );
-
- WikiAdmin::registerModule( 'Preferences', array(
+
+ WikiAdmin::registerModule( 'Preferences', array(
'image' =>
'/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_einstellungen_v1.png',
'level' => 'wikiadmin',
'message' => 'bs-preferences-label'
) );
wfProfileOut( 'BS::'.__METHOD__ );
- }
-
- /**
+
+
+}
+
+ /**
* returns the formular for Preferences
* @return string the formular string
*/
diff --git a/Preferences/Preferences.setup.php
b/Preferences/Preferences.setup.php
index 117d414..63c057c 100644
--- a/Preferences/Preferences.setup.php
+++ b/Preferences/Preferences.setup.php
@@ -1,23 +1,2 @@
<?php
-
-BsExtensionManager::registerExtension('Preferences',
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE, BsACTION::LOAD_SPECIALPAGE);
-
-$wgAutoloadClasses['BsPreferences'] = __DIR__ . '/Preferences.class.php';
-
-$wgMessagesDirs['Preferences'] = __DIR__ . '/i18n';
-
-$wgHooks['BeforePageDisplay'][] = "BsPreferences::onBeforePageDisplay";
-
-$aResourceModuleTemplate = array(
- 'localBasePath' => __DIR__,
- 'remoteExtPath' => 'BlueSpiceExtensions/Preferences'
-);
-
-$wgResourceModules['ext.bluespice.preferences'] = array(
- 'scripts' => 'resources/bluespice.preferences.js',
- 'dependencies' => array(
- 'jquery.cookie'
- ),
-) + $aResourceModuleTemplate;
-
-unset( $aResourceModuleTemplate );
+wfLoadExtension( 'BlueSpiceExtensions/Preferences' );
\ No newline at end of file
diff --git a/Preferences/extension.json b/Preferences/extension.json
new file mode 100644
index 0000000..0c91edb
--- /dev/null
+++ b/Preferences/extension.json
@@ -0,0 +1,42 @@
+{
+ "name": "Preferences",
+ "version": "2.27.0",
+ "url": "https://help.bluespice.com/index.php/Preferences";,
+ "author": [
+ "Sebastian Ulbricht",
+ "Stephan Muggli"
+ ],
+ "descriptionmsg": "bs-preferences-desc",
+ "license-name": "GPL-2.0+",
+ "type": "bluespice",
+ "bsgExtensions": {
+ "Preferences": {
+ "className": "BsPreferences",
+ "extPath": "/BlueSpiceExtensions/Preferences"
+ }
+ },
+ "MessagesDirs": {
+ "Preferences": [
+ "i18n"
+ ]
+ },
+ "AutoloadClasses": {
+ "BsPreferences": "Preferences.class.php"
+ },
+ "ResourceModules": {
+ "ext.bluespice.preferences": {
+ "scripts": "bluespice.preferences.js",
+ "dependencies": [
+ "jquery.cookie"
+ ]
+ }
+ },
+ "ResourceFileModulePaths": {
+ "localBasePath": "resources",
+ "remoteExtPath": "BlueSpiceExtensions/Preferences/resources"
+ },
+ "Hooks": {
+ "BeforePageDisplay": "BsPreferences::onBeforePageDisplay"
+ },
+ "manifest_version": 1
+}
--
To view, visit https://gerrit.wikimedia.org/r/305235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b46f9eba5a92e816b098ec0f69672f1cf61aada
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Gerharddiller85 <[email protected]>
Gerrit-Reviewer: Dvogel hallowelt <[email protected]>
Gerrit-Reviewer: Ljonka <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pwirth <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
