* @ingroup Skins
*/
class SkinVector extends SkinTemplate {
-
+
/* Functions */
-
+
/**
- * Intializes output page and sets up skin-specific parameters
+ * Initializes output page and sets up skin-specific parameters
* @param object $out Output page object to initialize
*/
public function initPage( OutputPage $out ) {
$this->stylename = 'vector';
$this->template = 'VectorTemplate';
}
-
+
/**
* Defines CSS files to be included
* @param object $out Output page to add styles to
*/
public function setupSkinUserCss( OutputPage $out ) {
- global $wgHandheldStyle;
-
- parent::setupSkinUserCss( $out );
-
+ global $wgContLang;
// Append to the default screen common & print styles...
- $out->addStyle( 'vector/main.css', 'screen' );
+ if ( $wgContLang->isRTL() ) {
+ $out->addStyle( 'vector/main-rtl.css', 'screen' );
+ } else {
+ $out->addStyle( 'vector/main-ltr.css', 'screen' );
+ }
+ // Add common styles
+ parent::setupSkinUserCss( $out );
}
-
+
/**
* A structured array of edit links by default used for the tabs
* @return array
* @private
*/
function buildNavigationUrls() {
- global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest;
- global $wgEnableVariants;
+ global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle;
+ global $wgDisableLangConversion;
wfProfileIn( __METHOD__ );
// Detects parameters
$action = $wgRequest->getVal( 'action', 'view' );
$section = $wgRequest->getVal( 'section' );
-
+
// Checks if page is some kind of content
if( $this->iscontent ) {
-
+
// Gets page objects for the related namespaces
$subjectPage = $this->mTitle->getSubjectPage();
$talkPage = $this->mTitle->getTalkPage();
-
+
// Determines if this is a talk page
$isTalk = $this->mTitle->isTalkPage();
-
+
// Generates XML IDs from namespace names
- $subjectId = $wgContLang->lc( $this->mTitle->getSubjectNsText() );
+ $subjectId = $wgContLang->lc($wgCanonicalNamespaceNames[MWNamespace::getSubject($this->mTitle->getNamespace())]);
+
if ( $subjectId == '' ) {
$subjectId = 'main';
}
- $talkId = "{$subjectId}_talk";
+ if ( $subjectId == 'main' ) {
+ $talkId = 'talk';
+ } else {
+ $talkId = "{$subjectId}_talk";
+ }
$currentId = $isTalk ? $talkId : $subjectId;
// Adds namespace links
$links['namespaces'][$subjectId] = $this->tabAction(
- $subjectPage, 'nstab-' . $subjectId, !$isTalk, '', true
+ $subjectPage, 'vector-namespace-' . $subjectId, !$isTalk, '', true
);
$links['namespaces'][$talkId] = $this->tabAction(
- $talkPage, 'talk', $isTalk, '', true
+ $talkPage, 'vector-namespace-talk', $isTalk, '', true
);
// Adds view view link
if ( $this->mTitle->exists() ) {
$links['views']['view'] = $this->tabAction(
$isTalk ? $talkPage : $subjectPage,
- 'view', ( $action == 'view' ), '', true
+ 'vector-view-view', ( $action == 'view' ), '', true
);
}
) {
// Builds CSS class for talk page links
$isTalkClass = $isTalk ? ' istalk' : '';
-
+
// Determines if we're in edit mode
$selected = (
( $action == 'edit' || $action == 'submit' ) &&
$links['views']['edit'] = array(
'class' => ( $selected ? 'selected' : '' ) . $isTalkClass,
'text' => $this->mTitle->exists()
- ? wfMsg( 'edit' )
- : wfMsg( 'create' ),
+ ? wfMsg( 'vector-view-edit' )
+ : wfMsg( 'vector-view-create' ),
'href' =>
$this->mTitle->getLocalUrl( $this->editUrlOptions() )
);
- // Checks if this is a talk page and we should show a new
+ // Checks if this is a current rev of talk page and we should show a new
// section link
- if ( $isTalk || $wgOut->showNewSectionLink() ) {
+ if ( ( $isTalk && $wgArticle->isCurrent() ) || ( $wgOut->showNewSectionLink() ) ) {
// Checks if we should ever show a new section link
if ( !$wgOut->forceHideNewSectionLink() ) {
// Adds new section link
$links['actions']['addsection'] = array(
'class' => $section == 'new' ? 'selected' : false,
- 'text' => wfMsg( 'addsection' ),
+ 'text' => wfMsg( 'vector-action-addsection' ),
'href' => $this->mTitle->getLocalUrl(
'action=edit§ion=new'
)
} elseif ( $this->mTitle->isKnown() ) {
// Adds view source view link
$links['views']['viewsource'] = array(
- 'class' => ( $action == 'edit') ? 'selected' : false,
- 'text' => wfMsg( 'viewsource' ),
+ 'class' => ( $action == 'edit' ) ? 'selected' : false,
+ 'text' => wfMsg( 'vector-view-viewsource' ),
'href' =>
$this->mTitle->getLocalUrl( $this->editUrlOptions() )
);
wfProfileOut( __METHOD__ . '-edit' );
wfProfileIn( __METHOD__ . '-live' );
-
+
// Checks if the page exists
if ( $this->mTitle->exists() ) {
// Adds history view link
$links['views']['history'] = array(
'class' => ($action == 'history') ? 'selected' : false,
- 'text' => wfMsg( 'history_short' ),
+ 'text' => wfMsg( 'vector-view-history' ),
'href' => $this->mTitle->getLocalUrl( 'action=history' ),
'rel' => 'archives',
);
-
+
if( $wgUser->isAllowed( 'delete' ) ) {
$links['actions']['delete'] = array(
'class' => ($action == 'delete') ? 'selected' : false,
- 'text' => wfMsg( 'delete' ),
+ 'text' => wfMsg( 'vector-action-delete' ),
'href' => $this->mTitle->getLocalUrl( 'action=delete' )
);
}
$links['actions']['move'] = array(
'class' => $this->mTitle->isSpecial( 'Movepage' ) ?
'selected' : false,
- 'text' => wfMsg( 'move' ),
+ 'text' => wfMsg( 'vector-action-move' ),
'href' => $moveTitle->getLocalUrl()
);
}
-
+
if (
$this->mTitle->getNamespace() !== NS_MEDIAWIKI &&
$wgUser->isAllowed( 'protect' )
$links['actions']['protect'] = array(
'class' => ($action == 'protect') ?
'selected' : false,
- 'text' => wfMsg( 'protect' ),
+ 'text' => wfMsg( 'vector-action-protect' ),
'href' =>
$this->mTitle->getLocalUrl( 'action=protect' )
);
$links['actions']['unprotect'] = array(
'class' => ($action == 'unprotect') ?
'selected' : false,
- 'text' => wfMsg( 'unprotect' ),
+ 'text' => wfMsg( 'vector-action-unprotect' ),
'href' =>
$this->mTitle->getLocalUrl( 'action=unprotect' )
);
$links['actions']['undelete'] = array(
'class' => false,
'text' => wfMsgExt(
- 'undelete_short',
+ 'vector-action-undelete',
array( 'parsemag' ),
$wgLang->formatNum( $n )
),
$links['actions']['protect'] = array(
'class' => ($action == 'protect') ?
'selected' : false,
- 'text' => wfMsg( 'protect' ),
+ 'text' => wfMsg( 'vector-action-protect' ),
'href' =>
$this->mTitle->getLocalUrl( 'action=protect' )
);
$links['actions']['unprotect'] = array(
'class' => ($action == 'unprotect') ?
'selected' : false,
- 'text' => wfMsg( 'unprotect' ),
+ 'text' => wfMsg( 'vector-action-unprotect' ),
'href' =>
$this->mTitle->getLocalUrl( 'action=unprotect' )
);
}
}
wfProfileOut( __METHOD__ . '-live' );
-
+
+ /**
+ * The following actions use messages which, if made particular to
+ * the Vector skin, would break the Ajax code which makes this
+ * action happen entirely inline. Skin::makeGlobalVariablesScript
+ * defines a set of messages in a javascript object - and these
+ * messages are assumed to be global for all skins. Without making
+ * a change to that procedure these messages will have to remain as
+ * the global versions.
+ */
// Checks if the user is logged in
if( $this->loggedin ) {
// Checks if the user is watching this page
// Adds watch action link
$links['actions']['watch'] = array(
'class' =>
- ( $action == 'watch' or $action == 'unwatch') ?
+ ( $action == 'watch' or $action == 'unwatch' ) ?
'selected' : false,
'text' => wfMsg( 'watch' ),
'href' => $this->mTitle->getLocalUrl( 'action=watch' )
);
}
}
+
+ // This is instead of SkinTemplateTabs - which uses a flat array
+ wfRunHooks( 'SkinTemplateNavigation', array( &$this, &$links ) );
// If it's not content, it's got to be a special page
} else {
$links['namespaces']['special'] = array(
'class' => 'selected',
- 'text' => wfMsg('nstab-special'),
+ 'text' => wfMsg( 'vector-namespace-special' ),
'href' => $wgRequest->getRequestURL()
);
}
// Gets list of language variants
$variants = $wgContLang->getVariants();
// Checks that language conversion is enabled and variants exist
- if( $wgEnableVariants && count( $variants ) > 1 ) {
+ if( !$wgDisableLangConversion && count( $variants ) > 1 ) {
// Gets preferred variant
$preferred = $wgContLang->getPreferredVariant();
// Loops over each variant
}
// Appends variant link
$links['variants'][$vcount] = array(
- 'class' => ( $code == $preferred )? 'selected' : false,
+ 'class' => ( $code == $preferred ) ? 'selected' : false,
'text' => $varname,
'href' => $this->mTitle->getLocalURL( '', $code )
);
}
wfProfileOut( __METHOD__ );
-
+
return $links;
}
}
* @ingroup Skins
*/
class VectorTemplate extends QuickTemplate {
-
+
/* Members */
-
+
/**
* @var Cached skin object
*/
var $skin;
-
+
/* Functions */
-
+
/**
* Outputs the entire contents of the XHTML page
*/
public function execute() {
global $wgRequest, $wgUseTwoButtonsSearchForm;
-
+
$this->skin = $this->data['skin'];
$action = $wgRequest->getText( 'action' );
-
+
// Suppress warnings to prevent notices about missing indexes in
// $this->data (is this really the best way to handle this?)
wfSuppressWarnings();
-
+
// Build additional attributes for navigation urls
$nav = $this->skin->buildNavigationUrls();
foreach ( $nav as $section => $links ) {
$this->data['personal_urls'][$key]['key'] =
$this->skin->tooltipAndAccesskey('pt-'.$key);
}
-
+
// Generate additional footer links
$footerlinks = array(
'info' => array(
'disclaimer',
),
);
-
+
// Build list of valid footer links
$validFooterLinks = array();
foreach( $footerlinks as $category => $links ) {
}
}
}
-
+
// Begin content output
?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="<?php $this->text('xhtmldefaultnamespace') ?>" <?php foreach($this->data['xhtmlnamespaces'] as $tag => $ns): ?>xmlns:<?php echo "{$tag}=\"{$ns}\" "; ?><?php endforeach ?>xml:lang="<?php $this->text('lang') ?>" lang="<?php $this->text('lang') ?>" dir="<?php $this->text('dir') ?>">
<!-- IEFixes -->
<!--[if lt IE 7]><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script>
<meta http-equiv="imagetoolbar" content="no" /><![endif]-->
+ <style type="text/css">body{behavior:url("<?php $this->text('stylepath') ?>/vector/csshover.htc")}</style>
<!-- /IEFixes -->
<!-- globalVariablesScript -->
<?php echo Skin::makeGlobalVariablesScript( $this->data ); ?>
<?php endif; ?>
</head>
<body<?php if($this->data['body_ondblclick']): ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php endif; ?> <?php if($this->data['body_onload']): ?> onload="<?php $this->text('body_onload') ?>"<?php endif; ?> class="mediawiki <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>">
- <div id="content-base"><div></div></div>
- <div id="panel-base"></div>
- <!-- page -->
- <div id="page">
- <!-- content -->
- <div id="content">
- <div class="buffer">
- <a name="top" id="top"></a>
- <!-- sitenotice -->
- <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
- <!-- /sitenotice -->
- <!-- firstHeading -->
- <h1 id="firstHeading" class="firstHeading"><?php $this->html('title') ?></h1>
- <!-- /firstHeading -->
- <!-- bodyContent -->
- <div id="bodyContent">
- <!-- tagline -->
- <h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
- <!-- /tagline -->
- <!-- subtitle -->
- <div id="contentSub"><?php $this->html('subtitle') ?></div>
- <!-- /subtitle -->
- <?php if($this->data['undelete']): ?>
- <!-- undelete -->
- <div id="contentSub2"><?php $this->html('undelete') ?></div>
- <!-- /undelete -->
- <?php endif; ?>
- <?php if($this->data['newtalk'] ): ?>
- <!-- newtalk -->
- <div class="usermessage"><?php $this->html('newtalk') ?></div>
- <!-- /newtalk -->
- <?php endif; ?>
- <?php if($this->data['showjumplinks']): ?>
- <!-- jumpto -->
- <div id="jump-to-nav">
- <?php $this->msg('jumpto') ?> <a href="#head"><?php $this->msg('jumptonavigation') ?></a>,
- <a href="#search"><?php $this->msg('jumptosearch') ?></a>
- </div>
- <!-- /jumpto -->
- <?php endif; ?>
- <!-- bodytext -->
- <?php $this->html('bodytext') ?>
- <!-- /bodytext -->
- <!-- catlinks -->
- <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?>
- <!-- /catlinks -->
- <!-- dataAfterContent -->
- <?php if($this->data['dataAfterContent']) { $this->html ('dataAfterContent'); } ?>
- <!-- /dataAfterContent -->
- <div class="visualClear"></div>
- </div>
- <!-- /bodyContent -->
+ <div id="page-base" class="noprint"></div>
+ <div id="head-base" class="noprint"></div>
+ <!-- content -->
+ <div id="content">
+ <a name="top" id="top"></a>
+ <!-- sitenotice -->
+ <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
+ <!-- /sitenotice -->
+ <!-- firstHeading -->
+ <h1 id="firstHeading" class="firstHeading"><?php $this->html('title') ?></h1>
+ <!-- /firstHeading -->
+ <!-- bodyContent -->
+ <div id="bodyContent">
+ <!-- tagline -->
+ <h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
+ <!-- /tagline -->
+ <!-- subtitle -->
+ <div id="contentSub"><?php $this->html('subtitle') ?></div>
+ <!-- /subtitle -->
+ <?php if($this->data['undelete']): ?>
+ <!-- undelete -->
+ <div id="contentSub2"><?php $this->html('undelete') ?></div>
+ <!-- /undelete -->
+ <?php endif; ?>
+ <?php if($this->data['newtalk'] ): ?>
+ <!-- newtalk -->
+ <div class="usermessage"><?php $this->html('newtalk') ?></div>
+ <!-- /newtalk -->
+ <?php endif; ?>
+ <?php if($this->data['showjumplinks']): ?>
+ <!-- jumpto -->
+ <div id="jump-to-nav">
+ <?php $this->msg('jumpto') ?> <a href="#head"><?php $this->msg('jumptonavigation') ?></a>,
+ <a href="#search"><?php $this->msg('jumptosearch') ?></a>
</div>
+ <!-- /jumpto -->
+ <?php endif; ?>
+ <!-- bodytext -->
+ <?php $this->html('bodytext') ?>
+ <!-- /bodytext -->
+ <!-- catlinks -->
+ <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?>
+ <!-- /catlinks -->
+ <!-- dataAfterContent -->
+ <?php if($this->data['dataAfterContent']) { $this->html('dataAfterContent'); } ?>
+ <!-- /dataAfterContent -->
+ <div class="visualClear"></div>
</div>
- <!-- /content -->
- <!-- header -->
- <div id="head">
- <div class="buffer">
- <div class="top">
- <!-- personal -->
- <div id="personal">
- <div class="buffer">
- <h5><?php $this->msg('personaltools') ?></h5>
- <ul <?php echo $this->langAttributes() ?>>
- <?php foreach($this->data['personal_urls'] as $key => $item): ?>
- <li <?= $item['attributes'] ?>><a href="<?php echo htmlspecialchars($item['href']) ?>"<?php echo $item['key'] ?><?php if(!empty($item['class'])): ?> class="<?php echo htmlspecialchars($item['class']) ?>"<?php endif; ?>><?php echo htmlspecialchars($item['text']) ?></a></li>
- <?php endforeach; ?>
- </ul>
- </div>
- </div>
- <!-- /personal -->
- </div>
- <div class="middle">
- <!-- namespaces -->
- <div id="namespaces">
- <h5><?php $this->msg('namespaces') ?></h5>
- <ul <?php echo $this->langAttributes() ?>>
- <?php foreach ($this->data['namespace_urls'] as $key => $link ): ?>
- <li <?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
- <?php endforeach; ?>
- </ul>
- </div>
- <!-- /namespaces -->
- <!-- variants -->
- <?php if ( count( $this->data['variant_urls'] ) > 0 ): ?>
- <div id="variants">
- <h5><div class="icon"><span><?php $this->msg('variants') ?></span></div></h5>
- <div class="menu">
- <ul <?php echo $this->langAttributes() ?>>
- <?php foreach ($this->data['variant_urls'] as $key => $link ): ?>
- <li<?php echo $link['attributes'] ?><?php if(!empty($link['class'])): ?> class="<?php echo htmlspecialchars($link['class']) ?>"<?php endif; ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
- <?php endforeach; ?>
- </ul>
- </div>
- </div>
- <?php endif; ?>
- <!-- /variants -->
- </div>
- <div class="bottom">
- <!-- views -->
- <?php if ( count( $this->data['view_urls'] ) > 0 ): ?>
- <div id="views">
- <h5><?php $this->msg('views') ?></h5>
- <ul <?php echo $this->langAttributes() ?>>
- <?php foreach ($this->data['view_urls'] as $key => $link ): ?>
- <li<?php echo $link['attributes'] ?><?php if(!empty($link['class'])): ?> class="<?php echo htmlspecialchars($link['class']) ?>"<?php endif; ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
- <?php endforeach; ?>
- </ul>
- </div>
- <?php endif; ?>
- <!-- /views -->
- <!-- actions -->
- <?php if ( count( $this->data['action_urls'] ) > 0 ): ?>
- <div id="actions">
- <h5><div class="icon"><span><?php $this->msg('actions') ?></span></div></h5>
- <div class="menu">
- <ul <?php echo $this->langAttributes() ?>>
- <?php foreach ($this->data['action_urls'] as $key => $link ): ?>
- <li<?php echo $link['attributes'] ?><?php if(!empty($link['class'])): ?> class="<?php echo htmlspecialchars($link['class']) ?>"<?php endif; ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
- <?php endforeach; ?>
- </ul>
- </div>
- </div>
- <?php endif; ?>
- <!-- /actions -->
- <!-- search -->
- <div id="search">
- <div class="buffer">
- <h5 <?php echo $this->langAttributes( ) ?>><label for="searchInput"><?php $this->msg( 'search') ?></label></h5>
- <form action="<?php $this->text( 'wgScript') ?>" id="searchform">
- <div>
- <input type='hidden' name="title" value="<?php $this->text( 'searchtitle') ?>"/>
- <input id="searchInput" name="search" type="text" <?php echo $this->skin->tooltipAndAccesskey( 'search'); ?> <?php if( isset( $this->data['search'] ) ): ?> value="<?php $this->text( 'search') ?>"<?php endif; ?> />
- <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg( 'searcharticle') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> />
- <?php if ( $wgUseTwoButtonsSearchForm ): ?>
- <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg( 'searchbutton') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> />
- <?php else: ?>
- <div><a href="<?php $this->text( 'searchaction') ?>" rel="search"><?php $this->msg( 'powersearch-legend') ?></a></div>
- <?php endif; ?>
- </div>
- </form>
- </div>
- </div>
- <!-- /search -->
- </div>
- </div>
+ <!-- /bodyContent -->
+ </div>
+ <!-- /content -->
+ <!-- header -->
+ <div id="head" class="noprint">
+ <!-- personal -->
+ <div id="personal">
+ <h5><?php $this->msg('personaltools') ?></h5>
+ <ul <?php $this->html('userlangattributes') ?>>
+ <?php foreach($this->data['personal_urls'] as $key => $item): ?>
+ <li <?php echo $item['attributes'] ?>><a href="<?php echo htmlspecialchars($item['href']) ?>"<?php echo $item['key'] ?><?php if(!empty($item['class'])): ?> class="<?php echo htmlspecialchars($item['class']) ?>"<?php endif; ?>><?php echo htmlspecialchars($item['text']) ?></a></li>
+ <?php endforeach; ?>
+ </ul>
</div>
- <!-- /header -->
- <!-- panel -->
- <div id="panel">
- <div class="buffer">
- <!-- fixalpha -->
- <script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha(); </script>
- <!-- /fixalpha -->
- <!-- sidebar -->
- <?php
- $sidebar = $this->data['sidebar'];
- $sidebar['TOOLBOX'] = ( !isset( $sidebar['TOOLBOX'] ) );
- $sidebar['LANGUAGES'] = ( !isset( $sidebar['LANGUAGES'] ) );
- foreach ( $sidebar as $name => $content ) {
- switch( $name ) {
- case 'SEARCH':
- break;
- case 'TOOLBOX':
- $this->toolBox();
- break;
- case 'LANGUAGES':
- $this->languageBox();
- break;
- default:
- $this->customBox( $name, $content );
- break;
- }
- }
- ?>
- <!-- /sidebar -->
+ <!-- /personal -->
+ <div id="left-navigation">
+ <!-- namespaces -->
+ <div id="namespaces">
+ <h5><?php $this->msg('namespaces') ?></h5>
+ <ul <?php $this->html('userlangattributes') ?>>
+ <?php foreach ($this->data['namespace_urls'] as $key => $link ): ?>
+ <li <?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><span><?php echo htmlspecialchars( $link['text'] ) ?></span></a></li>
+ <?php endforeach; ?>
+ </ul>
+ </div>
+ <!-- /namespaces -->
+ <!-- variants -->
+ <?php if ( count( $this->data['variant_urls'] ) > 0 ): ?>
+ <div id="variants">
+ <h5><span><?php $this->msg('variants') ?></span><a href="#"> </a></h5>
+ <div class="menu">
+ <ul <?php $this->html('userlangattributes') ?>>
+ <?php foreach ($this->data['variant_urls'] as $key => $link ): ?>
+ <li<?php echo $link['attributes'] ?><?php if(!empty($link['class'])): ?> class="<?php echo htmlspecialchars($link['class']) ?>"<?php endif; ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
+ <?php endforeach; ?>
+ </ul>
+ </div>
</div>
+ <?php endif; ?>
+ <!-- /variants -->
</div>
- <!-- /panel -->
- <div class="break"></div>
- <!-- foot -->
- <div id="foot">
- <div class="buffer">
- <ul id="foot-icons">
- <?php if( $this->data['poweredbyico']): ?>
- <li id="foot-icon-poweredby"><?php $this->html( 'poweredbyico') ?></li>
- <?php endif; ?>
- <?php if( $this->data['copyrightico']): ?>
- <li id="foot-icon-copyright"><?php $this->html( 'copyrightico') ?></li>
- <?php endif; ?>
+ <div id="right-navigation">
+ <!-- views -->
+ <?php if ( count( $this->data['view_urls'] ) > 0 ): ?>
+ <div id="views">
+ <h5><?php $this->msg('views') ?></h5>
+ <ul <?php $this->html('userlangattributes') ?>>
+ <?php foreach ($this->data['view_urls'] as $key => $link ): ?>
+ <li<?php echo $link['attributes'] ?><?php if(!empty($link['class'])): ?> class="<?php echo htmlspecialchars($link['class']) ?>"<?php endif; ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><span><?php echo htmlspecialchars( $link['text'] ) ?></span></a></li>
+ <?php endforeach; ?>
</ul>
- <?php foreach( $validFooterLinks as $category => $links ): ?>
- <?php if ( count( $links ) > 0 ): ?>
- <ul id="foot-<?php echo $category ?>">
- <?php foreach( $links as $link ): ?>
- <?php if( isset( $this->data[$link] ) && $this->data[$link] ): ?>
- <li id="foot-<?php echo $category ?>-<?php echo $link ?>"><?php $this->html( $link) ?></li>
- <?php endif; ?>
+ </div>
+ <?php endif; ?>
+ <!-- /views -->
+ <!-- actions -->
+ <?php if ( count( $this->data['action_urls'] ) > 0 ): ?>
+ <div id="actions">
+ <h5><span><?php $this->msg('actions') ?></span><a href="#"> </a></h5>
+ <div class="menu">
+ <ul <?php $this->html('userlangattributes') ?>>
+ <?php foreach ($this->data['action_urls'] as $key => $link ): ?>
+ <li<?php echo $link['attributes'] ?><?php if(!empty($link['class'])): ?> class="<?php echo htmlspecialchars($link['class']) ?>"<?php endif; ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
<?php endforeach; ?>
</ul>
+ </div>
+ </div>
+ <?php endif; ?>
+ <!-- /actions -->
+ <!-- search -->
+ <div id="search">
+ <h5 <?php $this->html('userlangattributes') ?>><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h5>
+ <form action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
+ <input type='hidden' name="title" value="<?php $this->text( 'searchtitle' ) ?>"/>
+ <input id="searchInput" name="search" type="text" <?php echo $this->skin->tooltipAndAccesskey( 'search' ); ?> <?php if( isset( $this->data['search'] ) ): ?> value="<?php $this->text( 'search' ) ?>"<?php endif; ?> />
+ <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg( 'searcharticle' ) ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> />
+ <?php if ( $wgUseTwoButtonsSearchForm ): ?>
+ <input type="submit" name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg( 'searchbutton' ) ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> />
+ <?php else: ?>
+ <div><a href="<?php $this->text( 'searchaction' ) ?>" rel="search"><?php $this->msg( 'powersearch-legend' ) ?></a></div>
<?php endif; ?>
- <?php endforeach; ?>
- <div style="clear:both"></div>
+ </form>
</div>
+ <!-- /search -->
</div>
- <!-- /foot -->
</div>
- <!-- /page -->
+ <!-- /header -->
+ <!-- panel -->
+ <div id="panel" class="noprint">
+ <!-- sidebar -->
+ <?php
+ $sidebar = $this->data['sidebar'];
+ $sidebar['TOOLBOX'] = ( !isset( $sidebar['TOOLBOX'] ) );
+ $sidebar['LANGUAGES'] = ( !isset( $sidebar['LANGUAGES'] ) );
+ foreach ( $sidebar as $name => $content ) {
+ switch( $name ) {
+ case 'SEARCH':
+ break;
+ case 'TOOLBOX':
+ $this->toolBox();
+ break;
+ case 'LANGUAGES':
+ $this->languageBox();
+ break;
+ default:
+ $this->customBox( $name, $content );
+ break;
+ }
+ }
+ ?>
+ <!-- /sidebar -->
+ </div>
+ <!-- /panel -->
+ <div class="break"></div>
+ <!-- foot -->
+ <div id="foot">
+ <?php foreach( $validFooterLinks as $category => $links ): ?>
+ <?php if ( count( $links ) > 0 ): ?>
+ <ul id="foot-<?php echo $category ?>">
+ <?php foreach( $links as $link ): ?>
+ <?php if( isset( $this->data[$link] ) && $this->data[$link] ): ?>
+ <li id="foot-<?php echo $category ?>-<?php echo $link ?>"><?php $this->html( $link ) ?></li>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ </ul>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ <ul id="foot-icons" class="noprint">
+ <?php if( $this->data['poweredbyico'] ): ?>
+ <li id="foot-icon-poweredby"><?php $this->html( 'poweredbyico' ) ?></li>
+ <?php endif; ?>
+ <?php if( $this->data['copyrightico'] ): ?>
+ <li id="foot-icon-copyright"><?php $this->html( 'copyrightico' ) ?></li>
+ <?php endif; ?>
+ </ul>
+ <div style="clear:both"></div>
+ </div>
+ <!-- /foot -->
<!-- logo -->
<div id="logo">
<a style="background-image: url(<?php $this->text('logopath') ?>);" href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>" <?php echo $this->skin->tooltipAndAccesskey('p-logo') ?>></a>
</div>
<!-- /logo -->
- <?php $this->html( 'bottomscripts'); /* JS call to runBodyOnloadHook */ ?>
- <?php $this->html( 'reporttime') ?>
- <?php if ( $this->data['debug'] ): ?>
+ <!-- fixalpha -->
+ <script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha( 'logo' ); </script>
+ <!-- /fixalpha -->
+ <?php $this->html( 'bottomscripts' ); /* JS call to runBodyOnloadHook */ ?>
+ <?php $this->html( 'reporttime' ) ?>
+ <?php if ( $this->data['debug'] ): ?>
<!-- Debug output:
- <?php $this->text( 'debug' ); ?>
+ <?php $this->text( 'debug' ); ?>
-->
<?php endif; ?>
</body>
</html>
<?php
// We're done with abusing arrays now...
- wfRestoreWarnings( );
+ wfRestoreWarnings();
}
/**
* Outputs a box with a list of tools
*/
- private function toolBox( ) {
+ private function toolBox() {
?>
<div class="portal" id="p-tb">
- <h5 <?php echo $this->langAttributes( ) ?>><?php $this->msg( 'toolbox') ?></h5>
+ <h5 <?php $this->html('userlangattributes') ?>><?php $this->msg( 'toolbox' ) ?></h5>
<div class="body">
<ul>
- <?php if( $this->data['notspecialpage']): ?>
- <li id="t-whatlinkshere"><a href="<?php echo htmlspecialchars( $this->data['nav_urls']['whatlinkshere']['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey( 't-whatlinkshere') ?>><?php $this->msg( 'whatlinkshere') ?></a></li>
- <?php if( $this->data['nav_urls']['recentchangeslinked'] ): ?>
- <li id="t-recentchangeslinked"><a href="<?php echo htmlspecialchars( $this->data['nav_urls']['recentchangeslinked']['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey( 't-recentchangeslinked') ?>><?php $this->msg( 'recentchangeslinked') ?></a></li>
+ <?php if( $this->data['notspecialpage'] ): ?>
+ <li id="t-whatlinkshere"><a href="<?php echo htmlspecialchars( $this->data['nav_urls']['whatlinkshere']['href'] ) ?>"<?php echo $this->skin->tooltipAndAccesskey( 't-whatlinkshere' ) ?>><?php $this->msg( 'whatlinkshere' ) ?></a></li>
+ <?php if( $this->data['nav_urls']['recentchangeslinked'] ): ?>
+ <li id="t-recentchangeslinked"><a href="<?php echo htmlspecialchars( $this->data['nav_urls']['recentchangeslinked']['href'] ) ?>"<?php echo $this->skin->tooltipAndAccesskey( 't-recentchangeslinked' ) ?>><?php $this->msg( 'recentchangeslinked-toolbox' ) ?></a></li>
<?php endif; ?>
<?php endif; ?>
- <?php if( isset( $this->data['nav_urls']['trackbacklink'])): ?>
- <li id="t-trackbacklink"><a href="<?php echo htmlspecialchars( $this->data['nav_urls']['trackbacklink']['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey( 't-trackbacklink') ?>><?php $this->msg( 'trackbacklink') ?></a></li>
+ <?php if( isset( $this->data['nav_urls']['trackbacklink'] ) ): ?>
+ <li id="t-trackbacklink"><a href="<?php echo htmlspecialchars( $this->data['nav_urls']['trackbacklink']['href'] ) ?>"<?php echo $this->skin->tooltipAndAccesskey( 't-trackbacklink' ) ?>><?php $this->msg( 'trackbacklink' ) ?></a></li>
<?php endif; ?>
<?php if( $this->data['feeds']): ?>
<li id="feedlinks">
- <?php foreach( $this->data['feeds'] as $key => $feed): ?>
- <a id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>" href="<?php echo htmlspecialchars( $feed['href']) ?>" rel="alternate" type="application/<?php echo $key ?>+xml" class="feedlink"<?php echo $this->skin->tooltipAndAccesskey( 'feed-'.$key) ?>><?php echo htmlspecialchars( $feed['text'])?></a>
+ <?php foreach( $this->data['feeds'] as $key => $feed ): ?>
+ <a id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>" href="<?php echo htmlspecialchars( $feed['href'] ) ?>" rel="alternate" type="application/<?php echo $key ?>+xml" class="feedlink"<?php echo $this->skin->tooltipAndAccesskey( 'feed-' . $key ) ?>><?php echo htmlspecialchars( $feed['text'] ) ?></a>
<?php endforeach; ?>
</li>
<?php endif; ?>
- <?php foreach( array( 'contributions', 'log', 'blockip', 'emailuser', 'upload', 'specialpages') as $special ): ?>
+ <?php foreach( array( 'contributions', 'log', 'blockip', 'emailuser', 'upload', 'specialpages' ) as $special ): ?>
<?php if( $this->data['nav_urls'][$special]): ?>
- <li id="t-<?php echo $special ?>"><a href="<?php echo htmlspecialchars( $this->data['nav_urls'][$special]['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey( 't-'.$special) ?>><?php $this->msg( $special) ?></a></li>
+ <li id="t-<?php echo $special ?>"><a href="<?php echo htmlspecialchars( $this->data['nav_urls'][$special]['href'] ) ?>"<?php echo $this->skin->tooltipAndAccesskey( 't-' . $special ) ?>><?php $this->msg( $special ) ?></a></li>
<?php endif; ?>
<?php endforeach; ?>
- <?php if( !empty( $this->data['nav_urls']['print']['href'])): ?>
- <li id="t-print"><a href="<?php echo htmlspecialchars( $this->data['nav_urls']['print']['href']) ?>" rel="alternate"<?php echo $this->skin->tooltipAndAccesskey( 't-print') ?>><?php $this->msg( 'printableversion') ?></a></li>
+ <?php if( !empty( $this->data['nav_urls']['print']['href'] ) ): ?>
+ <li id="t-print"><a href="<?php echo htmlspecialchars( $this->data['nav_urls']['print']['href'] ) ?>" rel="alternate"<?php echo $this->skin->tooltipAndAccesskey( 't-print' ) ?>><?php $this->msg( 'printableversion' ) ?></a></li>
<?php endif; ?>
<?php if ( !empty( $this->data['nav_urls']['permalink']['href'] ) ): ?>
- <li id="t-permalink"><a href="<?php echo htmlspecialchars( $this->data['nav_urls']['permalink']['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey( 't-permalink') ?>><?php $this->msg( 'permalink') ?></a></li>
- <?php elseif ( $this->data['nav_urls']['permalink']['href'] === ''): ?>
- <li id="t-ispermalink"<?php echo $this->skin->tooltip( 't-ispermalink') ?>><?php $this->msg( 'permalink') ?></li>
+ <li id="t-permalink"><a href="<?php echo htmlspecialchars( $this->data['nav_urls']['permalink']['href'] ) ?>"<?php echo $this->skin->tooltipAndAccesskey( 't-permalink' ) ?>><?php $this->msg( 'permalink' ) ?></a></li>
+ <?php elseif ( $this->data['nav_urls']['permalink']['href'] === '' ): ?>
+ <li id="t-ispermalink"<?php echo $this->skin->tooltip( 't-ispermalink' ) ?>><?php $this->msg( 'permalink' ) ?></li>
<?php endif; ?>
- <?php wfRunHooks( 'VectorTemplateToolboxEnd', array( &$this ) ); ?>
- <?php wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this ) ); ?>
+ <?php wfRunHooks( 'VectorTemplateToolboxEnd', array( &$this ) ); ?>
+ <?php wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this ) ); ?>
</ul>
</div>
</div>
<?php
}
-
+
/**
* Outputs a box with a list of alternative languages for this page
*/
- private function languageBox( ) {
- if( $this->data['language_urls'] ) {
+ private function languageBox() {
+ if( $this->data['language_urls'] ) {
?>
<div class="portal" id="p-lang">
- <h5 <?php echo $this->langAttributes( ) ?>><?php $this->msg( 'otherlanguages') ?></h5>
+ <h5 <?php $this->html('userlangattributes') ?>><?php $this->msg( 'otherlanguages' ) ?></h5>
<div class="body">
<ul>
- <?php foreach ( $this->data['language_urls'] as $langlink ): ?>
- <li class="<?php echo htmlspecialchars( $langlink['class'] ) ?>"><a href="<?php echo htmlspecialchars( $langlink['href'] ) ?>"><?php echo $langlink['text'] ?></a></li>
+ <?php foreach ( $this->data['language_urls'] as $langlink ): ?>
+ <li class="<?php echo htmlspecialchars( $langlink['class'] ) ?>"><a href="<?php echo htmlspecialchars( $langlink['href'] ) ?>"><?php echo $langlink['text'] ?></a></li>
<?php endforeach; ?>
</ul>
</div>
}
/**
- * Ouptus a box with a custom list of items or HTML content
+ * Outputs a box with a custom list of items or HTML content
* @param string $bar Message name for title of box
* @param mixed $content HTML or array of items to build a list from
*/
- private function customBox( $bar, $content ) {
+ private function customBox( $bar, $content ) {
?>
-<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$bar" ) ?>'<?php echo $this->skin->tooltip( 'p-'.$bar) ?>>
- <h5 <?php echo $this->langAttributes( ) ?>><?php $out = wfMsg( $bar ); if ( wfEmptyMsg( $bar, $out)) echo htmlspecialchars( $bar); else echo htmlspecialchars( $out); ?></h5>
- <div class='body'>
- <?php if ( is_array( $content ) ): ?>
+<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$bar" ) ?>'<?php echo $this->skin->tooltip( 'p-' . $bar ) ?>>
+ <h5 <?php $this->html('userlangattributes') ?>><?php $out = wfMsg( $bar ); if ( wfEmptyMsg( $bar, $out ) ) echo htmlspecialchars( $bar ); else echo htmlspecialchars( $out ); ?></h5>
+ <div class="body">
+ <?php if ( is_array( $content ) ): ?>
<ul>
- <?php foreach( $content as $key => $val): ?>
- <li id="<?php echo Sanitizer::escapeId( $val['id']) ?>"<?php if ( $val['active'] ): ?> class="active" <?php endif; ?>><a href="<?php echo htmlspecialchars( $val['href'] ) ?>"<?php echo $this->skin->tooltipAndAccesskey( $val['id']) ?>><?php echo htmlspecialchars( $val['text']) ?></a></li>
+ <?php foreach( $content as $key => $val ): ?>
+ <li id="<?php echo Sanitizer::escapeId( $val['id'] ) ?>"<?php if ( $val['active'] ): ?> class="active" <?php endif; ?>><a href="<?php echo htmlspecialchars( $val['href'] ) ?>"<?php echo $this->skin->tooltipAndAccesskey( $val['id'] ) ?>><?php echo htmlspecialchars( $val['text'] ) ?></a></li>
<?php endforeach; ?>
</ul>
<?php else: ?>
</div>
<?php
}
-
- /**
- * Build attributes describing user language
- * @return HTML and XML Language attributes
- */
- private function langAttributes( ) {
- return 'lang="' . $this->data['userlang'] . '" xml:lang="' . $this->data['userlang'] . '"';
- }
}
dépôts / lhc / web / wiklou.git / blobdiff