Fixup password reset page

This commit is contained in:
Johannes Zellner
2020-02-04 15:53:56 +01:00
parent a50fa9bcf4
commit 0762b337b8
2 changed files with 46 additions and 24 deletions
+24 -17
View File
@@ -5,7 +5,7 @@
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
<meta http-equiv="Content-Security-Policy" content="default-src <%= apiOrigin %> 'unsafe-inline' 'unsafe-eval' 'self'; img-src <%= apiOrigin %> 'self'" />
<title> Cloudron Login </title>
<title>Cloudron Login</title>
<link id="favicon" href="<%= apiOrigin %>/api/v1/cloudron/avatar" rel="icon" type="image/png">
@@ -38,18 +38,15 @@
<body ng-app="Application" ng-controller="LoginController">
<!-- login tester -->
<div class="layout-root">
<div class="layout-content" ng-hide="passwordReset">
<div class="layout-content" ng-show="mode === 'login'">
<div class="card" style="padding: 20px; margin-top: 100px; max-width: 620px;">
<div class="row">
<div class="col-md-12" style="text-align: center;">
<img width="128" height="128" style="margin-top: -84px" src="<%= apiOrigin %>/api/v1/cloudron/avatar"/>
<br/>
<h2>Cloudron Login</h2>
<h2 ng-show="passwordReset">Password Reset</h2>
</div>
</div>
<br/>
@@ -63,17 +60,17 @@
<form name="loginForm" ng-submit="onLogin()">
<div class="form-group">
<label class="control-label" for="inputUsername">Username</label>
<input type="text" class="form-control" id="inputUsername" name="username" ng-model="username" autofocus required>
<input type="text" class="form-control" id="inputUsername" name="username" ng-model="username" ng-disabled="busy" autofocus required>
</div>
<div class="form-group">
<label class="control-label" for="inputPassword">Password</label>
<input type="password" class="form-control" name="password" id="inputPassword" ng-model="password" required>
<input type="password" class="form-control" name="password" id="inputPassword" ng-model="password" ng-disabled="busy" required>
</div>
<div class="form-group">
<label class="control-label" for="inputPassword">2FA Token (if enabled)</label>
<input type="text" class="form-control" name="totpToken" id="inputTotpToken" ng-model="totpToken" value="">
<input type="text" class="form-control" name="totpToken" id="inputTotpToken" ng-model="totpToken" ng-disabled="busy" value="">
</div>
<input class="btn btn-primary btn-outline pull-right" type="submit" value="Sign in" ng-disabled="loginForm.$invalid"/>
<button class="btn btn-primary btn-outline pull-right" type="submit" ng-disabled="busy || loginForm.$invalid"><i class="fa fa-circle-notch fa-spin" ng-show="busy"></i> Sign in</button>
</form>
<a ng-href="" class="hand" ng-click="showPasswordReset()">Reset password</a>
</div>
@@ -81,7 +78,7 @@
</div>
</div>
<div class="layout-content" ng-show="passwordReset">
<div class="layout-content" ng-show="mode === 'passwordReset'">
<div class="card" style="padding: 20px; margin-top: 100px; max-width: 620px;">
<div class="row">
<div class="col-md-12" style="text-align: center;">
@@ -91,19 +88,15 @@
</div>
</div>
<br/>
<div class="row">
<div class="col-md-12">
<h4 class="has-error" ng-show="error">Invalid Credentials</h4>
</div>
</div>
<div class="row">
<div class="col-md-12">
<form name="passwordResetForm" ng-submit="onPasswordReset()">
<div class="form-group">
<label class="control-label" for="inputPasswordResetIdentifier">Username or Email</label>
<input type="text" class="form-control" id="inputPasswordResetIdentifier" name="passwordResetIdentifier" ng-model="passwordResetIdentifier" autofocus required>
<input type="text" class="form-control" id="inputPasswordResetIdentifier" name="passwordResetIdentifier" ng-model="passwordResetIdentifier" ng-disabled="busy" autofocus required>
</div>
<input class="btn btn-primary btn-outline pull-right" type="submit" value="Reset" ng-disabled="passwordResetForm.$invalid"/>
<br/>
<button class="btn btn-primary btn-outline pull-right" type="submit" value="Reset" ng-disabled="busy || passwordResetForm.$invalid"><i class="fa fa-circle-notch fa-spin" ng-show="busy"></i> Reset</button>
</form>
<a ng-href="" class="hand" ng-click="showLogin()">Back to login</a>
</div>
@@ -111,6 +104,20 @@
</div>
</div>
<div class="layout-content" ng-show="mode === 'passwordResetDone'">
<div class="card" style="padding: 20px; margin-top: 100px; max-width: 620px;">
<div class="row">
<div class="col-md-12" style="text-align: center;">
<img width="128" height="128" style="margin-top: -84px" src="<%= apiOrigin %>/api/v1/cloudron/avatar"/>
<br/>
<h2>Password Reset Email sent</h2>
<br/>
<button class="btn btn-primary" ng-click="showLogin()">Back to login</button>
</div>
</div>
</div>
</div>
<footer class="text-center">
<span class="text-muted">&copy; 2016-20 <a href="https://cloudron.io" target="_blank">Cloudron</a></span>
</footer>