From cf290732dcea49664ebfa3082f8f1c46ee3aa1c0 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Sun, 2 Dec 2018 00:45:22 +0100
Subject: [PATCH] frontend: css: add bottom border to most of cards and
 jumboframe

---
 frontend/static/css/fic.css          | 2 +-
 frontend/static/index.html           | 4 ++--
 frontend/static/views/defi.html      | 8 ++++----
 frontend/static/views/home.html      | 4 ++--
 frontend/static/views/rank.html      | 2 +-
 frontend/static/views/rules.html     | 4 ++--
 frontend/static/views/tag.html       | 2 +-
 frontend/static/views/team-edit.html | 2 +-
 frontend/static/views/theme.html     | 4 ++--
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/frontend/static/css/fic.css b/frontend/static/css/fic.css
index 6e5d8319..aa5d19d7 100644
--- a/frontend/static/css/fic.css
+++ b/frontend/static/css/fic.css
@@ -60,7 +60,7 @@ body {
 .navbar {
     margin-bottom: 0;
 }
-.navbar.niceborder {
+.niceborder {
     border-bottom: 5px #4eaee6 solid;
 }
 .navbar img {
diff --git a/frontend/static/index.html b/frontend/static/index.html
index a664f1de..7a72bd76 100644
--- a/frontend/static/index.html
+++ b/frontend/static/index.html
@@ -82,7 +82,7 @@
 	    <a class="nav-link dropdown-toogle" href="#" id="themesMenu" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 	      Scénarii
 	    </a>
-	    <div class="dropdown-menu">
+	    <div class="dropdown-menu niceborder">
 	      <a ng-repeat="(k,theme) in themes" ng-class="{active: k == current_theme}" class="dropdown-item" ng-href="/{{ theme.urlid }}">{{ theme.name }} <span class="badge badge-light"><span class="glyphicon glyphicon-fire" aria-hidden="true" ng-if="max_solved > 1 && theme.solved == max_solved" alt="Déjà {{ theme.solved }} challenges résolus dans ce thème"></span> <span class="glyphicon glyphicon-gift" aria-hidden="true" ng-if="theme.exercice_coeff_max > 1" alt="Des bonus existent pour au moins un challenge de ce thème"></span> <span ng-if="(my.team_id)">{{ theme.exercice_solved }}/</span>{{ theme.exercice_count }}</span></a>
 	    </div>
 	  </li>
@@ -90,7 +90,7 @@
 	    <a class="nav-link dropdown-toogle" href="#" id="tagsMenu" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 	      Tags
 	    </a>
-	    <div class="dropdown-menu">
+	    <div class="dropdown-menu niceborder">
 	      <a ng-repeat="(tname,tag) in tags" ng-class="{active: tname == current_tag}" class="dropdown-item" ng-href="/tags/{{ tname }}">#{{ tname }} <span class="badge badge-light"><span ng-if="(my.team_id)">{{ tag.solved }}/</span>{{ tag.count }}</span></a>
 	    </div>
 	  </li>
diff --git a/frontend/static/views/defi.html b/frontend/static/views/defi.html
index 78eb5f32..fac7ba87 100644
--- a/frontend/static/views/defi.html
+++ b/frontend/static/views/defi.html
@@ -19,10 +19,10 @@
 	  <div class="alert alert-warning mt-3" ng-if="!(my.exercices[current_exercice])">
 	    Vous n'avez pas encore accès à cet exercice.
 	  </div>
-	  <div class="jumbotron text-indent mt-3" ng-if="!(my.exercices[current_exercice])">
+	  <div class="jumbotron niceborder text-indent mt-3" ng-if="!(my.exercices[current_exercice])">
 	    <p class="lead text-justify" ng-bind-html="themes[current_theme].intro"></p>
 	  </div>
-	  <div class="jumbotron text-indent mt-3" ng-if="(my.exercices[current_exercice])">
+	  <div class="jumbotron niceborder text-indent mt-3" ng-if="(my.exercices[current_exercice])">
 	    <h3 class="display-4">{{ themes[current_theme].exercices[current_exercice].title }}</h3>
 	    <a ng-href="/tags/{{tag}}" class="badge badge-pill badge-secondary mr-2 mb-2" ng-repeat="tag in themes[current_theme].exercices[current_exercice].tags">#{{ tag }}</a>
 	    <p class="lead text-justify" ng-bind-html="my.exercices[current_exercice].statement"></p>
@@ -73,7 +73,7 @@
 	  </div>
 	</div>
 
-	<div class="col-xl mb-5">
+	<div class="col-xl mb-5" ng-controller="SubmissionController">
 	  <div class="card border-danger" ng-if="my.exercices[current_exercice] && !(my.exercices[current_exercice].solved)">
 	    <div class="card-header bg-danger text-white">
 	      <span class="glyphicon glyphicon-flag" aria-hidden="true"></span> Faire son rapport
@@ -83,7 +83,7 @@
 	      <li class="list-group-item" ng-class="messageClass" ng-if="my.exercices[current_exercice].submitted || sberr"><strong ng-if="!sberr">Votre solution a bien été envoyée !</strong><strong ng-if="sberr">{{ sberr }}</strong> {{ message }}</li>
 	    </ul>
 	    <div class="card-body" ng-if="!my.exercices[current_exercice].submitted || sberr">
-	      <form ng-controller="SubmissionController" ng-submit="ssubmit()">
+	      <form ng-submit="ssubmit()">
 		<div class="form-group" ng-repeat="(kid,key) in my.exercices[current_exercice].flags">
 		  <label for="sol_{{ kid }}">{{ key.label }}&nbsp;:</label>
 		  <input type="text" class="form-control" id="sol_{{ kid }}" autocomplete="off" name="sol_{{ kid }}" ng-model="key.value" ng-if="!key.found && !key.choices">
diff --git a/frontend/static/views/home.html b/frontend/static/views/home.html
index 5c9ea626..2a54b3d5 100644
--- a/frontend/static/views/home.html
+++ b/frontend/static/views/home.html
@@ -1,7 +1,7 @@
 <div class="alert alert-danger" ng-if="!(my.team_id)">
   <strong>Attention&nbsp;:</strong> puisqu'il s'agit de captures effectuées dans le but de découvrir si des actes malveillants ont été commis sur différents systèmes d'information, les contenus qui sont téléchargeables <em>peuvent</em> contenir du contenu malveillant&nbsp;!
 </div>
-<div class="alert alert-primary text-justify" ng-if="(my.team_id)">
+<div class="alert text-justify" ng-if="(my.team_id)" style="background-color: #4eaee6;">
   <strong>Félicitations <span ng-repeat="member in my.members"><span ng-if="$last && !$first"> et </span><span ng-if="$middle">, </span>{{ member.firstname | capitalize }} {{ member.lastname | capitalize }}</span>&nbsp;!</strong> vous êtes maintenant connecté à l'espace de votre équipe <em>{{ teams[my.team_id].name }}</em>. Vous pouvez changer ce nom dès maintenant en vous rendant sur la page de <a href="/edit">votre équipe</a>.
 </div>
 <div class="alert alert-warning text-justify" ng-if="(my.team_id && !my.members.length)">
@@ -9,7 +9,7 @@
 </div>
 
 <div class="card-columns">
-  <div class="card" ng-repeat="(k,theme) in themes">
+  <div class="card niceborder" ng-repeat="(k,theme) in themes">
     <div class="card-img-top theme-card" ng-show="theme.image" style="background-image: url({{ theme.image }})"></div>
     <div class="card-body">
       <h5 class="card-title">
diff --git a/frontend/static/views/rank.html b/frontend/static/views/rank.html
index 334d8a60..e7c74c31 100644
--- a/frontend/static/views/rank.html
+++ b/frontend/static/views/rank.html
@@ -1,4 +1,4 @@
-<div class="card bg-primary text-light">
+<div class="card niceborder bg-primary text-light">
   <div class="card-body">
     <input type="search" class="form-control" placeholder="Rechercher" ng-model="query">
   </div>
diff --git a/frontend/static/views/rules.html b/frontend/static/views/rules.html
index 847bb742..193d3ba1 100644
--- a/frontend/static/views/rules.html
+++ b/frontend/static/views/rules.html
@@ -1,5 +1,5 @@
 <div class="card-group text-justify mb-5">
-<div class="card">
+<div class="card niceborder">
 <div class="card-body text-indent">
   <h2>Débloquage des challenges</h2>
   <p>
@@ -68,7 +68,7 @@
   </table>
 </div>
 </div>
-<div class="card">
+<div class="card niceborder">
 <div class="card-body text-indent">
   <p>
     Par exemple&nbsp;:
diff --git a/frontend/static/views/tag.html b/frontend/static/views/tag.html
index 2d887cdd..ba20e793 100644
--- a/frontend/static/views/tag.html
+++ b/frontend/static/views/tag.html
@@ -1,5 +1,5 @@
 <div class="card-columns">
-  <div class="card" ng-repeat="ex in exercices">
+  <div class="card niceborder" ng-repeat="ex in exercices">
     <div class="card-body">
       <h6 class="card-title">
 	<a ng-href="/{{ex.theme.urlid}}">{{ex.theme.name}}</a> &gt;
diff --git a/frontend/static/views/team-edit.html b/frontend/static/views/team-edit.html
index f2f7c9c5..ac1b18e5 100644
--- a/frontend/static/views/team-edit.html
+++ b/frontend/static/views/team-edit.html
@@ -1,4 +1,4 @@
-<div class="card">
+<div class="card niceborder">
   <div class="card-header">Votre équipe est composée de :</div>
   <div class="card-body" ng-if="!my.members.length">
     Passez voir l'équipe serveur pour compléter ces informations.
diff --git a/frontend/static/views/theme.html b/frontend/static/views/theme.html
index 6ae7e72d..61ed3952 100644
--- a/frontend/static/views/theme.html
+++ b/frontend/static/views/theme.html
@@ -1,9 +1,9 @@
-<div class="jumbotron text-indent mt-2 mb-4">
+<div class="jumbotron niceborder text-indent mt-2 mb-4">
   <p class="lead text-justify" ng-bind-html="themes[current_theme].intro"></p>
 </div>
 
 <div class="card-group mb-5">
-  <div class="card" ng-repeat="(k,exercice) in themes[current_theme].exercices">
+  <div class="card niceborder" ng-repeat="(k,exercice) in themes[current_theme].exercices">
     <div class="card-body">
       <h5 class="card-title">
 	<a ng-href="/{{ themes[current_theme].urlid }}/{{ themes[current_theme].exercices[k].urlid }}" ng-if="my.exercices[k]">