dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e5bf6e4)
Try at fixing bug 15052 - Skins should add their name as a class in <body>
authorSQL <sql@users.mediawiki.org>
Sun, 10 Aug 2008 09:22:27 +0000 (09:22 +0000)
committerSQL <sql@users.mediawiki.org>
Sun, 10 Aug 2008 09:22:27 +0000 (09:22 +0000)
RELEASE-NOTES patch | blob | history
includes/Skin.php patch | blob | history
includes/SkinTemplate.php patch | blob | history
skins/Modern.php patch | blob | history
skins/MonoBook.php patch | blob | history

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 10b0acf..b144477 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -91,6 +91,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   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 ===
 
diff --git a/includes/Skin.php b/includes/Skin.php
index 6bb0dc0..92e593c 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -591,7 +591,8 @@ END;
                        '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;
        }
 
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 85871dc..cbe7a71 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -193,6 +193,7 @@ class SkinTemplate extends Skin {
                $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() ] :
diff --git a/skins/Modern.php b/skins/Modern.php
index b0194d6..381de4e 100644 (file)
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -95,7 +95,7 @@ class ModernTemplate extends QuickTemplate {
        </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>
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index bfbc6c6..fc37c99 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -104,7 +104,7 @@ class MonoBookTemplate extends QuickTemplate {
        </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">
Wiklou, le Wiki du Wiklou