aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-08-17 08:33:13 +1000
committerRedMatrix <info@friendica.com>2014-08-17 08:33:13 +1000
commite4620179acb9fb7004939c2e0fc8717f9b148ca3 (patch)
treec6bf759334cb3c9f372e9c43174ade234ebda130
parente3c8d36e06ad056ae9bf49c0e46b70ac048b8a07 (diff)
parent54fe09f466b69c960caf64dd325ebfabf3ddd962 (diff)
downloadvolse-hubzilla-e4620179acb9fb7004939c2e0fc8717f9b148ca3.tar.gz
volse-hubzilla-e4620179acb9fb7004939c2e0fc8717f9b148ca3.tar.bz2
volse-hubzilla-e4620179acb9fb7004939c2e0fc8717f9b148ca3.zip
Merge pull request #564 from cvogeley/master
Add account deletion to the UI
-rw-r--r--mod/settings.php1
-rwxr-xr-xview/tpl/settings_account.tpl8
2 files changed, 6 insertions, 3 deletions
diff --git a/mod/settings.php b/mod/settings.php
index 631ceb3c2..d6ebf9e90 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -629,6 +629,7 @@ function settings_content(&$a) {
'$submit' => t('Submit'),
'$email' => array('email', t('Email Address:'), $email, ''),
'$removeme' => t('Remove Account'),
+ '$removeaccount' => t('Remove this account from this server including all its channels'),
'$permanent' => t('Warning: This action is permanent and cannot be reversed.'),
'$account_settings' => $account_settings
));
diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl
index 169516f08..1e28d8b84 100755
--- a/view/tpl/settings_account.tpl
+++ b/view/tpl/settings_account.tpl
@@ -2,9 +2,6 @@
<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}}'>
@@ -23,4 +20,9 @@
{{$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>