piwik-site-selector -> piwik-siteselector

6 files changed, 62 insertions, 64 deletions

diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
index 1aadf4a0d2..bd64bf8f70 100644
--- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
+++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
@@ -27,7 +27,7 @@
         {# website #}
         <label class="website-label"><strong>{{ 'General_Website'|translate }}</strong></label>
 
-        <div piwik-site-selector
+        <div piwik-siteselector
              siteid="{{ idSite }}"
              sitename="{{ defaultReportSiteName }}"
              show-all-sites-item="false"
@@ -199,7 +199,7 @@
     <div>
         {# website #}
         <label class="website-label"><strong>{{ 'General_Website'|translate }}</strong></label>
-        <div piwik-site-selector
+        <div piwik-siteselector
              siteid="{{ idSite }}"
              sitename="{{ defaultReportSiteName }}"
              id="image-tracker-website"
diff --git a/plugins/CoreHome/javascripts/siteselector/siteselector-directive.js b/plugins/CoreHome/javascripts/siteselector/siteselector-directive.js
index 023f4bcc31..cac0a87eac 100644
--- a/plugins/CoreHome/javascripts/siteselector/siteselector-directive.js
+++ b/plugins/CoreHome/javascripts/siteselector/siteselector-directive.js
@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-angular.module('piwikApp').directive('piwikSiteSelector', function($document, piwik, $filter){
+angular.module('piwikApp').directive('piwikSiteselector', function($document, piwik, $filter){
     var defaults = {
         name: '',
         siteid: piwik.idSite,
diff --git a/plugins/CoreHome/javascripts/siteselector/siteselector.html b/plugins/CoreHome/javascripts/siteselector/siteselector.html
index 43b172f754..c37c0d2298 100644
--- a/plugins/CoreHome/javascripts/siteselector/siteselector.html
+++ b/plugins/CoreHome/javascripts/siteselector/siteselector.html
@@ -1,61 +1,59 @@
-<div ng-class="{'sites_autocomplete--dropdown': (model.hasMultipleWebsites || showAllSitesItem || !model.sites.length)}">
-    <div piwik-focus-anywhere-but-here="view.showSitesList=false" class="custom_select">
-
-        <script type="text/ng-template" id="siteselector_allsiteslink.html">
-            <div ng-click="switchSite({idsite: 'all', name: allSitesText})"
-                 class="custom_select_all">
-                <a href="{{ getUrlAllSites() }}"
-                   piwik-ignore-click
-                   ng-bind-html="allSitesText"></a>
-            </div>
-        </script>
-
-        <input ng-if="inputName" type="hidden" name="{{ inputName }}" ng-value="selectedSite.id"/>
-
-        <a ng-click="view.showSitesList=!view.showSitesList; view.showSitesList && model.loadInitialSites()"
-           href="javascript:void(0)"
-           class="custom_select_main_link"
-           ng-class="{'loading': model.isLoading}">
-            <span ng-bind-html="selectedSite.name || model.firstSiteName">?</span>
-        </a>
-
-        <div ng-show="view.showSitesList" class="custom_select_block">
-            <div ng-if="allSitesLocation=='top' && showAllSitesItem"
-                 ng-include="'siteselector_allsiteslink.html'"></div>
-
-            <div class="custom_select_container">
-                <ul class="custom_select_ul_list" ng-click="view.showSitesList=false;">
-                    <li ng-click="switchSite(site)"
-                        ng-repeat="site in model.sites"
-                        ng-hide="!showSelectedSite && activeSiteId==site.idsite">
-                        <a piwik-ignore-click href="{{ getUrlForSiteId(site.idsite) }}" piwik-autocomplete-matched="view.searchTerm">{{ site.name }}</a>
-                    </li>
-                </ul>
-                <ul ng-show="!model.sites.length && view.searchTerm" class="ui-autocomplete ui-front ui-menu ui-widget ui-widget-content ui-corner-all siteSelect">
-                    <li class="ui-menu-item">
-                        <a class="ui-corner-all" tabindex="-1">{{ ('SitesManager_NotFound' | translate) + ' ' + view.searchTerm }}</a>
-                    </li>
-                </ul>
-            </div>
-
-            <div ng-if="allSitesLocation=='bottom' && showAllSitesItem"
-                 ng-include="'siteselector_allsiteslink.html'"></div>
+<div piwik-focus-anywhere-but-here="view.showSitesList=false" class="custom_select"
+     ng-class="{'sites_autocomplete--dropdown': (model.hasMultipleWebsites || showAllSitesItem || !model.sites.length)}">
+
+    <script type="text/ng-template" id="siteselector_allsiteslink.html">
+        <div ng-click="switchSite({idsite: 'all', name: allSitesText})"
+             class="custom_select_all">
+            <a href="{{ getUrlAllSites() }}"
+               piwik-ignore-click
+               ng-bind-html="allSitesText"></a>
+        </div>
+    </script>
+
+    <input ng-if="inputName" type="hidden" name="{{ inputName }}" ng-value="selectedSite.id"/>
+
+    <a ng-click="view.showSitesList=!view.showSitesList; view.showSitesList && model.loadInitialSites()"
+       href="javascript:void(0)"
+       class="custom_select_main_link"
+       ng-class="{'loading': model.isLoading}">
+        <span ng-bind-html="selectedSite.name || model.firstSiteName">?</span>
+    </a>
+
+    <div ng-show="view.showSitesList" class="custom_select_block">
+        <div ng-if="allSitesLocation=='top' && showAllSitesItem"
+             ng-include="'siteselector_allsiteslink.html'"></div>
+
+        <div class="custom_select_container">
+            <ul class="custom_select_ul_list" ng-click="view.showSitesList=false;">
+                <li ng-click="switchSite(site)"
+                    ng-repeat="site in model.sites"
+                    ng-hide="!showSelectedSite && activeSiteId==site.idsite">
+                    <a piwik-ignore-click href="{{ getUrlForSiteId(site.idsite) }}" piwik-autocomplete-matched="view.searchTerm">{{ site.name }}</a>
+                </li>
+            </ul>
+            <ul ng-show="!model.sites.length && view.searchTerm" class="ui-autocomplete ui-front ui-menu ui-widget ui-widget-content ui-corner-all siteSelect">
+                <li class="ui-menu-item">
+                    <a class="ui-corner-all" tabindex="-1">{{ ('SitesManager_NotFound' | translate) + ' ' + view.searchTerm }}</a>
+                </li>
+            </ul>
+        </div>
 
-            <div class="custom_select_search" ng-show="autocompleteMinSites <= model.sites.length">
-                <input type="text"
-                       ng-click="view.searchTerm=''"
-                       ng-model="view.searchTerm"
-                       ng-change="model.searchSite(view.searchTerm)"
-                       length="15"
-                       class="websiteSearch inp"/>
-                <input type="submit" value="Search" class="but"/>
-                <img title="Clear"
-                     ng-show="view.searchTerm"
-                     ng-click="view.searchTerm=''; model.loadInitialSites()"
-                     class="reset"
-                     src="plugins/CoreHome/images/reset_search.png"/>
-            </div>
+        <div ng-if="allSitesLocation=='bottom' && showAllSitesItem"
+             ng-include="'siteselector_allsiteslink.html'"></div>
+
+        <div class="custom_select_search" ng-show="autocompleteMinSites <= model.sites.length">
+            <input type="text"
+                   ng-click="view.searchTerm=''"
+                   ng-model="view.searchTerm"
+                   ng-change="model.searchSite(view.searchTerm)"
+                   length="15"
+                   class="websiteSearch inp"/>
+            <input type="submit" value="Search" class="but"/>
+            <img title="Clear"
+                 ng-show="view.searchTerm"
+                 ng-click="view.searchTerm=''; model.loadInitialSites()"
+                 class="reset"
+                 src="plugins/CoreHome/images/reset_search.png"/>
         </div>
     </div>
-
-</div>
+</div>
\ No newline at end of file
diff --git a/plugins/CoreHome/templates/_siteSelectHeader.twig b/plugins/CoreHome/templates/_siteSelectHeader.twig
index b0ea798533..d150978d5d 100644
--- a/plugins/CoreHome/templates/_siteSelectHeader.twig
+++ b/plugins/CoreHome/templates/_siteSelectHeader.twig
@@ -1,5 +1,5 @@
 <div class="top_bar_sites_selector {% if currentModule == 'CoreHome' %}sites_selector_in_dashboard{% endif %}">
     <label>{{ 'General_Website'|translate }}</label>
-    <div piwik-site-selector></div>
+    <div piwik-siteselector></div>
 
 </div>
\ No newline at end of file
diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
index e0ba163e63..928165ded9 100644
--- a/plugins/UsersManager/templates/index.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -13,7 +13,7 @@
             <strong>{{ 'UsersManager_ApplyToAllWebsites'|translate }}</strong>
         {% endset %}
 
-        <div piwik-site-selector
+        <div piwik-siteselector
              siteid="{{ idSiteSelected }}"
              sitename="{{ defaultReportSiteName }}"
              all-sites-text="{{ applyAllSitesText|raw }}"
diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig
index 0f086f5f32..6fc0baf03e 100644
--- a/plugins/UsersManager/templates/userSettings.twig
+++ b/plugins/UsersManager/templates/userSettings.twig
@@ -44,7 +44,7 @@
                     {% set defaultReportIdSite=defaultReport %}
                 {% endif %}
 
-                <div piwik-site-selector
+                <div piwik-siteselector
                      siteid="{{ defaultReportIdSite }}"
                      sitename="{{ defaultReportSiteName }}"
                      switch-site-on-select="false"