From e5e96dfbffd48b3d6b527e539e300a5091e7a19c Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 4 Mar 2015 11:11:36 +0100
Subject: [PATCH] cleanup removeaccount

---
 mod/removeaccount.php      |  6 ++++--
 view/tpl/removeaccount.tpl | 38 ++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/mod/removeaccount.php b/mod/removeaccount.php
index 18aaa2517..4505bbea0 100644
--- a/mod/removeaccount.php
+++ b/mod/removeaccount.php
@@ -9,6 +9,7 @@ function removeaccount_post(&$a) {
 		return;
 
 	if((! x($_POST,'qxz_password')) || (! strlen(trim($_POST['qxz_password']))))
+		notice( t('Password not correct.') . EOL);
 		return;
 
 	if((! x($_POST,'verify')) || (! strlen(trim($_POST['verify']))))
@@ -22,6 +23,7 @@ function removeaccount_post(&$a) {
 	$account_id = get_account_id();
 
 	if(! account_verify_password($account['account_email'],$_POST['qxz_password']))
+		notice( t('Password not correct.') . EOL);
 		return;
 
 	if($account['account_password_changed'] != NULL_DATE) {
@@ -55,7 +57,7 @@ function removeaccount_content(&$a) {
 		'$basedir' => $a->get_baseurl(),
 		'$hash' => $hash,
 		'$title' => t('Remove This Account'),
-		'$desc' => t('This will completely remove this account including all its channels from the network. Once this has been done it is not recoverable.'),
+		'$desc' => array(t('WARNING: '), t('This account and all its channels will be completely removed from the network. '), t('This action is permanent and can not be undone!')),
 		'$passwd' => t('Please enter your password for verification:'),
 		'$global' => array('global', t('Remove this account, all its channels and all its channel clones from the network'), false, t('By default only the instances of the channels located on this hub will be removed from the network')),
 		'$submit' => t('Remove Account')
@@ -63,4 +65,4 @@ function removeaccount_content(&$a) {
 
 	return $o;		
 
-}
\ No newline at end of file
+}
diff --git a/view/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl
index b7378806b..aefcd51a8 100644
--- a/view/tpl/removeaccount.tpl
+++ b/view/tpl/removeaccount.tpl
@@ -1,22 +1,20 @@
-<h1>{{$title}}</h1>
-
-<div id="remove-account-wrapper">
-
-<div id="remove-account-desc">{{$desc}}</div>
-
-<form action="{{$basedir}}/removeaccount" autocomplete="off" method="post" >
-<input type="hidden" name="verify" value="{{$hash}}" />
-
-<div id="remove-account-pass-wrapper">
-<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
-<input type="password" id="remove-account-pass" name="qxz_password" />
-</div>
-<div id="remove-account-pass-end"></div>
-
-{{include file="field_checkbox.tpl" field=$global}}
-
-<input type="submit" name="submit" value="{{$submit}}" />
-
-</form>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-danger-wrapper" id="remove-account-desc">
+		<strong>{{$desc.0}}</strong>{{$desc.1}}<strong>{{$desc.2}}</strong>
+	</div>
+	<div class="section-content-tools-wrapper">
+		<form action="{{$basedir}}/removeaccount" autocomplete="off" method="post" >
+			<input type="hidden" name="verify" value="{{$hash}}" />
+			<div class="form-group" id="remove-account-pass-wrapper">
+				<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
+				<input class="form-control" type="password" id="remove-account-pass" name="qxz_password" />
+			</div>
+			{{include file="field_checkbox.tpl" field=$global}}
+			<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>
+		</form>
+	</div>
 </div>