strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #8143 from annando/issue-8136

Browse source 
Issue 8136: Optical enhancements for delegation page
This commit is contained in:
Philipp 2020-01-20 08:35:09 +01:00 committed by GitHub
parent 04d620fc2f 035e0c5a61
commit fdd8ba95fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Module/Settings/Delegation.php
View file

@ -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.')]; $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'), [ $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/delegation.tpl'), [
'$form_security_token' => BaseModule::getFormSecurityToken('delegate'), '$form_security_token' => BaseModule::getFormSecurityToken('delegate'),
'$account_header' => DI::l10n()->t('Additional Accounts'), '$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'), '$add_account' => DI::l10n()->t('Register an additional account'),
'$parent_header' => DI::l10n()->t('Parent User'), '$parent_header' => DI::l10n()->t('Parent User'),
'$parent_user' => $parent_user, '$parent_user' => $parent_user,

28
view/templates/settings/delegation.tpl
View file

@ -1,14 +1,15 @@
<h3>{{$header}}</h3> <div id="delegation" class="generic-page-wrapper">
<h1>{{$header}}</h1>
{{if !$is_child_user}} {{if !$is_child_user}}
<h4>{{$account_header}}</h4> <h2>{{$account_header}}</h2>
<div id="add-account-desc" class="add-account-desc">{{$account_desc}}</div> <div id="add-account-desc" class="add-account-desc"><p>{{$account_desc}}</p></div>
<a href='register'>{{$add_account}}</a> <p><a href='register'>{{$add_account}}</a></p>
{{/if}} {{/if}}
{{if $parent_user}} {{if $parent_user}}
<h4>{{$parent_header}}</h4> <h2>{{$parent_header}}</h2>
<div id="delegate-parent-desc" class="delegate-parent-desc">{{$parent_desc}}</div> <div id="delegate-parent-desc" class="delegate-parent-desc"><p>{{$parent_desc}}</p></div>
<div id="delegate-parent" class="delegate-parent"> <div id="delegate-parent" class="delegate-parent">
<form action="settings/delegation" method="post"> <form action="settings/delegation" method="post">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
@ -19,12 +20,11 @@
</div> </div>
{{/if}} {{/if}}
<h4>{{$delegates_header}}</h4> <h2>{{$delegates_header}}</h2>
<div id="delegate-desc" class="delegate-desc">{{$desc nofilter}}</div> <div id="delegate-desc" class="delegate-desc"><p>{{$desc nofilter}}</p></div>
<h4>{{$head_delegates}}</h4>
<h3>{{$head_delegates}}</h3>
{{if $delegates}} {{if $delegates}}
{{foreach $delegates as $x}} {{foreach $delegates as $x}}
<div class="contact-block-div"> <div class="contact-block-div">
@ -35,11 +35,10 @@
{{/foreach}} {{/foreach}}
<div class="clear"></div> <div class="clear"></div>
{{else}} {{else}}
{{$none}} <p>{{$none}}</p>
{{/if}} {{/if}}
<hr/>
<h4>{{$head_potentials}}</h4> <h3>{{$head_potentials}}</h3>
{{if $potentials}} {{if $potentials}}
{{foreach $potentials as $x}} {{foreach $potentials as $x}}
<div class="contact-block-div"> <div class="contact-block-div">
@ -50,5 +49,6 @@
{{/foreach}} {{/foreach}}
<div class="clear"></div> <div class="clear"></div>
{{else}} {{else}}
{{$none}} <p>{{$none}}</p>
{{/if}} {{/if}}
</div>

8
view/theme/frio/css/style.css
View file

@ -1297,21 +1297,21 @@ aside #group-sidebar li .group-edit-tool:first-child {
} }
/* contact block widget */ /* contact block widget */
#contact-block .contact-block-content { .contact-block-content {
clear: both; clear: both;
overflow: auto; overflow: auto;
height: auto; height: auto;
} }
#contact-block .contact-block-div { .contact-block-div {
float: left; float: left;
margin: 0px 5px 5px 0px; margin: 0px 5px 5px 0px;
/* height: 90px; /* height: 90px;
width: 90px;*/ width: 90px;*/
} }
#contact-block contact-block-link { .contact-block-link {
} }
#contact-block .contact-block-img { .contact-block-img {
height: 75px; height: 75px;
width: 75px; width: 75px;
border-radius: 4px; border-radius: 4px;