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

admin: secondary formating

Browse source
This commit is contained in:
nemunaire 2018-12-08 03:35:52 +01:00
parent 4de0c64672
commit 85658bb3c6
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1563,7 +1563,7 @@ function presenceCal(scope, location, data) {
.range(d3.range(8).map(function(d) { return "q" + d + "-8"; }));
var svg = d3.select(location).selectAll("svg")
.data(d3.range(scope.time.start, scope.time.start + (scope.time.start % 86400000 + scope.time.duration), 86400000).map(function(t) { return new Date(t); }))
.data(d3.range(scope.settings.start, scope.time.start + (scope.settings.start % 86400000 + scope.settings.end - scope.settings.start), 86400000).map(function(t) { return new Date(t); }))
.enter().append("svg")
.attr("width", width)
.attr("height", height)
@ -1582,7 +1582,7 @@ function presenceCal(scope, location, data) {
.attr("width", cellSize)
.attr("height", cellSize)
.attr("transform", function(d) { return "translate(" + (d.getHours() * cellSize) + "," + (d.getMinutes() / 15 * cellSize) + ")"; })
.attr("class", function(d) { if (d >= scope.time.start && d < scope.time.start + scope.time.duration) return color(data.reduce(function(prev, cur){
.attr("class", function(d) { if (d >= scope.settings.start && d < scope.settings.start + scope.settings.end - scope.settings.start) return color(data.reduce(function(prev, cur){
cur = new Date(cur).getTime();
dv = d.getTime();
return prev + ((dv <= cur && cur < dv+15*60000)?1:0);

4
admin/static/views/pki.html
View file

@ -37,7 +37,7 @@
<div class="modal fade" id="revokeModal" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-content bg-light">
<div class="modal-header">
<h5 class="modal-title">Révocation d'un certificat</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
@ -69,7 +69,7 @@
<div class="modal fade" id="associationModal" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-content bg-light">
<div class="modal-header">
<h5 class="modal-title">Associer le certificat à une équipe</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">

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

@ -19,7 +19,7 @@
</div>
</div>
<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>
<button type="submit" class="float-right btn mr-sm-2" ng-class="{'btn-success': someUpdt,'btn-secondary': !someUpdt}"><span class="glyphicon glyphicon-save" aria-hidden="true"></span> Publier cette scène</button>
</h2>
<div class="alert alert-info" ng-if="!scenes.length">

2
admin/static/views/team-export.html
View file

@ -4,7 +4,7 @@
<h2>{{ team.name }} <small>{{ teams[my.team_id].rank }}/{{ nb_teams }} &ndash; <ng-pluralize count="my.score" when="{'one': '{}&nbsp;point', 'other': '{}&nbsp;points'}"></ng-pluralize></small></h2>
<div class="row">
<div class="col-md" ng-repeat="(tid,theme) in themes">
<h4 ng-bind="theme.name"></h4>
<h4 ng-bind="theme.name" style="white-space: nowrap"></h4>
<ul class="list-unstyled">
<li ng-repeat="(eid,exercice) in theme.exercices" ng-if="my.exercices[eid] && (my.exercices[eid].tries || (my.exercices[eid].hints | countHints))">
<nobr ng-class="{'text-info': !my.exercices[eid].tries && !my.exercices[eid].solved_rank, 'text-warning': my.exercices[eid].tries && !my.exercices[eid].solved_rank, 'text-success': my.exercices[eid].solved_rank}">