Merge with master

5 files changed, 13 insertions, 13 deletions

diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index adef52eaaa..57063bfbdd 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -126,9 +126,8 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin
         if (Piwik::isUserIsSuperUser()) {
             $view->userAlias = $userLogin;
             $view->userEmail = Piwik::getSuperUserEmail();
-            if (!Piwik_Config::getInstance()->isFileWritable()) {
-                $view->configFileNotWritable = true;
-            }
+            $view->configFileNotWritable = !Piwik_Config::getInstance()->isFileWritable();
+
         } else {
             $user = Piwik_UsersManager_API::getInstance()->getUser($userLogin);
             $view->userAlias = $user['alias'];
diff --git a/plugins/UsersManager/javascripts/usersManager.js b/plugins/UsersManager/javascripts/usersManager.js
index 0db663d7c2..c24cbf73e6 100644
--- a/plugins/UsersManager/javascripts/usersManager.js
+++ b/plugins/UsersManager/javascripts/usersManager.js
@@ -196,7 +196,7 @@ $(document).ready(function () {
             piwikHelper.hideAjaxError();
             var idRow = $(this).attr('id');
             var loginToDelete = $(this).parent().parent().find('#userLogin').html();
-            $('#confirmUserRemove h2').text(sprintf(_pk_translate('UsersManager_DeleteConfirm_js'), '"' + loginToDelete + '"'));
+            $('#confirmUserRemove').find('h2').text(sprintf(_pk_translate('UsersManager_DeleteConfirm_js'), '"' + loginToDelete + '"'));
             piwikHelper.modalConfirm('#confirmUserRemove', {yes: function () { sendDeleteUserAJAX(loginToDelete); }});
         }
     );
diff --git a/plugins/UsersManager/javascripts/usersSettings.js b/plugins/UsersManager/javascripts/usersSettings.js
index 0bfdf3d8bb..4c05a46478 100644
--- a/plugins/UsersManager/javascripts/usersSettings.js
+++ b/plugins/UsersManager/javascripts/usersSettings.js
@@ -22,8 +22,9 @@ function sendUserSettingsAJAX() {
     var password = $('#password').val();
     var passwordBis = $('#passwordBis').val();
     var defaultReport = $('input[name=defaultReport]:checked').val();
+
     if (defaultReport == 1) {
-        defaultReport = $('#defaultReportSiteSelector .custom_select_main_link').attr('siteid');
+        defaultReport = $('#userSettingsTable').find('.custom_select_main_link').attr('siteid');
     }
     var postParams = {};
     postParams.alias = alias;
@@ -52,7 +53,7 @@ function sendUserSettingsAJAX() {
 function sendAnonymousUserSettingsAJAX() {
     var anonymousDefaultReport = $('input[name=anonymousDefaultReport]:checked').val();
     if (anonymousDefaultReport == 1) {
-        anonymousDefaultReport = $('#anonymousDefaultReportWebsite option:selected').val();
+        anonymousDefaultReport = $('#anonymousDefaultReportWebsite').find('option:selected').val();
     }
     var anonymousDefaultDate = $('input[name=anonymousDefaultDate]:checked').val();
 
@@ -81,7 +82,7 @@ $(document).ready(function () {
         }
 
     });
-    $('#userSettingsTable input').keypress(function (e) {
+    $('#userSettingsTable').find('input').keypress(function (e) {
         var key = e.keyCode || e.which;
         if (key == 13) {
             $('#userSettingsSubmit').click();
diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
index 3202f1a6b3..a90fe124b8 100644
--- a/plugins/UsersManager/templates/index.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -17,7 +17,7 @@
             'siteName': defaultReportSiteName,
             'idSite':idSiteSelected,
             'allSitesItemText': applyAllSitesText,
-            'allWebsitesLinkLocation': top,
+            'allWebsitesLinkLocation': 'top',
             'siteSelectorId':"usersManagerSiteSelect",
             'switchSiteOnSelect':false
         } %}
@@ -52,7 +52,7 @@
         {% for login,access in usersAccessByWebsite %}
             <tr>
                 <td id='login'>{{ login }}</td>
-                <td>{{ usersAliasByLogin[login] }}</td>
+                <td>{{ usersAliasByLogin[login]|raw }}</td>
                 <td id='noaccess'>{% if access=='noaccess' and idSiteSelected != 'all' %}{{ accesValid }}{% else %}{{ accesInvalid }}{% endif %}&nbsp;</td>
                 <td id='view'>{% if access == 'view' and idSiteSelected != 'all' %}{{ accesValid }}{% else %}{{ accesInvalid }}{% endif %}&nbsp;</td>
                 <td id='admin'>
@@ -89,7 +89,7 @@
     <br/>
     <h2>{{ 'UsersManager_UsersManagement'|translate }}</h2>
     <p>{{ 'UsersManager_UsersManagementMainDescription'|translate }}
-        {{ 'UsersManager_ThereAreCurrentlyNRegisteredUsers'|translate("<b>"+usersCount+"</b>")|raw }}</p>
+        {{ 'UsersManager_ThereAreCurrentlyNRegisteredUsers'|translate("<b>"~usersCount~"</b>")|raw }}</p>
     {% import 'ajaxMacros.twig' as ajax %}
     {{ ajax.errorDiv('ajaxErrorUsersManagement') }}
     {{ ajax.loadingDiv('ajaxLoadingUsersManagement') }}
@@ -114,7 +114,7 @@
                         <td id="userLogin" class="editable">{{ user.login }}</td>
                         <td id="password" class="editable">-</td>
                         <td id="email" class="editable">{{ user.email }}</td>
-                        <td id="alias" class="editable">{{ user.alias }}</td>
+                        <td id="alias" class="editable">{{ user.alias|raw }}</td>
                         <td id="token_auth">{{ user.token_auth }}</td>
                         <td>
                             <span class="edituser link_but" id="row{{ i }}">
diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig
index 7fc47c5bd0..4af206e6a7 100644
--- a/plugins/UsersManager/templates/userSettings.twig
+++ b/plugins/UsersManager/templates/userSettings.twig
@@ -55,7 +55,7 @@
                     'switchSiteOnSelect':false,
                     'showAllSitesItem':false,
                     'showSelectedSite':true,
-                    'siteSelectorId':defaultReportSiteSelector
+                    'siteSelectorId': 'defaultReportSiteSelector'
                 } %}
             </fieldset>
         </td>
@@ -107,7 +107,7 @@
 {% endif %}
 </p>
 <span style='margin-left:20px'>
-<a href='{{ linkTo({'token_auth':token_auth, 'action':setIgnoreCookie}) }}#excludeCookie'>&rsaquo; {% if ignoreCookieSet %}{{ 'UsersManager_ClickHereToDeleteTheCookie'|translate }}
+<a href='{{ linkTo({'token_auth':token_auth, 'action':'setIgnoreCookie'}) }}#excludeCookie'>&rsaquo; {% if ignoreCookieSet %}{{ 'UsersManager_ClickHereToDeleteTheCookie'|translate }}
     {% else %}{{'UsersManager_ClickHereToSetTheCookieOnDomain'|translate(piwikHost) }}{% endif %}
     <br/>
 </a></span>