From 3c5ef4eb30c3ffa0c3fb6706fa8b68ea72f445ed Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sat, 26 Oct 2019 17:52:17 +0200 Subject: [PATCH] put suffix + RDN in one line --- lam/help/help.inc | 2 ++ lam/lib/modules.inc | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lam/help/help.inc b/lam/help/help.inc index 24227e2f..fd9b1f85 100644 --- a/lam/help/help.inc +++ b/lam/help/help.inc @@ -247,6 +247,8 @@ $helpArray = array ( "Text" => _("Here you can export account profiles to other server profiles (overwrite existing). You may also export a profile to the global templates. In this case it will always be copied to all server profiles that do not yet have a profile with this name.")), // 400 - 499 // account pages + "400" => array ("Headline" => _("DN suffix") . '/' . _("RDN identifier"), + "Text" => _("The account will be saved under this LDAP suffix.") . '

' . _("This is the identifier for the relative DN value. It must be one of the given allowed LDAP attributes (e.g. user accounts usually use \"uid\" while groups use \"cn\").")), "401" => array ("Headline" => _("Load profile"), "Text" => _("Here you can load an account profile to set default settings for your account. The \"default\" profile is automatically loaded for new accounts.")), "403" => array ("Headline" => _("Create PDF file"), diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc index 1603d50d..128b3f9e 100644 --- a/lam/lib/modules.inc +++ b/lam/lib/modules.inc @@ -1066,14 +1066,14 @@ class accountContainer { $suffixList[getAbstractDN($this->dnSuffix)] = $this->dnSuffix; } $selectedSuffix = array($this->dnSuffix); - $suffixSelect = new htmlResponsiveSelect('accountContainerSuffix', $suffixList, $selectedSuffix, _('Suffix'), '361'); + $suffixSelect = new htmlResponsiveSelect('accountContainerSuffix', $suffixList, $selectedSuffix, _('Suffix')); $suffixSelect->setHasDescriptiveElements(true); $suffixSelect->setRightToLeftTextDirection(true); - $titleBarSuffixRdn->add($suffixSelect, 12); + $titleBarSuffixRdn->add($suffixSelect, 12, 12, 8); // RDN selection $rdnlist = getRDNAttributes($this->type->getId()); - $rdnSelect = new htmlResponsiveSelect('accountContainerRDN', $rdnlist, array($this->rdn), _('RDN identifier'), '301'); - $titleBarSuffixRdn->add($rdnSelect, 12); + $rdnSelect = new htmlResponsiveSelect('accountContainerRDN', $rdnlist, array($this->rdn), _('RDN identifier'), '400'); + $titleBarSuffixRdn->add($rdnSelect, 12, 12, 4); $titleBarContainer->add($titleBarSuffixRdn, 12); $titleBarDiv = new htmlDiv(null, $titleBarContainer, array('titleBar', 'ui-corner-top'));