Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@gmail.com>2015-10-15 17:34:57 +0300
committerThomas Steur <thomas.steur@gmail.com>2015-10-15 17:34:57 +0300
commit7f0a7f14ea562666d0a2508108d8de8789654299 (patch)
treea4a11544ab198c967f27c91c3e9383008d214ac7 /plugins
parent9a7c13bb1a1019c004ef70a89fe5feeeda716d58 (diff)
fixes #9002 loading indicator in website selector is sometimes missing
Diffstat (limited to 'plugins')
-rw-r--r--plugins/CoreHome/angularjs/siteselector/siteselector.directive.html4
-rw-r--r--plugins/CoreHome/angularjs/siteselector/siteselector.directive.less2
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;
}
}