IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

login: fix broken reset password form (#10881)

Browse Source
This commit is contained in:
Marcus Efraimsson 2018-02-12 17:09:39 +01:00 committed by Torkel Ödegaard
parent acd085605c
commit ac3bf54fb4
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/core/controllers/signup_ctrl.ts
View File

@ -21,8 +21,9 @@ export class SignUpCtrl {
$scope.navModel = { $scope.navModel = {
main: { main: {
icon: 'gicon gicon-branding', icon: 'gicon gicon-branding',
text: 'Sign Up',
subTitle: 'Register your Grafana account', subTitle: 'Register your Grafana account',
breadcrumbs: [{ title: 'Login', url: 'login' }, { title: 'Sign Up' }], breadcrumbs: [{ title: 'Login', url: 'login' }],
}, },
}; };

20
public/app/partials/reset_password.html
View File

@ -18,7 +18,7 @@
</div> </div>
</form> </form>
<div ng-if="mode === 'email-sent'"> <div ng-show="mode === 'email-sent'">
An email with a reset link as been sent to the email address. <br> An email with a reset link as been sent to the email address. <br>
You should receive it shortly. You should receive it shortly.
<div class="p-t-1"> <div class="p-t-1">
@ -27,5 +27,23 @@
</a> </a>
</div> </div>
</div> </div>
<form name="resetForm" class="login-form gf-form-group" ng-show="mode === 'reset'">
<div class="gf-form">
<span class="gf-form-label width-9">New Password</span>
<input type="password" name="NewPassword" class="gf-form-input max-width-14" required ng-minlength="4" ng-model='formModel.newPassword' placeholder="password" watch-change="formModel.newPassword = inputValue;">
</div>
<div class="gf-form">
<span class="gf-form-label width-9">Confirm Password</span>
<input type="password" name="ConfirmPassword" class="gf-form-input max-width-14" required ng-minlength="4" ng-model='formModel.confirmPassword' placeholder="confirm password">
</div>
<div class="signup__password-strength">
<password-strength password="formModel.newPassword"></password-strength>
</div>
<div class="gf-form-button-row">
<button type="submit" class="btn btn-success" ng-click="submitReset();" ng-disabled="!resetForm.$valid">
Reset Password
</button>
</div>
</form>
</div> </div>
</div> </div>