From c44363f50db2816881112a21c0c03877b779d1c7 Mon Sep 17 00:00:00 2001 From: Jack Phoenix Date: Sun, 7 Feb 2010 19:24:43 +0000 Subject: [PATCH] cleanup to CologneBlue.php, Nostalgia.php and Standard.php --- skins/CologneBlue.php | 94 ++++++++++++++++++++++--------------------- skins/Nostalgia.php | 15 ++++--- skins/Standard.php | 48 +++++++++++----------- 3 files changed, 81 insertions(+), 76 deletions(-) diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php index e67cbc720f..a7aac8a022 100644 --- a/skins/CologneBlue.php +++ b/skins/CologneBlue.php @@ -7,8 +7,9 @@ * @ingroup Skins */ -if( !defined( 'MEDIAWIKI' ) ) +if( !defined( 'MEDIAWIKI' ) ) { die( -1 ); +} /** * @todo document @@ -46,7 +47,9 @@ class SkinCologneBlue extends Skin { $s .= ''; $s .= str_replace( '
', '', $this->otherLanguages() ); $cat = $this->getCategoryLinks(); - if( $cat ) $s .= "
$cat\n"; + if( $cat ) { + $s .= "
$cat\n"; + } $s .= '
' . $this->pageTitleLinks(); $s .= ''; @@ -110,20 +113,20 @@ class SkinCologneBlue extends Skin { if ( 2 == $qb ) { # Right $s .= "#quickbar { position: absolute; right: 4px; }\n" . - "#article { margin-left: 4px; margin-right: 148px; }\n"; - } else if ( 1 == $qb ) { + "#article { margin-left: 4px; margin-right: 148px; }\n"; + } elseif ( 1 == $qb ) { $s .= "#quickbar { position: absolute; left: 4px; }\n" . - "#article { margin-left: 148px; margin-right: 4px; }\n"; - } else if ( 3 == $qb ) { # Floating left + "#article { margin-left: 148px; margin-right: 4px; }\n"; + } elseif ( 3 == $qb ) { # Floating left $s .= "#quickbar { position:absolute; left:4px } \n" . - "#topbar { margin-left: 148px }\n" . - "#article { margin-left:148px; margin-right: 4px; } \n" . - "body>#quickbar { position:fixed; left:4px; top:4px; overflow:auto ;bottom:4px;} \n"; # Hides from IE - } else if ( 4 == $qb ) { # Floating right + "#topbar { margin-left: 148px }\n" . + "#article { margin-left:148px; margin-right: 4px; } \n" . + "body>#quickbar { position:fixed; left:4px; top:4px; overflow:auto ;bottom:4px;} \n"; # Hides from IE + } elseif ( 4 == $qb ) { # Floating right $s .= "#quickbar { position: fixed; right: 4px; } \n" . - "#topbar { margin-right: 148px }\n" . - "#article { margin-right: 148px; margin-left: 4px; } \n" . - "body>#quickbar { position: fixed; right: 4px; top: 4px; overflow: auto ;bottom:4px;} \n"; # Hides from IE + "#topbar { margin-right: 148px }\n" . + "#article { margin-right: 148px; margin-left: 4px; } \n" . + "body>#quickbar { position: fixed; right: 4px; top: 4px; overflow: auto ;bottom:4px;} \n"; # Hides from IE } return $s; } @@ -242,8 +245,8 @@ class SkinCologneBlue extends Skin { $s .= $this->menuHead( 'qbpageoptions' ); $s .= $this->talkLink() - . $sep . $this->commentLink() - . $sep . $this->printableLink(); + . $sep . $this->commentLink() + . $sep . $this->printableLink(); if ( $wgUser->isLoggedIn() ) { $s .= $sep . $this->watchThisPage(); } @@ -251,9 +254,9 @@ class SkinCologneBlue extends Skin { $s .= $sep; $s .= $this->menuHead( 'qbpageinfo' ) - . $this->historyLink() - . $sep . $this->whatLinksHere() - . $sep . $this->watchPageLinksLink(); + . $this->historyLink() + . $sep . $this->whatLinksHere() + . $sep . $this->watchPageLinksLink(); if( $tns == NS_USER || $tns == NS_USER_TALK ) { $id = User::idFromName( $this->mTitle->getText() ); @@ -278,35 +281,33 @@ class SkinCologneBlue extends Skin { array( 'known', 'noclasses' ) ); if ( $wgUser->getNewtalk() ) { - $tl .= " *"; + $tl .= ' *'; } $s .= $this->link( - $wgUser->getUserPage(), - wfMsg( 'mypage' ), - array(), - array(), - array( 'known', 'noclasses' ) - ) - . $sep . $tl - . $sep . $this->specialLink( 'watchlist' ) - . $sep . $this->link( - SpecialPage::getSafeTitleFor( 'Contributions', $wgUser->getName() ), - wfMsg( 'mycontris' ), - array(), - array(), - array( 'known', 'noclasses' ) - ) - . $sep . $this->specialLink( 'preferences' ) - . $sep . $this->specialLink( 'userlogout' ); + $wgUser->getUserPage(), + wfMsg( 'mypage' ), + array(), + array(), + array( 'known', 'noclasses' ) + ) . $sep . $tl . $sep . $this->specialLink( 'watchlist' ) + . $sep . + $this->link( + SpecialPage::getSafeTitleFor( 'Contributions', $wgUser->getName() ), + wfMsg( 'mycontris' ), + array(), + array(), + array( 'known', 'noclasses' ) + ) . $sep . $this->specialLink( 'preferences' ) + . $sep . $this->specialLink( 'userlogout' ); } else { $s .= $this->specialLink( 'userlogin' ); } $s .= $this->menuHead( 'qbspecialpages' ) - . $this->specialLink( 'newpages' ) - . $sep . $this->specialLink( 'listfiles' ) - . $sep . $this->specialLink( 'statistics' ); + . $this->specialLink( 'newpages' ) + . $sep . $this->specialLink( 'listfiles' ) + . $sep . $this->specialLink( 'statistics' ); if ( $wgUser->isLoggedIn() && $wgEnableUploads ) { $s .= $sep . $this->specialLink( 'upload' ); } @@ -315,7 +316,7 @@ class SkinCologneBlue extends Skin { if( $wgSiteSupportPage ) { $s .= $sep . '' - . wfMsg( 'sitesupport' ) . ''; + . wfMsg( 'sitesupport' ) . ''; } $s .= $sep . $this->link( @@ -330,12 +331,12 @@ class SkinCologneBlue extends Skin { return $s; } - function menuHead( $key ){ + function menuHead( $key ) { $s = "\n
" . wfMsg( $key ) . "
"; return $s; } - function searchForm( $label = '' ){ + function searchForm( $label = '' ) { global $wgRequest, $wgUseTwoButtonsSearchForm; $search = $wgRequest->getText( 'search' ); @@ -346,13 +347,14 @@ class SkinCologneBlue extends Skin { } $s .= "searchboxes}\" class=\"mw-searchInput\" name=\"search\" size=\"14\" value=\"" - . htmlspecialchars( substr( $search, 0, 256 ) ) . "\" />
" - . "searchboxes}\" class=\"searchButton\" name=\"go\" value=\"" . htmlspecialchars( wfMsg( 'searcharticle' ) ) . "\" />"; + . htmlspecialchars( substr( $search, 0, 256 ) ) . "\" />
" + . "searchboxes}\" class=\"searchButton\" name=\"go\" value=\"" . htmlspecialchars( wfMsg( 'searcharticle' ) ) . "\" />"; - if( $wgUseTwoButtonsSearchForm ) + if( $wgUseTwoButtonsSearchForm ) { $s .= "searchboxes}\" class=\"searchButton\" name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( 'search' ) ) . "\" />\n"; - else + } else { $s .= '
\n"; + } $s .= ''; diff --git a/skins/Nostalgia.php b/skins/Nostalgia.php index 334f1c5ff4..d4f3f06f0a 100644 --- a/skins/Nostalgia.php +++ b/skins/Nostalgia.php @@ -6,8 +6,9 @@ * @ingroup Skins */ -if( !defined( 'MEDIAWIKI' ) ) +if( !defined( 'MEDIAWIKI' ) ) { die( -1 ); +} /** * @todo document @@ -40,10 +41,14 @@ class SkinNostalgia extends Skin { $s .= $this->pageTitleLinks(); $ol = $this->otherLanguages(); - if( $ol ) $s .= '
' . $ol; + if( $ol ) { + $s .= '
' . $ol; + } $cat = $this->getCategoryLinks(); - if( $cat ) $s .= '
' . $cat; + if( $cat ) { + $s .= '
' . $cat; + } $s .= "
\n\n"; $s .= "\n
"; @@ -104,8 +109,8 @@ class SkinNostalgia extends Skin { $s .= $this->bottomLinks(); $s .= "\n
" . $this->pageStats(); $s .= "\n
" . $this->mainPageLink() - . " | " . $this->aboutLink() - . " | " . $this->searchForm(); + . ' | ' . $this->aboutLink() + . ' | ' . $this->searchForm(); $s .= "\n
\n\n"; diff --git a/skins/Standard.php b/skins/Standard.php index f7a2435331..e57cfaf9c9 100644 --- a/skins/Standard.php +++ b/skins/Standard.php @@ -6,21 +6,15 @@ * @ingroup Skins */ -if( !defined( 'MEDIAWIKI' ) ) +if( !defined( 'MEDIAWIKI' ) ) { die( -1 ); +} /** * @todo document * @ingroup Skins */ class SkinStandard extends Skin { - /* - * OutputPage - */ - function outputPage( OutputPage $out ) { - global $wgStylePath; - parent::outputPage( $out ); - } /** * @@ -28,7 +22,7 @@ class SkinStandard extends Skin { function setupSkinUserCss( OutputPage $out ){ if ( 3 == $this->qbSetting() ) { # Floating left $out->addStyle( 'common/quickbar.css' ); - } else if ( 4 == $this->qbSetting() ) { # Floating right + } elseif ( 4 == $this->qbSetting() ) { # Floating right $out->addStyle( 'common/quickbar-right.css' ); } parent::setupSkinUserCss( $out ); @@ -43,15 +37,15 @@ class SkinStandard extends Skin { if ( 2 == $qb ) { # Right $s .= "#quickbar { position: absolute; top: 4px; right: 4px; " . - "border-left: 2px solid #000000; }\n" . - "#article, #mw-data-after-content { margin-left: 4px; margin-right: 152px; }\n"; - } else if ( 1 == $qb || 3 == $qb ) { + "border-left: 2px solid #000000; }\n" . + "#article, #mw-data-after-content { margin-left: 4px; margin-right: 152px; }\n"; + } elseif ( 1 == $qb || 3 == $qb ) { $s .= "#quickbar { position: absolute; top: 4px; left: 4px; " . - "border-right: 1px solid gray; }\n" . - "#article, #mw-data-after-content { margin-left: 152px; margin-right: 4px; }\n"; - } else if ( 4 == $qb) { + "border-right: 1px solid gray; }\n" . + "#article, #mw-data-after-content { margin-left: 152px; margin-right: 4px; }\n"; + } elseif ( 4 == $qb ) { $s .= "#quickbar { border-right: 1px solid gray; }\n" . - "#article, #mw-data-after-content { margin-right: 152px; margin-left: 4px; }\n"; + "#article, #mw-data-after-content { margin-right: 152px; margin-left: 4px; }\n"; } return $s; } @@ -71,10 +65,12 @@ class SkinStandard extends Skin { $qb = $this->qbSetting(); $shove = ( $qb != 0 ); $left = ( $qb == 1 || $qb == 3 ); - if( $wgContLang->isRTL() ) $left = !$left; + if( $wgContLang->isRTL() ) { + $left = !$left; + } if ( $shove && $left ) { # Left - $s .= $this->getQuickbarCompensator(); + $s .= $this->getQuickbarCompensator(); } wfProfileOut( __METHOD__ . '-2' ); wfProfileIn( __METHOD__ . '-3' ); @@ -87,7 +83,7 @@ class SkinStandard extends Skin { $this->aboutLink(), $this->specialLink( 'recentchanges' ), $this->searchForm() ) ) - . '
' . $this->pageStats() . ''; + . '
' . $this->pageStats() . ''; $s .= ''; if ( $shove && !$left ) { # Right @@ -229,14 +225,14 @@ class SkinStandard extends Skin { article with "Watch this article" checkbox disabled, the article is transparently unwatched. Therefore we do not show the "Watch this page" link in edit mode */ - if ( $wgUser->isLoggedIn() && $articleExists) { - if( $action != 'edit' && $action != 'submit' ){ + if ( $wgUser->isLoggedIn() && $articleExists ) { + if( $action != 'edit' && $action != 'submit' ) { $s .= $sep . $this->watchThisPage(); } if ( $this->mTitle->userCan( 'edit' ) ) $s .= $sep . $this->moveThisPage(); } - if ( $wgUser->isAllowed( 'delete' ) and $articleExists ) { + if ( $wgUser->isAllowed( 'delete' ) && $articleExists ) { $s .= $sep . $this->deleteThisPage() . $sep . $this->protectThisPage(); } @@ -244,14 +240,16 @@ class SkinStandard extends Skin { if( $articleExists && $action != 'history' ) { $s .= $sep . $this->historyLink(); } - $s.= $sep . $this->whatLinksHere(); + $s .= $sep . $this->whatLinksHere(); if( $wgOut->isArticleRelated() ) { $s .= $sep . $this->watchPageLinksLink(); } - if ( NS_USER == $this->mTitle->getNamespace() - || $this->mTitle->getNamespace() == NS_USER_TALK ) { + if ( + NS_USER == $this->mTitle->getNamespace() || + $this->mTitle->getNamespace() == NS_USER_TALK + ) { $id = User::idFromName( $this->mTitle->getText() ); $ip = User::isIP( $this->mTitle->getText() ); -- 2.20.1