| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | * Outputs the entire contents of the XHTML page |
| 69 | 69 | */ |
| 70 | 70 | public function execute() { |
| 71 | | - global $wgRequest, $wgUseTwoButtonsSearchForm; |
| | 71 | + global $wgRequest, $wgUseTwoButtonsSearchForm, $wgOut; |
| 72 | 72 | |
| 73 | 73 | $this->skin = $this->data['skin']; |
| 74 | 74 | $action = $wgRequest->getText( 'action' ); |
| — | — | @@ -159,63 +159,9 @@ |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | // Begin content output |
| 163 | | -?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
| 164 | | -<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') ?>"> |
| 165 | | - <head> |
| 166 | | - <meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" /> |
| 167 | | - <title><?php $this->text('pagetitle') ?></title> |
| 168 | | - <!-- headlinks --> |
| 169 | | - <?php $this->html('headlinks') ?> |
| 170 | | - <!-- /headlinks --> |
| 171 | | - <!-- csslinks --> |
| 172 | | - <?php $this->html('csslinks') ?> |
| 173 | | - <!-- /csslinks --> |
| 174 | | - <!-- IEFixes --> |
| 175 | | - <!--[if lt IE 7]><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script> |
| 176 | | - <meta http-equiv="imagetoolbar" content="no" /><![endif]--> |
| 177 | | - <style type="text/css">body{behavior:url("<?php $this->text('stylepath') ?>/vector/csshover.htc")}</style> |
| 178 | | - <!-- /IEFixes --> |
| 179 | | - <!-- globalVariablesScript --> |
| 180 | | - <?php echo Skin::makeGlobalVariablesScript( $this->data ); ?> |
| 181 | | - <!-- /globalVariablesScript --> |
| 182 | | - <!-- wikibits --> |
| 183 | | - <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/common/wikibits.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"><!-- wikibits js --></script> |
| 184 | | - <!-- /wikibits --> |
| 185 | | - <!-- headscripts --> |
| 186 | | - <?php $this->html('headscripts') ?> |
| 187 | | - <!-- /headscripts --> |
| 188 | | - <?php if($this->data['jsvarurl']): ?> |
| 189 | | - <!-- jsvarurl --> |
| 190 | | - <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('jsvarurl') ?>"><!-- site js --></script> |
| 191 | | - <!-- /jsvarurl --> |
| 192 | | - <?php endif; ?> |
| 193 | | - <?php if($this->data['pagecss']): ?> |
| 194 | | - <!-- pagecss --> |
| 195 | | - <style type="text/css"><?php $this->html('pagecss') ?></style> |
| 196 | | - <!-- /pagecss --> |
| 197 | | - <?php endif; ?> |
| 198 | | - <?php if($this->data['usercss']): ?> |
| 199 | | - <!-- usercss --> |
| 200 | | - <style type="text/css"><?php $this->html('usercss') ?></style> |
| 201 | | - <!-- /usercss --> |
| 202 | | - <?php endif; ?> |
| 203 | | - <?php if($this->data['userjs']): ?> |
| 204 | | - <!-- userjs --> |
| 205 | | - <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('userjs' ) ?>"></script> |
| 206 | | - <!-- /userjs --> |
| 207 | | - <?php endif; ?> |
| 208 | | - <?php if($this->data['userjsprev']): ?> |
| 209 | | - <!-- userjsprev --> |
| 210 | | - <script type="<?php $this->text('jsmimetype') ?>"><?php $this->html('userjsprev') ?></script> |
| 211 | | - <!-- /userjsprev --> |
| 212 | | - <?php endif; ?> |
| 213 | | - <?php if($this->data['trackbackhtml']): ?> |
| 214 | | - <!-- trackbackhtml --> |
| 215 | | - <?php echo $this->data['trackbackhtml']; ?> |
| 216 | | - <!-- /trackbackhtml --> |
| 217 | | - <?php endif; ?> |
| 218 | | - </head> |
| 219 | | - <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') ?>"> |
| | 163 | + |
| | 164 | + echo $wgOut->headElement( $this->skin ); |
| | 165 | +?> <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') ?>"> |
| 220 | 166 | <div id="page-base" class="noprint"></div> |
| 221 | 167 | <div id="head-base" class="noprint"></div> |
| 222 | 168 | <!-- content --> |
| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -72,6 +72,7 @@ |
| 73 | 73 | wfSuppressWarnings(); |
| 74 | 74 | |
| 75 | 75 | $path = htmlspecialchars( $wgStylePath ); |
| | 76 | + # FIXME: What is this? Should it apply to all skins? |
| 76 | 77 | $wgOut->addScript( <<<HTML |
| 77 | 78 | <!--[if lt IE 7]><script type="$wgJsMimeType" src="$path/common/IEFixes.js?$wgStyleVersion"></script> |
| 78 | 79 | <meta http-equiv="imagetoolbar" content="no" /><![endif]--> |
| Index: trunk/phase3/skins/Modern.php |
| — | — | @@ -56,48 +56,21 @@ |
| 57 | 57 | * @access private |
| 58 | 58 | */ |
| 59 | 59 | function execute() { |
| 60 | | - global $wgRequest; |
| | 60 | + global $wgRequest, $wgOut; |
| 61 | 61 | $this->skin = $skin = $this->data['skin']; |
| 62 | 62 | $action = $wgRequest->getText( 'action' ); |
| 63 | 63 | |
| 64 | 64 | // Suppress warnings to prevent notices about missing indexes in $this->data |
| 65 | 65 | wfSuppressWarnings(); |
| 66 | 66 | |
| 67 | | -?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
| 68 | | -<html xmlns="<?php $this->text('xhtmldefaultnamespace') ?>" <?php |
| 69 | | - foreach($this->data['xhtmlnamespaces'] as $tag => $ns) { |
| 70 | | - ?>xmlns:<?php echo "{$tag}=\"{$ns}\" "; |
| 71 | | - } ?>xml:lang="<?php $this->text('lang') ?>" lang="<?php $this->text('lang') ?>" dir="<?php $this->text('dir') ?>"> |
| 72 | | - <head> |
| 73 | | - <meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" /> |
| 74 | | - <?php $this->html('headlinks') ?> |
| 75 | | - <title><?php $this->text('pagetitle') ?></title> |
| 76 | | - <?php $this->html('csslinks') ?> |
| 77 | | - <!--[if lt IE 7]><meta http-equiv="imagetoolbar" content="no" /><![endif]--> |
| 78 | | - |
| 79 | | - <?php print Skin::makeGlobalVariablesScript( $this->data ); ?> |
| 80 | | - |
| 81 | | - <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/common/wikibits.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"><!-- wikibits js --></script> |
| 82 | | - <!-- Head Scripts --> |
| 83 | | -<?php $this->html('headscripts') ?> |
| 84 | | -<?php if($this->data['jsvarurl' ]) { ?> |
| 85 | | - <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('jsvarurl' ) ?>"><!-- site js --></script> |
| 86 | | -<?php } ?> |
| 87 | | -<?php if($this->data['pagecss' ]) { ?> |
| 88 | | - <style type="text/css"><?php $this->html('pagecss' ) ?></style> |
| 89 | | -<?php } |
| 90 | | - if($this->data['usercss' ]) { ?> |
| 91 | | - <style type="text/css"><?php $this->html('usercss' ) ?></style> |
| 92 | | -<?php } |
| 93 | | - if($this->data['userjs' ]) { ?> |
| 94 | | - <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('userjs' ) ?>"></script> |
| 95 | | -<?php } |
| 96 | | - if($this->data['userjsprev']) { ?> |
| 97 | | - <script type="<?php $this->text('jsmimetype') ?>"><?php $this->html('userjsprev') ?></script> |
| 98 | | -<?php } |
| 99 | | - if($this->data['trackbackhtml']) print $this->data['trackbackhtml']; ?> |
| 100 | | - </head> |
| 101 | | -<body<?php if($this->data['body_ondblclick']) { ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?> |
| | 67 | + $wgOut->addScript( <<<HTML |
| | 68 | +<!--[if lt IE 7]><script type="$wgJsMimeType" src="$path/common/IEFixes.js?$wgStyleVersion"></script> |
| | 69 | + <meta http-equiv="imagetoolbar" content="no" /><![endif]--> |
| | 70 | +HTML |
| | 71 | + ); |
| | 72 | + |
| | 73 | + echo $wgOut->headElement( $this->skin ); |
| | 74 | +?><body<?php if($this->data['body_ondblclick']) { ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?> |
| 102 | 75 | <?php if($this->data['body_onload' ]) { ?> onload="<?php $this->text('body_onload') ?>"<?php } ?> |
| 103 | 76 | class="mediawiki <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>"> |
| 104 | 77 | |