From 35e8542d6ea80da0368e43aad83157d62eb94149 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Tue, 21 Jan 2020 09:14:04 +0100 Subject: [PATCH 1/2] [9.2.17] Petites corrections --- core/core.php | 2 +- core/layout/blank.php | 2 +- core/layout/light.php | 2 +- core/module/page/page.php | 2 +- core/module/page/view/edit/edit.js.php | 2 +- core/module/theme/theme.php | 2 +- core/module/theme/view/footer/footer.js.php | 2 +- core/module/theme/view/header/header.js.php | 2 +- core/module/user/view/login/login.js.php | 2 +- module/form/form.php | 6 +++--- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/core.php b/core/core.php index 35ff675b..e69b0fa1 100644 --- a/core/core.php +++ b/core/core.php @@ -10,7 +10,7 @@ * @copyright Copyright (C) 2008-2018, Rémi Jean * @license GNU General Public License, version 3 * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2019, Frédéric Tempez + * @copyright Copyright (C) 2018-2020, Frédéric Tempez * @link http://zwiicms.com/ */ diff --git a/core/layout/blank.php b/core/layout/blank.php index 60544b37..f89039f8 100755 --- a/core/layout/blank.php +++ b/core/layout/blank.php @@ -10,12 +10,12 @@ showMetaImage(); ?> showFavicon(); ?> showVendor(); ?> + showStyle(); ?> -showStyle(); ?> showContent(); ?> showScript(); ?> diff --git a/core/layout/light.php b/core/layout/light.php index 5dde1966..4457195d 100755 --- a/core/layout/light.php +++ b/core/layout/light.php @@ -10,13 +10,13 @@ showMetaImage(); ?> showFavicon(); ?> showVendor(); ?> + showStyle(); ?> -showStyle(); ?> showNotification(); ?>
showContent(); ?>
diff --git a/core/module/page/page.php b/core/module/page/page.php index cdc6df93..ffcc111d 100755 --- a/core/module/page/page.php +++ b/core/module/page/page.php @@ -9,7 +9,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2019, Frédéric Tempez + * @copyright Copyright (C) 2018-2020, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.com/ */ diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php index 929cfa5c..69feecd0 100755 --- a/core/module/page/view/edit/edit.js.php +++ b/core/module/page/view/edit/edit.js.php @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @authorFrédéric Tempez - * @copyright Copyright (C) 2018-2019, Frédéric Tempez + * @copyright Copyright (C) 2018-2020, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.com/ */ diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 2bffb9a1..2aaeb7ae 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -11,7 +11,7 @@ * @license GNU General Public License, version 3 * @link http://zwiicms.com/ * @copyright : Frédéric Tempez - * @copyright Copyright (C) 2018-2019, Frédéric Tempez + * @copyright Copyright (C) 2018-2020, Frédéric Tempez */ class theme extends common { diff --git a/core/module/theme/view/footer/footer.js.php b/core/module/theme/view/footer/footer.js.php index c06ca00f..f39d0b61 100755 --- a/core/module/theme/view/footer/footer.js.php +++ b/core/module/theme/view/footer/footer.js.php @@ -8,7 +8,7 @@ * @copyright Copyright (C) 2008-2018, Rémi Jean * @license GNU General Public License, version 3 * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2019, Frédéric Tempez + * @copyright Copyright (C) 2018-2020, Frédéric Tempez * @link http://zwiicms.com/ */ diff --git a/core/module/theme/view/header/header.js.php b/core/module/theme/view/header/header.js.php index 70afd9a2..65f8707b 100755 --- a/core/module/theme/view/header/header.js.php +++ b/core/module/theme/view/header/header.js.php @@ -8,7 +8,7 @@ * @copyright Copyright (C) 2008-2018, Rémi Jean * @license GNU General Public License, version 3 * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2019, Frédéric Tempez + * @copyright Copyright (C) 2018-2020, Frédéric Tempez * @link http://zwiicms.com/ */ diff --git a/core/module/user/view/login/login.js.php b/core/module/user/view/login/login.js.php index 6e729297..385dc9d4 100644 --- a/core/module/user/view/login/login.js.php +++ b/core/module/user/view/login/login.js.php @@ -5,7 +5,7 @@ * file that was distributed with this source code. * * @authorFrédéric Tempez - * @copyright Copyright (C) 2018-2019, Frédéric Tempez + * @copyright Copyright (C) 2018-2020, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.com/ */ diff --git a/module/form/form.php b/module/form/form.php index 5980379c..44a57a3b 100644 --- a/module/form/form.php +++ b/module/form/form.php @@ -9,7 +9,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2019, Frédéric Tempez + * @copyright Copyright (C) 2018-2020, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.com/ */ @@ -51,7 +51,7 @@ class form extends common { self::TYPE_MAIL => 'Champ mail', self::TYPE_SELECT => 'Sélection', self::TYPE_CHECKBOX => 'Case à cocher', - self::TYPE_DATETIME => 'Date', + self::TYPE_DATETIME => 'Date' ]; public static $listUsers = [ @@ -169,7 +169,7 @@ class form extends common { /** * Export CSV * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2019, Frédéric Tempez + * @copyright Copyright (C) 2018-2020, Frédéric Tempez */ public function export2csv() { // Jeton incorrect From 09d9ae219c8035625aab3fda300124f876a28f52 Mon Sep 17 00:00:00 2001 From: Prof Langues Date: Fri, 31 Jan 2020 11:24:00 +0100 Subject: [PATCH 2/2] [9.2.17] Body Image responsive --- CHANGES.md | 7 +++++-- core/module/theme/theme.php | 6 ++++-- core/module/theme/view/body/body.php | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 2aa608d5..f75bbc80 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,8 +1,11 @@ # Changelog ## version 9.2.17 -- Corretion : - - Affiche le nom du la page plutôt que son id dans le fil d'ariane +- Corretions : + - Affiche le nom du la page plutôt que son id dans le fil d'ariane. + - Petites corrections. +- Modifications : + - Image du fond (body), options responsive cover et contain. ## version 9.2.16 - Optimisation : diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 2aaeb7ae..fbfd68ad 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -207,9 +207,11 @@ class theme extends common { '15px' => '15 pixels', '16px' => '16 pixels' ]; - public static $sizes = [ + public static $bodySizes = [ 'auto' => 'Automatique', - '100% 100%' => 'Image étirée' + '100% 100%' => 'Image étirée (100% 100%)', + 'cover' => 'Responsive (cover)', + 'contain' => 'Responsive (contain)' ]; public static $textTransforms = [ 'none' => 'Standard', diff --git a/core/module/theme/view/body/body.php b/core/module/theme/view/body/body.php index 47ada5e1..f5224778 100755 --- a/core/module/theme/view/body/body.php +++ b/core/module/theme/view/body/body.php @@ -57,7 +57,7 @@ ]); ?>
- 'Taille', 'selected' => $this->getData(['theme', 'body', 'imageSize']) ]); ?>