sql at svn
Aug 10, 2008, 2:22 AM
Views: 74
Permalink
|
|
SVN: [39058] trunk/phase3
|
|
Revision: 39058
Author: sql
Date: 2008-08-10 09:22:27 +0000 (Sun, 10 Aug 2008)
Log Message:
-----------
Try at fixing bug 15052 - Skins should add their name as a class in <body>
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES
trunk/phase3/includes/Skin.php
trunk/phase3/includes/SkinTemplate.php
trunk/phase3/skins/Modern.php
trunk/phase3/skins/MonoBook.php
Modified: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES 2008-08-10 08:43:33 UTC (rev 39057)
+++ trunk/phase3/RELEASE-NOTES 2008-08-10 09:22:27 UTC (rev 39058)
@@ -91,6 +91,7 @@
allows having the unprefixed page title as the default category sortkey
* (bug 15079) Add class="ns-talk" / "ns-subject" to <body>. Also added ns-special to
special pages.
+* (bug 15052) Skins should add their name as a class in <body>
=== API changes in 1.14 ===
Modified: trunk/phase3/includes/Skin.php
===================================================================
--- trunk/phase3/includes/Skin.php 2008-08-10 08:43:33 UTC (rev 39057)
+++ trunk/phase3/includes/Skin.php 2008-08-10 09:22:27 UTC (rev 39058)
@@ -591,7 +591,8 @@
'mediawiki ns-'.$wgTitle->getNamespace().
' '.( $wgContLang->isRTL() ? "rtl" : "ltr" ).
' '.Sanitizer::escapeClass( 'page-'.$wgTitle->getPrefixedText() ).
- ' '.( $wgTitle->isTalkPage() ? "ns-talk" : ( $wgTitle->isTalkPage() ? "ns-talk" : ( $wgTitle->getNamespace() == NS_SPECIAL ? "ns-special" : "ns-subject" ) ) );
+ ' '.( $wgTitle->isTalkPage() ? "ns-talk" : ( $wgTitle->isTalkPage() ? "ns-talk" : ( $wgTitle->getNamespace() == NS_SPECIAL ? "ns-special" : "ns-subject" ) ) ).
+ ' skin-'. Sanitizer::escapeClass( $this->getSkinName( ) );
return $a;
}
Modified: trunk/phase3/includes/SkinTemplate.php
===================================================================
--- trunk/phase3/includes/SkinTemplate.php 2008-08-10 08:43:33 UTC (rev 39057)
+++ trunk/phase3/includes/SkinTemplate.php 2008-08-10 09:22:27 UTC (rev 39058)
@@ -193,6 +193,7 @@
$tpl->set( 'displaytitle', $wgOut->mPageLinkTitle );
$tpl->set( 'pageclass', Sanitizer::escapeClass( 'page-'.$this->mTitle->getPrefixedText() ) );
$tpl->set( 'talkclass', ( $wgTitle->isTalkPage() ? "ns-talk" : ( $wgTitle->getNamespace() == NS_SPECIAL ? "ns-special" : "ns-subject" ) ) );
+ $tpl->set( 'skinnameclass', ( "skin-" . Sanitizer::escapeClass( $this->getSkinName ( ) ) ) );
$nsname = isset( $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] ) ?
$wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] :
Modified: trunk/phase3/skins/Modern.php
===================================================================
--- trunk/phase3/skins/Modern.php 2008-08-10 08:43:33 UTC (rev 39057)
+++ trunk/phase3/skins/Modern.php 2008-08-10 09:22:27 UTC (rev 39058)
@@ -95,7 +95,7 @@
</head>
<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('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('talkclass') ?>">
+ class="mediawiki <?php $this->text('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('talkclass') ?> <?php $this->text('skinnameclass') ?>">
<!-- heading -->
<div id="mw_header"><h1 id="firstHeading"><?php $this->data['displaytitle']!=""?$this->html('title'):$this->text('title') ?></h1></div>
Modified: trunk/phase3/skins/MonoBook.php
===================================================================
--- trunk/phase3/skins/MonoBook.php 2008-08-10 08:43:33 UTC (rev 39057)
+++ trunk/phase3/skins/MonoBook.php 2008-08-10 09:22:27 UTC (rev 39058)
@@ -104,7 +104,7 @@
</head>
<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('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('talkclass') ?>">
+ class="mediawiki <?php $this->text('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('talkclass') ?> <?php $this->text('skinnameclass') ?>">
<div id="globalWrapper">
<div id="column-content">
<div id="content">
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS[at]lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
SVN: [39058] trunk/phase3