Remove logo from image

mew22 · Jan 22, 2024 · 66e220f · 66e220f
1 parent 8f26e09
commit 66e220f
Show file tree

Hide file tree

Showing 70 changed files with 52 additions and 146 deletions.
diff --git a/accueil/image/page_actu.png b/accueil/image/page_actu.png
diff --git a/accueil/image/page_cybersecurite.png b/accueil/image/page_cybersecurite.png
diff --git a/accueil/image/page_metiers.png b/accueil/image/page_metiers.png
diff --git a/accueil/image/page_projet_pro_2024.png b/accueil/image/page_projet_pro_2024.png
diff --git a/accueil/image/page_vehicules_innovants.png b/accueil/image/page_vehicules_innovants.png
diff --git a/accueil/index.html b/accueil/index.html
@@ -10,9 +10,9 @@
 </head>
 <body>
     <div id="content"></div>
-    <div id="logo"></div>
     <div id="arrows">
         <img id="fleche_gauche" src="../image/arrow.svg"/>
+        <img id="logo" src="../image/pvi_logo.png"/>
         <img id="fleche_droite" src="../image/arrow.svg"/>
     </div>
 

diff --git a/accueil/index.js b/accueil/index.js
@@ -1,11 +1,11 @@
 pageList = [
     "page/accueil.html",
-    "page/innovant.html",
-    "page/actu.html",
+    "../page/innovant.html",
+    "../page/actu.html",
     "page/porte_ouverte.html",
-    "page/projet_pro_2024.html",
-    "page/cybersecu.html",
-    "page/metiers.html",
+    "../page/projet_pro_2024.html",
+    "../page/cybersecu.html",
+    "../page/metiers.html",
 ]
 
 pageAccueil = [

diff --git a/accueil/page/accueil.html b/accueil/page/accueil.html
@@ -5,9 +5,9 @@
     <title>Accueil</title>
 </head>
 <body>
-    <img id="accueil_background" src="image/production.jpg"/>
-    <img id="accueil_logo_pvi" src="image/pvi_logo.png"/>
-    <img id="accueil_logo_escal" src="image/escal_logo.png"/>
+    <img id="accueil_background" src="../image/production.jpg"/>
+    <img id="accueil_logo_pvi" src="../image/pvi_logo.png"/>
+    <img id="accueil_logo_escal" src="../image/escal_logo.png"/>
     <button id="welcome" class="welcome" type="button">Bienvenue</button>
     <div class="clock"></div>
     <script type="application/javascript">

diff --git a/accueil/page/cybersecu.html b/accueil/page/cybersecu.html
diff --git a/accueil/page/metiers.html b/accueil/page/metiers.html
diff --git a/accueil/page/projet_pro_2024.html b/accueil/page/projet_pro_2024.html
diff --git a/escal/image/logo.png b/escal/image/logo.png
diff --git a/escal/image/page_accord_fabrication.png b/escal/image/page_accord_fabrication.png
diff --git a/escal/image/page_actu.png b/escal/image/page_actu.png
diff --git a/escal/image/page_covid.png b/escal/image/page_covid.png
diff --git a/escal/image/page_epi.png b/escal/image/page_epi.png
diff --git a/escal/index.html b/escal/index.html
@@ -10,9 +10,9 @@
 </head>
 <body>
     <div id="content"></div>
-    <div id="logo"></div>
     <div id="arrows">
         <img id="fleche_gauche" src="../image/arrow.svg"/>
+        <img id="logo" src="../image/escal_logo.png"/>
         <img id="fleche_droite" src="../image/arrow.svg"/>
     </div>
 

diff --git a/escal/index.js b/escal/index.js
@@ -1,10 +1,10 @@
 pageList = [
     "page/accueil.html",
-    "page/epi.html",
-    "page/traffic_etech.html",
+    "../page/epi.html",
+    "../page/traffic_etech.html",
     "page/bonne_journee.html",
-    "page/actu.html",
-    "page/covid.html",
+    "../page/actu.html",
+    "../page/covid.html",
 ]
 
 pageAccueil = [

diff --git a/escal/page/accueil.html b/escal/page/accueil.html
@@ -5,8 +5,8 @@
     <title>Accueil</title>
 </head>
 <body>
-    <img id="accueil_background" src="image/production.jpg"/>
-    <img id="accueil_logo" src="image/logo.png"/>
+    <img id="accueil_background" src="../image/production2.jpg"/>
+    <img id="accueil_logo" src="../image/escal_logo.png"/>
     <button id="welcome" type="button">Bienvenue</button>
     <div class="clock"></div>
     <script type="application/javascript">

diff --git a/escal/page/actu.html b/escal/page/actu.html
diff --git a/escal/page/bonne_journee.html b/escal/page/bonne_journee.html
@@ -5,8 +5,8 @@
     <title>Title</title>
 </head>
 <body>
-    <img id="bonne_journee" src="image/neige.jpg"/>
-    <img id="accueil_logo" src="image/logo.png"/>
+    <img id="bonne_journee" src="../image/neige.jpg"/>
+    <img id="accueil_logo" src="../image/escal_logo.png"/>
     <button id="welcome" type="button">Bonne journée</button>
     <div class="clock"></div>
     <script type="application/javascript">

diff --git a/escal/page/covid.html b/escal/page/covid.html
diff --git a/escal/page/epi.html b/escal/page/epi.html
diff --git a/pvi/image/automne.jpg → image/automne.jpg b/pvi/image/automne.jpg → image/automne.jpg
diff --git a/accueil/image/escal_logo.png → image/escal_logo.png b/accueil/image/escal_logo.png → image/escal_logo.png
diff --git a/escal/image/neige.jpg → image/neige.jpg b/escal/image/neige.jpg → image/neige.jpg
diff --git a/image/page_accord_fabrication.png b/image/page_accord_fabrication.png
diff --git a/image/page_actu.png b/image/page_actu.png
diff --git a/image/page_covid.png b/image/page_covid.png
diff --git a/image/page_cybersecurite.png b/image/page_cybersecurite.png
diff --git a/image/page_epi.png b/image/page_epi.png
diff --git a/image/page_histoire.png b/image/page_histoire.png
diff --git a/image/page_metiers.png b/image/page_metiers.png
diff --git a/image/page_projet_pro_2024.png b/image/page_projet_pro_2024.png
diff --git a/image/page_vehicules_innovants.png b/image/page_vehicules_innovants.png
diff --git a/accueil/image/production.jpg → image/production.jpg b/accueil/image/production.jpg → image/production.jpg
diff --git a/escal/image/production.jpg → image/production2.jpg b/escal/image/production.jpg → image/production2.jpg
diff --git a/accueil/image/pvi_logo.png → image/pvi_logo.png b/accueil/image/pvi_logo.png → image/pvi_logo.png
diff --git a/pvi/image/pvi_logo_big.png → image/pvi_logo_big.png b/pvi/image/pvi_logo_big.png → image/pvi_logo_big.png
diff --git a/pvi/image/winter.jpg → image/winter.jpg b/pvi/image/winter.jpg → image/winter.jpg
diff --git a/lib/lib.css b/lib/lib.css
@@ -6,6 +6,7 @@ body {
     max-width: 100vh;
     z-index: 2;
     display: flex;
+    align-items: center;
     justify-content: space-between;
     margin-left: 2vh;
     margin-right: 2vh;
@@ -16,10 +17,6 @@ body {
 
 #logo {
     z-index: 3;
-    position: absolute;
-    top: 12vh;
-    left: 50%;
-    transform: translate(-50%, -50%);
     height: 10vh;
     width: 30vh;
 }
@@ -45,6 +42,7 @@ body {
 }
 
 #welcome {
+    z-index: 5;
     text-align: center;
     position: absolute;
     top: 80vh;

diff --git a/lib/lib.js b/lib/lib.js
@@ -23,6 +23,7 @@ $(document).ready(function () {
     $("#content").load(pageList[0], function() {
         startAutomaticSwipe()
         setArrowPosition(ArrowPosition.CENTER)
+        setArrowLogo(false)
     })
 })
 
@@ -44,12 +45,17 @@ $(document).on("click", "#welcome", function () {
 
 function setArrowPosition(position) {
     if (position === ArrowPosition.CENTER) {
-        $("#arrows").css({"position": "absolute", "top": "50vh"})
+        $("#arrows").css({"position": "absolute", "top": "46.5vh"})
     } else {
-        $("#arrows").css({"position": "absolute", "top": "9vh"})
+        $("#arrows").css({"position": "absolute", "top": "5.5vh"})
     }
 }
 
+function setArrowLogo(isVisible) {
+    const visible = isVisible ? "visible" : "hidden"
+    $("#logo").css("visibility", visible)
+}
+
 function startAutomaticSwipe() {
     timeoutId = setTimeout(() => { swipe(SwipeDirection.Right)}, automaticSwipeTimeoutInMilliSecond)
 
@@ -76,8 +82,10 @@ function loadPageAt(pageIndex) {
         startAutomaticSwipe()
         if (pageAccueil.includes(pageList[currentPage])) {
             setArrowPosition(ArrowPosition.CENTER)
+            setArrowLogo(false)
         } else {
             setArrowPosition(ArrowPosition.TOP)
+            setArrowLogo(true)
         }
     })
 }
diff --git a/accueil/page/actu.html → page/actu.html b/accueil/page/actu.html → page/actu.html
@@ -5,6 +5,6 @@
     <title>Title</title>
 </head>
 <body>
-    <img class="page_img" src="image/page_actu.png"/>
+    <img class="page_img" src="../image/page_actu.png"/>
 </body>
 </html>
diff --git a/pvi/page/covid.html → page/covid.html b/pvi/page/covid.html → page/covid.html
@@ -5,6 +5,6 @@
     <title>Title</title>
 </head>
 <body>
-    <img class="page_img" src="image/page_covid.png"/>
+    <img class="page_img" src="../image/page_covid.png"/>
 </body>
 </html>
diff --git a/pvi/page/cybersecu.html → page/cybersecu.html b/pvi/page/cybersecu.html → page/cybersecu.html
@@ -5,6 +5,6 @@
     <title>Title</title>
 </head>
 <body>
-    <img class="page_img" src="image/page_cybersecurite.png"/>
+    <img class="page_img" src="../image/page_cybersecurite.png"/>
 </body>
 </html>
diff --git a/pvi/page/epi.html → page/epi.html b/pvi/page/epi.html → page/epi.html
@@ -5,6 +5,6 @@
     <title>Title</title>
 </head>
 <body>
-    <img class="page_img" src="image/page_epi.png"/>
+    <img class="page_img" src="../image/page_epi.png"/>
 </body>
 </html>
diff --git a/pvi/page/histoire.html → page/histoire.html b/pvi/page/histoire.html → page/histoire.html
@@ -5,6 +5,6 @@
     <title>Title</title>
 </head>
 <body>
-    <img class="page_img" src="image/page_histoire.png"/>
+    <img class="page_img" src="../image/page_histoire.png"/>
 </body>
 </html>
diff --git a/accueil/page/innovant.html → page/innovant.html b/accueil/page/innovant.html → page/innovant.html
@@ -5,6 +5,6 @@
     <title>Title</title>
 </head>
 <body>
-    <img class="page_img" src="image/page_vehicules_innovants.png"/>
+    <img class="page_img" src="../image/page_vehicules_innovants.png"/>
 </body>
 </html>
diff --git a/pvi/page/metiers.html → page/metiers.html b/pvi/page/metiers.html → page/metiers.html
@@ -5,6 +5,6 @@
     <title>Title</title>
 </head>
 <body>
-    <img class="page_img" src="image/page_metiers.png"/>
+    <img class="page_img" src="../image/page_metiers.png"/>
 </body>
 </html>
diff --git a/escal/page/traffic_etech.html → page/projet_pro_2024.html b/escal/page/traffic_etech.html → page/projet_pro_2024.html
@@ -5,6 +5,6 @@
     <title>Title</title>
 </head>
 <body>
-    <img class="page_img" src="image/page_accord_fabrication.png"/>
+    <img class="page_img" src="../image/page_projet_pro_2024.png"/>
 </body>
 </html>
diff --git a/pvi/page/traffic_etech.html → page/traffic_etech.html b/pvi/page/traffic_etech.html → page/traffic_etech.html
@@ -5,6 +5,6 @@
     <title>Title</title>
 </head>
 <body>
-    <img class="page_img" src="image/page_accord_fabrication.png"/>
+    <img class="page_img" src="../image/page_accord_fabrication.png"/>
 </body>
 </html>
diff --git a/pvi/image/page_acces.png b/pvi/image/page_acces.png
diff --git a/pvi/image/page_accord_fabrication.png b/pvi/image/page_accord_fabrication.png
diff --git a/pvi/image/page_actu.png b/pvi/image/page_actu.png
diff --git a/pvi/image/page_covid.png b/pvi/image/page_covid.png
diff --git a/pvi/image/page_cybersecurite.png b/pvi/image/page_cybersecurite.png
diff --git a/pvi/image/page_epi.png b/pvi/image/page_epi.png
diff --git a/pvi/image/page_histoire.png b/pvi/image/page_histoire.png
diff --git a/pvi/image/page_metiers.png b/pvi/image/page_metiers.png
diff --git a/pvi/image/page_projet_pro_2024.png b/pvi/image/page_projet_pro_2024.png
diff --git a/pvi/image/page_vehicule_fonction.png b/pvi/image/page_vehicule_fonction.png
diff --git a/pvi/image/production.jpg b/pvi/image/production.jpg
diff --git a/pvi/index.html b/pvi/index.html
@@ -10,9 +10,9 @@
 </head>
 <body>
     <div id="content"></div>
-    <div id="logo"></div>
     <div id="arrows">
         <img id="fleche_gauche" src="../image/arrow.svg"/>
+        <img id="logo" src="../image/pvi_logo.png"/>
         <img id="fleche_droite" src="../image/arrow.svg"/>
     </div>
 

diff --git a/pvi/index.js b/pvi/index.js
@@ -1,14 +1,14 @@
 pageList = [
     "page/accueil.html",
-    "page/histoire.html",
-    "page/metiers.html",
-    "page/epi.html",
-    "page/covid.html",
+    "../page/histoire.html",
+    "../page/metiers.html",
+    "../page/epi.html",
+    "../page/covid.html",
     "page/bonne_journee.html",
-    "page/traffic_etech.html",
-    "page/actu.html",
-    "page/projet_pro_2024.html",
-    "page/cybersecu.html",
+    "../page/traffic_etech.html",
+    "../page/actu.html",
+    "../page/projet_pro_2024.html",
+    "../page/cybersecu.html",
 ]
 
 pageAccueil = [

diff --git a/pvi/page/acces.html b/pvi/page/acces.html
diff --git a/pvi/page/accueil.html b/pvi/page/accueil.html
@@ -5,8 +5,8 @@
     <title>Accueil</title>
 </head>
 <body>
-    <img id="accueil_background" src="image/production.jpg"/>
-    <img id="accueil_logo" src="image/pvi_logo_big.png"/>
+    <img id="accueil_background" src="../image/production.jpg"/>
+    <img id="accueil_logo" src="../image/pvi_logo_big.png"/>
     <button id="welcome" type="button">Bienvenue</button>
     <div class="clock"></div>
     <script type="application/javascript">

diff --git a/pvi/page/actu.html b/pvi/page/actu.html
diff --git a/pvi/page/bonne_journee.html b/pvi/page/bonne_journee.html
@@ -5,8 +5,8 @@
     <title>Title</title>
 </head>
 <body>
-    <img id="bonne_journee" src="image/winter.jpg"/>
-    <img id="accueil_logo" src="image/pvi_logo_big.png"/>
+    <img id="bonne_journee" src="../image/winter.jpg"/>
+    <img id="accueil_logo" src="../image/pvi_logo_big.png"/>
     <button id="welcome" type="button">Bonne journée</button>
     <div class="clock"></div>
     <script type="application/javascript">