From f2e6af6dea455b2e7373949c5e22d84f209abcbe Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Wed, 4 Nov 2020 09:15:08 +0100 Subject: [PATCH 1/7] Light div site marge haute --- core/core.php | 2 +- core/layout/light.php | 2 +- core/module/user/view/forgot/forgot.css | 20 -------------------- module/gallery/view/config/config.php | 4 ++-- 4 files changed, 4 insertions(+), 24 deletions(-) delete mode 100755 core/module/user/view/forgot/forgot.css diff --git a/core/core.php b/core/core.php index a5808573..c614cb0c 100644 --- a/core/core.php +++ b/core/core.php @@ -1547,7 +1547,7 @@ class core extends common { //$css .= '.button.buttonGrey,.button.buttonGrey:hover{color:' . $this->getData(['theme', 'text', 'textColor']) . '}'; $css .= '.container{max-width:' . $this->getData(['theme', 'site', 'width']) . '}'; $margin = $this->getData(['theme', 'site', 'margin']) ? '0' : '20px'; - $css .= $this->getData(['theme', 'site', 'width']) === '100%' ? '#site{margin:0 auto !important;} body{margin:0 auto !important;} #bar{margin:0 auto !important;} body > header{margin:0 auto !important;} body > nav {margin: 0 auto !important;} body > footer {margin:0 auto !important;}': "#site{margin: " . $margin . " auto !important;} body{margin:0px 10px;} #bar{margin: 0 -10px;} body > header{margin: 0 -10px;} body > nav {margin: 0 -10px;} body > footer {margin: 0 -10px;} "; + $css .= $this->getData(['theme', 'site', 'width']) === '100%' ? '#site.light{margin:100px auto !important;}#site{margin:0 auto !important;} body{margin:0 auto !important;} #bar{margin:0 auto !important;} body > header{margin:0 auto !important;} body > nav {margin: 0 auto !important;} body > footer {margin:0 auto !important;}': "#site.light{margin: 100px auto !important;}#site{margin: " . $margin . " auto !important;} body{margin:0px 10px;} #bar{margin: 0 -10px;} body > header{margin: 0 -10px;} body > nav {margin: 0 -10px;} body > footer {margin: 0 -10px;} "; $css .= $this->getData(['theme', 'site', 'width']) === '750px' ? '.button, button{font-size:0.8em;}' : ''; $css .= '#site{background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';border-radius:' . $this->getData(['theme', 'site', 'radius']) . ';box-shadow:' . $this->getData(['theme', 'site', 'shadow']) . ' #212223;}'; $css .= '.editorWysiwyg {background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';}'; diff --git a/core/layout/light.php b/core/layout/light.php index c3e3d6db..2c43b144 100644 --- a/core/layout/light.php +++ b/core/layout/light.php @@ -18,7 +18,7 @@ showNotification(); ?> -
+
showContent(); ?>
showScript(); ?> diff --git a/core/module/user/view/forgot/forgot.css b/core/module/user/view/forgot/forgot.css deleted file mode 100755 index 51a18ec5..00000000 --- a/core/module/user/view/forgot/forgot.css +++ /dev/null @@ -1,20 +0,0 @@ -/** - * 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 - * @copyright Copyright (C) 2008-2018, Rémi Jean - * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez - * @license GNU General Public License, version 3 - * @link http://zwiicms.fr/ - */ - - -/** @import url("site/data/admin.css"); */ - -/** NE PAS EFFACER -* admin.css -*/ \ No newline at end of file diff --git a/module/gallery/view/config/config.php b/module/gallery/view/config/config.php index 3ff54341..0c41378b 100644 --- a/module/gallery/view/config/config.php +++ b/module/gallery/view/config/config.php @@ -13,7 +13,7 @@ 'href' => helper::baseUrl() . $this->getUrl(0) . '/theme/' . $_SESSION['csrf'], 'value' => template::ico('brush','right') . 'Thème' ]); ?> -
+
@@ -45,7 +45,7 @@
- +
From 3a5702e36bc8af69b438a52043a574db5f462ad0 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Wed, 4 Nov 2020 09:17:29 +0100 Subject: [PATCH 2/7] =?UTF-8?q?recharger=20le=20th=C3=A8me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/core.php b/core/core.php index c614cb0c..5d9cbd10 100644 --- a/core/core.php +++ b/core/core.php @@ -1442,6 +1442,10 @@ class common { if ($this->getData(['core', 'dataVersion']) < 10304) { // Couleur des sous menus $this->setData(['theme', 'menu', 'backgroundColorSub', $this->getData(['theme', 'menu', 'backgroundColor']) ]); + // Nettoyage du fichier de thème pour forcer une régénération + if (file_exists(self::DATA_DIR . '/theme.css')) { // On ne sait jamais + unlink (self::DATA_DIR . '/theme.css'); + } $this->setData(['core', 'dataVersion', 10304]); } } From 47eef283180929c987507f7b08906e777e41a7b5 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Wed, 4 Nov 2020 09:50:20 +0100 Subject: [PATCH 3/7] inversion icones + et - config --- core/module/config/view/index/index.css | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/core/module/config/view/index/index.css b/core/module/config/view/index/index.css index f644a17a..0ba62757 100755 --- a/core/module/config/view/index/index.css +++ b/core/module/config/view/index/index.css @@ -16,22 +16,18 @@ /** NE PAS EFFACER * admin.css -*/ */ - -/** NE PAS EFFACER -* admin.css -*/ +*/ .blockContainer { display : none; } -#info .zwiico-minus-circled { +#info .zwiico-plus-circled { display: inline; } .zwiico-minus-circled, -#info .zwiico-plus-circled { +#info .zwiico-minus-circled { display: none; } From 8105d466c994b0c0a60585fa08e7eb014edd8a16 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Wed, 4 Nov 2020 13:22:07 +0100 Subject: [PATCH 4/7] redirection maintenance --- core/core.php | 2 +- core/module/maintenance/maintenance.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/core.php b/core/core.php index 5d9cbd10..21d318de 100644 --- a/core/core.php +++ b/core/core.php @@ -1551,7 +1551,7 @@ class core extends common { //$css .= '.button.buttonGrey,.button.buttonGrey:hover{color:' . $this->getData(['theme', 'text', 'textColor']) . '}'; $css .= '.container{max-width:' . $this->getData(['theme', 'site', 'width']) . '}'; $margin = $this->getData(['theme', 'site', 'margin']) ? '0' : '20px'; - $css .= $this->getData(['theme', 'site', 'width']) === '100%' ? '#site.light{margin:100px auto !important;}#site{margin:0 auto !important;} body{margin:0 auto !important;} #bar{margin:0 auto !important;} body > header{margin:0 auto !important;} body > nav {margin: 0 auto !important;} body > footer {margin:0 auto !important;}': "#site.light{margin: 100px auto !important;}#site{margin: " . $margin . " auto !important;} body{margin:0px 10px;} #bar{margin: 0 -10px;} body > header{margin: 0 -10px;} body > nav {margin: 0 -10px;} body > footer {margin: 0 -10px;} "; + $css .= $this->getData(['theme', 'site', 'width']) === '100%' ? '#site.light{margin:15px auto !important;}#site{margin:0 auto !important;} body{margin:0 auto !important;} #bar{margin:0 auto !important;} body > header{margin:0 auto !important;} body > nav {margin: 0 auto !important;} body > footer {margin:0 auto !important;}': "#site.light{margin: 150px auto !important;}#site{margin: " . $margin . " auto !important;} body{margin:0px 10px;} #bar{margin: 0 -10px;} body > header{margin: 0 -10px;} body > nav {margin: 0 -10px;} body > footer {margin: 0 -10px;} "; $css .= $this->getData(['theme', 'site', 'width']) === '750px' ? '.button, button{font-size:0.8em;}' : ''; $css .= '#site{background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';border-radius:' . $this->getData(['theme', 'site', 'radius']) . ';box-shadow:' . $this->getData(['theme', 'site', 'shadow']) . ' #212223;}'; $css .= '.editorWysiwyg {background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';}'; diff --git a/core/module/maintenance/maintenance.php b/core/module/maintenance/maintenance.php index 9d1dfb88..f20d12d8 100644 --- a/core/module/maintenance/maintenance.php +++ b/core/module/maintenance/maintenance.php @@ -22,6 +22,11 @@ class maintenance extends common { * Maintenance */ public function index() { + // Redirection vers l'accueil après rafraîchissement et que la maintenance est terminée. + if($this->getData(['config', 'maintenance']) == False){ + header('Location:' . helper::baseUrl()); + exit(); + } // Page perso définie et existante if ($this->getData(['config','page302']) !== 'none' AND $this->getData(['page',$this->getData(['config','page302'])]) ) { From d06aa23eba26a498b50002f730f7b3e4510dc574 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Wed, 4 Nov 2020 13:26:25 +0100 Subject: [PATCH 5/7] =?UTF-8?q?g=C3=A9n=C3=A9rateur=20al=C3=A9atoire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/class/template.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/class/template.class.php b/core/class/template.class.php index e7b9551f..d86fa96e 100644 --- a/core/class/template.class.php +++ b/core/class/template.class.php @@ -53,8 +53,9 @@ class template { $numbers = array(0,1,2,3,4,5,6,7,8,9,10,12,13,14,15,16,17,18,19,20); $letters = array('u','t','s','r','q','p','o','n','m','l','k','j','i','h','g','f','e','d','c','b','a'); $limit = $attributes['limit'] ? count($letters)-1 : 10 ; - $firstNumber = rand ( 0 , $limit ); - $secondNumber = rand ( 0 , $limit ); + mt_srand((float) microtime()*1000000); + $firstNumber = mt_rand ( 0 , $limit ); + $secondNumber = mt_rand ( 0 , $limit ); $result = $firstNumber + $secondNumber; $result = password_hash($result, PASSWORD_BCRYPT); $firstLetter = uniqid(); From 67843f4f0ffb53dd3cee23dff6cb3c1b5e416207 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Wed, 4 Nov 2020 13:35:07 +0100 Subject: [PATCH 6/7] Nettoyage css --- core/module/install/view/update/update.css | 1 - core/module/maintenance/view/index/index.css | 1 + core/module/sitemap/view/index/index.css | 1 + core/module/theme/view/index/index.css | 13 ++++++++++--- core/module/user/view/forgot/forgot.css | 1 + core/module/user/view/login/login.css | 14 +------------- 6 files changed, 14 insertions(+), 17 deletions(-) create mode 100644 core/module/maintenance/view/index/index.css create mode 100644 core/module/sitemap/view/index/index.css create mode 100644 core/module/user/view/forgot/forgot.css diff --git a/core/module/install/view/update/update.css b/core/module/install/view/update/update.css index 3037ba11..93ca0929 100755 --- a/core/module/install/view/update/update.css +++ b/core/module/install/view/update/update.css @@ -18,5 +18,4 @@ /** NE PAS EFFACER * admin.css -*/ */ \ No newline at end of file diff --git a/core/module/maintenance/view/index/index.css b/core/module/maintenance/view/index/index.css new file mode 100644 index 00000000..bb166ea9 --- /dev/null +++ b/core/module/maintenance/view/index/index.css @@ -0,0 +1 @@ +/* vide */ \ No newline at end of file diff --git a/core/module/sitemap/view/index/index.css b/core/module/sitemap/view/index/index.css new file mode 100644 index 00000000..d7c543b0 --- /dev/null +++ b/core/module/sitemap/view/index/index.css @@ -0,0 +1 @@ +/* Vide */ \ No newline at end of file diff --git a/core/module/theme/view/index/index.css b/core/module/theme/view/index/index.css index 4eeb6012..9be946f1 100755 --- a/core/module/theme/view/index/index.css +++ b/core/module/theme/view/index/index.css @@ -27,13 +27,16 @@ footer { position: relative; z-index: 10; } + .footerbodyFixed { position: relative; z-index: 5; -} +} + nav li ul { display: none; } + #themeShowAll, #themeBack, #themeManage, @@ -42,6 +45,7 @@ nav li ul { position: relative; z-index: 11; } + .themeOverlay { -webkit-transition: all .3s; transition: all .3s; @@ -56,10 +60,13 @@ nav li ul { display: block; background: transparent; } + .themeOverlay:not(.themeOverlayHideBackground):hover, .themeOverlayTriggerHover { background: rgba(39, 174, 96, .5); } + #themeOverlayBody { - position: fixed; /* Sinon l'overlay s'arrête à la hauteur de la fenêtre et non de la page*/ -} + position: fixed; + /* Sinon l'overlay s'arrête à la hauteur de la fenêtre et non de la page*/ +} \ No newline at end of file diff --git a/core/module/user/view/forgot/forgot.css b/core/module/user/view/forgot/forgot.css new file mode 100644 index 00000000..d7c543b0 --- /dev/null +++ b/core/module/user/view/forgot/forgot.css @@ -0,0 +1 @@ +/* Vide */ \ No newline at end of file diff --git a/core/module/user/view/login/login.css b/core/module/user/view/login/login.css index 75723119..e1afad0e 100755 --- a/core/module/user/view/login/login.css +++ b/core/module/user/view/login/login.css @@ -1,13 +1 @@ -/** - * 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 - * @copyright Copyright (C) 2008-2018, Rémi Jean - * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez - * @license GNU General Public License, version 3 - * @link http://zwiicms.fr/ - */ +/** vide */ \ No newline at end of file From 6d3cec1b65e0b854903191084d2d29ad3d487c8d Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Wed, 4 Nov 2020 14:06:31 +0100 Subject: [PATCH 7/7] changes --- CHANGES.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 3e8871ab..6b6cd266 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,10 +8,13 @@ - Thème administration : modification de l'appel du code CSS permettant une mise à jour du thème sans vider le cache. - Thème du menu : alignement inopérant ; arrière-plan semi-transparent non uniforme. - Supprime les warning lors d'une primo installation. + - Inversion des icônes + et - dans la configuration - Amélioration : - - Thème menu : couleurs du sous menu. + - Thème menu : couleurs du sous-menu. - Mise en page du corps des mails de notification. - Paramètres de localisation. + - Maintenance terminée, redirection vers l'accueil. + - Marge haute dans les vues en mode light. - Modification : - Changement de noms de classe : - navLevel1 devient navMain