From 5a3d4fe3ce65c6067fff2d31663f6b1657549742 Mon Sep 17 00:00:00 2001 From: SQL Date: Sun, 10 Aug 2008 09:22:27 +0000 Subject: [PATCH] Try at fixing bug 15052 - Skins should add their name as a class in --- RELEASE-NOTES | 1 + includes/Skin.php | 3 ++- includes/SkinTemplate.php | 1 + skins/Modern.php | 2 +- skins/MonoBook.php | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 10b0acfcaa..b144477695 100644 --- 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 . Also added ns-special to special pages. +* (bug 15052) Skins should add their name as a class in === API changes in 1.14 === diff --git a/includes/Skin.php b/includes/Skin.php index 6bb0dc05de..92e593cf8a 100644 --- 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 85871dcaba..cbe7a71970 100644 --- 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 b0194d6b0e..381de4e77b 100644 --- a/skins/Modern.php +++ b/skins/Modern.php @@ -95,7 +95,7 @@ class ModernTemplate extends QuickTemplate { data['body_ondblclick']) { ?> ondblclick="text('body_ondblclick') ?>" data['body_onload' ]) { ?> onload="text('body_onload') ?>" - class="mediawiki text('nsclass') ?> text('dir') ?> text('pageclass') ?> text('talkclass') ?>"> + class="mediawiki text('nsclass') ?> text('dir') ?> text('pageclass') ?> text('talkclass') ?> text('skinnameclass') ?>">

data['displaytitle']!=""?$this->html('title'):$this->text('title') ?>

diff --git a/skins/MonoBook.php b/skins/MonoBook.php index bfbc6c6c8f..fc37c99c92 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -104,7 +104,7 @@ class MonoBookTemplate extends QuickTemplate { data['body_ondblclick']) { ?> ondblclick="text('body_ondblclick') ?>" data['body_onload']) { ?> onload="text('body_onload') ?>" - class="mediawiki text('nsclass') ?> text('dir') ?> text('pageclass') ?> text('talkclass') ?>"> + class="mediawiki text('nsclass') ?> text('dir') ?> text('pageclass') ?> text('talkclass') ?> text('skinnameclass') ?>">

-- 2.20.1