2 files changed, 31 insertions, 14 deletions

diff --git a/plugins/UsersManager/javascripts/usersManager.js b/plugins/UsersManager/javascripts/usersManager.js
index 6caec78b13..193affb38e 100644
--- a/plugins/UsersManager/javascripts/usersManager.js
+++ b/plugins/UsersManager/javascripts/usersManager.js
@@ -98,11 +98,11 @@ function launchAjaxRequest(self, successCallback) {
     );
 }
 
-function updateSuperUserAccess(login, isSuperUser)
+function updateSuperUserAccess(login, hasSuperUserAccess)
 {
     var parameters = {};
     parameters.userLogin = login;
-    parameters.hasSuperUserAccess = isSuperUser;
+    parameters.hasSuperUserAccess = hasSuperUserAccess ? 1: 0;
 
     var ajaxHandler = new ajaxHelper();
     ajaxHandler.addParams({
@@ -117,6 +117,25 @@ function updateSuperUserAccess(login, isSuperUser)
     ajaxHandler.send(true);
 }
 
+function bindUpdateSuperUserAccess() {
+    var login     = $(this).parents('td').data('login');
+    var hasAccess = parseInt($(this).data('hasaccess'), 10);
+
+    var message = 'Do_You_Really_Want_To_Grant_%s_SuperUser_Permission?_The_User_Will_Have_Access_To_All_Websites_And_Users_...';
+    if (hasAccess) {
+        message = 'Do_You_Really_Want_To_Remove_%s_SuperUser_Permission?_The_User_Will_Lose_Access_To_All_Websites_And_Users_...';
+    }
+
+    message = _pk_translate(message);
+    message = message.replace('%s', login)
+
+    $('#superUserAccessConfirm h2').text(message);
+
+    piwikHelper.modalConfirm('#superUserAccessConfirm', {yes: function () {
+        updateSuperUserAccess(login, !hasAccess);
+    }});
+}
+
 function bindUpdateAccess() {
     var self = this;
     // callback called when the ajax request Update the user permissions is successful
@@ -255,15 +274,7 @@ $(document).ready(function () {
     $('#access .updateAccess')
         .click(bindUpdateAccess);
 
-    $('#superUserAccess .accessGranted').click(function () {
-        var login = $(this).parents('td').attr('login');
-        updateSuperUserAccess(login, 0);
-    });
-
-    $('#superUserAccess .updateAccess').click(function () {
-        var login = $(this).parents('td').attr('login');
-        updateSuperUserAccess(login, 1);
-    });
+    $('#superUserAccess .accessGranted, #superUserAccess .updateAccess').click(bindUpdateSuperUserAccess);
 
     // when a site is selected, reload the page w/o showing the ajax loading element
     $('#usersManagerSiteSelect').bind('piwik:siteSelected', function (e, site) {
diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
index e165f8aa25..885f87501a 100644
--- a/plugins/UsersManager/templates/index.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -172,9 +172,9 @@
             <tr>
                 <td id='login'>{{ login }}</td>
                 <td>{{ alias|raw }}</td>
-                <td id='superuser' login="{{ login|e('html_attr') }}">
-                    <img src='plugins/UsersManager/images/ok.png' class='accessGranted' {% if not (login in superUserLogins) %}style="display:none"{% endif %} />
-                    <img src='plugins/UsersManager/images/no-access.png' class='updateAccess' {% if login in superUserLogins %}style="display:none"{% endif %} />
+                <td id='superuser' data-login="{{ login|e('html_attr') }}">
+                    <img src='plugins/UsersManager/images/ok.png' class='accessGranted' data-hasaccess="1" {% if not (login in superUserLogins) %}style="display:none"{% endif %} />
+                    <img src='plugins/UsersManager/images/no-access.png' class='updateAccess' data-hasaccess="0" {% if login in superUserLogins %}style="display:none"{% endif %} />
                     &nbsp;
                 </td>
             </tr>
@@ -184,5 +184,11 @@
 
     <div id="superUserAccessUpdated" style="vertical-align:top;"></div>
 
+    <div class="ui-confirm" id="superUserAccessConfirm">
+        <h2> </h2>
+        <input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/>
+        <input role="no" type="button" value="{{ 'General_No'|translate }}"/>
+    </div>
+
 {% endif %}
 {% endblock %}