From 2c5986c12764664e7bf20d3b769cc4ddbb8101af Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sat, 21 Nov 2020 15:16:51 +0100 Subject: [PATCH 1/4] Persistence ouverture des blocs dans la config --- core/module/config/view/index/index.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/module/config/view/index/index.js.php b/core/module/config/view/index/index.js.php index cf6a7a92..14354f54 100755 --- a/core/module/config/view/index/index.js.php +++ b/core/module/config/view/index/index.js.php @@ -61,7 +61,7 @@ $( document).ready(function() { * Sauvegarder la position des blocs * true = bloc déplié */ - document.cookie = $(this).attr('id') + "=" + $(this).find(".zwiico-minus").is(":visible") + ";expires=Fri, 31 Dec 9999 23:59:59 GMT;path=/;SameSite=Lax"; + document.cookie = $(this).attr('id') + "=" + $(this).find(".zwiico-minus-circled").is(":visible") + ";expires=Fri, 31 Dec 9999 23:59:59 GMT;path=/;SameSite=Lax"; }).on("click", "span > input, input, textarea, label, option, button, a:not(.inputFile), .blockContainer", function(e) { // Empêcher les déclenchements dans les blocs e.stopPropagation(); From 0a2e3cb28d7ce6cfe8d7243ef1a213a54bfb6bbc Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sun, 22 Nov 2020 18:01:41 +0100 Subject: [PATCH 2/4] bords des icones RSS tranparentes --- module/blog/ressource/feed-icon-16.gif | Bin 652 -> 652 bytes module/news/ressource/feed-icon-16.gif | Bin 652 -> 652 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/module/blog/ressource/feed-icon-16.gif b/module/blog/ressource/feed-icon-16.gif index b0e4adf1d517547adb01c44d4b91dc78c170b6a5..26fa274454d016fdafa1b371e6d172030b61ac7d 100755 GIT binary patch delta 96 zcmeBS?P29{_jI$cOcY=cU^rH|ktdwd;Xlzp@h1x-7ehUR4g(N?OkiMt*-$@uG2;`~ Jzrq|0)&Tp;Hm?8x delta 96 zcmeBS?P29{_jI$cOcY=cV0gx`ktdwdfq`hC_>%>!RtH3aOkiMt*}yt^G2;_fT>%aT FYXA&%3b6nH diff --git a/module/news/ressource/feed-icon-16.gif b/module/news/ressource/feed-icon-16.gif index b0e4adf1d517547adb01c44d4b91dc78c170b6a5..26fa274454d016fdafa1b371e6d172030b61ac7d 100755 GIT binary patch delta 96 zcmeBS?P29{_jI$cOcY=cU^rH|ktdwd;Xlzp@h1x-7ehUR4g(N?OkiMt*-$@uG2;`~ Jzrq|0)&Tp;Hm?8x delta 96 zcmeBS?P29{_jI$cOcY=cV0gx`ktdwdfq`hC_>%>!RtH3aOkiMt*}yt^G2;_fT>%aT FYXA&%3b6nH From 62a4debf624454bbd302d54da39e917c9a506501 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sun, 22 Nov 2020 18:56:14 +0100 Subject: [PATCH 3/4] =?UTF-8?q?R=C3=A9initialisation=20du=20mdp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 12 +++++++++++- core/core.php | 4 ++-- core/module/user/user.php | 7 ++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 512e6c25..06bdd834 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,15 @@ # Changelog +## Version 10.3.09 +Corrections : + - Configuration : persistance de l'ouverture des blocs. + - Réinitialisation du mot de passe : + - Remise à zéro du timer après renouvellement du mot de passe. + - Affichage de le fenêtrenouveau mot de passe en mode allégé. + - Redirection sur la page d'accueil. + - Modules news et blog : transparence icône RSS. + - Position de l'écran de configuration + ## Version 10.3.08 Corrections : - Notification de mise à jour d'update bloqué @@ -12,7 +22,7 @@ Corrections : ## version 10.3.06 - Correction : - Edition de page avec module, le changement de mise en page désactive le bouton d'option du module. -- Modification : +- Modification : - Modules News et Blog : ajout de l'option flux RSS. L'option est activée par défaut. ## version 10.3.05 diff --git a/core/core.php b/core/core.php index d36f3807..238e9bb2 100755 --- a/core/core.php +++ b/core/core.php @@ -40,7 +40,7 @@ class common { const ACCESS_TIMER = 1800; // Numéro de version - const ZWII_VERSION = '10.3.08'; + const ZWII_VERSION = '10.3.09'; const ZWII_UPDATE_CHANNEL = "v10"; public static $actions = []; @@ -1602,7 +1602,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:150px 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:60px 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: 60px 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/user/user.php b/core/module/user/user.php index 9d8ce8e5..46a253d5 100755 --- a/core/module/user/user.php +++ b/core/module/user/user.php @@ -522,16 +522,21 @@ class user extends common { $this->setData(['user', $this->getUrl(2), 'password', $newPassword]); // Réinitialise la date de la demande $this->setData(['user', $this->getUrl(2), 'forgot', 0]); + // Réinitialise le blocage + $this->setData(['user', $this->getUrl(2),'connectFail',0 ]); + $this->setData(['user', $this->getUrl(2),'connectTimeout',0 ]); // Valeurs en sortie $this->addOutput([ 'notification' => 'Nouveau mot de passe enregistré', - 'redirect' => helper::baseUrl() . 'user/login/' . str_replace('/', '_', $this->getUrl()), + //'redirect' => helper::baseUrl() . 'user/login/' . str_replace('/', '_', $this->getUrl()), + 'redirect' => helper::baseUrl(), 'state' => true ]); } } // Valeurs en sortie $this->addOutput([ + 'display' => self::DISPLAY_LAYOUT_LIGHT, 'title' => 'Réinitialisation du mot de passe', 'view' => 'reset' ]); From 5c50a87ff99281562df163fa490061dee0a23fef Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sun, 22 Nov 2020 18:59:03 +0100 Subject: [PATCH 4/4] Theme reset normal --- core/module/user/view/reset/reset.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/module/user/view/reset/reset.css b/core/module/user/view/reset/reset.css index 805e9150..75723119 100755 --- a/core/module/user/view/reset/reset.css +++ b/core/module/user/view/reset/reset.css @@ -11,8 +11,3 @@ * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ - - -/** NE PAS EFFACER -* admin.css -*/ \ No newline at end of file