From ea2276324c8c0c057fb530000b0aa2df7c37ac65 Mon Sep 17 00:00:00 2001
From: Romain d'Alverny <rda@mageia.org>
Date: Sat, 30 Jun 2012 15:10:19 +0000
Subject: adjust layout, move search box

---
 skins/Vector.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'skins/Vector.php')

diff --git a/skins/Vector.php b/skins/Vector.php
index 0a7c74a..3c59015 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -455,9 +455,27 @@ class VectorTemplate extends QuickTemplate {
             left: 0;
             width: 100%;
         }
+        #mgnavt-search {
+            position: absolute;
+            top: 80px;
+            right: 10px;
+        }
         </style>
         <header id="mgnavt">
             <h1><a href="/en/">Wiki</a> &raquo; <?php $this->text('title')?></h1>
+            <form action="<?php $this->text( 'wgScript' ) ?>" id="mgnavt-search">
+                <input type='hidden' name="title" value="<?php $this->text( 'searchtitle' ) ?>"/>
+                <?php if ( $wgVectorUseSimpleSearch ): ?>
+                    <div id="simpleSearch">
+                        <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; ?> />
+                        <button id="searchButton" type='submit' name='button' <?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?>>&nbsp;</button>
+                    </div>
+                    <?php else: ?>
+                    <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' ); ?> />
+                    <input type="submit" name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg( 'searchbutton' ) ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> />
+                    <?php endif; ?>
+            </form>
         </header>
         <div id="mga-body">
 		<div id="mw-page-base" class="noprint"></div>
@@ -525,7 +543,7 @@ class VectorTemplate extends QuickTemplate {
 				<?php $this->renderNavigation( array( 'NAMESPACES', 'VARIANTS' ) ); ?>
 			</div>
 			<div id="right-navigation">
-				<?php $this->renderNavigation( array( 'VIEWS', 'ACTIONS', 'SEARCH' ) ); ?>
+				<?php $this->renderNavigation( array( 'VIEWS', 'ACTIONS' ) ); ?>
 			</div>
 		</div>
 		<!-- /header -->
-- 
cgit v1.2.1