fic
/
server
2
0
Fork 0
Code Issues Pull Requests 10 Releases Wiki Activity

public interface: random fixes

This commit is contained in:
nemunaire 2018-01-23 03:54:20 +01:00
parent e53bcadc05
commit 3aadab40b0
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/static/views/public.html
View File

@ -18,7 +18,7 @@
<a class="dropdown-item" ng-click="clearScene()">Scène vide</a>
</div>
</div>
<button ng-click="addScene()" class="float-right btn btn-primary mr-sm-2"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Ajouter un élément</button>
<button type="button" ng-click="addScene()" class="float-right btn btn-primary mr-sm-2"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Ajouter un élément</button>
<button type="submit" class="float-right btn btn-success mr-sm-2"><span class="glyphicon glyphicon-save" aria-hidden="true"></span> Publier cette scène</button>
</h2>
@ -58,14 +58,14 @@
</div>
</div>
<div class="form-group row" ng-if="scene.type == 'panel' || scene.type == 'countdown'">
<div class="form-group row" ng-if="scene.type == 'panel' || scene.type == 'themes' || 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 == 'countdown'">
<div class="form-group row" ng-if="scene.type == 'message' || scene.type == 'panel' || scene.type == 'themes' || 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">

2
frontend/static/js/public.js
View File

@ -108,8 +108,6 @@ angular.module("FICApp")
$scope.duration = 0;
$scope.init = function(end) {
console.log(end);
console.log(Date.parse(end)/1000);
$scope.initT(Date.parse(end)/1000);
}
$scope.initT = function(end) {

6
frontend/static/public.html
View File

@ -99,12 +99,12 @@
<small class="authors" ng-if="themes[my.exercices[s.params.exercice].theme_id].authors">par {{ themes[my.exercices[s.params.exercice].theme_id].authors }}</small>
</p>
<p ng-bind-html="my.exercices[s.params.exercice].statement"></p>
<ul class="list-inline">
<ul class="list-inline text-secondary">
<li>Rapporte <ng-pluralize count="themes[my.exercices[s.params.exercice].theme_id].exercices[s.params.exercice].gain" when="{'0': 'aucun point', 'one': '{} point', 'other': '{} points'}"></ng-pluralize></li>
<li><ng-pluralize count="my.exercices[s.params.exercice].files.length" when="{'0': 'Aucun fichier disponible', 'one': '{} fichier disponible', 'other': '{} fichiers disponibles'}"></ng-pluralize></li>
<li ng-if="my.exercices[s.params.exercice].files"><ng-pluralize count="my.exercices[s.params.exercice].files.length" when="{'0': 'Aucun fichier disponible', 'one': '{} fichier disponible', 'other': '{} fichiers disponibles'}"></ng-pluralize></li>
<li ng-if="my.exercices[s.params.exercice].hints.length"><ng-pluralize count="my.exercices[s.params.exercice].hints.length" when="{'0': 'Aucun indice disponible', 'one': '{} indice disponible', 'other': '{} indices disponibles'}"></ng-pluralize></li>
<li>Tenté par <ng-pluralize count="themes[my.exercices[s.params.exercice].theme_id].exercices[s.params.exercice].tried" when="{'0': 'aucune équipe', 'one': '{} équipe', 'other': '{} équipes'}"></ng-pluralize></li>
<li><ng-pluralize count="my.exercices[s.params.exercice].solved_number" when="{'0': 'aucun tentative', 'one': '{} tentative', 'other': '{} tentatives'}"></ng-pluralize></li>
<li ng-if="my.exercices[s.params.exercice].tries"><ng-pluralize count="my.exercices[s.params.exercice].tries" when="{'0': 'Aucune tentative', 'one': '{} tentative', 'other': '{} tentatives'}"></ng-pluralize></li>
<li>Résolu par <ng-pluralize count="themes[my.exercices[s.params.exercice].theme_id].exercices[s.params.exercice].solved" when="{'0': 'aucune équipe', 'one': '{} équipe', 'other': '{} équipes'}"></ng-pluralize></li>
</ul>
</div>