From fa9f2490ecf1f02add08f07eb4d537b34f434dfd Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sat, 13 Jan 2018 19:58:55 +0100 Subject: [PATCH] responsive --- lam/lib/baseModule.inc | 4 +-- lam/lib/security.inc | 6 +++- lam/templates/ou_edit.php | 71 ++++++++++++++++++++------------------- 3 files changed, 43 insertions(+), 38 deletions(-) diff --git a/lam/lib/baseModule.inc b/lam/lib/baseModule.inc index 1fe8af27..fdbc3bff 100644 --- a/lam/lib/baseModule.inc +++ b/lam/lib/baseModule.inc @@ -4,10 +4,9 @@ use \LAM\PDF\PDFTable; use LAM\TYPES\ConfiguredType; use function LAM\TYPES\getScopeFromTypeId; /* -$Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2003 - 2017 Roland Gruber + Copyright (C) 2003 - 2018 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 @@ -171,6 +170,7 @@ abstract class baseModule { // load attributes $attributeNames = array_merge($this->getManagedAttributes($typeId), $this->getManagedHiddenAttributes($typeId)); $attributeNames = array_unique($attributeNames); + $attributeNames = array_values($attributeNames); for ($i = 0; $i < sizeof($attributeNames); $i++) { if (isset($attributes[$attributeNames[$i]])) { $this->attributes[$attributeNames[$i]] = $attributes[$attributeNames[$i]]; diff --git a/lam/lib/security.inc b/lam/lib/security.inc index 5e745d5e..6c16138f 100644 --- a/lam/lib/security.inc +++ b/lam/lib/security.inc @@ -556,10 +556,14 @@ function validateSecurityToken($post = true) { * Adds a hidden input field to the given meta HTML table. * Should be used to add token at the end of table. * - * @param htmlTable|htmlGroup $container table + * @param htmlTable|htmlGroup|htmlResponsiveRow $container table */ function addSecurityTokenToMetaHTML(&$container) { $token = new htmlHiddenInput(getSecurityTokenName(), $_SESSION[getSecurityTokenName()]); + if ($container instanceof htmlResponsiveRow) { + $container->add($token, 12); + return; + } $container->addElement($token, true); } diff --git a/lam/templates/ou_edit.php b/lam/templates/ou_edit.php index 51ad58be..2dca066d 100644 --- a/lam/templates/ou_edit.php +++ b/lam/templates/ou_edit.php @@ -1,20 +1,20 @@ '; echo "
\n"; $tabindex = 1; - $container = new htmlTable(); + $container = new htmlResponsiveRow(); $label = new htmlOutputText(_("Do you really want to delete this OU?")); $label->colspan = 5; - $container->addElement($label, true); - $container->addElement(new htmlSpacer(null, '10px'), true); + $container->add($label, 12); + $container->addVerticalSpacer('1rem'); $dnLabel = new htmlOutputText(getAbstractDN($_POST['deleteableOU'])); $dnLabel->colspan = 5; - $container->addElement($dnLabel, true); - $container->addElement(new htmlSpacer(null, '10px'), true); - $container->addElement(new htmlButton('sure', _("Delete"))); - $container->addElement(new htmlButton('abort', _("Cancel"))); - $container->addElement(new htmlHiddenInput('deleteOU', 'submit')); - $container->addElement(new htmlHiddenInput('deletename', $_POST['deleteableOU'])); + $container->add($dnLabel, 12); + $container->addVerticalSpacer('1rem'); + $buttonGroup = new htmlGroup(); + $buttonGroup->addElement(new htmlButton('sure', _("Delete"))); + $buttonGroup->addElement(new htmlSpacer('0.5rem', null)); + $buttonGroup->addElement(new htmlButton('abort', _("Cancel"))); + $container->add($buttonGroup, 12); + $container->add(new htmlHiddenInput('deleteOU', 'submit'), 12); + $container->add(new htmlHiddenInput('deletename', $_POST['deleteableOU']), 12); addSecurityTokenToMetaHTML($container); parseHtml(null, $container, array(), false, $tabindex, 'user'); echo "
"; @@ -158,22 +161,22 @@ display_main($message, $error); */ function display_main($message, $error) { // display main page - include 'main_header.php'; + include '../lib/adminHeader.inc'; echo '
'; echo "
\n"; $tabindex = 1; - $container = new htmlTable(); - $container->addElement(new htmlSubTitle(_("OU editor")), true); + $container = new htmlResponsiveRow(); + $container->add(new htmlTitle(_("OU editor")), 12); if (isset($error)) { $msg = new htmlStatusMessage("ERROR", "", $error); $msg->colspan = 5; - $container->addElement($msg, true); + $container->add($msg, 12); } elseif (isset($message)) { $msg = new htmlStatusMessage("INFO", "", $message); $msg->colspan = 5; - $container->addElement($msg, true); + $container->add($msg, 12); } $typeManager = new \LAM\TYPES\TypeManager(); @@ -199,35 +202,33 @@ function display_main($message, $error) { if (!empty($options)) { // new OU - $container->addElement(new htmlOutputText(_("New organisational unit"))); - $parentOUSelect = new htmlSelect('parentOU', $options, array()); + $container->add(new htmlSubTitle(_("New organisational unit")), 12); + $parentOUSelect = new htmlResponsiveSelect('parentOU', $options, array(), _('Parent DN'), '601'); $parentOUSelect->setContainsOptgroups(true); $parentOUSelect->setHasDescriptiveElements(true); $parentOUSelect->setRightToLeftTextDirection(true); $parentOUSelect->setSortElements(false); - $container->addElement($parentOUSelect); - $container->addElement(new htmlInputField('newOU')); - $container->addElement(new htmlButton('createOU', _("Ok"))); - $container->addElement(new htmlHelpLink('601'), true); - - $container->addElement(new htmlSpacer(null, '10px'), true); + $container->add($parentOUSelect, 12); + $container->add(new htmlResponsiveInputField(_('Name'), 'newOU'), 12); + $container->addLabel(new htmlOutputText(' ', false)); + $container->addField(new htmlButton('createOU', _("Ok"))); + $container->addVerticalSpacer('2rem'); // delete OU - $container->addElement(new htmlOutputText(_("Delete organisational unit"))); - $deleteableOUSelect = new htmlSelect('deleteableOU', $options, array()); + $container->add(new htmlSubTitle(_("Delete organisational unit")), 12); + $deleteableOUSelect = new htmlResponsiveSelect('deleteableOU', $options, array(), _('Organisational unit'), '602'); $deleteableOUSelect->setContainsOptgroups(true); $deleteableOUSelect->setHasDescriptiveElements(true); $deleteableOUSelect->setRightToLeftTextDirection(true); $deleteableOUSelect->setSortElements(false); - $container->addElement($deleteableOUSelect); - $container->addElement(new htmlOutputText('')); - $container->addElement(new htmlButton('deleteOU', _("Ok"))); - $container->addElement(new htmlHelpLink('602'), true); + $container->add($deleteableOUSelect, 12); + $container->addLabel(new htmlOutputText(' ', false)); + $container->addField(new htmlButton('deleteOU', _("Ok"))); } addSecurityTokenToMetaHTML($container); parseHtml(null, $container, array(), false, $tabindex, 'user'); echo ("
\n"); echo '
'; - include 'main_footer.php'; + include '../lib/adminFooter.inc'; }