summaryrefslogtreecommitdiff
path: root/skins/Vector/VectorTemplate.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2015-12-17 09:15:42 +0100
committerPierre Schmitz <pierre@archlinux.de>2015-12-17 09:44:51 +0100
commita1789ddde42033f1b05cc4929491214ee6e79383 (patch)
tree63615735c4ddffaaabf2428946bb26f90899f7bf /skins/Vector/VectorTemplate.php
parent9e06a62f265e3a2aaabecc598d4bc617e06fa32d (diff)
Update to MediaWiki 1.26.0
Diffstat (limited to 'skins/Vector/VectorTemplate.php')
-rw-r--r--skins/Vector/VectorTemplate.php124
1 files changed, 41 insertions, 83 deletions
diff --git a/skins/Vector/VectorTemplate.php b/skins/Vector/VectorTemplate.php
index fa3de5e0..ec2c87aa 100644
--- a/skins/Vector/VectorTemplate.php
+++ b/skins/Vector/VectorTemplate.php
@@ -87,6 +87,10 @@ class VectorTemplate extends BaseTemplate {
$this->data['personal_urls'] =
array_reverse( $this->data['personal_urls'] );
}
+
+ $this->data['pageLanguage'] =
+ $this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
+
// Output HTML Page
$this->html( 'headelement' );
?>
@@ -106,12 +110,14 @@ class VectorTemplate extends BaseTemplate {
if ( is_callable( array( $this, 'getIndicators' ) ) ) {
echo $this->getIndicators();
}
+ // Loose comparison with '!=' is intentional, to catch null and false too, but not '0'
+ if ( $this->data['title'] != '' ) {
?>
- <h1 id="firstHeading" class="firstHeading" lang="<?php
- $this->data['pageLanguage'] =
- $this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
- $this->text( 'pageLanguage' );
- ?>"><?php $this->html( 'title' ) ?></h1>
+ <h1 id="firstHeading" class="firstHeading" lang="<?php $this->text( 'pageLanguage' ); ?>"><?php
+ $this->html( 'title' )
+ ?></h1>
+ <?php
+ } ?>
<?php $this->html( 'prebodyhtml' ) ?>
<div id="bodyContent" class="mw-body-content">
<?php
@@ -121,9 +127,9 @@ class VectorTemplate extends BaseTemplate {
<?php
}
?>
- <div id="contentSub"<?php
- $this->html( 'userlangattributes' )
- ?>><?php $this->html( 'subtitle' ) ?></div>
+ <div id="contentSub"<?php $this->html( 'userlangattributes' ) ?>><?php
+ $this->html( 'subtitle' )
+ ?></div>
<?php
if ( $this->data['undelete'] ) {
?>
@@ -142,13 +148,12 @@ class VectorTemplate extends BaseTemplate {
<?php $this->msg( 'jumpto' ) ?>
<a href="#mw-head"><?php
$this->msg( 'jumptonavigation' )
- ?></a><?php
- $this->msg( 'comma-separator' )
- ?>
+ ?></a><?php $this->msg( 'comma-separator' ) ?>
<a href="#p-search"><?php $this->msg( 'jumptosearch' ) ?></a>
</div>
- <?php $this->html( 'bodycontent' ) ?>
<?php
+ $this->html( 'bodycontent' );
+
if ( $this->data['printfooter'] ) {
?>
<div class="printfooter">
@@ -156,23 +161,13 @@ class VectorTemplate extends BaseTemplate {
</div>
<?php
}
- ?>
- <?php
+
if ( $this->data['catlinks'] ) {
- ?>
- <?php
$this->html( 'catlinks' );
- ?>
- <?php
}
- ?>
- <?php
+
if ( $this->data['dataAfterContent'] ) {
- ?>
- <?php
$this->html( 'dataAfterContent' );
- ?>
- <?php
}
?>
<div class="visualClear"></div>
@@ -204,19 +199,11 @@ class VectorTemplate extends BaseTemplate {
<?php
foreach ( $this->getFooterLinks() as $category => $links ) {
?>
- <ul id="footer-<?php
- echo $category
- ?>">
+ <ul id="footer-<?php echo $category ?>">
<?php
foreach ( $links as $link ) {
?>
- <li id="footer-<?php
- echo $category
- ?>-<?php
- echo $link
- ?>"><?php
- $this->html( $link )
- ?></li>
+ <li id="footer-<?php echo $category ?>-<?php echo $link ?>"><?php $this->html( $link ) ?></li>
<?php
}
?>
@@ -231,16 +218,10 @@ class VectorTemplate extends BaseTemplate {
<?php
foreach ( $footericons as $blockName => $footerIcons ) {
?>
- <li id="footer-<?php
- echo htmlspecialchars( $blockName ); ?>ico">
+ <li id="footer-<?php echo htmlspecialchars( $blockName ); ?>ico">
<?php
foreach ( $footerIcons as $icon ) {
- ?>
- <?php
echo $this->getSkin()->makeFooterIcon( $icon );
- ?>
-
- <?php
}
?>
</li>
@@ -314,17 +295,14 @@ class VectorTemplate extends BaseTemplate {
$msg = $name;
}
$msgObj = wfMessage( $msg );
+ $labelId = Sanitizer::escapeId( "p-$name-label" );
?>
<div class="portal" role="navigation" id='<?php
echo Sanitizer::escapeId( "p-$name" )
?>'<?php
echo Linker::tooltip( 'p-' . $name )
- ?> aria-labelledby='<?php echo Sanitizer::escapeId( "p-$name-label" ) ?>'>
- <h3<?php
- $this->html( 'userlangattributes' )
- ?> id='<?php
- echo Sanitizer::escapeId( "p-$name-label" )
- ?>'><?php
+ ?> aria-labelledby='<?php echo $labelId ?>'>
+ <h3<?php $this->html( 'userlangattributes' ) ?> id='<?php echo $labelId ?>'><?php
echo htmlspecialchars( $msgObj->exists() ? $msgObj->text() : $msg );
?></h3>
@@ -335,20 +313,15 @@ class VectorTemplate extends BaseTemplate {
<ul>
<?php
foreach ( $content as $key => $val ) {
- ?>
- <?php echo $this->makeListItem( $key, $val ); ?>
-
- <?php
+ echo $this->makeListItem( $key, $val );
}
if ( $hook !== null ) {
- wfRunHooks( $hook, array( &$this, true ) );
+ Hooks::run( $hook, array( &$this, true ) );
}
?>
</ul>
<?php
} else {
- ?>
- <?php
echo $content; /* Allow raw HTML block to be defined by extensions */
}
@@ -389,12 +362,13 @@ class VectorTemplate extends BaseTemplate {
<?php
foreach ( $this->data['namespace_urls'] as $link ) {
?>
- <li <?php
- echo $link['attributes']
- ?>><span><a href="<?php
+ <li <?php echo $link['attributes'] ?>><span><a href="<?php
echo htmlspecialchars( $link['href'] )
?>" <?php
- echo $link['key']
+ echo $link['key'];
+ if ( isset ( $link['rel'] ) ) {
+ echo ' rel="' . htmlspecialchars( $link['rel'] ) . '"';
+ }
?>><?php
echo htmlspecialchars( $link['text'] )
?></a></span></li>
@@ -422,16 +396,16 @@ class VectorTemplate extends BaseTemplate {
}
}
?>
- <h3 id="p-variants-label"><span><?php echo htmlspecialchars( $variantLabel ) ?></span><a href="#"></a></h3>
+ <h3 id="p-variants-label">
+ <span><?php echo htmlspecialchars( $variantLabel ) ?></span><a href="#"></a>
+ </h3>
<div class="menu">
<ul>
<?php
foreach ( $this->data['variant_urls'] as $link ) {
?>
- <li<?php
- echo $link['attributes']
- ?>><a href="<?php
+ <li<?php echo $link['attributes'] ?>><a href="<?php
echo htmlspecialchars( $link['href'] )
?>" lang="<?php
echo htmlspecialchars( $link['lang'] )
@@ -458,15 +432,11 @@ class VectorTemplate extends BaseTemplate {
}
?>" aria-labelledby="p-views-label">
<h3 id="p-views-label"><?php $this->msg( 'views' ) ?></h3>
- <ul<?php
- $this->html( 'userlangattributes' )
- ?>>
+ <ul<?php $this->html( 'userlangattributes' ) ?>>
<?php
foreach ( $this->data['view_urls'] as $link ) {
?>
- <li<?php
- echo $link['attributes']
- ?>><span><a href="<?php
+ <li<?php echo $link['attributes'] ?>><span><a href="<?php
echo htmlspecialchars( $link['href'] )
?>" <?php
echo $link['key'];
@@ -504,9 +474,7 @@ class VectorTemplate extends BaseTemplate {
<?php
foreach ( $this->data['action_urls'] as $link ) {
?>
- <li<?php
- echo $link['attributes']
- ?>>
+ <li<?php echo $link['attributes'] ?>>
<a href="<?php
echo htmlspecialchars( $link['href'] )
?>" <?php
@@ -548,17 +516,7 @@ class VectorTemplate extends BaseTemplate {
</h3>
<form action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
- <?php
- if ( $this->config->get( 'VectorUseSimpleSearch' ) ) {
- ?>
- <div id="simpleSearch">
- <?php
- } else {
- ?>
- <div>
- <?php
- }
- ?>
+ <div<?php echo $this->config->get( 'VectorUseSimpleSearch' ) ? ' id="simpleSearch"' : '' ?>>
<?php
echo $this->makeSearchInput( array( 'id' => 'searchInput' ) );
echo Html::hidden( 'title', $this->get( 'searchtitle' ) );
@@ -582,7 +540,7 @@ class VectorTemplate extends BaseTemplate {
array( 'id' => 'searchButton', 'class' => 'searchButton' )
);
?>
- </div>
+ </div>
</form>
</div>
<?php