From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Tue, 21 Jul 2009 22:03:31 +0000 (+0000)
Subject: Fixed text wrapping problem, which was being solved in langues with spaces between... 
X-Git-Tag: 1.31.0-rc.0~40778
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=53acbec0feec76a9843527e793843a03ee7426bb;p=lhc%2Fweb%2Fwiklou.git

Fixed text wrapping problem, which was being solved in langues with spaces between words by changing them to &nbsp; (dirty hack) but was not fixed in languages without them such as Chinese. This does it with CSS (how it should have been done originally).
---

diff --git a/skins/Vector.php b/skins/Vector.php
index 2a8855c47d..89b8239615 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -717,7 +717,7 @@ class VectorTemplate extends QuickTemplate {
 	<div class="menu">
 		<ul <?php $this->html('userlangattributes') ?>>
 			<?php foreach ($this->data['variant_urls'] as $key => $link ): ?>
-				<li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo str_replace( ' ', '&nbsp;', htmlspecialchars( $link['text'] ) ) ?></a></li>
+				<li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
 			<?php endforeach; ?>
 		</ul>
 	</div>
@@ -747,7 +747,7 @@ class VectorTemplate extends QuickTemplate {
 	<div class="menu">
 		<ul <?php $this->html('userlangattributes') ?>>
 			<?php foreach ($this->data['action_urls'] as $key => $link ): ?>
-				<li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo str_replace( ' ', '&nbsp;', htmlspecialchars( $link['text'] ) ) ?></a></li>
+				<li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
 			<?php endforeach; ?>
 		</ul>
 	</div>
diff --git a/skins/vector/main-ltr.css b/skins/vector/main-ltr.css
index 6b0527e6e0..d45152bceb 100644
--- a/skins/vector/main-ltr.css
+++ b/skins/vector/main-ltr.css
@@ -269,6 +269,7 @@ body {
 	div.vectorMenu li a {
 		display: inline-block;
 		padding: 0.5em;
+		white-space: nowrap;
 	}
 	/* IGNORED BY IE6 */
 	div.vectorMenu li > a {
diff --git a/skins/vector/main-rtl.css b/skins/vector/main-rtl.css
index 0b0c79b711..03980c4926 100644
--- a/skins/vector/main-rtl.css
+++ b/skins/vector/main-rtl.css
@@ -269,6 +269,7 @@ body {
 	div.vectorMenu li a {
 		display: inline-block;
 		padding: 0.5em;
+		white-space: nowrap;
 	}
 	/* IGNORED BY IE6 */
 	div.vectorMenu li > a {