From: Jack Phoenix Date: Sun, 29 Mar 2009 15:29:34 +0000 (+0000) Subject: further cleanup to skins. instead of referring the user to docs/skin.txt, why not... X-Git-Tag: 1.31.0-rc.0~42287 X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=593c5c427e4380ea580f7f1432b1e586ac0a8eef;p=lhc%2Fweb%2Fwiklou.git further cleanup to skins. instead of referring the user to docs/skin.txt, why not to include the skin descriptions on the actual files? :) --- diff --git a/skins/Chick.php b/skins/Chick.php index a95a72cea4..75204c6621 100644 --- a/skins/Chick.php +++ b/skins/Chick.php @@ -1,8 +1,8 @@ addStyle( 'chick/IE55Fixes.css', 'screen,handheld', 'IE 5.5000' ); $out->addStyle( 'chick/IE60Fixes.css', 'screen,handheld', 'IE 6' ); } -} - - +} \ No newline at end of file diff --git a/skins/MySkin.php b/skins/MySkin.php index 460984540b..fac2b724ce 100644 --- a/skins/MySkin.php +++ b/skins/MySkin.php @@ -1,8 +1,8 @@ \n
\n"; - $s .= "
".$this->logoText( "right" )."
"; + $s .= ''; $s .= $this->pageTitle(); $s .= $this->pageSubtitle() . "\n"; - $s .= "
"; + $s .= '
'; $s .= $this->topLinks() . "\n
"; $notice = wfGetSiteNotice(); @@ -40,10 +40,10 @@ 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
"; @@ -79,7 +79,7 @@ class SkinNostalgia extends Skin { $s .= $sep . $this->specialLink( 'watchlist' ); /* show my contributions link */ $s .= $sep . $this->link( - SpecialPage::getSafeTitleFor( "Contributions", $wgUser->getName() ), + SpecialPage::getSafeTitleFor( 'Contributions', $wgUser->getName() ), wfMsgHtml( 'mycontris' ) ); /* show my preferences link */ $s .= $sep . $this->specialLink( 'preferences' ); @@ -111,6 +111,4 @@ class SkinNostalgia extends Skin { return $s; } -} - - +} \ No newline at end of file diff --git a/skins/Simple.php b/skins/Simple.php index b26f50d024..367d393389 100644 --- a/skins/Simple.php +++ b/skins/Simple.php @@ -1,8 +1,8 @@ addStyle( 'simple/main.css', 'screen' ); $out->addStyle( 'simple/rtl.css', '', '', 'rtl' ); - } function reallyGenerateUserStylesheet() { global $wgUser; $s = ''; - if (($undopt = $wgUser->getOption("underline")) != 2) { + if( ( $undopt = $wgUser->getOption( 'underline' ) ) != 2 ) { $underline = $undopt ? 'underline' : 'none'; $s .= "a { text-decoration: $underline; }\n"; } - if ($wgUser->getOption('highlightbroken')) { + if( $wgUser->getOption( 'highlightbroken' ) ) { $s .= "a.new, #quickbar a.new { text-decoration: line-through; }\n"; } else { $s .= <<getOption('justify')) { + if( $wgUser->getOption( 'justify' ) ) { $s .= "#article, #bodyContent { text-align: justify; }\n"; } - if (!$wgUser->getOption('showtoc')) { + if( !$wgUser->getOption( 'showtoc' ) ) { $s .= "#toc { display: none; }\n"; } - if (!$wgUser->getOption('editsection')) { + if( !$wgUser->getOption( 'editsection' ) ) { $s .= ".editsection { display: none; }\n"; } return $s; } -} - - +} \ No newline at end of file diff --git a/skins/Standard.php b/skins/Standard.php index 694bc5e389..3da5645c14 100644 --- a/skins/Standard.php +++ b/skins/Standard.php @@ -1,8 +1,7 @@ qbSetting() ) { # Floating left $qb = "setup(\"quickbar\")"; - if($a["onload"]) { - $a["onload"] .= ";$qb"; + if( $a['onload'] ) { + $a['onload'] .= ";$qb"; } else { - $a["onload"] = $qb; + $a['onload'] = $qb; } } return $a; @@ -83,27 +82,26 @@ class SkinStandard extends Skin { function doAfterContent() { global $wgContLang, $wgLang; - $fname = 'SkinStandard::doAfterContent'; - wfProfileIn( $fname ); - wfProfileIn( $fname.'-1' ); + wfProfileIn( __METHOD__ ); + wfProfileIn( __METHOD__ . '-1' ); $s = "\n

\n"; $s .= "\n\n
\n"; - wfProfileOut( $fname.'-3' ); - wfProfileIn( $fname.'-4' ); - if ( 0 != $qb ) { $s .= $this->quickBar(); } - wfProfileOut( $fname.'-4' ); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ . '-3' ); + wfProfileIn( __METHOD__ . '-4' ); + if ( 0 != $qb ) { + $s .= $this->quickBar(); + } + wfProfileOut( __METHOD__ . '-4' ); + wfProfileOut( __METHOD__ ); return $s; } @@ -133,12 +133,11 @@ class SkinStandard extends Skin { global $wgOut, $wgTitle, $wgUser, $wgRequest, $wgContLang; global $wgEnableUploads, $wgRemoteUploads; - $fname = 'Skin::quickBar'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); $action = $wgRequest->getText( 'action' ); $wpPreview = $wgRequest->getBool( 'wpPreview' ); - $tns=$wgTitle->getNamespace(); + $tns = $wgTitle->getNamespace(); $s = "\n
"; $s .= "\n" . $this->logoText() . "\n
"; @@ -162,17 +161,17 @@ class SkinStandard extends Skin { if( $wgUser->isLoggedIn() ) { $s.= $this->specialLink( 'watchlist' ) ; $s .= $sep . $this->makeKnownLink( $wgContLang->specialPage( 'Contributions' ), - wfMsg( 'mycontris' ), 'target=' . wfUrlencode($wgUser->getName() ) ); + wfMsg( 'mycontris' ), 'target=' . wfUrlencode( $wgUser->getName() ) ); } // only show watchlist link if logged in $s .= "\n
"; $articleExists = $wgTitle->getArticleId(); - if ( $wgOut->isArticle() || $action =='edit' || $action =='history' || $wpPreview) { - if($wgOut->isArticle()) { + if ( $wgOut->isArticle() || $action == 'edit' || $action == 'history' || $wpPreview ) { + if( $wgOut->isArticle() ) { $s .= '' . $this->editThisPage() . ''; } else { # backlink to the article in edit or history mode - if($articleExists){ # no backlink if no article - switch($tns) { + if( $articleExists ){ # no backlink if no article + switch( $tns ) { case NS_TALK: case NS_USER_TALK: case NS_PROJECT_TALK: @@ -208,19 +207,19 @@ class SkinStandard extends Skin { $text = wfMsg( 'categorypage' ); break; default: - $text= wfMsg( 'articlepage' ); + $text = wfMsg( 'articlepage' ); } $link = $wgTitle->getText(); - if ($nstext = $wgContLang->getNsText($tns) ) { # add namespace if necessary - $link = $nstext . ':' . $link ; + if( $nstext = $wgContLang->getNsText( $tns ) ) { # add namespace if necessary + $link = $nstext . ':' . $link; } $s .= $this->makeLink( $link, $text ); } elseif( $wgTitle->getNamespace() != NS_SPECIAL ) { # we just throw in a "New page" text to tell the user that he's in edit mode, # and to avoid messing with the separator that is prepended to the next item - $s .= '' . wfMsg('newpage') . ''; + $s .= '' . wfMsg( 'newpage' ) . ''; } } @@ -240,32 +239,31 @@ class SkinStandard extends Skin { unwatched. Therefore we do not show the "Watch this page" link in edit mode */ if ( $wgUser->isLoggedIn() && $articleExists) { - if($action!='edit' && $action != 'submit' ) - { + if( $action != 'edit' && $action != 'submit' ){ $s .= $sep . $this->watchThisPage(); } if ( $wgTitle->userCan( 'edit' ) ) $s .= $sep . $this->moveThisPage(); } - if ( $wgUser->isAllowed('delete') and $articleExists ) { + if ( $wgUser->isAllowed( 'delete' ) and $articleExists ) { $s .= $sep . $this->deleteThisPage() . $sep . $this->protectThisPage(); } $s .= $sep . $this->talkLink(); - if ($articleExists && $action !='history') { + if( $articleExists && $action != 'history' ) { $s .= $sep . $this->historyLink(); } - $s.=$sep . $this->whatLinksHere(); + $s.= $sep . $this->whatLinksHere(); - if($wgOut->isArticleRelated()) { + if( $wgOut->isArticleRelated() ) { $s .= $sep . $this->watchPageLinksLink(); } if ( NS_USER == $wgTitle->getNamespace() || $wgTitle->getNamespace() == NS_USER_TALK ) { - $id=User::idFromName($wgTitle->getText()); - $ip=User::isIP($wgTitle->getText()); + $id = User::idFromName( $wgTitle->getText() ); + $ip = User::isIP( $wgTitle->getText() ); if( $id || $ip ){ $s .= $sep . $this->userContribsLink(); @@ -289,9 +287,8 @@ class SkinStandard extends Skin { } $s .= "\n
\n"; - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return $s; } - }