dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5d5e354)
Finish cross-skin unification of <head>
authorAryeh Gregor <simetrical@users.mediawiki.org>
Fri, 10 Jul 2009 02:13:02 +0000 (02:13 +0000)
committerAryeh Gregor <simetrical@users.mediawiki.org>
Fri, 10 Jul 2009 02:13:02 +0000 (02:13 +0000)
Vector and Modern are now using $wgOut->headElement(), finishing the
work that r52864 started.  -80 lines net.

skins/Modern.php patch | blob | history
skins/MonoBook.php patch | blob | history
skins/Vector.php patch | blob | history

diff --git a/skins/Modern.php b/skins/Modern.php
index 6f24cc3..c49342e 100644 (file)
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -56,48 +56,21 @@ class ModernTemplate extends QuickTemplate {
         * @access private
         */
        function execute() {
-               global $wgRequest;
+               global $wgRequest, $wgOut;
                $this->skin = $skin = $this->data['skin'];
                $action = $wgRequest->getText( 'action' );
 
                // Suppress warnings to prevent notices about missing indexes in $this->data
                wfSuppressWarnings();
 
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="<?php $this->text('xhtmldefaultnamespace') ?>" <?php 
-       foreach($this->data['xhtmlnamespaces'] as $tag => $ns) {
-               ?>xmlns:<?php echo "{$tag}=\"{$ns}\" ";
-       } ?>xml:lang="<?php $this->text('lang') ?>" lang="<?php $this->text('lang') ?>" dir="<?php $this->text('dir') ?>">
-       <head>
-               <meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" />
-               <?php $this->html('headlinks') ?>
-               <title><?php $this->text('pagetitle') ?></title>
-               <?php $this->html('csslinks') ?>
-               <!--[if lt IE 7]><meta http-equiv="imagetoolbar" content="no" /><![endif]-->
-               
-               <?php print Skin::makeGlobalVariablesScript( $this->data ); ?>
-                
-               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/common/wikibits.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"><!-- wikibits js --></script>
-               <!-- Head Scripts -->
-<?php $this->html('headscripts') ?>
-<?php  if($this->data['jsvarurl'  ]) { ?>
-               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('jsvarurl'  ) ?>"><!-- site js --></script>
-<?php  } ?>
-<?php  if($this->data['pagecss'   ]) { ?>
-               <style type="text/css"><?php $this->html('pagecss'   ) ?></style>
-<?php  }
-               if($this->data['usercss'   ]) { ?>
-               <style type="text/css"><?php $this->html('usercss'   ) ?></style>
-<?php  }
-               if($this->data['userjs'    ]) { ?>
-               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('userjs' ) ?>"></script>
-<?php  }
-               if($this->data['userjsprev']) { ?>
-               <script type="<?php $this->text('jsmimetype') ?>"><?php $this->html('userjsprev') ?></script>
-<?php  }
-               if($this->data['trackbackhtml']) print $this->data['trackbackhtml']; ?>
-       </head>
-<body<?php if($this->data['body_ondblclick']) { ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?>
+               $wgOut->addScript( <<<HTML
+<!--[if lt IE 7]><script type="$wgJsMimeType" src="$path/common/IEFixes.js?$wgStyleVersion"></script>
+       <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
+HTML
+               );
+
+               echo $wgOut->headElement( $this->skin );
+?><body<?php if($this->data['body_ondblclick']) { ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?>
 <?php if($this->data['body_onload'    ]) { ?> onload="<?php     $this->text('body_onload')     ?>"<?php } ?>
  class="mediawiki <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>">
 
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index d380e2a..ad859a0 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -72,6 +72,7 @@ class MonoBookTemplate extends QuickTemplate {
                wfSuppressWarnings();
 
                $path = htmlspecialchars( $wgStylePath );
+               # FIXME: What is this?  Should it apply to all skins?
                $wgOut->addScript( <<<HTML
 <!--[if lt IE 7]><script type="$wgJsMimeType" src="$path/common/IEFixes.js?$wgStyleVersion"></script>
        <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
diff --git a/skins/Vector.php b/skins/Vector.php
index bb697d6..94ccbb0 100644 (file)
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -67,7 +67,7 @@ class VectorTemplate extends QuickTemplate {
         * Outputs the entire contents of the XHTML page
         */
        public function execute() {
-               global $wgRequest, $wgUseTwoButtonsSearchForm;
+               global $wgRequest, $wgUseTwoButtonsSearchForm, $wgOut;
 
                $this->skin = $this->data['skin'];
                $action = $wgRequest->getText( 'action' );
@@ -159,63 +159,9 @@ class VectorTemplate extends QuickTemplate {
                }
 
                // Begin content output
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="<?php $this->text('xhtmldefaultnamespace') ?>" <?php foreach($this->data['xhtmlnamespaces'] as $tag => $ns): ?>xmlns:<?php echo "{$tag}=\"{$ns}\" "; ?><?php endforeach ?>xml:lang="<?php $this->text('lang') ?>" lang="<?php $this->text('lang') ?>" dir="<?php $this->text('dir') ?>">
-       <head>
-               <meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" />
-               <title><?php $this->text('pagetitle') ?></title>
-               <!-- headlinks -->
-               <?php $this->html('headlinks') ?>
-               <!-- /headlinks -->
-               <!-- csslinks -->
-               <?php $this->html('csslinks') ?>
-               <!-- /csslinks -->
-               <!-- IEFixes -->
-               <!--[if lt IE 7]><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script>
-               <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
-               <style type="text/css">body{behavior:url("<?php $this->text('stylepath') ?>/vector/csshover.htc")}</style>
-               <!-- /IEFixes -->
-               <!-- globalVariablesScript -->
-               <?php echo Skin::makeGlobalVariablesScript( $this->data ); ?>
-               <!-- /globalVariablesScript -->
-               <!-- wikibits -->
-               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/common/wikibits.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"><!-- wikibits js --></script>
-               <!-- /wikibits -->
-               <!-- headscripts -->
-               <?php $this->html('headscripts') ?>
-               <!-- /headscripts -->
-               <?php if($this->data['jsvarurl']): ?>
-               <!-- jsvarurl -->
-               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('jsvarurl') ?>"><!-- site js --></script>
-               <!-- /jsvarurl -->
-               <?php endif; ?>
-               <?php if($this->data['pagecss']): ?>
-               <!-- pagecss -->
-               <style type="text/css"><?php $this->html('pagecss') ?></style>
-               <!-- /pagecss -->
-               <?php endif; ?>
-               <?php if($this->data['usercss']): ?>
-               <!-- usercss -->
-               <style type="text/css"><?php $this->html('usercss') ?></style>
-               <!-- /usercss -->
-               <?php endif; ?>
-               <?php if($this->data['userjs']): ?>
-               <!-- userjs -->
-               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('userjs' ) ?>"></script>
-               <!-- /userjs -->
-               <?php endif; ?>
-               <?php if($this->data['userjsprev']): ?>
-               <!-- userjsprev -->
-               <script type="<?php $this->text('jsmimetype') ?>"><?php $this->html('userjsprev') ?></script>
-               <!-- /userjsprev -->
-               <?php endif; ?>
-               <?php if($this->data['trackbackhtml']): ?>
-               <!-- trackbackhtml -->
-               <?php echo $this->data['trackbackhtml']; ?>
-               <!-- /trackbackhtml -->
-               <?php endif; ?>
-       </head>
-       <body<?php if($this->data['body_ondblclick']): ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php endif; ?> <?php if($this->data['body_onload']): ?> onload="<?php $this->text('body_onload') ?>"<?php endif; ?> class="mediawiki <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>">
+
+               echo $wgOut->headElement( $this->skin );
+?>     <body<?php if($this->data['body_ondblclick']): ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php endif; ?> <?php if($this->data['body_onload']): ?> onload="<?php $this->text('body_onload') ?>"<?php endif; ?> class="mediawiki <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>">
                <div id="page-base" class="noprint"></div>
                <div id="head-base" class="noprint"></div>
                <!-- content -->
Wiklou, le Wiki du Wiklou