diff options
| author | Matthieu Aubry <matt@piwik.org> | 2015-10-16 01:29:23 +0300 |
|---|---|---|
| committer | Matthieu Aubry <matt@piwik.org> | 2015-10-16 01:29:23 +0300 |
| commit | eebfbcbaa77cc947f0ec557141a6e04a5ac3fc8a (patch) | |
| tree | be4f83a99d6795ee777bb99b07018649cc321975 /plugins | |
| parent | 5b64e37e82cab28cac0998910dccefd73668400e (diff) | |
| parent | 7f0a7f14ea562666d0a2508108d8de8789654299 (diff) | |
Merge pull request #9013 from piwik/9002
Loading indicator in website selector is sometimes missing
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/CoreHome/angularjs/siteselector/siteselector.directive.html | 4 | ||||
| -rw-r--r-- | plugins/CoreHome/angularjs/siteselector/siteselector.directive.less | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html index 3a4cbec8f2..9ee4932163 100644 --- a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html +++ b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html @@ -13,8 +13,8 @@ <input ng-if="inputName" type="hidden" name="{{ inputName }}" ng-value="selectedSite.id"/> - <a ng-click="view.showSitesList=!view.showSitesList; view.showSitesList && model.loadInitialSites();" - piwik-onenter="view.showSitesList=!view.showSitesList; view.showSitesList && model.loadInitialSites();" + <a ng-click="view.showSitesList=!view.showSitesList; view.showSitesList && !model.isLoading && model.loadInitialSites();" + piwik-onenter="view.showSitesList=!view.showSitesList; view.showSitesList && !model.isLoading && model.loadInitialSites();" href="javascript:void(0)" title="{{ 'General_ChooseWebsite'|translate }}" ng-class="{'loading': model.isLoading}" diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less index 4afc63a8f9..1614ceb4cd 100644 --- a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less +++ b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less @@ -33,7 +33,7 @@ .siteSelector.expanded { .loading { - background: url(plugins/Morpheus/images/loading-blue.gif) no-repeat right 9px; + background: url(plugins/Morpheus/images/loading-blue.gif) no-repeat 94% 11px; } } |