From 83b3600e60af38d52f84756c365f8187e99ce314 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Thu, 13 Oct 2016 20:16:42 +0200
Subject: [PATCH] Ready to publish solutions

---
 frontend/static/index.html       | 21 ++++++++++++++++++---
 frontend/static/js/app.js        |  7 ++++++-
 frontend/static/views/theme.html |  5 ++++-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/frontend/static/index.html b/frontend/static/index.html
index 05e3095c..59f656f2 100644
--- a/frontend/static/index.html
+++ b/frontend/static/index.html
@@ -32,7 +32,12 @@
     <div class="navbar navbar-default">
       <div class="container">
 	<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="/">
             <img src="/img/fic.png" alt="Forum International de la Cybersécurité" class="center-block">
 	  </a>
@@ -49,8 +54,18 @@
           <span class="point">:</span>
           <span id="sec">{{ time.seconds | time }}</span>
 	</div>
-	<div id="clock" class="col-sm-7" ng-show="!(!time.start || my.team_id)">
-          {{ time.start | date:"shortDate" }}
+	<div id="clock" class="col-sm-7" ng-show="!(time.start || my.team_id)" style="padding: 25px">
+	  <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>
diff --git a/frontend/static/js/app.js b/frontend/static/js/app.js
index 411cf490..df0ea4fd 100644
--- a/frontend/static/js/app.js
+++ b/frontend/static/js/app.js
@@ -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() {
 	    if ($scope.my && $scope.themes) {
 		angular.forEach($scope.themes, function(theme, key) {
@@ -139,6 +139,11 @@ angular.module("FICApp")
 	    }
 	    $http.get("/my.json").success(function(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();
 	    });
 	    console.log("refresh!");
diff --git a/frontend/static/views/theme.html b/frontend/static/views/theme.html
index 4c8ae68b..b907dc6a 100644
--- a/frontend/static/views/theme.html
+++ b/frontend/static/views/theme.html
@@ -71,7 +71,7 @@
 
 	  <div class="panel panel-success" ng-show="(!my.team_id && my.exercices[current_exercice].keys)">
 	    <div class="panel-heading">
-	      <div class="panel-title">Clefs du challenge</div>
+	      <div class="panel-title">Solution du challenge</div>
 	    </div>
 	    <div class="panel-body">
 	      <p>
@@ -81,5 +81,8 @@
 		<dt>{{ key.slice(128) }}</dt>
 		<dd class="samp"><code>{{ key.slice(0, 128) }}</code></dd>
 	      </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>