From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Thu, 16 Dec 2010 19:02:43 +0000 (+0000)
Subject: Fixed RTL errors for SimpleSearch
X-Git-Tag: 1.31.0-rc.0~33263
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=6171dbac81de8b9e80a8d5eba3a5d7e43c63a325;p=lhc%2Fweb%2Fwiklou.git

Fixed RTL errors for SimpleSearch
---

diff --git a/skins/Vector.php b/skins/Vector.php
index 77acefe2c9..8b4a92adfb 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -702,9 +702,13 @@ class VectorTemplate extends BaseTemplate {
 		<input type='hidden' name="title" value="<?php $this->text( 'searchtitle' ) ?>"/>
 		<?php if ( $wgVectorUseSimpleSearch && $wgUser->getOption( 'vector-simplesearch' ) ): ?>
 		<div id="simpleSearch">
+			<?php if ( $this->data['rtl'] ): ?>
+			<?php echo $this->makeSearchButton("image", array( "id" => "searchButton", "src" => $this->skin->getSkinStylePath('images/search-rtl.png') )); ?>
+			<?php endif; ?>
 			<?php echo $this->makeSearchInput(array( "id" => "searchInput", "type" => "text" )); ?>
-			<?php echo $this->makeSearchButton("image", array( "id" => "searchButton",
-				"src" => $this->skin->getSkinStylePath('images/search-' . ( $this->data['rtl'] ? 'rtl' : 'ltr' ) . '.png') )); ?>
+			<?php if ( !$this->data['rtl'] ): ?>
+			<?php echo $this->makeSearchButton("image", array( "id" => "searchButton", "src" => $this->skin->getSkinStylePath('images/search-ltr.png') )); ?>
+			<?php endif; ?>
 		</div>
 		<?php else: ?>
 		<?php echo $this->makeSearchInput(array( "id" => "searchInput" )); ?>
diff --git a/skins/vector/screen.css b/skins/vector/screen.css
index fa8cb89635..a28a8c2094 100644
--- a/skins/vector/screen.css
+++ b/skins/vector/screen.css
@@ -388,6 +388,7 @@ div#mw-head h5 {
 		font-size: 13px;
 		width: 14em;
 		background-color: transparent;
+		direction: ltr;
 	}
 	/* OVERRIDDEN BY COMPLIANT BROWSERS */
 	div#simpleSearch button#searchButton {