Ready to publish solutions

This commit is contained in:
nemunaire 2016-10-13 20:16:42 +02:00
parent 6cc54635a5
commit 83b3600e60
3 changed files with 28 additions and 5 deletions

View File

@ -32,7 +32,12 @@
<div class="navbar navbar-default"> <div class="navbar navbar-default">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="navbar-header col-sm-3"> <div class="navbar-header col-sm-3" ng-show="!(time.start || my.team_id)">
<a href="https://www.forum-fic.com/">
<img src="/img/fic.png" alt="Forum International de la Cybersécurité" class="center-block">
</a>
</div>
<div class="navbar-header col-sm-3" ng-show="(time.start || my.team_id)">
<a href="/"> <a href="/">
<img src="/img/fic.png" alt="Forum International de la Cybersécurité" class="center-block"> <img src="/img/fic.png" alt="Forum International de la Cybersécurité" class="center-block">
</a> </a>
@ -49,8 +54,18 @@
<span class="point">:</span> <span class="point">:</span>
<span id="sec">{{ time.seconds | time }}</span> <span id="sec">{{ time.seconds | time }}</span>
</div> </div>
<div id="clock" class="col-sm-7" ng-show="!(!time.start || my.team_id)"> <div id="clock" class="col-sm-7" ng-show="!(time.start || my.team_id)" style="padding: 25px">
{{ time.start | date:"shortDate" }} <div class="btn-group btn-group-justified btn-group-lg">
<a class="btn btn-default" href="/">
<span class="glyphicon glyphicon-home"></span> Accueil
</a>
<a class="btn btn-default" href="/rank">
<span class="glyphicon glyphicon-list"></span> Classement
</a>
<a class="btn btn-default" href="https://www.youtube.com/playlist?list=PLSJ8QLhKMtQv7jRhdAn9wXSMYTsvqfieX">
<span class="glyphicon glyphicon-blackboard"></span> Vidéos
</a>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -92,7 +92,7 @@ angular.module("FICApp")
} }
} }
}) })
.controller("DataController", function($scope, $http, $rootScope, $timeout) { .controller("DataController", function($sce, $scope, $http, $rootScope, $timeout) {
var actMenu = function() { var actMenu = function() {
if ($scope.my && $scope.themes) { if ($scope.my && $scope.themes) {
angular.forEach($scope.themes, function(theme, key) { angular.forEach($scope.themes, function(theme, key) {
@ -139,6 +139,11 @@ angular.module("FICApp")
} }
$http.get("/my.json").success(function(my) { $http.get("/my.json").success(function(my) {
$scope.my = my; $scope.my = my;
angular.forEach($scope.my.exercices, function(exercice, eid) {
if (exercice.video_uri) {
exercice.video_uri = $sce.trustAsResourceUrl(exercice.video_uri);
}
});
actMenu(); actMenu();
}); });
console.log("refresh!"); console.log("refresh!");

View File

@ -71,7 +71,7 @@
<div class="panel panel-success" ng-show="(!my.team_id && my.exercices[current_exercice].keys)"> <div class="panel panel-success" ng-show="(!my.team_id && my.exercices[current_exercice].keys)">
<div class="panel-heading"> <div class="panel-heading">
<div class="panel-title">Clefs du challenge</div> <div class="panel-title">Solution du challenge</div>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<p> <p>
@ -81,5 +81,8 @@
<dt>{{ key.slice(128) }}</dt> <dt>{{ key.slice(128) }}</dt>
<dd class="samp"><code>{{ key.slice(0, 128) }}</code></dd> <dd class="samp"><code>{{ key.slice(0, 128) }}</code></dd>
</dl> </dl>
<iframe type="text/html" ng-show="my.exercices[current_exercice].video_uri" ng-src="{{ my.exercices[current_exercice].video_uri }}" frameborder="0" style="width: 100%; height: 35vw">
Regardez la vidéo de résolution de cet exercice : <a ng-href="{{ my.exercices[current_exercice].video_uri }}">{{ my.exercices[current_exercice].video_uri }}</a>.
</iframe>
</div> </div>
</div> </div>