adjust layout, move search box

2 files changed, 22 insertions, 4 deletions

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 -->
diff --git a/skins/vector/main-ltr.css b/skins/vector/main-ltr.css
index 78dd1e2..03426fe 100644
--- a/skins/vector/main-ltr.css
+++ b/skins/vector/main-ltr.css
@@ -95,11 +95,11 @@ body {
 	#left-navigation {
 		position: absolute;
 		left: 10em;
-		top: 2.5em;
+		top: 2em;
 	}
 	#right-navigation {
 		float: right;
-		margin-top: 2.5em;
+		margin-top: 2em;
 	}
 	/* Navigation Labels */
 	div.vectorTabs h5,
@@ -387,7 +387,7 @@ body {
 /* Panel */
 #mw-panel {
 	position: absolute;
-	top: 160px;
+	top: 2.3em;
 	padding-top: 1em;
 	width: 10em;
 	left: 0;