Merge pull request #8143 from annando/issue-8136
Issue 8136: Optical enhancements for delegation page
This commit is contained in:
commit
fdd8ba95fc
|
@ -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,
|
||||
|
|
|
@ -1,14 +1,15 @@
|
|||
<h3>{{$header}}</h3>
|
||||
<div id="delegation" class="generic-page-wrapper">
|
||||
<h1>{{$header}}</h1>
|
||||
|
||||
{{if !$is_child_user}}
|
||||
<h4>{{$account_header}}</h4>
|
||||
<div id="add-account-desc" class="add-account-desc">{{$account_desc}}</div>
|
||||
<a href='register'>{{$add_account}}</a>
|
||||
<h2>{{$account_header}}</h2>
|
||||
<div id="add-account-desc" class="add-account-desc"><p>{{$account_desc}}</p></div>
|
||||
<p><a href='register'>{{$add_account}}</a></p>
|
||||
{{/if}}
|
||||
|
||||
{{if $parent_user}}
|
||||
<h4>{{$parent_header}}</h4>
|
||||
<div id="delegate-parent-desc" class="delegate-parent-desc">{{$parent_desc}}</div>
|
||||
<h2>{{$parent_header}}</h2>
|
||||
<div id="delegate-parent-desc" class="delegate-parent-desc"><p>{{$parent_desc}}</p></div>
|
||||
<div id="delegate-parent" class="delegate-parent">
|
||||
<form action="settings/delegation" method="post">
|
||||
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
|
||||
|
@ -19,12 +20,11 @@
|
|||
</div>
|
||||
{{/if}}
|
||||
|
||||
<h4>{{$delegates_header}}</h4>
|
||||
<h2>{{$delegates_header}}</h2>
|
||||
|
||||
<div id="delegate-desc" class="delegate-desc">{{$desc nofilter}}</div>
|
||||
|
||||
<h4>{{$head_delegates}}</h4>
|
||||
<div id="delegate-desc" class="delegate-desc"><p>{{$desc nofilter}}</p></div>
|
||||
|
||||
<h3>{{$head_delegates}}</h3>
|
||||
{{if $delegates}}
|
||||
{{foreach $delegates as $x}}
|
||||
<div class="contact-block-div">
|
||||
|
@ -35,11 +35,10 @@
|
|||
{{/foreach}}
|
||||
<div class="clear"></div>
|
||||
{{else}}
|
||||
{{$none}}
|
||||
<p>{{$none}}</p>
|
||||
{{/if}}
|
||||
<hr/>
|
||||
|
||||
<h4>{{$head_potentials}}</h4>
|
||||
<h3>{{$head_potentials}}</h3>
|
||||
{{if $potentials}}
|
||||
{{foreach $potentials as $x}}
|
||||
<div class="contact-block-div">
|
||||
|
@ -50,5 +49,6 @@
|
|||
{{/foreach}}
|
||||
<div class="clear"></div>
|
||||
{{else}}
|
||||
{{$none}}
|
||||
<p>{{$none}}</p>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user