summaryrefslogtreecommitdiffstats
path: root/skins
diff options
context:
space:
mode:
Diffstat (limited to 'skins')
-rw-r--r--skins/Vector/VectorTemplate.php67
1 files changed, 36 insertions, 31 deletions
diff --git a/skins/Vector/VectorTemplate.php b/skins/Vector/VectorTemplate.php
index 8ffd626..3372efe 100644
--- a/skins/Vector/VectorTemplate.php
+++ b/skins/Vector/VectorTemplate.php
@@ -119,6 +119,40 @@ class VectorTemplate extends BaseTemplate {
}
#right-navigation { margin-right: 100px; }
</style>
+ <header id="mgnavt">
+ <h1 id="firstHeading" class="firstHeading" lang="<?php $this->text( 'pageLanguage' ); ?>"><a href="/en/">Wiki</a> &raquo; <?php
+ $this->html( 'title' )
+ ?></h1>
+
+ <form action="<?php $this->text( 'wgScript' ) ?>" id="mgnavt-search">
+ <div<?php echo $this->config->get( 'VectorUseSimpleSearch' ) ? ' id="simpleSearch"' : '' ?>>
+ <?php
+ echo $this->makeSearchInput( [ 'id' => 'searchInput' ] );
+ echo Html::hidden( 'title', $this->get( 'searchtitle' ) );
+ // We construct two buttons (for 'go' and 'fulltext' search modes),
+ // but only one will be visible and actionable at a time (they are
+ // overlaid on top of each other in CSS).
+ // * Browsers will use the 'fulltext' one by default (as it's the
+ // first in tree-order), which is desirable when they are unable
+ // to show search suggestions (either due to being broken or
+ // having JavaScript turned off).
+ // * The mediawiki.searchSuggest module, after doing tests for the
+ // broken browsers, removes the 'fulltext' button and handles
+ // 'fulltext' search itself; this will reveal the 'go' button and
+ // cause it to be used.
+ echo $this->makeSearchButton(
+ 'fulltext',
+ [ 'id' => 'mw-searchButton', 'class' => 'searchButton mw-fallbackSearchButton' ]
+ );
+ echo $this->makeSearchButton(
+ 'go',
+ [ 'id' => 'searchButton', 'class' => 'searchButton' ]
+ );
+ ?>
+ </div>
+ </form>
+ </header>
+ <div id=mga-body">
<div id="mw-page-base" class="noprint"></div>
<div id="mw-head-base" class="noprint"></div>
<div id="content" class="mw-body" role="main">
@@ -138,9 +172,6 @@ class VectorTemplate extends BaseTemplate {
// 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->text( 'pageLanguage' ); ?>"><?php
- $this->html( 'title' )
- ?></h1>
<?php
} ?>
<?php $this->html( 'prebodyhtml' ) ?>
@@ -259,8 +290,9 @@ class VectorTemplate extends BaseTemplate {
?>
<div style="clear:both"></div>
</div>
+ </div><!-- mga-body -->
<?php $this->printTrail(); ?>
-
+ <script src="//nav.mageia.org/js/"></script>
</body>
</html>
<?php
@@ -571,33 +603,6 @@ class VectorTemplate extends BaseTemplate {
<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
- echo $this->makeSearchInput( [ 'id' => 'searchInput' ] );
- echo Html::hidden( 'title', $this->get( 'searchtitle' ) );
- // We construct two buttons (for 'go' and 'fulltext' search modes),
- // but only one will be visible and actionable at a time (they are
- // overlaid on top of each other in CSS).
- // * Browsers will use the 'fulltext' one by default (as it's the
- // first in tree-order), which is desirable when they are unable
- // to show search suggestions (either due to being broken or
- // having JavaScript turned off).
- // * The mediawiki.searchSuggest module, after doing tests for the
- // broken browsers, removes the 'fulltext' button and handles
- // 'fulltext' search itself; this will reveal the 'go' button and
- // cause it to be used.
- echo $this->makeSearchButton(
- 'fulltext',
- [ 'id' => 'mw-searchButton', 'class' => 'searchButton mw-fallbackSearchButton' ]
- );
- echo $this->makeSearchButton(
- 'go',
- [ 'id' => 'searchButton', 'class' => 'searchButton' ]
- );
- ?>
- </div>
- </form>
</div>
<?php