Sebschlicht2 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340963 )
Change subject: use Bootstrap 3
......................................................................
use Bootstrap 3
The Bootstrap extension has been added as dependency, in order to
make the MOOC interface layout work as intended.
The README file has been updated to reflect this new dependency.
The content handler adds the Bootstrap styles on MOOC pages.
Change-Id: Ia31477ab511a75799f828097d69e99fab9123ea9
---
M MOOC.php
M README.md
M composer.json
M includes/content/MoocContent.php
4 files changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MOOC
refs/changes/63/340963/1
diff --git a/MOOC.php b/MOOC.php
index 18eccb9..82f3121 100644
--- a/MOOC.php
+++ b/MOOC.php
@@ -11,7 +11,6 @@
$wgExtensionMessagesFiles['MOOCAlias'] = __DIR__ . '/MOOC.i18n.alias.php';
$wgExtensionMessagesFiles['MOOCNamespaces'] = __DIR__ .
'/MOOC.namespaces.php';
- // TODO how to include boostrap other than shipping => composer?!
// TODO get out how to include jquery.ui.effects (includes easing) other
than shipping
$wgMOOCSectionConfig = [
diff --git a/README.md b/README.md
index 5735856..b442914 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,9 @@
## Installation
1. install the dependencies
- * [MwEmbedSupport](https://www.mediawiki.org/wiki/Extension:MwEmbedSupport)
- *
[TimedMediaHandler](https://www.mediawiki.org/wiki/Extension:TimedMediaHandler)
+ *
[TimedMediaHandler](https://www.mediawiki.org/wiki/Extension:TimedMediaHandler)
with its dependency
[MwEmbedSupport](https://www.mediawiki.org/wiki/Extension:MwEmbedSupport)
+ (this is no real dependecy but necessary to embed e.g. videos - as intended
by the MOOC extension)
+ * [Bootstrap](https://www.mediawiki.org/wiki/Extension:Bootstrap) to get
the proper interface layout
1. and additionally append the following line to your *LocalSettings.php*:
`require_once "$IP/extensions/MOOC/MOOC.php";`
diff --git a/composer.json b/composer.json
index 0031b26..879277f 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,7 @@
},
"require": {
"php": ">=5.6",
- "composer/installers": "~1.0"
+ "composer/installers": ">1.0.12",
+ "mediawiki/bootstrap": "~1.1"
}
}
diff --git a/includes/content/MoocContent.php b/includes/content/MoocContent.php
index fc5d17f..3fd7510 100644
--- a/includes/content/MoocContent.php
+++ b/includes/content/MoocContent.php
@@ -82,6 +82,7 @@
$output->setEnableOOUI( true );
$output->addModuleScripts( 'ext.mooc' );
$output->addModuleStyles( 'ext.mooc' );
+ $output->addModuleStyles( 'ext.bootstrap.styles' );
$output->setText( MoocContentRenderer::renderItem( $output,
$this->entity ) );
--
To view, visit https://gerrit.wikimedia.org/r/340963
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia31477ab511a75799f828097d69e99fab9123ea9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MOOC
Gerrit-Branch: master
Gerrit-Owner: Sebschlicht2 <sebschli...@uni-koblenz.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
