fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

public: new carousels in pubic interface: teams and exercices

Browse source 
+ fix autocarousel directive
This commit is contained in:
nemunaire 2018-02-02 21:10:31 +01:00
parent 68e5c4cd2b
commit 1dcebc4eca
5 changed files with 66 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
admin/static/js/app.js
View file

@ -535,7 +535,7 @@ angular.module("FICApp")
"countdown": "Compte à rebours",
"message": "Message",
"panel": "Boîte",
"themes": "Carousel de thèmes",
"carousel": "Carousel",
"exercice": "Exercice",
"table": "Tableau",
"rank": "Classement",
@ -544,6 +544,11 @@ angular.module("FICApp")
"teams": "Accueil des équipes",
"public": "Accueil du public",
};
$scope.carousel_types = {
"exercices": "Exercices",
"teams": "Équipes",
"themes": "Thèmes",
};
$scope.colors = {
"primary": "Primaire",
"secondary": "Secondaire",

9
admin/static/views/public.html
View file

@ -51,21 +51,22 @@
</div>
</div>
<div class="form-group row" ng-if="scene.type == 'welcome'">
<div class="form-group row" ng-if="scene.type == 'welcome' || scene.type == 'carousel'">
<label for="wtype" class="col-sm-2 col-form-label col-form-label-sm">Sorte</label>
<div class="col-sm-10">
<select class="custom-select custom-select-sm" id="wtype" ng-model="scene.params.kind" ng-options="k as v for (k, v) in welcome_types"></select>
<select class="custom-select custom-select-sm" id="wtype" ng-if="scene.type == 'welcome'" ng-model="scene.params.kind" ng-options="k as v for (k, v) in welcome_types"></select>
<select class="custom-select custom-select-sm" id="wtype" ng-if="scene.type == 'carousel'" ng-model="scene.params.kind" ng-options="k as v for (k, v) in carousel_types"></select>
</div>
</div>
<div class="form-group row" ng-if="scene.type == 'panel' || scene.type == 'themes' || scene.type == 'countdown'">
<div class="form-group row" ng-if="scene.type == 'panel' || scene.type == 'carousel' || scene.type == 'countdown'">
<label for="ptype" class="col-sm-2 col-form-label col-form-label-sm">Couleur du cadre</label>
<div class="col-sm-10">
<select class="custom-select custom-select-sm" id="ptype" ng-model="scene.params.color" ng-options="k as v for (k, v) in colors"></select>
</div>
</div>
<div class="form-group row" ng-if="scene.type == 'message' || scene.type == 'panel' || scene.type == 'themes' || scene.type == 'countdown'">
<div class="form-group row" ng-if="scene.type == 'message' || scene.type == 'panel' || scene.type == 'carousel' || scene.type == 'countdown'">
<label for="mtitle" class="col-sm-2 col-form-label col-form-label-sm">Titre</label>
<div class="col-sm-10">
<input type="text" id="mtitle" ng-model="scene.params.title" class="form-control form-control-sm">