no wrap for labels of extended input elements

This commit is contained in:
Roland Gruber 2011-04-09 10:03:41 +00:00
parent 9c6738c085
commit 1ab2670c10
2 changed files with 22 additions and 0 deletions

View File

@ -480,12 +480,14 @@ class htmlTableExtendedInputField extends htmlInputField {
*/ */
function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) { function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
// print label text // print label text
echo '<div class="nowrap">';
echo $this->label; echo $this->label;
if ($this->required) { if ($this->required) {
$graphicsPath = "../../graphics"; $graphicsPath = "../../graphics";
if (is_dir("../graphics")) $graphicsPath = "../graphics"; if (is_dir("../graphics")) $graphicsPath = "../graphics";
echo '<img src="' . $graphicsPath . '/required.png" alt="required" width=16 height=16 title="' . _('required') . '">'; echo '<img src="' . $graphicsPath . '/required.png" alt="required" width=16 height=16 title="' . _('required') . '">';
} }
echo '</div>';
echo "\n</td>\n<td>\n"; echo "\n</td>\n<td>\n";
// print input field // print input field
$return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope); $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) * @return array List of input field names and their type (name => type)
*/ */
function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) { function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
echo '<div class="nowrap">';
echo $this->label; echo $this->label;
echo '</div>';
echo "\n</td>\n<td>\n"; echo "\n</td>\n<td>\n";
$return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope); $return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope);
// print help link // print help link
@ -1140,7 +1144,9 @@ class htmlTableExtendedRadio extends htmlRadio {
* @return array List of input field names and their type (name => type) * @return array List of input field names and their type (name => type)
*/ */
function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) { function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
echo '<div class="nowrap">';
echo $this->label; echo $this->label;
echo '</div>';
echo "\n</td>\n<td>\n"; echo "\n</td>\n<td>\n";
$return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope); $return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope);
// print help link // print help link
@ -1346,14 +1352,18 @@ class htmlTableExtendedInputCheckbox extends htmlInputCheckbox {
*/ */
function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) { function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
if ($this->labelFirst) { if ($this->labelFirst) {
echo '<div class="nowrap">';
echo $this->label; echo $this->label;
echo '</div>';
echo "\n</td>\n<td>\n"; echo "\n</td>\n<td>\n";
$return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope); $return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope);
} }
else { else {
$return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope); $return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope);
echo "\n</td>\n<td>\n"; echo "\n</td>\n<td>\n";
echo '<div class="nowrap">';
echo $this->label; echo $this->label;
echo '</div>';
} }
// print help link // print help link
if ($this->helpID != null) { if ($this->helpID != null) {
@ -1457,7 +1467,9 @@ class htmlTableExtendedInputFileUpload extends htmlInputFileUpload {
* @return array List of input field names and their type (name => type) * @return array List of input field names and their type (name => type)
*/ */
function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) { function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
echo '<div class="nowrap">';
echo $this->label; echo $this->label;
echo '</div>';
echo "\n</td>\n<td>\n"; echo "\n</td>\n<td>\n";
$return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope); $return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope);
// print help link // print help link
@ -1584,12 +1596,14 @@ class htmlTableExtendedInputTextarea extends htmlInputTextarea {
* @return array List of input field names and their type (name => type) * @return array List of input field names and their type (name => type)
*/ */
function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) { function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
echo '<div class="nowrap">';
echo $this->label; echo $this->label;
if ($this->required) { if ($this->required) {
$graphicsPath = "../../graphics"; $graphicsPath = "../../graphics";
if (is_dir("../graphics")) $graphicsPath = "../graphics"; if (is_dir("../graphics")) $graphicsPath = "../graphics";
echo '<img src="' . $graphicsPath . '/required.png" alt="required" width=16 height=16 title="' . _('required') . '">'; echo '<img src="' . $graphicsPath . '/required.png" alt="required" width=16 height=16 title="' . _('required') . '">';
} }
echo '</div>';
echo "\n</td>\n<td>\n"; echo "\n</td>\n<td>\n";
$return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope); $return = parent::generateHTML($module, $input, $values, $restricted, $tabindex, $scope);
// print help link // print help link

View File

@ -39,6 +39,10 @@ body {
background-color:#F5F5F5; background-color:#F5F5F5;
} }
.defaultBackground {
background-color:#F5F5F5;
}
/* links */ /* links */
a { a {
color: blue; color: blue;
@ -180,6 +184,10 @@ tr.highlight {
display: none; display: none;
} }
.nowrap {
white-space: nowrap;
}
/** /**
* table style for delete.php * table style for delete.php
* *