extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 08:23:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed double displayed label

Browse Source
This commit is contained in:
Ralf Becker 2007-07-12 08:03:37 +00:00
parent 2fc090e301
commit 58c7f4bf61
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
etemplate/inc/class.customfields_widget.inc.php
View File

@ -122,7 +122,8 @@
$row_class = 'row'; $row_class = 'row';
etemplate::add_child($cell,$label =& etemplate::empty_cell('label','',array( etemplate::add_child($cell,$label =& etemplate::empty_cell('label','',array(
'label' => $field['label'], 'label' => $field['label'],
'no_lang' => substr(lang($field['label']),-1) == '*' ? 2 : 0 'no_lang' => substr(lang($field['label']),-1) == '*' ? 2 : 0,
'span' => $field['type'] === 'label' ? '2' : '',
))); )));
} }
switch ((string)$field['type']) switch ((string)$field['type'])
@ -154,7 +155,6 @@
} }
break; break;
case 'label' : case 'label' :
$label['span'] = 'all';
$row_class = 'th'; $row_class = 'th';
break; break;
case 'checkbox' : case 'checkbox' :
@ -208,16 +208,20 @@
'size' => $field['type'] == 'link-entry' ? '' : $field['type'], 'size' => $field['type'] == 'link-entry' ? '' : $field['type'],
)); ));
} }
if ($readonly) $input['readonly'] = true;
if (!empty($field['help']) && $row_class != 'th')
{
$input['help'] = $field['help'];
$input['no_lang'] = substr(lang($help),-1) == '*' ? 2 : 0;
}
$cell['data'][0]['c'.$n++] = $row_class.',top'; $cell['data'][0]['c'.$n++] = $row_class.',top';
etemplate::add_child($cell,$input);
unset($input); if (!is_null($input))
{
if ($readonly) $input['readonly'] = true;
if (!empty($field['help']) && $row_class != 'th')
{
$input['help'] = $field['help'];
$input['no_lang'] = substr(lang($help),-1) == '*' ? 2 : 0;
}
etemplate::add_child($cell,$input);
unset($input);
}
unset($label); unset($label);
} }
if ($type != 'customfields-list') if ($type != 'customfields-list')