From 46118bc63a384bee5b8521edff69c1e22c5cf462 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 18 Jun 2021 15:20:53 -0400
Subject: [PATCH] feat: tpl changes for nodebb/nodebb#9607

---
 templates/register.tpl         | 8 --------
 templates/registerComplete.tpl | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/templates/register.tpl b/templates/register.tpl
index d9c5005..b2af3ce 100644
--- a/templates/register.tpl
+++ b/templates/register.tpl
@@ -8,14 +8,6 @@
 				<p>{error}</p>
 			</div>
 			<form component="register/local" class="form-horizontal" role="form" action="{config.relative_path}/register" method="post">
-				<div class="form-group">
-					<label for="email" class="col-lg-4 control-label">[[register:email_address]]</label>
-					<div class="col-lg-8">
-						<input class="form-control" type="email" placeholder="[[register:email_address_placeholder]]" name="email" id="email" autocorrect="off" autocapitalize="off" />
-						<span class="register-feedback" id="email-notify"></span>
-						<span class="help-block">[[register:help.email]]</span>
-					</div>
-				</div>
 				<div class="form-group">
 					<label for="username" class="col-lg-4 control-label">[[register:username]]</label>
 					<div class="col-lg-8">
diff --git a/templates/registerComplete.tpl b/templates/registerComplete.tpl
index eb4e98b..6868fd2 100644
--- a/templates/registerComplete.tpl
+++ b/templates/registerComplete.tpl
@@ -3,7 +3,7 @@
 <div class="row">
 	<div class="col-xs-12 col-sm-8 col-sm-offset-2">
 		<p class="lead text-center">
-			[[register:interstitial.intro]]
+			{{{ if register }}}[[register:interstitial.intro-new]]{{{ else }}}[[register:interstitial.intro]]{{{ end }}}
 		</p>
 
 		<!-- IF errors.length -->
@@ -42,6 +42,6 @@
 </form>
 <form role="form" method="post" action="{config.relative_path}/register/abort">
 	<p class="text-center">
-		<button class="btn btn-link">[[register:cancel_registration]]</button>
+		<button class="btn btn-link">{{{ if register }}}[[register:cancel_registration]]{{{ else }}}[[modules:bootbox.cancel]]{{{ end }}}</button>
 	</p>
 </form>
\ No newline at end of file