From 8df75742d22c0444af9855462032d329039dcd28 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 15 Aug 2019 15:11:25 +0200 Subject: [PATCH] refactored edit header --- lam/lib/modules.inc | 18 +++++------------- lam/lib/types/user.inc | 2 +- lam/style/500_layout.css | 3 +-- .../ui-bg_highlight-soft_75_cccccc_1x150.png | Bin 142 -> 0 bytes 4 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 lam/style/images/ui-bg_highlight-soft_75_cccccc_1x150.png diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc index 39d44889..b07743da 100644 --- a/lam/lib/modules.inc +++ b/lam/lib/modules.inc @@ -1056,8 +1056,8 @@ class accountContainer { $titleBarContainer->addVerticalSpacer('0.5rem'); $titleBarSubtitleText = new htmlOutputText($this->titleBarSubtitle, false); $titleBarContainer->add(new htmlDiv(null, $titleBarSubtitleText, array('titleBarSubtitle', 'text-left')), 12); - $titleBarContainer->addVerticalSpacer('1rem'); $titleBarSuffixRdn = new htmlResponsiveRow(); + $titleBarSuffixRdn->add(new htmlHorizontalLine(), 12); // suffix $suffixList = array(); foreach ($this->getOUs() as $suffix) { @@ -1067,24 +1067,16 @@ class accountContainer { $suffixList[getAbstractDN($this->dnSuffix)] = $this->dnSuffix; } $selectedSuffix = array($this->dnSuffix); - $suffixGroup = new htmlGroup(); - $suffixGroup->addElement(new htmlOutputText(_('Suffix'))); - $suffixSelect = new htmlSelect('accountContainerSuffix', $suffixList, $selectedSuffix); + $suffixSelect = new htmlResponsiveSelect('accountContainerSuffix', $suffixList, $selectedSuffix, _('Suffix'), '361'); $suffixSelect->setHasDescriptiveElements(true); $suffixSelect->setRightToLeftTextDirection(true); $suffixSelect->setCSSClasses(array('auto-width')); - $suffixGroup->addElement($suffixSelect); - $suffixGroup->addElement(new htmlHelpLink('361')); - $titleBarSuffixRdn->add($suffixGroup, 12, 6, 6, 'nowrap maxrow'); + $titleBarSuffixRdn->add($suffixSelect, 12); // RDN selection - $rdnGroup = new htmlGroup(); - $rdnGroup->addElement(new htmlOutputText(_('RDN identifier'))); $rdnlist = getRDNAttributes($this->type->getId()); - $rdnSelect = new htmlSelect('accountContainerRDN', $rdnlist, array($this->rdn)); + $rdnSelect = new htmlResponsiveSelect('accountContainerRDN', $rdnlist, array($this->rdn), _('RDN identifier'), '301'); $rdnSelect->setCSSClasses(array('auto-width')); - $rdnGroup->addElement($rdnSelect); - $rdnGroup->addElement(new htmlHelpLink('301'), 1); - $titleBarSuffixRdn->add($rdnGroup, 12, 6, 6, 'nowrap maxrow'); + $titleBarSuffixRdn->add($rdnSelect, 12); $titleBarContainer->add($titleBarSuffixRdn, 12); $titleBarDiv = new htmlDiv(null, $titleBarContainer, array('titleBar', 'ui-corner-top')); diff --git a/lam/lib/types/user.inc b/lam/lib/types/user.inc index 3b42152f..f7fabada 100644 --- a/lam/lib/types/user.inc +++ b/lam/lib/types/user.inc @@ -209,7 +209,7 @@ class user extends baseType { return $this->buildAccountStatusIcon($container); } $subtitle = $this->buildAccountStatusIcon($container); - $spacer = '        '; + $spacer = '        '; // check if an email address can be shown if (isset($personalAttributes['mail'][0]) && !empty($personalAttributes['mail'][0])) { $subtitle .= '' . htmlspecialchars($personalAttributes['mail'][0]) . '' . $spacer; diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css index dcd3bd8d..a1420019 100644 --- a/lam/style/500_layout.css +++ b/lam/style/500_layout.css @@ -584,7 +584,7 @@ button.lam-account-type { /* title bar */ .titleBar { - background: #AAAAAA url(images/ui-bg_highlight-soft_75_cccccc_1x150.png) repeat-x scroll 50% 50%; + background-image: linear-gradient(#fdfdfd, #cccccc); border-top: 1px solid #AAAAAA; border-left: 1px solid #AAAAAA; border-right: 1px solid #AAAAAA; @@ -596,7 +596,6 @@ button.lam-account-type { } .titleBarSubtitle { -/* font-style: italic;*/ padding: 0px 5px 0px 10px; } diff --git a/lam/style/images/ui-bg_highlight-soft_75_cccccc_1x150.png b/lam/style/images/ui-bg_highlight-soft_75_cccccc_1x150.png deleted file mode 100644 index 2dee53f0b41dc3109791e4647e06a261ac1fae6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^j6gh%g9%7Z5Ghp!Qk(@Ik;M!Q+`=Ht$S`Y;1W=H@ z#M9T6{V@kW52IzZ@C`GdkglhTV~EE2