Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsgiehl <stefangiehl@gmail.com>2011-06-18 19:24:49 +0400
committersgiehl <stefangiehl@gmail.com>2011-06-18 19:24:49 +0400
commitf5eb0a82192fa3f53aff927967a406a7c854cac2 (patch)
tree6d02da2ff2a27f991893b3f91e935551d5d75540 /plugins/UsersManager
parent8eb3d154841da9544db54738721e12e2c7a3b45e (diff)
fixes #2430 show change password confirm on users settings page
git-svn-id: http://dev.piwik.org/svn/trunk@4934 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/UsersManager')
-rw-r--r--plugins/UsersManager/templates/userSettings.js10
-rw-r--r--plugins/UsersManager/templates/userSettings.tpl7
2 files changed, 16 insertions, 1 deletions
diff --git a/plugins/UsersManager/templates/userSettings.js b/plugins/UsersManager/templates/userSettings.js
index c1eb621438..1e2eb149de 100644
--- a/plugins/UsersManager/templates/userSettings.js
+++ b/plugins/UsersManager/templates/userSettings.js
@@ -63,7 +63,15 @@ function getAnonymousUserSettingsAJAX()
$(document).ready( function() {
$('#userSettingsSubmit').click( function() {
- $.ajax( getUserSettingsAJAX() );
+ var onValidate = function() {
+ $.ajax( getUserSettingsAJAX() );
+ }
+ if($('#password').val() != '') {
+ piwikHelper.windowModal( '#confirmPasswordChange', onValidate);
+ } else {
+ onValidate();
+ }
+
});
$('#userSettingsTable input').keypress( function(e) {
var key=e.keyCode || e.which;
diff --git a/plugins/UsersManager/templates/userSettings.tpl b/plugins/UsersManager/templates/userSettings.tpl
index d43906023b..48c0bcb74c 100644
--- a/plugins/UsersManager/templates/userSettings.tpl
+++ b/plugins/UsersManager/templates/userSettings.tpl
@@ -5,6 +5,13 @@
<h2>{'UsersManager_MenuUserSettings'|translate}</h2>
<br />
+
+<div class="ui-confirm" id="confirmPasswordChange">
+ <h2>{'UsersManager_ChangePasswordConfirm'|translate}</h2>
+ <input id="yes" type="button" value="{'General_Yes'|translate}" />
+ <input id="no" type="button" value="{'General_No'|translate}" />
+</div>
+
<table id='userSettingsTable' class="adminTable" style='width:1000px'>
<tr>
<td><label for="username">{'General_Username'|translate} </label></td>