1
0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-22 16:29:09 +01:00

label hint as optional during registration. formatting. lint updates

This commit is contained in:
Kyle Spearrin 2016-10-05 21:24:22 -04:00
parent abe6ff074b
commit 9478adea88
4 changed files with 28 additions and 16 deletions

View File

@ -8,14 +8,15 @@
</div>
<div class="form-group has-feedback" show-errors>
<label for="email" class="sr-only">Email</label>
<input type="email" id="email" name="Email" class="form-control" placeholder="Email" ng-model="model.email" required api-field
/>
<input type="email" id="email" name="Email" class="form-control" placeholder="Email" ng-model="model.email"
required api-field />
<span class="fa fa-envelope form-control-feedback"></span>
</div>
<div class="form-group has-feedback" show-errors>
<label for="masterPassword" class="sr-only">Master Password</label>
<input type="password" id="masterPassword" name="MasterPasswordHash" class="form-control" placeholder="Master Password" ng-model="model.masterPassword"
required api-field />
<input type="password" id="masterPassword" name="MasterPasswordHash" class="form-control" placeholder="Master Password"
ng-model="model.masterPassword"
required api-field />
<span class="fa fa-lock form-control-feedback"></span>
</div>
<div class="row">

View File

@ -10,7 +10,8 @@
</div>
<a ui-sref="frontend.login.info">Ready to log in?</a>
</div>
<form name="passwordHintForm" ng-submit="passwordHintForm.$valid && submit(model)" ng-show="!success" api-form="submitPromise">
<form name="passwordHintForm" ng-submit="passwordHintForm.$valid && submit(model)" ng-show="!success"
api-form="submitPromise">
<div class="callout callout-danger validation-errors" ng-show="passwordHintForm.$errors">
<h4>Errors have occured</h4>
<ul>
@ -19,7 +20,8 @@
</div>
<div class="form-group has-feedback" show-errors>
<label for="email" class="sr-only">Your account email address</label>
<input type="email" id="email" name="Email" class="form-control" placeholder="Your account email address" ng-model="model.email" required api-field />
<input type="email" id="email" name="Email" class="form-control" placeholder="Your account email address"
ng-model="model.email" required api-field />
<span class="fa fa-envelope form-control-feedback"></span>
</div>
<div class="row">

View File

@ -11,7 +11,8 @@
</div>
<a ui-sref="frontend.login.info">Ready to log in?</a>
</div>
<form name="registerForm" ng-submit="registerForm.$valid && register(registerForm)" ng-show="!success" api-form="registerPromise">
<form name="registerForm" ng-submit="registerForm.$valid && register(registerForm)" ng-show="!success"
api-form="registerPromise">
<div class="callout callout-danger validation-errors" ng-show="registerForm.$errors">
<h4>Errors have occured</h4>
<ul>
@ -20,32 +21,40 @@
</div>
<div class="form-group has-feedback" show-errors>
<label for="email" class="sr-only">Email</label>
<input type="email" id="email" name="Email" class="form-control" placeholder="Email" ng-model="model.email" required api-field />
<input type="email" id="email" name="Email" class="form-control" placeholder="Email" ng-model="model.email"
required api-field />
<span class="fa fa-envelope form-control-feedback"></span>
<p class="help-block">You'll use your email address to log in.</p>
</div>
<div class="form-group has-feedback" show-errors>
<label for="name" class="sr-only">Your Name</label>
<input type="text" id="name" name="Name" class="form-control" ng-model="model.name" placeholder="Your Name" required api-field>
<input type="text" id="name" name="Name" class="form-control" ng-model="model.name" placeholder="Your Name"
required api-field>
<span class="fa fa-user form-control-feedback"></span>
<p class="help-block">What should we call you?</p>
</div>
<div class="form-group has-feedback" show-errors>
<label for="masterPassword" class="sr-only">Master Password</label>
<input type="password" id="masterPassword" name="MasterPasswordHash" class="form-control" ng-model="model.masterPassword" placeholder="Master Password" required api-field>
<input type="password" id="masterPassword" name="MasterPasswordHash" class="form-control"
ng-model="model.masterPassword" placeholder="Master Password" required api-field>
<span class="fa fa-lock form-control-feedback"></span>
<p class="help-block">The master password is the password you use to access your vault.</p>
</div>
<div class="form-group has-feedback" show-errors>
<label form="confirmMasterPassword" class="sr-only">Re-type Master Password</label>
<input type="password" id="confirmMasterPassword" name="ConfirmMasterPassword" class="form-control" placeholder="Re-type Master Password"
<input type="password" id="confirmMasterPassword" name="ConfirmMasterPassword" class="form-control"
placeholder="Re-type Master Password"
ng-model="model.confirmMasterPassword" required api-field>
<span class="fa fa-lock form-control-feedback"></span>
<p class="help-block">It is very important that you do not forget your master password. There is <u>no way</u> to recover the password in the event that you forget it.</p>
<p class="help-block">
It is very important that you do not forget your master password.
There is <u>no way</u> to recover the password in the event that you forget it.
</p>
</div>
<div class="form-group has-feedback" show-errors>
<label for="hint" class="sr-only">Master Password Hint</label>
<input type="text" id="hint" name="MasterPasswordHint" class="form-control" ng-model="model.masterPasswordHint" placeholder="Master Password Hint" api-field>
<label for="hint" class="sr-only">Master Password Hint (optional)</label>
<input type="text" id="hint" name="MasterPasswordHint" class="form-control" ng-model="model.masterPasswordHint"
placeholder="Master Password Hint (optional)" api-field>
<span class="fa fa-lightbulb-o form-control-feedback"></span>
<p class="help-block">A master password hint can help you remember your password if you forget it.</p>
</div>

View File

@ -4,8 +4,8 @@ angular
.directive('passwordMeter', function () {
return {
template: '<div class="progress {{outerClass}}"><div class="progress-bar progress-bar-{{valueClass}}" ' +
+ 'role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="100" ' +
+ 'ng-style="{width : ( value + \'%\' ) }"><span class="sr-only">{{value}}%</span></div></div>',
'role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="100" ' +
'ng-style="{width : ( value + \'%\' ) }"><span class="sr-only">{{value}}%</span></div></div>',
restrict: 'A',
scope: {
password: '=passwordMeter',