* Fixing Users manager

Refs #4019
matomo-org · Jun 25, 2013 · 0232067 · 0232067
1 parent 4487ee6
commit 0232067
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/plugins/CoreHome/templates/_siteSelect.twig b/plugins/CoreHome/templates/_siteSelect.twig
@@ -40,7 +40,7 @@
                 <ul class="custom_select_ul_list">
                     {% for info in sites %}
                         <li {% if (showSelectedSite is not defined or showSelectedSite == false) and idSite == info.idsite %} style="display: none"{% endif %}>
-                            <a href="#" siteid="{{ info.idsite }}">{{ info.name }}</a>
+                            <a href="#" siteid="{{ info.idsite }}">{{ info.name|raw }}</a>
                         </li>
                     {% endfor %}
                 </ul>

diff --git 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').find('.custom_select_main_link').attr('siteid');
+        defaultReport = $('#userSettingsTable').find('.custom_select_main_link').attr('siteid');
     }
     var postParams = {};
     postParams.alias = alias;

diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig
@@ -106,7 +106,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>

diff --git a/plugins/Zeitgeist/templates/admin.twig b/plugins/Zeitgeist/templates/admin.twig
@@ -49,7 +49,7 @@
 
                     {% if configFileNotWritable is not empty %}
                     <div class="ajaxSuccess" style="display:inline-block">
-                        {{ 'General_ConfigFileIsNotWritable'|translate("(config/config.ini.php)","<br/>") }}
+                        {{ 'General_ConfigFileIsNotWritable'|translate("(config/config.ini.php)","<br/>")|raw }}
                     </div>
                     {% elseif false %}
                     <div class="ajaxSuccess" style="display:inline-block">