Skip to content
Extraits de code Groupes Projets
Valider 6af210e3 rédigé par Thomas Steur's avatar Thomas Steur
Parcourir les fichiers

refs #2174 workaround for a bug in Webkit which does not apply the styles /...

refs #2174 workaround for a bug in Webkit which does not apply the styles / render in this case. only if one manually adds a class afterwards and removes it again
parent f1ce9781
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<label class="website-label"><strong>{{ 'General_Website'|translate }}</strong></label> <label class="website-label"><strong>{{ 'General_Website'|translate }}</strong></label>
<div piwik-siteselector <div piwik-siteselector
class="sites_autocomplete"
siteid="{{ idSite }}" siteid="{{ idSite }}"
sitename="{{ defaultReportSiteName }}" sitename="{{ defaultReportSiteName }}"
show-all-sites-item="false" show-all-sites-item="false"
...@@ -200,6 +201,7 @@ ...@@ -200,6 +201,7 @@
{# website #} {# website #}
<label class="website-label"><strong>{{ 'General_Website'|translate }}</strong></label> <label class="website-label"><strong>{{ 'General_Website'|translate }}</strong></label>
<div piwik-siteselector <div piwik-siteselector
class="sites_autocomplete"
siteid="{{ idSite }}" siteid="{{ idSite }}"
sitename="{{ defaultReportSiteName }}" sitename="{{ defaultReportSiteName }}"
id="image-tracker-website" id="image-tracker-website"
......
...@@ -30,7 +30,6 @@ angular.module('piwikApp').directive('piwikSiteselector', function($document, pi ...@@ -30,7 +30,6 @@ angular.module('piwikApp').directive('piwikSiteselector', function($document, pi
templateUrl: 'plugins/CoreHome/javascripts/siteselector/siteselector.html', templateUrl: 'plugins/CoreHome/javascripts/siteselector/siteselector.html',
controller: 'SiteSelectorController', controller: 'SiteSelectorController',
compile: function (element, attrs) { compile: function (element, attrs) {
element.addClass('sites_autocomplete');
for (var index in defaults) { for (var index in defaults) {
if (!attrs[index]) { attrs[index] = defaults[index]; } if (!attrs[index]) { attrs[index] = defaults[index]; }
......
<div class="top_bar_sites_selector {% if currentModule == 'CoreHome' %}sites_selector_in_dashboard{% endif %}"> <div class="top_bar_sites_selector {% if currentModule == 'CoreHome' %}sites_selector_in_dashboard{% endif %}">
<label>{{ 'General_Website'|translate }}</label> <label>{{ 'General_Website'|translate }}</label>
<div piwik-siteselector></div> <div piwik-siteselector class="sites_autocomplete"></div>
</div> </div>
\ No newline at end of file
...@@ -166,7 +166,7 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp ...@@ -166,7 +166,7 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp
if (!lastDate) { if (!lastDate) {
return; return;
} }
model.lastVisitsDate = lastDate; model.lastVisitsDate = lastDate;
return piwikApi.fetch({ return piwikApi.fetch({
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
{% endset %} {% endset %}
<div piwik-siteselector <div piwik-siteselector
class="sites_autocomplete"
siteid="{{ idSiteSelected }}" siteid="{{ idSiteSelected }}"
sitename="{{ defaultReportSiteName }}" sitename="{{ defaultReportSiteName }}"
all-sites-text="{{ applyAllSitesText|raw }}" all-sites-text="{{ applyAllSitesText|raw }}"
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
{% endif %} {% endif %}
<div piwik-siteselector <div piwik-siteselector
class="sites_autocomplete"
siteid="{{ defaultReportIdSite }}" siteid="{{ defaultReportIdSite }}"
sitename="{{ defaultReportSiteName }}" sitename="{{ defaultReportSiteName }}"
switch-site-on-select="false" switch-site-on-select="false"
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter