From 3bc9b46079d7a20d54c4109106e671826cf6620f Mon Sep 17 00:00:00 2001
From: Danny B <danny_b@users.mediawiki.org>
Date: Mon, 19 Jul 2010 10:52:01 +0000
Subject: [PATCH] * (bug 24401) SimpleSearch: No button/text indicating
 'Search' if image is disabled

---
 RELEASE-NOTES             |  1 +
 skins/Vector.php          |  2 +-
 skins/vector/main-ltr.css | 14 ++++++++------
 skins/vector/main-rtl.css | 14 ++++++++------
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9767f007b3..f90094711f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -242,6 +242,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 24244) Updated comments in DefaultSettings.php to reflect Image: --> File:
   namespace rename.
 * Make wfTimestamp recognize negative unix timestamp values.
+* (bug 24401) SimpleSearch: No button/text indicating 'Search' if image is disabled
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent.
diff --git a/skins/Vector.php b/skins/Vector.php
index b638a59b0a..86bed7e31a 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -771,7 +771,7 @@ class VectorTemplate extends QuickTemplate {
 		<?php if ( $wgVectorUseSimpleSearch && $wgUser->getOption( 'vector-simplesearch' ) ): ?>
 		<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' ); ?>>&#160;</button>
+			<button id="searchButton" type='submit' name='button' <?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?>><img src="<?php echo $wgStylePath . '/vector/search-' . ( $wgContLang->isRTL() ? 'rtl' : 'ltr' ) . '.png?' . $wgStyleVersion ?>" alt="<?php $this->msg( 'searchbutton' ) ?>" /></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; ?> />
diff --git a/skins/vector/main-ltr.css b/skins/vector/main-ltr.css
index 0fd42a9c21..180dc9a9c3 100644
--- a/skins/vector/main-ltr.css
+++ b/skins/vector/main-ltr.css
@@ -383,15 +383,17 @@ div#mw-head h5 {
 	/* OVERRIDDEN BY COMPLIANT BROWSERS */
 	div#simpleSearch button#searchButton {
 		padding: 0;
-		margin: 5px 5px 0 5px;
-		height: 13px;
-		width: 12px;
+		margin: 0 5px;
 		border: none;
 		cursor: pointer;
 		background-color: transparent;
-		background-image: url(images/search-ltr.png?1);
-		background-position: center center;
-		background-repeat: no-repeat;
+		font-size: x-small;
+	}
+	div#simpleSearch button#searchButton img {
+		border: none;
+		margin: 0;
+		padding: 0;
+		vertical-align: middle;
 	}
 /* Panel */
 div#mw-panel {
diff --git a/skins/vector/main-rtl.css b/skins/vector/main-rtl.css
index 32bccf9b83..22f2ea7023 100644
--- a/skins/vector/main-rtl.css
+++ b/skins/vector/main-rtl.css
@@ -383,15 +383,17 @@ div#mw-head h5 {
 	/* OVERRIDDEN BY COMPLIANT BROWSERS */
 	div#simpleSearch button#searchButton {
 		padding: 0;
-		margin: 5px 5px 0 5px;
-		height: 13px;
-		width: 12px;
+		margin: 0 5px;
 		border: none;
 		cursor: pointer;
 		background-color: transparent;
-		background-image: url(images/search-rtl.png?1);
-		background-position: center center;
-		background-repeat: no-repeat;
+		font-size: x-small;
+	}
+	div#simpleSearch button#searchButton img {
+		border: none;
+		margin: 0;
+		padding: 0;
+		vertical-align: middle;
 	}
 /* Panel */
 div#mw-panel {
-- 
2.20.1