diff options
| -rw-r--r-- | mod/settings.php | 5 | ||||
| -rwxr-xr-x | view/tpl/settings_account.tpl | 44 |
2 files changed, 20 insertions, 29 deletions
diff --git a/mod/settings.php b/mod/settings.php index 71ca38d91..a40a1deca 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -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'), diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index 36bb494d8..5f1f9c9b1 100755 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -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> {{$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> |