From f02910ba284d485432c73b347fb7ed237b6b2c05 Mon Sep 17 00:00:00 2001
From: Arthur <aboivert.sa@gmail.com>
Date: Tue, 4 Jun 2019 14:49:19 +0200
Subject: [PATCH] New backgrounds

---
 .idea/jsLibraryMappings.xml   |  3 +-
 .idea/site-accueil-insa.iml   |  1 +
 admin/scores.php              |  4 +--
 assets/css/planningEvents.css |  3 --
 assets/css/style.css          | 13 ++++++++
 assets/js/statsDisplay.js     |  2 +-
 boomsouffle.php               |  2 +-
 coms.php                      | 14 ++++-----
 glissefondor.php              |  2 +-
 info.php                      |  6 ++--
 peksentard.php                |  7 +++--
 peksentardhint.php            | 58 +++++++++++++++++++++++++++++++++++
 verredaigle.php               |  2 +-
 13 files changed, 95 insertions(+), 22 deletions(-)
 create mode 100644 peksentardhint.php

diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
index b589560..c2ce77e 100644
--- a/.idea/jsLibraryMappings.xml
+++ b/.idea/jsLibraryMappings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JavaScriptLibraryMappings">
-    <file url="PROJECT" libraries="{jquery-3.3.1, jquery-confirm}" />
+    <file url="PROJECT" libraries="{@types/jquery-countdown, jquery-3.3.1}" />
+    <includedPredefinedLibrary name="HTTP Response Handler" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/site-accueil-insa.iml b/.idea/site-accueil-insa.iml
index 5fbf2ae..e17b7e6 100644
--- a/.idea/site-accueil-insa.iml
+++ b/.idea/site-accueil-insa.iml
@@ -5,5 +5,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="jquery-3.3.1" level="application" />
+    <orderEntry type="library" name="@types/jquery-countdown" level="application" />
   </component>
 </module>
\ No newline at end of file
diff --git a/admin/scores.php b/admin/scores.php
index 7a7681d..a9be6ac 100644
--- a/admin/scores.php
+++ b/admin/scores.php
@@ -8,8 +8,8 @@ $relativePath = "../";
         <ul>
             <strong style="color: #ee293d">Quelques règles pour les scores</strong>
             <li>Pas de score total négatif pour une équipe</li>
-            <li>A priori les scores supérieurs à 1000 ça marche, mais au cas où restez à
-                moins de 1000 (comme l'année dernière quoi</li>
+            <li>A priori les scores supérieurs à 1000 marchent, mais au cas où restez à
+                moins de 1000 (comme l'année dernière quoi)</li>
         </ul>
         Si jamais y'a un quelconque problème, envoyez-moi un message.
 <br>
diff --git a/assets/css/planningEvents.css b/assets/css/planningEvents.css
index 1ba0d65..63cb975 100755
--- a/assets/css/planningEvents.css
+++ b/assets/css/planningEvents.css
@@ -53,10 +53,7 @@
     width: 100%;
 }
 
-.event-color:hover{
-    border-color: #e9b82f;
 
-}
 
 .event-text {
     margin: auto;
diff --git a/assets/css/style.css b/assets/css/style.css
index 96df764..22693d4 100755
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -94,6 +94,11 @@ a:hover, a:focus {
     text-shadow: 0 0 4px #bd8a39;
 }
 
+#hidea {
+    color: #f2f2f2;
+}
+
+
 strong {
     font-weight: bold;
 }
@@ -443,6 +448,14 @@ Full-Width Styles
     font-size: 12px;
     color: #535353;
 }
+
+#hint-peksentard {
+    font-size: 12px;
+    color: #535353;
+    text-align: left;
+    display: inline-table;
+
+}
 .team-button{
 
     border-radius: 10px 10px 0 0;
diff --git a/assets/js/statsDisplay.js b/assets/js/statsDisplay.js
index d33f984..dc9afe2 100644
--- a/assets/js/statsDisplay.js
+++ b/assets/js/statsDisplay.js
@@ -20,7 +20,7 @@ function showScores(team) {
     console.log(team);
     $.alert({
         title: nameTeam(team),
-        theme: 'supervan',
+        theme:'supervan',
         content: function () {
             let self = this;
             let object = {
diff --git a/boomsouffle.php b/boomsouffle.php
index d470e93..29ad7bc 100644
--- a/boomsouffle.php
+++ b/boomsouffle.php
@@ -4,7 +4,7 @@ ob_start(); // Start reading html
 <h1>Boomsouffle</h1>
 <?php
 $pageContent = ob_get_clean(); // Store html content in variable
-$customBackgroundId = "bg_boo";
+$customBackgroundId = "boo_bg.jpg";
 $pageTitle = "Boomsouffle";
 include("includes/template.php"); // Display template with variable content
 ?>
diff --git a/coms.php b/coms.php
index d676a84..f21c74c 100755
--- a/coms.php
+++ b/coms.php
@@ -8,7 +8,7 @@ ob_start(); // Start reading html
 <?php
 $comId = "";
 $comTitle = "La Respo des Com's";
-$comDescription = "";
+$comDescription = "Prête à tous les possibles pendant cette semaine inténsement gazive !";
 $comRespo = "Léa Raucroy";
 $comRespoFacebook="";
 $comRespoNumero ="0677529943";
@@ -23,7 +23,7 @@ include("includes/coms/com_template.php");
 
 $comId = "";
 $comTitle = "Com Sirius Black";
-$comDescription = "";
+$comDescription = "Presque prêts pour vous accueillir !!!";
 $comRespo = "Christine Berho";
 $comRespoFacebook="";
 $comRespoNumero ="0750957714";
@@ -38,7 +38,7 @@ include("includes/coms/com_template.php");
 
 $comId = "";
 $comTitle = "Com Animagus";
-$comDescription = "";
+$comDescription = "Mot d'ordre : Incendio";
 $comRespo = "Célestine Paillé";
 $comRespoFacebook="";
 $comRespoNumero ="0777343233";
@@ -113,7 +113,7 @@ include("includes/coms/com_template.php");
 
 $comId = "";
 $comTitle = "Com Ravitaillement";
-$comDescription = "La meilleure";
+$comDescription = "Ici, c'est la Compote qui vous ravit !";
 $comRespo = "Hugo Franceschi";
 $comRespoFacebook="";
 $comRespoNumero ="0625877539";
@@ -128,11 +128,11 @@ include("includes/coms/com_template.php");
 
 $comId = "";
 $comTitle = "Spé'Bar";
-$comDescription = "";
-$comRespo = "Alban";
+$comDescription = "Des potions pour en voir de toutes les couleurs";
+$comRespo = "Alban Charonnat";
 $comRespoFacebook="";
 $comRespoNumero ="";
-$comRespoId = "";
+$comRespoId = "charonna@etud.insa-toulouse.fr";
 $comRespoPhoto = "assets/images/usa_logo.png";
 $comRespo2 = "";
 $comRespo2Id = "";
diff --git a/glissefondor.php b/glissefondor.php
index 710a631..404dc1a 100755
--- a/glissefondor.php
+++ b/glissefondor.php
@@ -5,7 +5,7 @@ ob_start(); // Start reading html
 
 <?php
 $pageContent = ob_get_clean(); // Store html content in variable
-$customBackgroundId = "bg_gli";
+$customBackgroundId = "gli_bg.jpg";
 $pageTitle = "Glissefondor";
 include("includes/template.php"); // Display template with variable content
 ?>
\ No newline at end of file
diff --git a/info.php b/info.php
index 70904d5..c95269a 100644
--- a/info.php
+++ b/info.php
@@ -68,17 +68,17 @@ ob_start(); // Start reading html
         <li><a href="https://developer.mozilla.org/en-US/docs/Web/CSS/CSS3"><i class="fab fa-css3-alt"></i></a></li>
     </ul>
     <p>
-        Image de fond trouvée sur <a href="https://www.pexels.com/photo/train-with-smoke-507410/"> Pexexls</a>
+        Image de fond trouvée sur <a href="https://www.pexels.com/photo/train-with-smoke-507410/"> Pexels</a>
     </p>
 
     <h1>Vie Privée</h1>
     <p>
         Le site utilise <a href="https://matomo.org/">Matomo</a> pour analyser la
         fréquentation. Ces données sont anonymes et permettent de savoir quelles pages sont utiles ainsi que ton pays
-        d'origine (pour voir si les étrangers ont reçu les info). Pour ne pas
+        d'origine (pour voir si les étrangers ont reçu les infos). Pour ne pas
         être traqué, tu peux simplement activer l'option "Indiquer aux sites que je
         ne souhaite pas être traqué" de ton navigateur.
-        Si jamais ça marche pas, envoie-un mail.
+        Si jamais ça marche pas, envoie-moi un mail.
     </p>
 </div>
 
diff --git a/peksentard.php b/peksentard.php
index 6d2d954..e0fac21 100644
--- a/peksentard.php
+++ b/peksentard.php
@@ -1,10 +1,13 @@
 <?php
 ob_start(); // Start reading html
 ?>
-<h1>Peksentard</h1>
+<h1>Peks<a id="hidea" href="peksentardhint.php">e</a>ntard</h1>
+
+
+
 <?php
 $pageContent = ob_get_clean(); // Store html content in variable
-$customBackgroundId = "bg_pek";
+$customBackgroundId = "pek_bg.jpg";
 $pageTitle = "Peksentard";
 include("includes/template.php"); // Display template with variable content
 ?>
diff --git a/peksentardhint.php b/peksentardhint.php
new file mode 100644
index 0000000..ffe01ca
--- /dev/null
+++ b/peksentardhint.php
@@ -0,0 +1,58 @@
+<?php
+if (!isset($relativePath))
+    $relativePath='';
+
+if (!isset($customBackgroundId))
+    $customBackgroundId='';
+
+
+require_once $relativePath.'classes/dao.php';
+require_once $relativePath.'includes/score_functions.php';
+
+
+?>
+<!DOCTYPE html>
+<html lang="fr">
+<head>
+    <meta charset='utf-8'>
+    <meta http-equiv="X-UA-Compatible" content="chrome=1">
+    <meta name="viewport" content="width=device-width,maximum-scale=2">
+    <link rel="shortcut icon" href="<?= $relativePath ?>favicon.ico">
+    <title>Tiens tiens tiens</title>
+    <!-- Matomo -->
+    <script type="text/javascript">
+        var _paq = _paq || [];
+        /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+        _paq.push(['disableCookies']);
+        _paq.push(['trackPageView']);
+        _paq.push(['enableLinkTracking']);
+        (function() {
+            var u="//etud.insa-toulouse.fr/~accueil_insa/analytics/";
+            _paq.push(['setTrackerUrl', u+'piwik.php']);
+            _paq.push(['setSiteId', '1']);
+            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+            g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+        })();
+    </script>
+    <!-- End Matomo Code -->
+</head>
+</html>
+
+<code>
+function meilleure_team (team :string) return string is
+<br>
+begin
+<br>
+case team is
+<br>
+when “Peksentard” => return “La meilleure équipe et le meilleur respo”;
+<br>
+    when others=> return “Aussi excitant que Bran roi”;
+<br>
+ end case;
+<br>
+end meilleure_team;
+</code>
+
+<p id="hint"> sorry je peux pas indent :/</p>
+
diff --git a/verredaigle.php b/verredaigle.php
index d446f67..0d79ba1 100644
--- a/verredaigle.php
+++ b/verredaigle.php
@@ -4,7 +4,7 @@ ob_start(); // Start reading html
 <h1>Verredaigle</h1>
 <?php
 $pageContent = ob_get_clean(); // Store html content in variable
-$customBackgroundId = "bg_ver";
+$customBackgroundId = "ver_bg.jpg";
 $pageTitle = "Verredaigle";
 include("includes/template.php"); // Display template with variable content
 ?>