From 0af42ee8aa5fbfca09b90995216d9cdb6178c46c Mon Sep 17 00:00:00 2001
From: Keplyx <keplyx@gmail.com>
Date: Thu, 24 May 2018 14:27:15 +0200
Subject: [PATCH] Added photos to com

---
 assets/css/hamburger.css       |  1 -
 assets/css/style.css           | 15 ++++++++--
 coms.php                       | 14 ++++++---
 includes/coms/com_template.php | 14 +++++++--
 photos.php                     | 54 +++++++++++++++++-----------------
 5 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/assets/css/hamburger.css b/assets/css/hamburger.css
index ee73c29..70d5f97 100644
--- a/assets/css/hamburger.css
+++ b/assets/css/hamburger.css
@@ -16,7 +16,6 @@
     background-color: #fff;
     margin: 5px 0;
     transition: 0.3s;
-    box-shadow: 1px 1px 3px #333;
 }
 
 #bar1 {
diff --git a/assets/css/style.css b/assets/css/style.css
index 17fd03a..c10f817 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -282,13 +282,24 @@ Full-Width Styles
     width: 100%;
     table-layout: auto;
     text-align: center;
-    border: 1px solid #5c5c5c;
+    border: 1px solid #494949;
 }
 
 #table_coms td{
     vertical-align: middle;
     border: none;
-    padding: 0 0 0 10px;
+    padding: 0;
+}
+
+#table_coms .com_photo{
+    vertical-align: middle;
+    width: 50%;
+}
+
+
+#table_coms img{
+    height: 100px;
+    margin: 5px;
 }
 
 .com_description{
diff --git a/coms.php b/coms.php
index 1fdd79c..dac83d2 100644
--- a/coms.php
+++ b/coms.php
@@ -9,6 +9,8 @@ $comTitle = "COM Mise à Feu";
 $comDescription = "Ici pour mettre l'ambiance toute la semaine!";
 $comRespo = "Paul MERLE";
 $comRespoId = "p_merle";
+$comRespoPhoto = "assets/images/usa_logo.svg";
+$comRespo2Photo = "assets/images/usa_logo.svg";
 include("includes/coms/com_template.php");
 
 $comTitle = "COM Ins'cape Game";
@@ -25,14 +27,18 @@ include("includes/coms/com_template.php");
 
 $comTitle = "COM Walle-E";
 $comDescription = "Une journée dans la foret de Boucone, avec de nombreuses activités le matin ayant pour but de nettoyer la foret, et une piscine en accès libre l'après midi";
-$comRespo = "Nélia BAHRAOUI et Lucas PERIN";
-$comRespoId = "bahraoui ou lperin";
+$comRespo = "Nélia BAHRAOUI";
+$comRespoId = "bahraoui ";
+$comRespo2 = "Lucas PERIN";
+$comRespo2Id = "lperin";
 include("includes/coms/com_template.php");
 
 $comTitle = "COM Parrainage";
 $comDescription = "Ici pour vous aider à vous sentir moins perdus";
-$comRespo = "Léa LAXAGUE et Blaise MAUGARD";
-$comRespoId = "laxague ou bmaugard";
+$comRespo = "Léa LAXAGUE";
+$comRespoId = "laxague ";
+$comRespo2 = "Blaise MAUGARD";
+$comRespo2Id = "bmaugard";
 include("includes/coms/com_template.php");
 
 $comTitle = "COM Hubble";
diff --git a/includes/coms/com_template.php b/includes/coms/com_template.php
index 1cec447..7217572 100644
--- a/includes/coms/com_template.php
+++ b/includes/coms/com_template.php
@@ -1,12 +1,22 @@
 <h3 id="<?= $comId ?>"><?= $comTitle ?></h3>
 <table id="table_coms">
     <tr>
-        <td class="com_description"><?= $comDescription ?></td>
+        <td colspan="2" class="com_description"><?= $comDescription ?></td>
     </tr>
     <tr>
-        <td>Responsable : <?= $comRespo ?></td>
+        <td><?= $comRespo ?></td>
+        <td rowspan="2" class="com_photo"><img src="<?= $comRespoPhoto ?>"></td>
     </tr>
     <tr>
         <td><span class="fas fa-envelope"></span> Mail : <?= $comRespoId ?></td>
     </tr>
+    <?php if ($comRespo2 != ""): ?>
+    <tr>
+        <td><?= $comRespo2 ?></td>
+        <td rowspan="2" class="com_photo"><img src="<?= $comRespo2Photo ?>"></td>
+    </tr>
+    <tr>
+        <td><span class="fas fa-envelope"></span> Mail : <?= $comRespo2Id ?></td>
+    </tr>
+    <?php endif; ?>
 </table>
diff --git a/photos.php b/photos.php
index 03c0406..97d7bcb 100644
--- a/photos.php
+++ b/photos.php
@@ -218,37 +218,37 @@ function generatePath($path)
 }
 
 ?>
-<div id="photo_overlay" style="display:none">
+    <div id="photo_overlay" style="display:none">
 
-    <img src="" id="img_big" onclick="toggleFullscreen()">
-    <div id="close_back" onclick="closeBig()"></div>
-    <div id="loading" onclick="closeBig()">
-        <i class="fas fa-spinner fa-spin"></i>
-    </div>
+        <img src="" id="img_big" onclick="toggleFullscreen()">
+        <div id="close_back" onclick="closeBig()"></div>
+        <div id="loading" onclick="closeBig()">
+            <i class="fas fa-spinner fa-spin"></i>
+        </div>
 
-    <div id="photo_buttons">
-        <i id="right" class="fas fa-arrow-right" onclick="displayNext(1)"></i>
-        <i id="left" class="fas fa-arrow-left" onclick="displayNext(-1)"></i>
-        <div id="photo_control">
-            <i id="close" class="fas fa-times" onclick="closeBig()"></i>
-            <a id="img_big_download" download="" href="">
-                <i id="download" class="fas fa-download"></i>
-            </a>
-            <a href="" id="img_big_link">
-                <i id="fullscreen" class="fas fa-expand-arrows-alt"></i>
-            </a>
+        <div id="photo_buttons">
+            <i id="right" class="fas fa-arrow-right" onclick="displayNext(1)"></i>
+            <i id="left" class="fas fa-arrow-left" onclick="displayNext(-1)"></i>
+            <div id="photo_control">
+                <i id="close" class="fas fa-times" onclick="closeBig()"></i>
+                <a id="img_big_download" download="" href="">
+                    <i id="download" class="fas fa-download"></i>
+                </a>
+                <a href="" id="img_big_link">
+                    <i id="fullscreen" class="fas fa-expand-arrows-alt"></i>
+                </a>
+            </div>
         </div>
     </div>
-</div>
 
-<h1 id="photos_title">Photos</h1>
-<p>Cliquez sur le dossier de votre choix pour afficher les photos</p>
-<ul class="photos_path">
-    <li><p>Chemin : </p></li>
-    <?php
-    generatePath(getActivePath());
-    ?>
-</ul>
+    <h1 id="photos_title">Photos</h1>
+    <p>Cliquez sur le dossier de votre choix pour afficher les photos</p>
+    <ul class="photos_path">
+        <li><p>Chemin : </p></li>
+        <?php
+        generatePath(getActivePath());
+        ?>
+    </ul>
 <?php if (getDirectoriesCount(photoRoot . getActivePath()) > 0): ?>
     <div class="photos_folder">
         <?php
@@ -271,7 +271,7 @@ function generatePath($path)
         ?>
     </div>
 <?php endif; ?>
-<script src="assets/scripts/photosScript.js"></script>
+    <script src="assets/scripts/photosScript.js"></script>
 <?php
 $pageContent = ob_get_clean(); // Store html content in variable
 ?>