actually use the angular based site selector, some more improvements, bugfixes

2 files changed, 16 insertions, 16 deletions

diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
index cfb1d76510..734aabbf23 100644
--- a/plugins/UsersManager/templates/index.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -12,14 +12,14 @@
         {% set applyAllSitesText %}
             <strong>{{ 'UsersManager_ApplyToAllWebsites'|translate }}</strong>
         {% endset %}
-        {% include "@CoreHome/_siteSelect.twig" with {
-            'siteName': defaultReportSiteName,
-            'idSite':idSiteSelected,
-            'allSitesItemText': applyAllSitesText,
-            'allWebsitesLinkLocation': 'top',
-            'siteSelectorId':"usersManagerSiteSelect",
-            'switchSiteOnSelect':false
-        } %}
+
+        <div piwik-site-selector
+             siteid="{{ idSiteSelected }}"
+             sitename="{{ defaultReportSiteName }}"
+             allsitestext="{{ applyAllSitesText|raw }}"
+             allsiteslocation="top"
+             id="usersManagerSiteSelect"
+             switchsiteonselect="0"></div>
     </section>
 </div>
 
diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig
index aa64d90ccb..4fe5b9e7dd 100644
--- a/plugins/UsersManager/templates/userSettings.twig
+++ b/plugins/UsersManager/templates/userSettings.twig
@@ -43,14 +43,14 @@
                 {% else %}
                     {% set defaultReportIdSite=defaultReport %}
                 {% endif %}
-                {% include "@CoreHome/_siteSelect.twig" with {
-                    'siteName':defaultReportSiteName,
-                    'idSite':defaultReportIdSite,
-                    'switchSiteOnSelect':false,
-                    'showAllSitesItem':false,
-                    'showSelectedSite':true,
-                    'siteSelectorId': 'defaultReportSiteSelector'
-                } %}
+
+                <div piwik-site-selector
+                     siteid="{{ defaultReportIdSite }}"
+                     sitename="{{ defaultReportSiteName }}"
+                     switchsiteonselect="0"
+                     showallsitesitem="0"
+                     showselectedsite="1"
+                     id="defaultReportSiteSelector"></div>
             </fieldset>
         </td>
     </tr>