[Fusionforge-commits] r16059 - branches/wheezy/plugins/mediawiki/mediawiki-skin
Thorsten Glaser
mirabilos at fusionforge.org
Mon Aug 6 11:46:19 CEST 2012
Author: mirabilos
Date: 2012-08-06 11:46:18 +0200 (Mon, 06 Aug 2012)
New Revision: 16059
Modified:
branches/wheezy/plugins/mediawiki/mediawiki-skin/FusionForge.php
branches/wheezy/plugins/mediawiki/mediawiki-skin/FusionForge.php.patch
Log:
FF wants the forgebar and thus all forge styles
Modified: branches/wheezy/plugins/mediawiki/mediawiki-skin/FusionForge.php
===================================================================
--- branches/wheezy/plugins/mediawiki/mediawiki-skin/FusionForge.php 2012-08-06 09:42:21 UTC (rev 16058)
+++ branches/wheezy/plugins/mediawiki/mediawiki-skin/FusionForge.php 2012-08-06 09:46:18 UTC (rev 16059)
@@ -42,6 +42,12 @@
*/
function setupSkinUserCss( OutputPage $out ) {
global $wgHandheldStyle;
+
+ /* add FusionForge styles */
+ foreach ($GLOBALS['HTML']->stylesheets as $sheet) {
+ $out->addStyle($sheet['css'], $sheet['media']);
+ }
+
parent::setupSkinUserCss( $out );
$out->addModuleStyles( 'skins.monobook' );
@@ -56,11 +62,6 @@
$out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' );
$out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' );
- /* add FusionForge global and per-FF-theme styles */
- $out->addStyle('/themes/css/mediawiki.css', 'screen');
- $out->addStyle('/themes/' . $GLOBALS['HTML']->_theme .
- '/mediawiki.css', 'screen');
-
}
}
Modified: branches/wheezy/plugins/mediawiki/mediawiki-skin/FusionForge.php.patch
===================================================================
--- branches/wheezy/plugins/mediawiki/mediawiki-skin/FusionForge.php.patch 2012-08-06 09:42:21 UTC (rev 16058)
+++ branches/wheezy/plugins/mediawiki/mediawiki-skin/FusionForge.php.patch 2012-08-06 09:46:18 UTC (rev 16059)
@@ -1,6 +1,6 @@
--- FusionForge.php.renamed 2012-08-06 11:35:42.000000000 +0200
-+++ FusionForge.php 2012-08-06 11:38:49.000000000 +0200
-@@ -23,6 +23,20 @@
++++ FusionForge.php 2012-08-06 11:45:29.000000000 +0200
+@@ -23,11 +23,31 @@
var $skinname = 'fusionforge', $stylename = 'fusionforge',
$template = 'FusionForgeTemplate', $useHeadElement = true;
@@ -21,19 +21,18 @@
/**
* @param $out OutputPage
*/
-@@ -42,6 +56,11 @@
- $out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' );
- $out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' );
-
-+ /* add FusionForge global and per-FF-theme styles */
-+ $out->addStyle('/themes/css/mediawiki.css', 'screen');
-+ $out->addStyle('/themes/' . $GLOBALS['HTML']->_theme .
-+ '/mediawiki.css', 'screen');
+ function setupSkinUserCss( OutputPage $out ) {
+ global $wgHandheldStyle;
+
- }
- }
++ /* add FusionForge styles */
++ foreach ($GLOBALS['HTML']->stylesheets as $sheet) {
++ $out->addStyle($sheet['css'], $sheet['media']);
++ }
++
+ parent::setupSkinUserCss( $out );
-@@ -51,6 +70,8 @@
+ $out->addModuleStyles( 'skins.monobook' );
+@@ -51,6 +71,8 @@
*/
class FusionForgeTemplate extends BaseTemplate {
@@ -42,7 +41,7 @@
/**
* Template filter callback for FusionForge skin.
* Takes an associative array of data set from a SkinTemplate-based
-@@ -66,6 +87,12 @@
+@@ -66,6 +88,12 @@
wfSuppressWarnings();
$this->html( 'headelement' );
@@ -55,7 +54,7 @@
?><div id="globalWrapper">
<div id="column-content"><div id="content">
<a id="top"></a>
-@@ -162,8 +189,8 @@
+@@ -162,8 +190,8 @@
</div>
<?php
$this->printTrail();
@@ -66,7 +65,7 @@
wfRestoreWarnings();
} // end of execute() method
-@@ -174,6 +201,30 @@
+@@ -174,6 +202,30 @@
if ( !isset( $sidebar['TOOLBOX'] ) ) $sidebar['TOOLBOX'] = true;
if ( !isset( $sidebar['LANGUAGES'] ) ) $sidebar['LANGUAGES'] = true;
More information about the Fusionforge-commits
mailing list