<?php
/**
- * Base class for template-based skins
+ * Base class for template-based skins.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
$this->thisquery = wfArrayToCGI( $query );
$this->loggedin = $user->isLoggedIn();
$this->username = $user->getName();
- $this->userdisplayname = $user->getDisplayName();
if ( $this->loggedin || $this->showIPinHeader() ) {
$this->userpageUrlDetails = self::makeUrlDetails( $this->userpage );
$tpl->setRef( 'thispage', $this->thispage );
$tpl->setRef( 'titleprefixeddbkey', $this->thispage );
$tpl->set( 'titletext', $title->getText() );
- $tpl->set( 'articleid', $title->getArticleId() );
+ $tpl->set( 'articleid', $title->getArticleID() );
$tpl->set( 'isarticle', $out->isArticle() );
$tpl->set( 'capitalizeallnouns', $lang->capitalizeAllNouns() ? ' capitalize-all-nouns' : '' );
$tpl->set( 'showjumplinks', $user->getOption( 'showjumplinks' ) );
$tpl->set( 'username', $this->loggedin ? $this->username : null );
- $tpl->set( 'userdisplayname', $this->loggedin ? $this->userdisplayname : null );
$tpl->setRef( 'userpage', $this->userpage );
$tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href'] );
$tpl->set( 'userlang', $userlang );
$tpl->set( 'bottomscripts', $this->bottomScripts() );
$tpl->set( 'printfooter', $this->printSource() );
- # Add a <div class="mw-content-ltr/rtl"> around the body text
+ # An ID that includes the actual body text; without categories, contentSub, ...
+ $realBodyAttribs = array( 'id' => 'mw-content-text' );
+
+ # Add a mw-content-ltr/rtl class to be able to style based on text direction
+ # when the content is different from the UI language, i.e.:
# not for special pages or file pages AND only when viewing AND if the page exists
# (or is in MW namespace, because that has default content)
if( !in_array( $title->getNamespace(), array( NS_SPECIAL, NS_FILE ) ) &&
in_array( $request->getVal( 'action', 'view' ), array( 'view', 'historysubmit' ) ) &&
( $title->exists() || $title->getNamespace() == NS_MEDIAWIKI ) ) {
$pageLang = $title->getPageLanguage();
- $realBodyAttribs = array( 'lang' => $pageLang->getHtmlCode(), 'dir' => $pageLang->getDir(),
- 'class' => 'mw-content-'.$pageLang->getDir() );
- $out->mBodytext = Html::rawElement( 'div', $realBodyAttribs, $out->mBodytext );
+ $realBodyAttribs['lang'] = $pageLang->getHtmlCode();
+ $realBodyAttribs['dir'] = $pageLang->getDir();
+ $realBodyAttribs['class'] = 'mw-content-'.$pageLang->getDir();
}
+ $out->mBodytext = Html::rawElement( 'div', $realBodyAttribs, $out->mBodytext );
$tpl->setRef( 'bodytext', $out->mBodytext );
# Language links
if ( $nt ) {
$language_urls[] = array(
'href' => $nt->getFullURL(),
- 'text' => ( $wgContLang->getLanguageName( $nt->getInterwiki() ) != '' ?
- $wgContLang->getLanguageName( $nt->getInterwiki() ) : $l ),
+ 'text' => ( Language::fetchLanguageName( $nt->getInterwiki() ) != '' ?
+ Language::fetchLanguageName( $nt->getInterwiki() ) : $l ),
'title' => $nt->getText(),
'class' => $class,
'lang' => $nt->getInterwiki(),
if ( $this->useHeadElement ) {
$tpl->set( 'headelement', $out->headElement( $this ) );
} else {
- $tpl->set( 'headscripts', $out->getScript() );
+ $tpl->set( 'headscripts', $out->getHeadScripts() . $out->getHeadItems() );
}
$tpl->set( 'debughtml', $this->generateDebugHTML() );
* This is setup as a method so that like with $wgLogo and getLogo() a skin
* can override this setting and always output one or the other if it has
* a reason it can't output one of the two modes.
+ * @return bool
*/
function useCombinedLoginLink() {
global $wgUseCombinedLoginLink;
$returnto = wfArrayToCGI( $a );
if( $this->loggedin ) {
$personal_urls['userpage'] = array(
- 'text' => $this->userdisplayname,
+ 'text' => $this->username,
'href' => &$this->userpageUrlDetails['href'],
'class' => $this->userpageUrlDetails['exists'] ? false : 'new',
'active' => ( $this->userpageUrlDetails['href'] == $pageurl )
);
# We need to do an explicit check for Special:Contributions, as we
- # have to match both the title, and the target (which could come
- # from request values or be specified in "sub page" form. The plot
- # thickens, because $wgTitle is altered for special pages, so doesn't
- # contain the original alias-with-subpage.
+ # have to match both the title, and the target, which could come
+ # from request values (Special:Contributions?target=Jimbo_Wales)
+ # or be specified in "sub page" form
+ # (Special:Contributions/Jimbo_Wales). The plot
+ # thickens, because the Title object is altered for special pages,
+ # so it doesn't contain the original alias-with-subpage.
$origTitle = Title::newFromText( $request->getText( 'title' ) );
if( $origTitle instanceof Title && $origTitle->isSpecialPage() ) {
list( $spName, $spPar ) = SpecialPageFactory::resolveAlias( $origTitle->getText() );
if( $this->showIPinHeader() ) {
$href = &$this->userpageUrlDetails['href'];
$personal_urls['anonuserpage'] = array(
- 'text' => $this->userdisplayname,
+ 'text' => $this->username,
'href' => $href,
'class' => $this->userpageUrlDetails['exists'] ? false : 'new',
'active' => ( $pageurl == $href )
'href' => $title->getLocalURL( $this->editUrlOptions() ),
'primary' => true, // don't collapse this in vector
);
-
+
// section link
if ( $showNewSection ) {
// Adds new section link
// Checks that language conversion is enabled and variants exist
// And if it is not in the special namespace
if( count( $variants ) > 1 ) {
- // Gets preferred variant (note that user preference is
+ // Gets preferred variant (note that user preference is
// only possible for wiki content language variant)
$preferred = $pageLang->getPreferredVariant();
// Loops over each variant
$content_navigation['variants'][] = array(
'class' => ( $code == $preferred ) ? 'selected' : false,
'text' => $varname,
- 'href' => $title->getLocalURL( array( 'variant' => $code ) )
+ 'href' => $title->getLocalURL( array( 'variant' => $code ) ),
+ 'lang' => $code,
+ 'hreflang' => $code
);
}
}
$nav_urls['whatlinkshere'] = array(
'href' => SpecialPage::getTitleFor( 'Whatlinkshere', $this->thispage )->getLocalUrl()
);
- if ( $this->getTitle()->getArticleId() ) {
+ if ( $this->getTitle()->getArticleID() ) {
$nav_urls['recentchangeslinked'] = array(
'href' => SpecialPage::getTitleFor( 'Recentchangeslinked', $this->thispage )->getLocalUrl()
);
'href' => self::makeSpecialUrlSubpage( 'Contributions', $rootUser )
);
- if ( $user->isLoggedIn() ) {
- $logPage = SpecialPage::getTitleFor( 'Log' );
- $nav_urls['log'] = array(
- 'href' => $logPage->getLocalUrl( array( 'user' => $rootUser ) )
- );
- }
+ $logPage = SpecialPage::getTitleFor( 'Log' );
+ $nav_urls['log'] = array(
+ 'href' => $logPage->getLocalUrl( array( 'user' => $rootUser ) )
+ );
if ( $this->getUser()->isAllowed( 'block' ) ) {
$nav_urls['blockip'] = array(
/**
* @private
+ * @return bool
*/
function haveData( $str ) {
return isset( $this->data[$str] );
/**
* Get a Message object with its context set
*
- * @param $name Str message name
+ * @param $name string message name
* @return Message
*/
public function getMsg( $name ) {
* stored by SkinTemplate.
* The resulting array is built acording to a format intended to be passed
* through makeListItem to generate the html.
+ * @return array
*/
function getToolbox() {
wfProfileIn( __METHOD__ );
if ( !isset( $sidebar['LANGUAGES'] ) ) {
$sidebar['LANGUAGES'] = true;
}
-
+
if ( !isset( $options['search'] ) || $options['search'] !== true ) {
unset( $sidebar['SEARCH'] );
}
if ( isset( $options['languages'] ) && $options['languages'] === false ) {
unset( $sidebar['LANGUAGES'] );
}
-
+
$boxes = array();
foreach ( $sidebar as $boxName => $content ) {
if ( $content === false ) {
'generated' => false,
'content' => $this->data['language_urls'],
);
- }
+ }
break;
default:
$msgObj = $this->getMsg( $boxName );
break;
}
}
-
+
// HACK: Compatibility with extensions still using SkinTemplateToolboxEnd
$hookContents = null;
if ( isset( $boxes['TOOLBOX'] ) ) {
}
}
// END hack
-
+
if ( isset( $options['htmlOnly'] ) && $options['htmlOnly'] === true ) {
foreach ( $boxes as $boxName => $box ) {
if ( is_array( $box['content'] ) ) {
}
// HACK, shove the toolbox end onto the toolbox if we're rendering itself
if ( $hookContents ) {
- $content .= "\n $hookContents";
+ $content .= "\n $hookContents";
}
// END hack
$content .= "\n</ul>\n";
// END hack
}
}
-
+
return $boxes;
}
* A link-fallback can be used to specify a tag to use instead of <a> if there is
* no link. eg: If you specify 'link-fallback' => 'span' than any non-link will
* output a <span> instead of just text.
+ * @return string
*/
function makeLink( $key, $item, $options = array() ) {
if ( isset( $item['text'] ) ) {
* If you need an id or class on a single link you should include a "links"
* array with just one link item inside of it.
* $options is also passed on to makeLink calls
+ * @return string
*/
function makeListItem( $key, $item, $options = array() ) {
if ( isset( $item['links'] ) ) {
* If you pass "flat" as an option then the returned array will be a flat array
* of footer icons instead of a key/value array of footerlinks arrays broken
* up into categories.
+ * @return array|mixed
*/
function getFooterLinks( $option = null ) {
$footerlinks = $this->data['footerlinks'];
* in the list of footer icons. This is mostly useful for skins which only
* display the text from footericons instead of the images and don't want a
* duplicate copyright statement because footerlinks already rendered one.
+ * @return
*/
function getFooterIcons( $option = null ) {
// Generate additional footer icons
dépôts / lhc / web / wiklou.git / blobdiff