clean up account settings

This commit is contained in:
Mario Vavti 2015-03-04 10:11:48 +01:00
parent 6d30abe4bf
commit 4b08ccd873
2 changed files with 20 additions and 29 deletions

View File

@ -708,9 +708,8 @@ function settings_content(&$a) {
$o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_account"),
'$title' => t('Account Settings'),
'$h_pass' => t('Password Settings'),
'$password1'=> array('npassword', t('New Password:'), '', ''),
'$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')),
'$password1'=> array('npassword', t('Enter New Password:'), '', ''),
'$password2'=> array('confirm', t('Confirm New Password:'), '', t('Leave password fields blank unless changing')),
'$submit' => t('Submit'),
'$email' => array('email', t('Email Address:'), $email, ''),
'$removeme' => t('Remove Account'),

View File

@ -1,28 +1,20 @@
<div class="generic-content-wrapper-styled">
<h1>{{$title}}</h1>
<form action="settings/account" id="settings-account-form" method="post" autocomplete="off" >
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{include file="field_input.tpl" field=$email}}
<h3 class="settings-heading">{{$h_pass}}</h3>
{{include file="field_password.tpl" field=$password1}}
{{include file="field_password.tpl" field=$password2}}
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<a title="{{$permanent}}" class="btn btn-danger btn-xs pull-right" href="removeaccount"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
<h2>{{$title}}</h2>
<div class="clear"></div>
</div>
<form action="settings/account" id="settings-account-form" method="post" autocomplete="off" >
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<div class="section-content-tools-wrapper">
{{include file="field_input.tpl" field=$email}}
{{include file="field_password.tpl" field=$password1}}
{{include file="field_password.tpl" field=$password2}}
<div class="settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
</div>
{{$account_settings}}
</div>
</form>
</div>
{{$account_settings}}
<div id="settings-remove-account-link">
<h3 class="settings-heading">{{$removeme}}</h3>
<div id="settings-remove-account-desc">{{$removeaccount}}</div>
<button title="{{$permanent}}" class="btn btn-danger" type="submit" formaction="removeaccount">{{$removeme}}</button>
</div>
</div>