Update 2016-06-09T23:21:54.767Z

app/accounts/views/accountsRegister.html

@@ -6,11 +6,12 @@
         <p class="login-box-msg">Register for a new account.</p>
         <div class="text-center" ng-show="success">
             <div class="callout callout-success">
-                <h4>Almost done!</h4> Check your email ({{model.email}}) to complete your registration.
+                <h4>You're Registered!</h4>
+                <p>You may now log in to your new account.</p>
             </div>
             <a ui-sref="frontend.login.info">Ready to log in?</a>
         </div>
-        <form name="registerForm" ng-submit="registerForm.$valid && register(model)" 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>
@@ -21,6 +22,32 @@
                 <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 />
                 <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>
+                <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>
+                <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"
+                       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>
+            </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>
+                <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>
             <div class="row">
                 <div class="col-xs-7">

app/accounts/views/accountsRegisterFinalize.html

@@ -1,7 +0,0 @@
-<div class="register-box">
-    <div class="register-logo">
-        <i class="fa fa-shield"></i> <b>bit</b>warden
-    </div>
-    <div class="register-box-body" ui-view>
-    </div>
-</div>

app/accounts/views/accountsRegisterFinalizeConfirm.html

@@ -1,35 +0,0 @@
-<p class="login-box-msg">Confirm your master password.</p>
-<div class="text-center" ng-show="success">
-    <div class="callout callout-success">
-        <h4>You're Registered!</h4>
-        <p>You may now log in to your new account.</p>
-    </div>
-    <a ui-sref="frontend.login.info">Ready to log in?</a>
-</div>
-<form name="finalizeConfirmForm" ng-submit="finalizeConfirmForm.$valid && confirm(finalizeConfirmForm)" ng-show="!success"
-      api-form="confirmPromise">
-    <div class="callout callout-danger validation-errors" ng-show="finalizeConfirmForm.$errors">
-        <h4>Errors have occured</h4>
-        <ul>
-            <li ng-repeat="e in finalizeConfirmForm.$errors">{{e}}</li>
-        </ul>
-    </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"
-               ng-model="model.confirmMasterPassword" 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 no way to recover the password in the event that you forget it.</p>
-    </div>
-    <hr />
-    <div class="row">
-        <div class="col-xs-7">
-            <a href="#" ng-click="loadInfo()"><i class="fa fa-arrow-left"></i> Go Back</a>
-        </div>
-        <div class="col-xs-5">
-            <button type="submit" class="btn btn-primary btn-block btn-flat" ng-disabled="finalizeConfirmForm.$loading">
-                <i class="fa fa-refresh fa-spin loading-icon" ng-show="finalizeConfirmForm.$loading"></i>Submit
-            </button>
-        </div>
-    </div>
-</form>

app/accounts/views/accountsRegisterFinalizeInfo.html

@@ -1,35 +0,0 @@
-<p class="login-box-msg">Finalize the creation of your new account.</p>
-<form name="finalizeInfoForm" ng-submit="finalizeInfoForm.$valid && info()">
-    <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" ng-model="model.email" placeholder="Email" readonly required>
-        <span class="fa fa-envelope form-control-feedback"></span>
-    </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>
-        <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>
-        <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 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">
-        <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>
-    <hr />
-    <div class="row">
-        <div class="col-xs-7">
-            <a ui-sref="frontend.login.info">Cancel registration</a>
-        </div>
-        <div class="col-xs-5">
-            <button type="submit" class="btn btn-primary btn-block btn-flat">Continue</button>
-        </div>
-    </div>
-</form>

app/vault/views/vault.html

@@ -46,7 +46,7 @@
                                 <button type="button" ng-click="deleteSite(site)" class="btn btn-link btn-table" uib-tooltip="Delete"><i class="fa fa-lg fa-trash"></i></button>
                                 <button type="button" ng-click="editSite(site)" class="btn btn-link btn-table" uib-tooltip="View/Edit"><i class="fa fa-lg fa-pencil"></i></button>
                             </td>
-                            <td>{{site.name}}</td>
+                            <td>{{site.name}} <i class="fa fa-star text-muted" uib-tooltip="Favorite" ng-show="site.favorite"></i></td>
                             <td>{{site.username}}</td>
                         </tr>
                     </tbody>

app/vault/views/vaultAddSite.html

@@ -82,6 +82,12 @@
             <label for="notes">Notes</label>
             <textarea id="notes" name="Notes" class="form-control" ng-model="site.notes" api-field></textarea>
         </div>
+        <div class="checkbox">
+            <label>
+                <input type="checkbox" ng-model="site.favorite" name="Favorite" />
+                Favorite
+            </label>
+        </div>
     </div>
     <div class="modal-footer">
         <button type="submit" class="btn btn-primary btn-flat" ng-disabled="addSiteForm.$loading">

app/vault/views/vaultEditSite.html

@@ -85,6 +85,12 @@
             <label for="notes">Notes</label>
             <textarea id="notes" name="Notes" class="form-control" ng-model="site.notes" api-field></textarea>
         </div>
+        <div class="checkbox">
+            <label>
+                <input type="checkbox" ng-model="site.favorite" name="Favorite" />
+                Favorite
+            </label>
+        </div>
     </div>
     <div class="modal-footer">
         <button type="submit" class="btn btn-primary btn-flat" ng-disabled="editSiteForm.$loading">