From 7b92d5ebf848e17bf20289edcd602cc9c0b02d7f Mon Sep 17 00:00:00 2001
From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Tue, 14 Jul 2009 21:53:57 +0000
Subject: [PATCH] Added optional simplified search in header configured
 using$wgVectorUseSimpleSearch.

---
 skins/Vector.php               |  11 +++++++----
 skins/vector/images/search.png | Bin 0 -> 458 bytes
 skins/vector/main-ltr.css      |  11 +++++++++++
 skins/vector/main-rtl.css      |   4 ++++
 4 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 skins/vector/images/search.png

diff --git a/skins/Vector.php b/skins/Vector.php
index 6bd2cbf874..f9f1c09ed2 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -682,7 +682,7 @@ class VectorTemplate extends QuickTemplate {
 	 * when UI is in RTL mode
 	 */
 	private function renderNavigation( $elements ) {
-		global $wgContLang, $wgUseTwoButtonsSearchForm;
+		global $wgContLang, $wgVectorUseSimpleSearch, $wgStylePath;
 		
 		// If only one element was given, wrap it in an array, allowing more
 		// flexible arguments
@@ -776,12 +776,15 @@ class VectorTemplate extends QuickTemplate {
 	<h5 <?php $this->html('userlangattributes') ?>><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h5>
 	<form action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
 		<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; ?> />
+			<input  id="searchButton" type='image' name='fulltext' src="<?php echo $wgStylePath ?>/vector/images/search.png" <?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> align="top" />
+		</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' ); ?> />
-		<?php if ( $wgUseTwoButtonsSearchForm ): ?>
 		<input type="submit" name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg( 'searchbutton' ) ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> />
-		<?php else: ?>
-		<div><a href="<?php $this->text( 'searchaction' ) ?>" rel="search"><?php $this->msg( 'powersearch-legend' ) ?></a></div>
 		<?php endif; ?>
 	</form>
 </div>
diff --git a/skins/vector/images/search.png b/skins/vector/images/search.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb1a13f2dccb5f788462f2896328cf26b3b3e182
GIT binary patch
literal 458
zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{3?%2B3|#`GBuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrH1%B?S0{xcd0}zj^cK)TxuZcJ0`D=H=C^SBp!EnpWLDboE{D
zwr6eatrK^>u32!hq<zkequ=&le5I{#v}X5(>C1M+rDmp;b$G?(H#F7R*gH<y|Dj{U
z!>z|3&YM5?{)77q_CDEn?)m4>pD*mm2msopP!i-9{2xDHh>4MY3sif>)5S5Q;#SIq
z+v}PYL|iYjimdJ0)hfmn_v8P59dTRr-1I}t$}ET6&UhxS6`gd{c*)ka1^tCBub=Ke
zb?jw<jC%w_<;!aqimo&rEPLf;b=oGqZS5|}$xq%~_{vwX{PMTBS<fF-ghsuqZ<T#?
zWyAaJH9xkMuibSe^Zo8w-`B3z`siUX#cKVEePY!?cR!p`HRWBcb$7FD++`D0xz2cd
zv6gKs%&!!e`MNjE^IAFaPS%>K%iVS|@x7?b@tG`H>d{j?kNt4tnU49Q_x5ew@aN)*
gv#07zzl$X><n$?Tp4R$oGSGhvp00i_>zopr0OjuOkN^Mx

literal 0
HcmV?d00001

diff --git a/skins/vector/main-ltr.css b/skins/vector/main-ltr.css
index 3c2e37c59d..7af633a12b 100644
--- a/skins/vector/main-ltr.css
+++ b/skins/vector/main-ltr.css
@@ -292,6 +292,17 @@ div#head h5 {
 		margin: 0;
 		margin-top: 0.4em;
 	}
+	div#p-search div#simpleSearch input#searchInput {
+		margin-top: 0.125em;
+		border: solid 1px #AAAAAA;
+		height: 1.25em;
+		width: 10em;
+		padding: 0.5em;
+	}
+	div#p-search div#simpleSearch input#searchButton {
+		border: none;
+		margin-left: 0.25em;
+	}
 /* Panel */
 div#panel {
 	position: absolute;
diff --git a/skins/vector/main-rtl.css b/skins/vector/main-rtl.css
index 504a264f8d..6c1e4b93dd 100644
--- a/skins/vector/main-rtl.css
+++ b/skins/vector/main-rtl.css
@@ -292,6 +292,10 @@ div#head h5 {
 		margin: 0;
 		margin-top: 0.4em;
 	}
+	div#p-search input#searchButton {
+		border: none;
+		margin-right: 0.25em;
+	}
 /* Panel */
 div#panel {
 	position: absolute;
-- 
2.20.1