Commit 2b2e8402 authored by Carsten  Rose's avatar Carsten Rose

Fix radio plain vertical. Fix label2 not to be bold.

parent 2d633804
Pipeline #2813 passed with stages
in 2 minutes and 44 seconds
......@@ -2071,7 +2071,7 @@ abstract class AbstractBuildForm {
$html .= '<input ' . $attribute . '>';
if (isset($formElement['label2'])) {
$html .= $formElement['label2'];
$html .= Support::wrapTag("<span style='font-weight: 400;'>", $formElement['label2']);
}
$labelAttribute = Support::doAttribute('title', $formElement[FE_TOOLTIP]);
......@@ -2496,7 +2496,6 @@ abstract class AbstractBuildForm {
return $this->constructRadioButton($formElement, $htmlFormElementName, $value, $json, $mode);
}
$itemKey = array();
$itemValue = array();
......@@ -2509,7 +2508,7 @@ abstract class AbstractBuildForm {
$attributeBase .= Support::doAttribute('type', $formElement[FE_TYPE]);
$attributeBase .= Support::doAttribute('data-load', ($formElement[FE_DYNAMIC_UPDATE] === 'yes') ? 'data-load' : '');
$attributeBaseLabel = Support::doAttribute('style', 'min-width: ' . $formElement[F_FE_MIN_WIDTH] . 'px;');
$attributeBaseLabel = Support::doAttribute('style', 'min-width: ' . $formElement[F_FE_MIN_WIDTH] . 'px; font-weight: 400;');
$jj = 0;
......@@ -2518,7 +2517,7 @@ abstract class AbstractBuildForm {
if ($formElement[FE_MODE] == FE_MODE_READONLY) {
$radioClass .= ' qfq-disabled';
}
$radioOuterTag = ($orientation === ALIGN_HORIZONTAL) ? "label $attributeBaseLabel" : 'div';
// $radioOuterTag = ($orientation === ALIGN_HORIZONTAL) ? "label $attributeBaseLabel" : 'label';
$br = '';
$attribute = $attributeBase;
......@@ -2543,9 +2542,9 @@ abstract class AbstractBuildForm {
$htmlElement = '<input ' . $attribute . '>' . $tmpValue;
// With ALIGN_HORIZONTAL: the label causes some trouble: skip it
if (($orientation === ALIGN_VERTICAL)) {
$htmlElement = Support::wrapTag("<label>", $htmlElement);
}
// if (($orientation === ALIGN_VERTICAL)) {
// $htmlElement = Support::wrapTag("<label>", $htmlElement);
// }
if ($formElement[FE_MAX_LENGTH] > 1) {
......@@ -2559,7 +2558,7 @@ abstract class AbstractBuildForm {
$wrapAttribute = Support::doAttribute('title', $formElement[FE_TOOLTIP]);
$wrapAttribute .= Support::doAttribute('class', $radioClass);
$htmlElement = Support::wrapTag("<$radioOuterTag $wrapAttribute>", $htmlElement) . $br;
$htmlElement = Support::wrapTag("<label $wrapAttribute $attributeBaseLabel>", $htmlElement) . $br;
$html .= $htmlElement;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment