From 1ab2670c1038f4339d2cc541569624dcf971c158 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sat, 9 Apr 2011 10:03:41 +0000
Subject: [PATCH] no wrap for labels of extended input elements

---
 lam/lib/html.inc         | 14 ++++++++++++++
 lam/style/500_layout.css |  8 ++++++++
 2 files changed, 22 insertions(+)

diff --git a/lam/lib/html.inc b/lam/lib/html.inc
index 4a38ae2f..c2969562 100644
--- a/lam/lib/html.inc
+++ b/lam/lib/html.inc
@@ -480,12 +480,14 @@ class htmlTableExtendedInputField extends htmlInputField {
 	 */
 	function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
 		// print label text
+		echo '<div class="nowrap">';
 		echo $this->label;
 		if ($this->required) {
 			$graphicsPath = "../../graphics";
 			if (is_dir("../graphics")) $graphicsPath = "../graphics";
 			echo '<img src="' . $graphicsPath . '/required.png" alt="required" width=16 height=16 title="' . _('required') . '">';
 		}
+		echo '</div>';
 		echo "\n</td>\n<td>\n";
 		// print input field
 		$return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope);
@@ -1009,7 +1011,9 @@ class htmlTableExtendedSelect extends htmlSelect {
 	 * @return array List of input field names and their type (name => type)
 	 */
 	function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
+		echo '<div class="nowrap">';
 		echo $this->label;
+		echo '</div>';
 		echo "\n</td>\n<td>\n";
 		$return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope);
 		// print help link
@@ -1140,7 +1144,9 @@ class htmlTableExtendedRadio extends htmlRadio {
 	 * @return array List of input field names and their type (name => type)
 	 */
 	function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
+		echo '<div class="nowrap">';
 		echo $this->label;
+		echo '</div>';
 		echo "\n</td>\n<td>\n";
 		$return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope);
 		// print help link
@@ -1346,14 +1352,18 @@ class htmlTableExtendedInputCheckbox extends htmlInputCheckbox {
 	 */
 	function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
 		if ($this->labelFirst) {
+			echo '<div class="nowrap">';
 			echo $this->label;
+			echo '</div>';
 			echo "\n</td>\n<td>\n";
 			$return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope);
 		}
 		else {
 			$return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope);
 			echo "\n</td>\n<td>\n";
+			echo '<div class="nowrap">';
 			echo $this->label;
+			echo '</div>';
 		}
 		// print help link
 		if ($this->helpID != null) {
@@ -1457,7 +1467,9 @@ class htmlTableExtendedInputFileUpload extends htmlInputFileUpload {
 	 * @return array List of input field names and their type (name => type)
 	 */
 	function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
+		echo '<div class="nowrap">';
 		echo $this->label;
+		echo '</div>';
 		echo "\n</td>\n<td>\n";
 		$return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope);
 		// print help link
@@ -1584,12 +1596,14 @@ class htmlTableExtendedInputTextarea extends htmlInputTextarea {
 	 * @return array List of input field names and their type (name => type)
 	 */
 	function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
+		echo '<div class="nowrap">';
 		echo $this->label;
 		if ($this->required) {
 			$graphicsPath = "../../graphics";
 			if (is_dir("../graphics")) $graphicsPath = "../graphics";
 			echo '<img src="' . $graphicsPath . '/required.png" alt="required" width=16 height=16 title="' . _('required') . '">';
 		}
+		echo '</div>';
 		echo "\n</td>\n<td>\n";
 		$return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope);
 		// print help link
diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css
index d531f8f0..75a53309 100644
--- a/lam/style/500_layout.css
+++ b/lam/style/500_layout.css
@@ -39,6 +39,10 @@ body {
   background-color:#F5F5F5;
 }
 
+.defaultBackground {
+  background-color:#F5F5F5;
+}
+
 /* links */
 a {
 color: blue;
@@ -180,6 +184,10 @@ tr.highlight {
 	display: none;
 }
 
+.nowrap {
+	white-space: nowrap;
+}
+
 /**
  * table style for delete.php
  *