diff options
| author | brantje <brantje@gmail.com> | 2016-10-07 16:38:23 +0300 |
|---|---|---|
| committer | brantje <brantje@gmail.com> | 2016-10-07 16:38:23 +0300 |
| commit | ca590057b5125d4810d17f85020a29a6457aa4a0 (patch) | |
| tree | bc4d5108f85f2d365df936658576c96385048411 /templates | |
| parent | e8df9295ed1c2e8513288f1663f8aeec99451f46 (diff) | |
Change vault password, minor fixes
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/main.php | 2 | ||||
| -rw-r--r-- | templates/views/partials/forms/settings/general_settings.html | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/templates/main.php b/templates/main.php index 4945a1ba..e0a2db93 100644 --- a/templates/main.php +++ b/templates/main.php @@ -129,7 +129,7 @@ style('passman', 'app'); <div id="app-settings-content" ng-show="settingsShown"> <!-- Your settings in here --> <div class="settings-container"> - <div><a class="link" ng-href="#/vault/{{active_vault.vault_id}}/settings">Settings</a></div> + <div><a class="link" ng-href="#/vault/{{active_vault.guid}}/settings">Settings</a></div> <div><span class="link" ng-click="logout()">Logout</span></div> <div><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6YS8F97PETVU2" target="_blank" class="link">Donate</a></div> </div> diff --git a/templates/views/partials/forms/settings/general_settings.html b/templates/views/partials/forms/settings/general_settings.html index 2ba51a0c..437215c6 100644 --- a/templates/views/partials/forms/settings/general_settings.html +++ b/templates/views/partials/forms/settings/general_settings.html @@ -3,7 +3,7 @@ <h3>Rename vault</h3> <label>New vault name</label> <input type="text" ng-model="$parent.new_vault_name"> - <button ng-click="saveVaultSettings()" tooltip="'Not working :P'"> + <button ng-click="saveVaultSettings()"> Change </button> @@ -17,9 +17,19 @@ <ng-password-meter password="newVaultPass"></ng-password-meter> <label>New vault password</label> <input type="password" ng-model="newVaultPass2"> + <div ng-show="error" class="error"> + <ul> + <li>{{error}}</li> + </ul> + </div> <button ng-click="changeVaultPassword(oldVaultPass,newVaultPass,newVaultPass2)" - tooltip="'Not working :P'">Change + >Change </button> + <div ng-show="change_pw.total > 0"> + Please wait you vault is being updated, do not leave this page.<br /> + <div progress-bar="change_pw.percent" index="change_pw.done" total="change_pw.total"></div> + </div> + </div> <div class="col-xs-12 col-md-6"> <h3>About passman</h3> |