From 035e0c5a61b25073779fa5482efe5d79463207cb Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 20 Jan 2020 05:05:20 +0000 Subject: [PATCH] Issue 8136: Optical enhancements for delegation page --- src/Module/Settings/Delegation.php | 4 ++-- view/templates/settings/delegation.tpl | 28 +++++++++++++------------- view/theme/frio/css/style.css | 8 ++++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Module/Settings/Delegation.php b/src/Module/Settings/Delegation.php index 579d2bf82..d7f49e6a9 100644 --- a/src/Module/Settings/Delegation.php +++ b/src/Module/Settings/Delegation.php @@ -131,7 +131,7 @@ class Delegation extends BaseSettingsModule } } - $parent_user = ['parent_user', '', $parent_uid, '', $parents]; + $parent_user = ['parent_user', DI::l10n()->t('Parent User'), $parent_uid, '', $parents]; $parent_password = ['parent_password', DI::l10n()->t('Parent Password:'), '', DI::l10n()->t('Please enter the password of the parent account to legitimize your request.')]; } @@ -140,7 +140,7 @@ class Delegation extends BaseSettingsModule $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/delegation.tpl'), [ '$form_security_token' => BaseModule::getFormSecurityToken('delegate'), '$account_header' => DI::l10n()->t('Additional Accounts'), - '$account_desc' => DI::l10n()->t('Register additional accounts that are automatically connected to your existing account so you can manage it from this account.'), + '$account_desc' => DI::l10n()->t('Register additional accounts that are automatically connected to your existing account so you can manage them from this account.'), '$add_account' => DI::l10n()->t('Register an additional account'), '$parent_header' => DI::l10n()->t('Parent User'), '$parent_user' => $parent_user, diff --git a/view/templates/settings/delegation.tpl b/view/templates/settings/delegation.tpl index b9f888cd6..74e3350d6 100644 --- a/view/templates/settings/delegation.tpl +++ b/view/templates/settings/delegation.tpl @@ -1,14 +1,15 @@ -

{{$header}}

+
+

{{$header}}

{{if !$is_child_user}} -

{{$account_header}}

- -{{$add_account}} +

{{$account_header}}

+ +

{{$add_account}}

{{/if}} {{if $parent_user}} -

{{$parent_header}}

-
{{$parent_desc}}
+

{{$parent_header}}

+

{{$parent_desc}}

@@ -19,12 +20,11 @@
{{/if}} -

{{$delegates_header}}

+

{{$delegates_header}}

-
{{$desc nofilter}}
- -

{{$head_delegates}}

+

{{$desc nofilter}}

+

{{$head_delegates}}

{{if $delegates}} {{foreach $delegates as $x}}
@@ -35,11 +35,10 @@ {{/foreach}}
{{else}} - {{$none}} +

{{$none}}

{{/if}} -
-

{{$head_potentials}}

+

{{$head_potentials}}

{{if $potentials}} {{foreach $potentials as $x}}
@@ -50,5 +49,6 @@ {{/foreach}}
{{else}} - {{$none}} +

{{$none}}

{{/if}} +
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 2ae29f106..94f0edfd7 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1297,21 +1297,21 @@ aside #group-sidebar li .group-edit-tool:first-child { } /* contact block widget */ -#contact-block .contact-block-content { +.contact-block-content { clear: both; overflow: auto; height: auto; } -#contact-block .contact-block-div { +.contact-block-div { float: left; margin: 0px 5px 5px 0px; /* height: 90px; width: 90px;*/ } -#contact-block contact-block-link { +.contact-block-link { } -#contact-block .contact-block-img { +.contact-block-img { height: 75px; width: 75px; border-radius: 4px;