From 4bec7148504db251f17319e1ae9b6b443629d9a2 Mon Sep 17 00:00:00 2001
From: Fred Tempez <frederic.tempez@outlook.com>
Date: Sun, 22 Oct 2023 17:34:27 +0200
Subject: [PATCH] =?UTF-8?q?v54=20int=C3=A9gre=20les=20rows?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php                          |   2 +-
 module/workshop/view/config/config.php |   2 +-
 module/workshop/view/index/index.css   |  13 ++
 module/workshop/view/index/index.php   | 170 +++++++++++++------------
 4 files changed, 103 insertions(+), 84 deletions(-)
 create mode 100644 module/workshop/view/index/index.css

diff --git a/core/core.php b/core/core.php
index 62cf17c..91c2845 100644
--- a/core/core.php
+++ b/core/core.php
@@ -50,7 +50,7 @@ class common
 	const ACCESS_TIMER = 1800;
 
 	// Numéro de version
-	const ZWII_VERSION = '1.0.53';
+	const ZWII_VERSION = '1.0.54';
 
 	// URL autoupdate
 	const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/lms/';
diff --git a/module/workshop/view/config/config.php b/module/workshop/view/config/config.php
index 67db0a5..8a9c9f7 100644
--- a/module/workshop/view/config/config.php
+++ b/module/workshop/view/config/config.php
@@ -97,7 +97,7 @@
 				<div class="col12">
 					<?php echo template::checkbox('coursesConfigTemplate', true, 'Mise en évidence', [
 						'checked' => $this->getData(['module', $this->getUrl(0), 'config', 'template']),
-						'help' => 'Template identique à TinyMCE avec une bordure et le titre en évidence. Classe de la division : workshopContainer'
+						'help' => 'Template identique à TinyMCE avec une bordure et le titre en évidence. Classe de la division : workshopItemContainer'
 					]); ?>
 				</div>
 			</div>
diff --git a/module/workshop/view/index/index.css b/module/workshop/view/index/index.css
new file mode 100644
index 0000000..53ba2ee
--- /dev/null
+++ b/module/workshop/view/index/index.css
@@ -0,0 +1,13 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2023, Frédéric Tempez
+ * @license CC Attribution-NonCommercial-NoDerivatives 4.0 International
+ * @link http://zwiicms.fr/
+ */
diff --git a/module/workshop/view/index/index.php b/module/workshop/view/index/index.php
index 7f51f54..f98a34e 100644
--- a/module/workshop/view/index/index.php
+++ b/module/workshop/view/index/index.php
@@ -1,26 +1,28 @@
-<div class="row">
-    <?php foreach ($this->getData(['course']) as $courseId => $courseValue): ?>
-        <!-- Layout en colonnes -->
-        <div class="workshopContainer col<?php echo $this->getData(['module', $this->getUrl(0), 'config', 'layout']); ?>">
-
-            <!-- Affchage par bloc et bordure -->
-            <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'template']) === true): ?>
-                <div class="block">
-                    <h4>
+<?php $startRow = 0; ?>
+<?php foreach ($this->getData(['course']) as $courseId => $courseValue): ?>
+    <?php if ($startRow === 0): ?>
+        <div class="row  workshopRowContainer">
+    <?php endif; ?>
+    <!-- Layout en colonnes -->
+    <div class="workshopItemContainer col<?php echo $this->getData(['module', $this->getUrl(0), 'config', 'layout']); ?>">
+        <!-- Affchage par bloc et bordure -->
+        <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'template']) === true): ?>
+            <div class="block">
+                <h4>
                 <?php else: ?>
                     <p>
-                <?php endif; ?>
+        <?php endif; ?>
 
-                    <!-- Insère le titre court dans tous les cas -->
-                    <span class="workshopTitle">
-                        <?php echo $courseValue['title']; ?>
-                    </span>
+                <!-- Insère le titre court dans tous les cas -->
+                <span class="workshopTitle">
+                    <?php echo $courseValue['title']; ?>
+                </span>
 
-                        <!-- Fin du bloc et bordure titre 4 -->
+                <!-- Fin du bloc et bordure titre 4 -->
                 <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'template']) === true): ?>
-                    </h4>
-                    <?php else: ?>
-                    <p>
+            </h4>
+            <?php else: ?>
+                <p>
                 <?php endif; ?>
                 <!-- Description -->
                 <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'description']) === true): ?>
@@ -29,82 +31,86 @@
                         <?php echo $courseValue['description']; ?>
                     </span>
                 </p>
-                <?php endif; ?>
-                <!-- Author -->
-                <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'author']) === true): ?>
+            <?php endif; ?>
+            <!-- Author -->
+            <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'author']) === true): ?>
+                <p>
+                    <span class="workshopAuthor">
+                        <?php echo sprintf(helper::translate('Auteur : %s'), $this->signature($courseValue['author'])); ?>
+                    </span>
+                </p>
+            <?php endif; ?>
+            <!-- Modalité d'ouverture -->
+            <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'access']) === true): ?>
+                <div class="workshopAccessContainer">
                     <p>
-                        <span class="workshopAuthor">
-                            <?php echo sprintf(helper::translate('Auteur : %s'), $this->signature($courseValue['author'])); ?>
+                        <span class="workshopAccess">
+                            <?php echo helper::translate('Disponibilité : ') . $module::$coursesAccess[$courseValue['access']]; ?>
                         </span>
-                    </p>
-                <?php endif; ?>
-                <!-- Modalité d'ouverture -->
-                <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'access']) === true): ?>
-                    <div class="workshopAccessContainer">
-                        <p>
-                            <span class="workshopAccess">
-                                <?php echo helper::translate('Disponibilité : ') . $module::$coursesAccess[$courseValue['access']]; ?>
-                            </span>
-                            <!--Les dates d'ouverture et de fermeture -->
-                            <?php if ($courseValue['access'] === self::COURSE_ACCESS_DATE): ?>
-                                <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'openingdate']) === true): ?>
-                                <p>
-                                    <span class="workshopOpeningDate">
+                        <!--Les dates d'ouverture et de fermeture -->
+                        <?php if ($courseValue['access'] === self::COURSE_ACCESS_DATE): ?>
+                            <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'openingdate']) === true): ?>
+                            <p>
+                                <span class="workshopOpeningDate">
                                     <?php echo sprintf(helper::translate('%s Ouvre le %s'), template::ico('calendar-empty'), helper::dateUTF8('%d %B %Y', $courseValue['openingDate'])); ?>
-                                    </span>
-                                </p>
-                            <?php endif; ?>
-                            <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'closingdate']) === true): ?>
-                                <p>
-                                    <span class="workshopClosingDate">
-                                     <?php echo sprintf(helper::translate('%s Ferme le %s'), template::ico('calendar-empty'), helper::dateUTF8('%d %B %Y', $courseValue['closingDate'])); ?>
-                                    </span>
-                                </p>
-                            <?php endif; ?>
+                                </span>
+                            </p>
                         <?php endif; ?>
-                        </p>
-                    </div>
-                <?php endif; ?>
-
-                <!-- Modalité d'inscription -->
-                <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'enrolment']) === true): ?>
-                    <p>
-                        <span class="workshopEnrolment">
-                            <?php echo sprintf(helper::translate('Inscription : %s '), $module::$coursesEnrolment[$courseValue['enrolment']]); ?>
-                        </span>
+                        <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'closingdate']) === true): ?>
+                            <p>
+                                <span class="workshopClosingDate">
+                                    <?php echo sprintf(helper::translate('%s Ferme le %s'), template::ico('calendar-empty'), helper::dateUTF8('%d %B %Y', $courseValue['closingDate'])); ?>
+                                </span>
+                            </p>
+                        <?php endif; ?>
+                    <?php endif; ?>
                     </p>
-                <?php endif; ?>
+                </div>
+            <?php endif; ?>
 
-                <!-- Lien accès au cours-->
-                <div class="row">
-                    <div class="col6 workshopLinkContainer">
-                        <?php if (
-                            $courseValue['access'] === self::COURSE_ACCESS_OPEN
-                            ||
-                            ($courseValue['access'] === self::COURSE_ACCESS_DATE && time() >= $courseValue['openingDate'] && time() <= $courseValue['closingDate'])
-                        ): ?>
-                       <span class="workshopSuscribe">
+            <!-- Modalité d'inscription -->
+            <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'enrolment']) === true): ?>
+                <p>
+                    <span class="workshopEnrolment">
+                        <?php echo sprintf(helper::translate('Inscription : %s '), $module::$coursesEnrolment[$courseValue['enrolment']]); ?>
+                    </span>
+                </p>
+            <?php endif; ?>
+
+            <!-- Lien accès au cours-->
+            <div class="row">
+                <div class="col6 workshopLinkContainer">
+                    <?php if (
+                        $courseValue['access'] === self::COURSE_ACCESS_OPEN
+                        ||
+                        ($courseValue['access'] === self::COURSE_ACCESS_DATE && time() >= $courseValue['openingDate'] && time() <= $courseValue['closingDate'])
+                    ): ?>
+                        <span class="workshopSuscribe">
                             <a href="<?php echo helper::baseUrl(); ?>course/swap/<?php echo $courseId; ?>">
                                 <?php echo $this->getData(['module', $this->getUrl(0), 'caption', 'url']); ?>
                             </a>
                         </span>
-                        <?php endif; ?>
-                    </div>
-                    <div class="col6 textAlignRight">
-                        <!-- Lien désinscription-->
-                        <?php if ($this->getData(['enrolment', $courseId, $this->getUser('id')])): ?>
-                            <span class="workshopUnsuscribe">
+                    <?php endif; ?>
+                </div>
+                <div class="col6 textAlignRight">
+                    <!-- Lien désinscription-->
+                    <?php if ($this->getData(['enrolment', $courseId, $this->getUser('id')])): ?>
+                        <span class="workshopUnsuscribe">
                             <a href="<?php echo helper::baseUrl(); ?>course/unsuscribe/<?php echo $courseId; ?>">
                                 <?php echo $this->getData(['module', $this->getUrl(0), 'caption', 'unsuscribe']); ?>
                             </a>
-                            </span>
-                        <?php endif; ?>
-                    </div>
+                        </span>
+                    <?php endif; ?>
                 </div>
-                <!-- Fin du bloc et bordure -->
-                <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'template']) === true): ?>
-                </div>
-            <?php endif; ?>
+            </div>
+            <!-- Fin du bloc et bordure -->
+            <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'template']) === true): ?>
+            </div>
+        <?php endif; ?>
+    </div>
+    <?php $startRow = $startRow + $this->getData(['module', $this->getUrl(0), 'config', 'layout']); ?>
+    <?php if ($startRow === 12): ?>
         </div>
-    <?php endforeach; ?>
-</div>
\ No newline at end of file
+        <?php $startRow = 0; ?>
+    <?php endif; ?>
+<?php endforeach; ?>
\ No newline at end of file