summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Legler <alex@a3li.li>2016-01-06 17:58:38 +0100
committerAlex Legler <alex@a3li.li>2016-01-06 17:58:38 +0100
commit0fa826b5981216e2420a5f8c710fb125f36e8288 (patch)
tree3e0199c42755af356ed88a887027136932248bd2
parentTyrian sync (diff)
downloadskin-tyrian-0fa826b5981216e2420a5f8c710fb125f36e8288.tar.gz
skin-tyrian-0fa826b5981216e2420a5f8c710fb125f36e8288.tar.bz2
skin-tyrian-0fa826b5981216e2420a5f8c710fb125f36e8288.zip
Adapt to MediaWiki 1.26
Also, if anyone reads this who is knowledgeable on the MediaWiki ResourceLoader, how do I make my skin load a javascript file?
-rw-r--r--SkinTyrian.php8
-rw-r--r--Tyrian.php3
-rw-r--r--TyrianTemplate.php8
3 files changed, 14 insertions, 5 deletions
diff --git a/SkinTyrian.php b/SkinTyrian.php
index ab5e934..8833da2 100644
--- a/SkinTyrian.php
+++ b/SkinTyrian.php
@@ -3,7 +3,7 @@
* Tyrian -- the new look of gentoo.org
* MediaWiki implementation based on MonoBook nouveau.
*
- * Copyright (C) 2014-2015 Alex Legler <a3li@gentoo.org>
+ * Copyright (C) 2014-2016 Alex Legler <a3li@gentoo.org>
*/
/**
@@ -15,9 +15,13 @@ class SkinTyrian extends SkinTemplate {
public $stylename = 'Tyrian';
public $template = 'TyrianTemplate';
+ private $output;
+
const CDN_URL = 'https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/';
function setupSkinUserCss(OutputPage $out) {
+ $this->output = $out;
+
parent::setupSkinUserCss($out);
$out->addStyle(SkinTyrian::CDN_URL . 'bootstrap.min.css');
@@ -29,4 +33,4 @@ class SkinTyrian extends SkinTemplate {
'skins.tyrian.styles'
));
}
-} \ No newline at end of file
+}
diff --git a/Tyrian.php b/Tyrian.php
index 4ce80e3..e800bfe 100644
--- a/Tyrian.php
+++ b/Tyrian.php
@@ -3,7 +3,7 @@
* Tyrian -- the new look of gentoo.org
* MediaWiki implementation based on MonoBook nouveau.
*
- * Copyright (C) 2014-2015 Alex Legler <a3li@gentoo.org>
+ * Copyright (C) 2014-2016 Alex Legler <a3li@gentoo.org>
*/
$wgExtensionCredits['skin'][] = array(
@@ -26,6 +26,7 @@ $wgValidSkinNames['tyrian'] = 'Tyrian';
// Register modules
$wgResourceModules['skins.tyrian.styles'] = array(
+ 'position' => 'top',
'styles' => array(
'main.css' => array('media' => 'screen'),
),
diff --git a/TyrianTemplate.php b/TyrianTemplate.php
index 20f7b88..d35ddcf 100644
--- a/TyrianTemplate.php
+++ b/TyrianTemplate.php
@@ -3,7 +3,7 @@
* Tyrian -- the new look of gentoo.org
* MediaWiki implementation based on MonoBook nouveau.
*
- * Copyright (C) 2014-2015 Alex Legler <a3li@gentoo.org>
+ * Copyright (C) 2014-2016 Alex Legler <a3li@gentoo.org>
*/
class TyrianTemplate extends BaseTemplate {
function execute() {
@@ -62,7 +62,11 @@ class TyrianTemplate extends BaseTemplate {
<?php $this->footer(); ?>
- <script src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/bootstrap.min.js"></script>
+ <script>
+ window.RLQ = window.RLQ || []; window.RLQ.push( function () {
+ $.getScript("https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/bootstrap.min.js");
+ } );
+ </script>
<?php
$this->printTrail();
echo Html::closeElement( 'body' );