Skip to content
Extraits de code Groupes Projets
Valider 93604ea7 rédigé par Thomas Steur's avatar Thomas Steur Validation de Matthieu Aubry
Parcourir les fichiers

use piwik framework select fields in sites manager (#10575)

parent f83dc71c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -135,19 +135,22 @@ ...@@ -135,19 +135,22 @@
function (timezones) { function (timezones) {
var scopeTimezones = [];
$scope.timezones = []; $scope.timezones = [];
angular.forEach(timezones, function(groupTimezones, timezoneGroup) { angular.forEach(timezones, function(groupTimezones, timezoneGroup) {
angular.forEach(groupTimezones, function(label, code) { angular.forEach(groupTimezones, function(label, code) {
$scope.timezones.push({ scopeTimezones.push({
group: timezoneGroup, group: timezoneGroup,
key: code, key: code,
value: label value: label
}); });
}); });
}); });
$scope.timezones = scopeTimezones;
} }
); );
}; };
......
...@@ -84,25 +84,23 @@ ...@@ -84,25 +84,23 @@
<div piwik-form-field="setting" all-settings="settingsPerPlugin.settings"></div> <div piwik-form-field="setting" all-settings="settingsPerPlugin.settings"></div>
</div> </div>
</div> </div>
<div piwik-field uicontrol="select" name="currency"
ng-model="site.currency"
title="{{ 'SitesManager_Currency'|translate }}"
inline-help="{{ 'SitesManager_CurrencySymbolWillBeUsedForGoals' | translate }}"
options='currencies'>
</div>
<div class="form-group row"> <div piwik-field uicontrol="select" name="timezone"
<div class="col s12 m6 input-field"> ng-model="site.timezone"
<select ng-model="site.currency" ng-options="k as v for (k, v) in currencies"></select> title="{{ 'SitesManager_Timezone'|translate }}"
<label>{{ 'SitesManager_Currency'|translate }}</label> inline-help="#timezoneHelpText"
</div> options='timezones'>
<div class="col s12 m6 form-help">
{{ 'SitesManager_CurrencySymbolWillBeUsedForGoals' | translate }}
</div>
</div> </div>
<div class="form-group row"> <div id="timezoneHelpText" class="inline-help-node">
<div class="col s12 m6 input-field"> <div ng-include="'plugins/SitesManager/templates/help/timezone-help.html'"></div>
<select ng-model="site.timezone" ng-options="t.key as t.value group by t.group for t in timezones"></select>
<label>{{ 'SitesManager_Timezone'|translate }}</label>
</div>
<div class="col s12 m6 form-help">
<div ng-include="'plugins/SitesManager/templates/help/timezone-help.html'"></div>
</div>
</div> </div>
<div class="editingSiteFooter"> <div class="editingSiteFooter">
......
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