Merge "VectorTemplate: Some consistency in mixed PHP/HTML formatting"
This commit is contained in:
commit
068a68bffa
@ -59,7 +59,6 @@ class VectorTemplate extends BaseTemplate {
|
||||
<div id="mw-head-base" class="noprint"></div>
|
||||
<div id="content" class="mw-body" role="main">
|
||||
<a id="top"></a>
|
||||
|
||||
<?php
|
||||
if ( $this->data['sitenotice'] ) {
|
||||
?>
|
||||
@ -137,7 +136,6 @@ class VectorTemplate extends BaseTemplate {
|
||||
</div>
|
||||
<div id="mw-navigation">
|
||||
<h2><?php $this->msg( 'navigation-heading' ) ?></h2>
|
||||
|
||||
<div id="mw-head">
|
||||
<?php $this->renderNavigation( 'PERSONAL' ); ?>
|
||||
<div id="left-navigation">
|
||||
@ -193,7 +191,7 @@ class VectorTemplate extends BaseTemplate {
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
<div style="clear:both"></div>
|
||||
<div style="clear: both;"></div>
|
||||
</div>
|
||||
<?php $this->printTrail(); ?>
|
||||
|
||||
@ -266,7 +264,6 @@ class VectorTemplate extends BaseTemplate {
|
||||
<h3<?php $this->html( 'userlangattributes' ) ?> id='<?php echo $labelId ?>'><?php
|
||||
echo htmlspecialchars( $msgObj->exists() ? $msgObj->text() : $msg );
|
||||
?></h3>
|
||||
|
||||
<div class="body">
|
||||
<?php
|
||||
if ( is_array( $content ) ) {
|
||||
@ -322,9 +319,9 @@ class VectorTemplate extends BaseTemplate {
|
||||
<ul<?php $this->html( 'userlangattributes' ) ?>>
|
||||
<?php
|
||||
foreach ( $this->data['namespace_urls'] as $key => $item ) {
|
||||
echo "\t\t\t\t\t\t\t" . $this->makeListItem( $key, $item, [
|
||||
echo $this->makeListItem( $key, $item, [
|
||||
'vector-wrap' => true,
|
||||
] ) . "\n";
|
||||
] );
|
||||
}
|
||||
?>
|
||||
</ul>
|
||||
@ -351,12 +348,11 @@ class VectorTemplate extends BaseTemplate {
|
||||
<h3 id="p-variants-label">
|
||||
<span><?php echo htmlspecialchars( $variantLabel ) ?></span>
|
||||
</h3>
|
||||
|
||||
<div class="menu">
|
||||
<ul>
|
||||
<?php
|
||||
foreach ( $this->data['variant_urls'] as $key => $item ) {
|
||||
echo "\t\t\t\t\t\t\t\t" . $this->makeListItem( $key, $item ) . "\n";
|
||||
echo $this->makeListItem( $key, $item );
|
||||
}
|
||||
?>
|
||||
</ul>
|
||||
@ -375,10 +371,10 @@ class VectorTemplate extends BaseTemplate {
|
||||
<ul<?php $this->html( 'userlangattributes' ) ?>>
|
||||
<?php
|
||||
foreach ( $this->data['view_urls'] as $key => $item ) {
|
||||
echo "\t\t\t\t\t\t\t" . $this->makeListItem( $key, $item, [
|
||||
echo $this->makeListItem( $key, $item, [
|
||||
'vector-wrap' => true,
|
||||
'vector-collapsible' => true,
|
||||
] ) . "\n";
|
||||
] );
|
||||
}
|
||||
?>
|
||||
</ul>
|
||||
@ -395,12 +391,11 @@ class VectorTemplate extends BaseTemplate {
|
||||
<h3 id="p-cactions-label"><span><?php
|
||||
$this->msg( 'vector-more-actions' )
|
||||
?></span></h3>
|
||||
|
||||
<div class="menu">
|
||||
<ul<?php $this->html( 'userlangattributes' ) ?>>
|
||||
<?php
|
||||
foreach ( $this->data['action_urls'] as $key => $item ) {
|
||||
echo "\t\t\t\t\t\t\t\t" . $this->makeListItem( $key, $item ) . "\n";
|
||||
echo $this->makeListItem( $key, $item );
|
||||
}
|
||||
?>
|
||||
</ul>
|
||||
@ -454,7 +449,6 @@ class VectorTemplate extends BaseTemplate {
|
||||
<h3<?php $this->html( 'userlangattributes' ) ?>>
|
||||
<label for="searchInput"><?php $this->msg( 'search' ) ?></label>
|
||||
</h3>
|
||||
|
||||
<form action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
|
||||
<div<?php echo $this->config->get( 'VectorUseSimpleSearch' ) ? ' id="simpleSearch"' : '' ?>>
|
||||
<?php
|
||||
|
Loading…
Reference in New Issue
Block a user