| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -104,7 +104,7 @@ |
| 105 | 105 | </head> |
| 106 | 106 | <body<?php if($this->data['body_ondblclick']) { ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?> |
| 107 | 107 | <?php if($this->data['body_onload']) { ?> onload="<?php $this->text('body_onload') ?>"<?php } ?> |
| 108 | | - class="mediawiki <?php $this->text('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>"> |
| | 108 | + class="mediawiki <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>"> |
| 109 | 109 | <div id="globalWrapper"> |
| 110 | 110 | <div id="column-content"> |
| 111 | 111 | <div id="content"> |
| Index: trunk/phase3/skins/Modern.php |
| — | — | @@ -95,7 +95,7 @@ |
| 96 | 96 | </head> |
| 97 | 97 | <body<?php if($this->data['body_ondblclick']) { ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?> |
| 98 | 98 | <?php if($this->data['body_onload' ]) { ?> onload="<?php $this->text('body_onload') ?>"<?php } ?> |
| 99 | | - class="mediawiki <?php $this->text('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('talkclass') ?> <?php $this->text('skinnameclass') ?>"> |
| | 99 | + class="mediawiki <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>"> |
| 100 | 100 | |
| 101 | 101 | <!-- heading --> |
| 102 | 102 | <div id="mw_header"><h1 id="firstHeading"><?php $this->data['displaytitle']!=""?$this->html('title'):$this->text('title') ?></h1></div> |
| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -191,7 +191,7 @@ |
| 192 | 192 | $tpl->set( 'title', $wgOut->getPageTitle() ); |
| 193 | 193 | $tpl->set( 'pagetitle', $wgOut->getHTMLTitle() ); |
| 194 | 194 | $tpl->set( 'displaytitle', $wgOut->mPageLinkTitle ); |
| 195 | | - $tpl->set( 'pageclass', Sanitizer::escapeClass( 'page-'.$this->mTitle->getPrefixedText() ) ); |
| | 195 | + $tpl->set( 'pageclass', $this->getPageClasses( $this->mTitle ) ); |
| 196 | 196 | $tpl->set( 'skinnameclass', ( "skin-" . Sanitizer::escapeClass( $this->getSkinName ( ) ) ) ); |
| 197 | 197 | |
| 198 | 198 | $nsname = isset( $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] ) ? |
| — | — | @@ -254,7 +254,6 @@ |
| 255 | 255 | $tpl->set( 'handheld', $wgRequest->getBool( 'handheld' ) ); |
| 256 | 256 | $tpl->set( 'csslinks', $this->buildCssLinks() ); |
| 257 | 257 | $tpl->setRef( 'loggedin', $this->loggedin ); |
| 258 | | - $tpl->set( 'nsclass', $this->getNamespaceClasses( $this->mTitle ) ); |
| 259 | 258 | $tpl->set('notspecialpage', $this->mTitle->getNamespace() != NS_SPECIAL); |
| 260 | 259 | /* XXX currently unused, might get useful later |
| 261 | 260 | $tpl->set( "editable", ($this->mTitle->getNamespace() != NS_SPECIAL ) ); |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -589,14 +589,13 @@ |
| 590 | 590 | $a['onload'] = $wgOut->getOnloadHandler(); |
| 591 | 591 | $a['class'] = |
| 592 | 592 | 'mediawiki' . |
| 593 | | - ' '.$this->getNamespaceClasses( $wgTitle ) . |
| 594 | 593 | ' '.( $wgContLang->isRTL() ? "rtl" : "ltr" ). |
| 595 | | - ' '.Sanitizer::escapeClass( 'page-'.$wgTitle->getPrefixedText() ). |
| | 594 | + ' '.$this->getPageClasses( $wgTitle ) . |
| 596 | 595 | ' skin-'. Sanitizer::escapeClass( $this->getSkinName( ) ); |
| 597 | 596 | return $a; |
| 598 | 597 | } |
| 599 | 598 | |
| 600 | | - function getNamespaceClasses( $title ) { |
| | 599 | + function getPageClasses( $title ) { |
| 601 | 600 | $numeric = 'ns-'.$title->getNamespace(); |
| 602 | 601 | if( $title->getNamespace() == NS_SPECIAL ) { |
| 603 | 602 | $type = "ns-special"; |
| — | — | @@ -605,7 +604,8 @@ |
| 606 | 605 | } else { |
| 607 | 606 | $type = "ns-subject"; |
| 608 | 607 | } |
| 609 | | - return "$numeric $type"; |
| | 608 | + $name = Sanitizer::escapeClass( 'page-'.$title->getPrefixedText() ); |
| | 609 | + return "$numeric $type $name"; |
| 610 | 610 | } |
| 611 | 611 | |
| 612 | 612 | /** |
| Index: trunk/extensions/DumpHTML/SkinOffline.php |
| — | — | @@ -141,7 +141,7 @@ |
| 142 | 142 | <?php if($this->data['userjsprev']) { ?><script type="<?php $this->text('jsmimetype') ?>"><?php $this->html('userjsprev') ?></script><?php } ?> |
| 143 | 143 | </head> |
| 144 | 144 | <body |
| 145 | | - <?php if($this->data['nsclass' ]) { ?>class="<?php $this->text('nsclass') ?>"<?php } ?>> |
| | 145 | + <?php if($this->data['pageclass']) { ?>class="<?php $this->text('pageclass') ?>"<?php } ?>> |
| 146 | 146 | <div id="globalWrapper"> |
| 147 | 147 | <div id="column-content"> |
| 148 | 148 | <div id="content"> |