harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more cleanup of atoken UI

Browse Source
This commit is contained in:
redmatrix 2016-07-15 01:43:09 -07:00
parent 5e475acb85
commit d54f5a3831
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Zotlabs/Module/Settings.php
View File

@ -134,7 +134,7 @@ class Settings extends \Zotlabs\Web\Controller {
$expires = NULL_DATE; $expires = NULL_DATE;
} }
if($token_errs) { if($token_errs) {
notice( t('Name and Token are required.') . EOL); notice( t('Name and Password are required.') . EOL);
return; return;
} }
if($atoken_id) { if($atoken_id) {
@ -774,10 +774,13 @@ class Settings extends \Zotlabs\Web\Controller {
intval(local_channel()) intval(local_channel())
); );
$desc = t('Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access the private content.');
$tpl = get_markup_template("settings_tokens.tpl"); $tpl = get_markup_template("settings_tokens.tpl");
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_tokens"), '$form_security_token' => get_form_security_token("settings_tokens"),
'$title' => t('Guest Access Tokens'), '$title' => t('Guest Access Tokens'),
'$desc' => $desc,
'$tokens' => $t, '$tokens' => $t,
'$atoken' => $atoken, '$atoken' => $atoken,
'$name' => array('name', t('Login Name'), (($atoken) ? $atoken['atoken_name'] : ''),''), '$name' => array('name', t('Login Name'), (($atoken) ? $atoken['atoken_name'] : ''),''),

5
view/theme/redbasic/css/style.css
View File

@ -2045,5 +2045,8 @@ dl.bb-dl > dd > li {
list-style-type: none; list-style-type: none;
} }
.atoken-list li { .atoken-list li {
margin-bottom: 8px; margin-bottom: 10px;
}
.atoken-text {
margin: 5px 10px 5px 10px;
} }

1
view/tpl/settings_tokens.tpl
View File

@ -3,6 +3,7 @@
<h2>{{$title}}</h2> <h2>{{$title}}</h2>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="atoken-text descriptive-text">{{$desc}}</div>
<form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" > <form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" >
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}} {{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}}