diff --git a/lam/lib/html.inc b/lam/lib/html.inc index bd32d666..99daf20e 100644 --- a/lam/lib/html.inc +++ b/lam/lib/html.inc @@ -4013,21 +4013,16 @@ class htmlResponsiveInputCheckbox extends htmlInputCheckbox { // label text $labelGroup = new htmlGroup(); $labelGroup->addElement(new htmlOutputText($this->label)); - if (!empty($this->helpID)) { - $helpLinkLabel = new htmlHelpLink($this->helpID); - $helpLinkLabel->setCSSClasses(array('hide-on-tablet', 'margin-left5')); - $labelGroup->addElement($helpLinkLabel); - } - $row->add($labelGroup, 12, 6, 6, 'responsiveLabel'); + $row->add($labelGroup, 6, 6, 6, 'responsiveLabel'); // input field $fieldGroup = new htmlGroup(); $fieldGroup->addElement($this); if (!empty($this->helpID)) { $helpLink = new htmlHelpLink($this->helpID); - $helpLink->setCSSClasses(array('hide-on-mobile', 'margin-left5')); + $helpLink->setCSSClasses(array('margin-left5 align-unset-img')); $fieldGroup->addElement($helpLink); } - $row->add($fieldGroup, 12, 6, 6, 'responsiveField nowrap'); + $row->add($fieldGroup, 6, 6, 6, 'responsiveField nowrap'); return $row->generateHTML($module, $input, $values, $restricted, $tabindex, $scope); } diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css index a9231d2b..53970208 100644 --- a/lam/style/500_layout.css +++ b/lam/style/500_layout.css @@ -189,6 +189,10 @@ input { vertical-align: top; } +.align-unset-img img { + vertical-align: unset; +} + table.lamHeader { background-image: url(lam-images/headerLine.png); padding: 0px; @@ -420,12 +424,6 @@ td.loginRightBox { max-width: 580px; } -.size16 { - height: 16px; - width: 16px; - max-width: 16px; -} - div.centeredTable { display: table; width: 100%; @@ -569,7 +567,7 @@ p.statusText { } input.smallImageButton { - background-position: 2px center; + background-position: center center; background-repeat: no-repeat; height:24px; border: 0px; @@ -577,6 +575,12 @@ input.smallImageButton { cursor:pointer; } +.size16 { + height: 16px !important; + width: 16px !important; + max-width: 16px; +} + /* help tooltip */ th.help { text-align: left; diff --git a/lam/templates/config/conftypes.php b/lam/templates/config/conftypes.php index fde35da2..75a6d950 100644 --- a/lam/templates/config/conftypes.php +++ b/lam/templates/config/conftypes.php @@ -6,11 +6,12 @@ use \htmlImage; use \htmlOutputText; use \htmlSpacer; use \htmlButton; -use \htmlElement; use \htmlGroup; -use \htmlTableExtendedInputField; +use \htmlResponsiveInputCheckbox; use \LAMConfig; use \htmlTableExtendedInputCheckbox; +use \htmlResponsiveRow; +use \htmlResponsiveInputField; /* This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) Copyright (C) 2004 - 2017 Roland Gruber @@ -148,52 +149,58 @@ echo ("