From 8b27aac5bd44b8faedc3fea7b032cfcdbaaee9d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Tue, 22 Mar 2022 18:50:33 +0100
Subject: [PATCH 1/5] 11307

---
 CHANGES.md                             | 2 ++
 core/module/addon/addon.php            | 2 ++
 core/module/addon/view/store/store.php | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8c952c38..2e53266b 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,8 @@
     - Module galerie, option plein écran inopérante.
 ### Amélioration : 
     - Module galerie, lorsque le module ne cotient qu'une galerie, la page listant les galeries est omise.
+### Modification :
+    - Neutralisation du téléchargement depuis le catalogue.
 
 ## Version 11.3.06
 ### Corrections :
diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php
index 2aff2f7a..69836f68 100644
--- a/core/module/addon/addon.php
+++ b/core/module/addon/addon.php
@@ -320,11 +320,13 @@ class addon extends common {
 					? strftime('%d %B %Y', $store[$key]['versionDate'])
 					: utf8_encode(strftime('%d %B %Y', $store[$key]['versionDate'])),
 					implode(', ', array_keys($inPagesTitle,$key)),
+					/*
 					template::button('moduleExport' . $key, [
 							'class' => $class,
 							'href' => helper::baseUrl(). $this->getUrl(0) . '/uploadItem/' . $key.'/' . $_SESSION['csrf'],// appel de fonction vaut exécution, utiliser un paramètre
 							'value' => $ico
 							])
+							*/
 				];
 			}
 		}
diff --git a/core/module/addon/view/store/store.php b/core/module/addon/view/store/store.php
index e1324a6a..cf2204af 100644
--- a/core/module/addon/view/store/store.php
+++ b/core/module/addon/view/store/store.php
@@ -9,7 +9,7 @@
 	</div>
 </div>
 <?php if($module::$storeList): ?>
-	<?php echo template::table([2, 2, 1, 2, 2, 2, 1], $module::$storeList, ['Catégorie', 'Module', 'Version', 'Date', 'Pages', 'Télécharger ou <br> Mettre à jour']); ?>
+	<?php echo template::table([5, 2, 1, 2, 2], $module::$storeList, ['Catégorie', 'Module', 'Version', 'Date', 'Pages']); ?>
 <?php else: ?>
 	<?php echo template::speech('Le catalogue est vide.'); ?>
 <?php endif; ?>
\ No newline at end of file

From 1a8f99c7eefe6175ae5f27c3eb14434b6991c00c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Tue, 22 Mar 2022 18:50:53 +0100
Subject: [PATCH 2/5] 11307 fonte placeholder

---
 core/module/theme/view/fontAdd/fontAdd.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/module/theme/view/fontAdd/fontAdd.php b/core/module/theme/view/fontAdd/fontAdd.php
index 89bf4839..9085f503 100644
--- a/core/module/theme/view/fontAdd/fontAdd.php
+++ b/core/module/theme/view/fontAdd/fontAdd.php
@@ -53,7 +53,7 @@
 						<?php echo template::text('fontAddFontName', [
 							'autocomplete' => 'off',
 							'label' => 'Nom (Font Family)',
-							'placeholder' => 'PerryGothic, sans-serif'
+							'placeholder' => 'PerryGothic'
 						]); ?>
 					</div>
 				</div>

From ea438faae321263561d45183fddefb592779aab1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Tue, 22 Mar 2022 19:05:36 +0100
Subject: [PATCH 3/5] typo

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 2e53266b..5c27f2ea 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,7 +4,7 @@
 ### Correction :
     - Module galerie, option plein écran inopérante.
 ### Amélioration : 
-    - Module galerie, lorsque le module ne cotient qu'une galerie, la page listant les galeries est omise.
+    - Module galerie, lorsque le module ne contient qu'une galerie, la page listant les galeries est omise.
 ### Modification :
     - Neutralisation du téléchargement depuis le catalogue.
 

From 5b2075a6ac9f28882a9950ca5316026c711dca4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Sat, 30 Apr 2022 15:36:52 +0200
Subject: [PATCH 4/5] bug htaccess

---
 .htaccess | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index b2036adb..715df752 100644
--- a/.htaccess
+++ b/.htaccess
@@ -32,4 +32,5 @@ Options -Indexes
     Options -MultiViews
 </IfModule>
 
-# URL rewriting (ne pas supprimer ce commentaire !)
\ No newline at end of file
+# ne pas supprimer la ligne URL rewriting !
+# URL rewriting
\ No newline at end of file

From 60166caf790fa0353060c1ab4e236786d0097d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Tue, 3 May 2022 16:08:29 +0200
Subject: [PATCH 5/5] =?UTF-8?q?merge=20compl=C3=A9ment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.md                                 | 2 +-
 core/module/theme/view/fontAdd/fontAdd.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index c7760082..e946c95a 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -31,7 +31,7 @@
 ## Version 11.3.07
 ### Correction :
     - Module galerie, option plein écran inopérante.
-### Amélioration : 
+### Amélioration :
     - Module galerie, lorsque le module ne contient qu'une galerie, la page listant les galeries est omise.
 ### Modification :
     - Neutralisation du téléchargement depuis le catalogue.
diff --git a/core/module/theme/view/fontAdd/fontAdd.php b/core/module/theme/view/fontAdd/fontAdd.php
index e9bfe8a5..cddc03fe 100644
--- a/core/module/theme/view/fontAdd/fontAdd.php
+++ b/core/module/theme/view/fontAdd/fontAdd.php
@@ -46,8 +46,8 @@
 					<div class="col6">
 						<?php echo template::text('fontAddFontName', [
 							'autocomplete' => 'off',
-							'label' => 'Nom (Font Family)',
-							'placeholder' => 'PerryGothic'
+							'label' => 'Nom',
+							'placeholder' => 'Big Marker Extrude'
 						]); ?>
 					</div>
 				</div>