From 47c55d76c5dacc48e57403033eb1a5d25fc7bf20 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Mon, 19 Aug 2019 21:56:21 +0200 Subject: [PATCH] responsive --- lam/lib/modules/courierMailAccount.inc | 23 +++++++++++------------ lam/lib/modules/courierMailAlias.inc | 20 +++++++------------- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/lam/lib/modules/courierMailAccount.inc b/lam/lib/modules/courierMailAccount.inc index 38ad1d52..98a140ce 100644 --- a/lam/lib/modules/courierMailAccount.inc +++ b/lam/lib/modules/courierMailAccount.inc @@ -237,7 +237,7 @@ class courierMailAccount extends baseModule { * {@inheritDoc} */ public function display_html_attributes() { - $return = new htmlTable(); + $return = new htmlResponsiveRow(); if ($this->isExtensionEnabled()) { if ($this->isUnixDisabled($this->getAccountContainer()->get_type()->getModules())) { // home directory @@ -254,7 +254,7 @@ class courierMailAccount extends baseModule { $unitIndex = floor(log(substr($this->attributes['quota'][0], 0, -1), 1000)); $value = round((float) (substr($this->attributes['quota'][0], 0, -1)) / pow(1000, $unitIndex), 2); } - $return->addElement(new htmlOutputText(_('Mailbox quota'))); + $return->addLabel(new htmlOutputText(_('Mailbox quota'))); $tempTable = new htmlTable(); $boxInput = new htmlInputField('quotaValue', $value); $boxInput->setFieldSize(5); @@ -270,25 +270,24 @@ class courierMailAccount extends baseModule { $unitSelect = new htmlSelect('quotaUnit', $units, $selected); $unitSelect->setSortElements(false); $tempTable->addElement($unitSelect); - $return->addElement($tempTable); - $return->addElement(new htmlHelpLink('quota'), true); + $tempTable->addElement(new htmlHelpLink('quota')); + $return->addField($tempTable); // check boxes for account access control $disableimap = isset($this->attributes['disableimap'][0]) && ($this->attributes['disableimap'][0] != 0); - $return->addElement(new htmlTableExtendedInputCheckbox('disableimap', $disableimap, _('Disable IMAP access'), 'disableimap'), true); + $return->add(new htmlResponsiveInputCheckbox('disableimap', $disableimap, _('Disable IMAP access'), 'disableimap'), 12); $disablepop3 = isset($this->attributes['disablepop3'][0]) && ($this->attributes['disablepop3'][0] != 0); - $return->addElement(new htmlTableExtendedInputCheckbox('disablepop3', $disablepop3, _('Disable POP3 access'), 'disablepop3'), true); + $return->add(new htmlResponsiveInputCheckbox('disablepop3', $disablepop3, _('Disable POP3 access'), 'disablepop3'), 12); $disablewebmail = isset($this->attributes['disablewebmail'][0]) && ($this->attributes['disablewebmail'][0] != 0); - $return->addElement(new htmlTableExtendedInputCheckbox('disablewebmail', $disablewebmail, _('Disable webmail access'), 'disablewebmail'), true); + $return->add(new htmlResponsiveInputCheckbox('disablewebmail', $disablewebmail, _('Disable webmail access'), 'disablewebmail'), 12); $disableshared = isset($this->attributes['disableshared'][0]) && ($this->attributes['disableshared'][0] != 0); - $return->addElement(new htmlTableExtendedInputCheckbox('disableshared', $disableshared, _('Disable shared folder access'), 'disableshared'), true); + $return->add(new htmlResponsiveInputCheckbox('disableshared', $disableshared, _('Disable shared folder access'), 'disableshared'), 12); // remove extension - $return->addElement(new htmlSpacer(null, '20px'), true); + $return->addVerticalSpacer('2rem'); $remButton = new htmlButton('remObjectClass', _('Remove Courier mail extension')); - $remButton->colspan = 3; - $return->addElement($remButton); + $return->add($remButton, 12, 12, 12, 'text-center'); } else { - $return->addElement(new htmlButton('addObjectClass', _('Add Courier mail extension'))); + $return->add(new htmlButton('addObjectClass', _('Add Courier mail extension')), 12); } return $return; } diff --git a/lam/lib/modules/courierMailAlias.inc b/lam/lib/modules/courierMailAlias.inc index e3402aa6..4dbb6a59 100644 --- a/lam/lib/modules/courierMailAlias.inc +++ b/lam/lib/modules/courierMailAlias.inc @@ -2,7 +2,7 @@ /* * This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) * Copyright (C) 2017 Lars Althof - * 2017 Roland Gruber + * 2017 - 2019 Roland Gruber * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -145,22 +145,16 @@ class courierMailAlias extends baseModule { * {@inheritdoc} */ function display_html_attributes() { - $return = new htmlTable(); - $mail = (!empty($this->attributes['mail'][0])) ? $this->attributes['mail'][0] : ''; - $boxInput = new htmlTableExtendedInputField (_('Email address'), 'mail', $mail, 'mail', true); - $boxInput->setFieldSize(40); - $boxInput->setFieldMaxLength(40); - $return->addElement($boxInput, true); + $return = new htmlResponsiveRow(); + $this->addSimpleInputTextField($return, 'mail', _('Email address'), true); $this->addMultiValueInputTextField($return, 'maildrop', _('Recipient address'), true); - $return->addElement(new htmlOutputText(_('Mail source'))); + $return->addVerticalSpacer('0.5rem'); $selectedSource = (!empty($this->attributes['mailsource'][0])) ? $this->attributes['mailsource'][0] : "-"; - $return->addElement(new htmlSelect('mailsource', array('-', 'esmtp', 'local'), array($selectedSource))); - $return->addElement(new htmlHelpLink('mailsource'), true); + $return->add(new htmlResponsiveSelect('mailsource', array('-', 'esmtp', 'local'), array($selectedSource), _('Mail source'), 'mailsource'), 12); $description = (!empty($this->attributes['description'][0])) ? $this->attributes['description'][0] : ''; - $boxInput = new htmlTableExtendedInputField(_('Description'), 'description', $description, 'description'); - $boxInput->setFieldSize(40); + $boxInput = new htmlResponsiveInputField(_('Description'), 'description', $description, 'description'); $boxInput->setFieldMaxLength(100); - $return->addElement($boxInput, true); + $return->add($boxInput, 12); return $return; }