From 01b62e49b4258737b486c08f603e98897c98b91a Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 14 Jul 2020 16:30:15 +0200
Subject: [PATCH] Add a "Back to login" link similar to the forgot password
 page

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 templates/admin.php    |  2 ++
 templates/domains.php  |  4 +++-
 templates/form.php     |  7 ++++---
 templates/message.php  |  5 +++--
 templates/register.php | 13 +++++++++++--
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/templates/admin.php b/templates/admin.php
index 198e776..16ff9e5 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -1,4 +1,6 @@
 <?php
+/** @var array $_ */
+/** @var \OCP\IL10N $l */
 script('registration', 'settings');
 ?>
 <form id="registration_settings_form" class="section">
diff --git a/templates/domains.php b/templates/domains.php
index 111ed9e..13ce4ef 100644
--- a/templates/domains.php
+++ b/templates/domains.php
@@ -1,5 +1,7 @@
 <?php
-\OCP\Util::addStyle('registration', 'style');
+/** @var array $_ */
+/** @var \OCP\IL10N $l */
+style('registration', 'style');
 ?>
 <ul class="error-wide">
 	<li class='error'><?php p($l->t('Registration is only allowed for the following domains:')); ?>
diff --git a/templates/form.php b/templates/form.php
index 83853ff..ada251e 100644
--- a/templates/form.php
+++ b/templates/form.php
@@ -1,7 +1,8 @@
 <?php
-\OCP\Util::addStyle('core', 'guest');
-\OCP\Util::addStyle('registration', 'style');
-\OCP\Util::addScript('registration', 'form');
+/** @var array $_ */
+/** @var \OCP\IL10N $l */
+style('registration', 'style');
+script('registration', 'form');
 ?><form action="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('registration.register.createAccount', ['token'=>$_['token']])) ?>" method="post">
 	<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
 	<fieldset>
diff --git a/templates/message.php b/templates/message.php
index b583958..c895520 100644
--- a/templates/message.php
+++ b/templates/message.php
@@ -1,6 +1,7 @@
 <?php
-\OCP\Util::addStyle('registration', 'style');
-\OCP\Util::addStyle('core', 'guest');
+/** @var array $_ */
+/** @var \OCP\IL10N $l */
+style('registration', 'style');
 ?>
 <ul class="msg error-wide nc-theming-main-text">
 	<li><?php print_unescaped($_['msg'])?></li>
diff --git a/templates/register.php b/templates/register.php
index 3cfc6d6..6c2d542 100644
--- a/templates/register.php
+++ b/templates/register.php
@@ -1,6 +1,7 @@
 <?php
-\OCP\Util::addStyle('registration', 'style');
-\OCP\Util::addStyle('core', 'guest');
+/** @var array $_ */
+/** @var \OCP\IL10N $l */
+style('registration', 'style');
 if ($_['entered']): ?>
 	<?php if (empty($_['errormsg'])): ?>
 		<ul class="success">
@@ -21,6 +22,10 @@ if ($_['entered']): ?>
 				</p>
 				<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']); ?>" />
 				<input type="submit" id="submit" value="<?php p($l->t('Request verification link')); ?>" />
+
+				<a id="lost-password-back" href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('core.login.showLoginForm')) ?>">
+					<?php p($l->t('Back to login')); ?>
+				</a>
 			</fieldset>
 		</form>
 	<?php endif; ?>
@@ -44,6 +49,10 @@ if ($_['entered']): ?>
 			</p>
 			<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']); ?>" />
 			<input type="submit" id="submit" value="<?php p($l->t('Request verification link')); ?>" />
+
+			<a id="lost-password-back" href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('core.login.showLoginForm')) ?>">
+				<?php p($l->t('Back to login')); ?>
+			</a>
 		</fieldset>
 	</form>
 <?php endif; ?>