Port to NC 25

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

5 files changed, 107 insertions, 79 deletions

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 5967ad9..e89b78a 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -38,7 +38,7 @@ This app allows users to register a new account.
 	<screenshot>https://raw.githubusercontent.com/nextcloud/registration/master/docs/demo.gif</screenshot>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/registration/master/docs/admin-settings.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="22" max-version="24" />
+		<nextcloud min-version="22" max-version="25" />
 	</dependencies>
 	<background-jobs>
 		<job>OCA\Registration\BackgroundJob\ExpireRegistrations</job>
diff --git a/css/style.css b/css/style.css
index d8f1aa3..0de83fa 100644
--- a/css/style.css
+++ b/css/style.css
@@ -12,6 +12,10 @@
 	box-shadow: 0 1px 0 rgba(0,0,0,.1) inset !important;
 }
 
+.nc-25 #body-login #password {
+	box-shadow: none !important;
+}
+
 #email-icon,
 #token-icon,
 #loginname-icon,
@@ -21,7 +25,6 @@
 	position: absolute;
 	left: 16px;
 	top: 22px;
-	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=30)';
 	filter: alpha(opacity=30);
 	opacity: .3;
 }
@@ -30,6 +33,10 @@
 	top: 27px;
 }
 
+.nc-25 #email-icon {
+	top: 22px;
+}
+
 input[type='submit'] {
 	width: calc(100% - 10px) !important;
 	white-space: normal;
@@ -45,6 +52,14 @@ input[type='submit'] {
 	text-decoration: underline;
 }
 
+.nc-25 .msg {
+    color: var(--color-main-text);
+}
+
+.nc-25 .msg a {
+    color: var(--color-main-text);
+}
+
 .error {
 	margin-bottom: 15px;
 }
@@ -53,6 +68,12 @@ input[type='submit'] {
 	position: relative;
 }
 
-.toggle-password {
-	top: 7px !important;
+.nc-25 .groupbutton {
+    position: relative;
+}
+
+.nc-25 .toggle-password {
+    position: absolute;
+    right: 0;
+    top: 5px;
 }
diff --git a/templates/form/email.php b/templates/form/email.php
index 9de7dce..89d8382 100644
--- a/templates/form/email.php
+++ b/templates/form/email.php
@@ -4,6 +4,7 @@
 style('registration', 'style');
 script('registration', 'registration-form');
 ?>
+<div class="login-box">
 	<form action="" method="post">
 		<fieldset>
 			<?php if ($_['message']): ?>
@@ -43,3 +44,4 @@ script('registration', 'registration-form');
 			</a>
 		</fieldset>
 	</form>
+</div>
diff --git a/templates/form/user.php b/templates/form/user.php
index 93c8598..470d22c 100644
--- a/templates/form/user.php
+++ b/templates/form/user.php
@@ -3,83 +3,86 @@
 /** @var \OCP\IL10N $l */
 style('registration', 'style');
 script('registration', 'registration-form');
-?><form action="" method="post">
-	<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
-	<fieldset>
-		<?php if (!empty($_['message'])) {?>
-		<ul class="error">
-			<li><?php p($_['message']); ?></li>
-		</ul>
-		<?php } else { ?>
-		<ul class="msg">
-			<li><?php p($l->t('Welcome, you can create your account below.'));?></li>
-		</ul>
-		<?php } ?>
-
-		<?php if (!empty($_['additional_hint'])): ?>
+?>
+<div class="login-box">
+	<form action="" method="post">
+		<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
+		<fieldset>
+			<?php if (!empty($_['message'])) {?>
+			<ul class="error">
+				<li><?php p($_['message']); ?></li>
+			</ul>
+			<?php } else { ?>
 			<ul class="msg">
-				<li><?php p($_['additional_hint']); ?></li>
+				<li><?php p($l->t('Welcome, you can create your account below.'));?></li>
 			</ul>
-		<?php endif; ?>
-
-		<?php if (!$_['email_is_optional'] || !empty($_['email'])) { ?>
-			<p class="grouptop">
-				<input type="email" name="email" id="email" value="<?php p($_['email']); ?>" disabled />
-				<label for="email" class="infield"><?php p($_['email']); ?></label>
-				<img id="email-icon" class="svg" src="<?php print_unescaped(image_path('', 'actions/mail.svg')); ?>" alt=""/>
-			</p>
-		<?php } ?>
-
-		<?php if (!$_['email_is_login']) { ?>
+			<?php } ?>
+	
+			<?php if (!empty($_['additional_hint'])): ?>
+				<ul class="msg">
+					<li><?php p($_['additional_hint']); ?></li>
+				</ul>
+			<?php endif; ?>
+	
+			<?php if (!$_['email_is_optional'] || !empty($_['email'])) { ?>
+				<p class="grouptop">
+					<input type="email" name="email" id="email" value="<?php p($_['email']); ?>" disabled />
+					<label for="email" class="infield"><?php p($_['email']); ?></label>
+					<img id="email-icon" class="svg" src="<?php print_unescaped(image_path('', 'actions/mail.svg')); ?>" alt=""/>
+				</p>
+			<?php } ?>
+	
+			<?php if (!$_['email_is_login']) { ?>
+				<p class="groupmiddle">
+					<input type="text" name="loginname" id="loginname" value="<?php if (!empty($_['loginname'])) {
+		p($_['loginname']);
+	} ?>" placeholder="<?php p($l->t('Login name')); ?>" required />
+					<label for="loginname" class="infield"><?php p($l->t('Login name')); ?></label>
+					<img id="loginname-icon" class="svg" src="<?php print_unescaped(image_path('', 'categories/auth.svg')); ?>" alt=""/>
+				</p>
+			<?php } else { ?>
+				<input type="hidden" name="loginname" value="<?php p($_['email']); ?>" />
+			<?php } ?>
+	
+			<?php if ($_['show_fullname']) { ?>
 			<p class="groupmiddle">
-				<input type="text" name="loginname" id="loginname" value="<?php if (!empty($_['loginname'])) {
-	p($_['loginname']);
-} ?>" placeholder="<?php p($l->t('Login name')); ?>" required />
-				<label for="loginname" class="infield"><?php p($l->t('Login name')); ?></label>
-				<img id="loginname-icon" class="svg" src="<?php print_unescaped(image_path('', 'categories/auth.svg')); ?>" alt=""/>
+				<input type="text" name="fullname" id="fullname" value="<?php if (!empty($_['fullname'])) {
+		p($_['fullname']);
+	} ?>" placeholder="<?php p($l->t('Full name')); ?>" <?php if ($_['enforce_fullname']) {
+		p('required');
+	} ?> />
+				<label for="fullname" class="infield"><?php p($l->t('Full name')); ?></label>
+				<img id="fullname-icon" class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
 			</p>
-		<?php } else { ?>
-			<input type="hidden" name="loginname" value="<?php p($_['email']); ?>" />
-		<?php } ?>
-
-		<?php if ($_['show_fullname']) { ?>
-		<p class="groupmiddle">
-			<input type="text" name="fullname" id="fullname" value="<?php if (!empty($_['fullname'])) {
-	p($_['fullname']);
-} ?>" placeholder="<?php p($l->t('Full name')); ?>" <?php if ($_['enforce_fullname']) {
-	p('required');
-} ?> />
-			<label for="fullname" class="infield"><?php p($l->t('Full name')); ?></label>
-			<img id="fullname-icon" class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
-		</p>
-		<?php } else { ?>
-			<input type="hidden" name="fullname" value="" />
-		<?php } ?>
-
-		<?php if ($_['show_phone']) { ?>
-			<p class="groupmiddle">
-				<input type="text" name="phone" id="phone" value="<?php if (!empty($_['phone'])) {
-	p($_['phone']);
-} ?>" placeholder="<?php p($l->t('Phone number')); ?>" <?php if ($_['enforce_phone']) {
-	p('required');
-} ?> />
-				<label for="phone" class="infield"><?php p($l->t('Phone number')); ?></label>
-				<img id="phone-icon" class="svg" src="<?php print_unescaped(image_path('', 'clients/phone.svg')); ?>" alt=""/>
+			<?php } else { ?>
+				<input type="hidden" name="fullname" value="" />
+			<?php } ?>
+	
+			<?php if ($_['show_phone']) { ?>
+				<p class="groupmiddle">
+					<input type="text" name="phone" id="phone" value="<?php if (!empty($_['phone'])) {
+		p($_['phone']);
+	} ?>" placeholder="<?php p($l->t('Phone number')); ?>" <?php if ($_['enforce_phone']) {
+		p('required');
+	} ?> />
+					<label for="phone" class="infield"><?php p($l->t('Phone number')); ?></label>
+					<img id="phone-icon" class="svg" src="<?php print_unescaped(image_path('', 'clients/phone.svg')); ?>" alt=""/>
+				</p>
+			<?php } else { ?>
+				<input type="hidden" name="phone" value="" />
+			<?php } ?>
+	
+			<p class="groupbottom">
+				<input type="password" name="password" id="password" value="<?php if (!empty($_['password'])) {
+		p($_['password']);
+	} ?>" placeholder="<?php p($l->t('Password')); ?>" required />
+				<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
+				<img id="password-icon" class="svg" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
+				<button id="showadminpass" class="toggle-password">
+					<img src="<?php print_unescaped(image_path('core', 'actions/toggle.svg')); ?>">
+				</button>
 			</p>
-		<?php } else { ?>
-			<input type="hidden" name="phone" value="" />
-		<?php } ?>
-
-		<p class="groupbottom">
-			<input type="password" name="password" id="password" value="<?php if (!empty($_['password'])) {
-	p($_['password']);
-} ?>" placeholder="<?php p($l->t('Password')); ?>" required />
-			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
-			<img id="password-icon" class="svg" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
-			<a id="showadminpass" href="#" class="toggle-password">
-				<img src="<?php print_unescaped(image_path('core', 'actions/toggle.svg')); ?>">
-			</a>
-		</p>
-		<input type="submit" id="submit" value="<?php p($l->t('Create account')); ?>" />
-	</fieldset>
-</form>
+			<input type="submit" class="primary" id="submit" value="<?php p($l->t('Create account')); ?>" />
+		</fieldset>
+	</form>
+</div>
diff --git a/templates/form/verification.php b/templates/form/verification.php
index b68473d..4d760d9 100644
--- a/templates/form/verification.php
+++ b/templates/form/verification.php
@@ -4,6 +4,7 @@
 style('registration', 'style');
 script('registration', 'registration-form');
 ?>
+<div class="login-box">
 	<form action="" method="post">
 		<fieldset>
 			<?php if ($_['message']): ?>
@@ -25,3 +26,4 @@ script('registration', 'registration-form');
 			</a>
 		</fieldset>
 	</form>
+</div>