From 4ed4a4e0d9dcaf6ae737413b7cc5f16839d574e3 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Thu, 11 Jun 2020 11:25:53 +0200
Subject: [PATCH] =?UTF-8?q?10.2.dev33=20persistances=20des=20positions=20d?=
 =?UTF-8?q?e=20blocs=20durant=20la=20dur=C3=A9e=20de=20la=20session.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.md                                 |  1 +
 core/core.php                              |  2 +-
 core/module/config/view/index/index.css    |  3 +-
 core/module/config/view/index/index.js.php | 35 +++++++++++++++++++++-
 core/module/config/view/index/index.php    | 18 +++++------
 core/module/page/view/edit/edit.js.php     | 28 ++++++++++++++++-
 core/module/page/view/edit/edit.php        | 12 ++++----
 7 files changed, 80 insertions(+), 19 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 43375282..2e753856 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@
         - la connexion d'un utilisateur sur un autre poste ou navigateur déconnecte la session précédente.
         - sécurisation du login
         - journalisation de l'utilisation du site
+    - Ecran de configuration et d'édition des pages, les blocs sont pliables et dépliables afin d'alléger l'occupation sur l'écran. Le statut des blocs (fermés ; ouverts) est persistante au cours de la session.
 - Modifications :
     - Thème, les sélecteurs de couleur affiche la valeur RGBa d'une couleur différente de celle de la sélection.
     - Thème de l'administration, amélioration du rendu.
diff --git a/core/core.php b/core/core.php
index 8e33d7a4..903c52c1 100755
--- a/core/core.php
+++ b/core/core.php
@@ -39,7 +39,7 @@ class common {
 	const ACCESS_TIMER = 1800;
 
 	// Numéro de version
-	const ZWII_VERSION = '10.2.00.dev32';
+	const ZWII_VERSION = '10.2.00.dev33';
 	const ZWII_UPDATE_CHANNEL = "v10";
 
 	public static $actions = [];
diff --git a/core/module/config/view/index/index.css b/core/module/config/view/index/index.css
index 27c1bd94..e9fa2971 100755
--- a/core/module/config/view/index/index.css
+++ b/core/module/config/view/index/index.css
@@ -22,7 +22,8 @@
     display: inline;
 }
 
-.zwiico-minus,#info .zwiico-plus {
+.zwiico-minus,
+#info .zwiico-plus {
     display: none;
 }
 
diff --git a/core/module/config/view/index/index.js.php b/core/module/config/view/index/index.js.php
index d119f2c2..34bcfe51 100755
--- a/core/module/config/view/index/index.js.php
+++ b/core/module/config/view/index/index.js.php
@@ -34,7 +34,22 @@ $( document).ready(function() {
         $("#configSmtpAuthParam").slideUp();
     }
 
+
     /**
+     * Initialisation des blocs
+     */
+
+    var i = ["info", "setup", "social", "ceo", "network", "smtp", "login", "logs", "script", "system" ];
+    $.each(i,function(e) {
+        if (getCookie(i[e]) === "true") {
+            $("#" + i[e]).find(".zwiico-plus").hide();
+            $("#" + i[e]).find(".zwiico-minus").show();
+            $("#" + i[e]).find(".blockContainer").show();
+        }
+    });
+
+    /**
+     * 
      * Blocs dépliants
      */
 
@@ -42,6 +57,11 @@ $( document).ready(function() {
         $(this).find(".zwiico-plus").toggle();
         $(this).find(".zwiico-minus").toggle();
         $(this).find(".blockContainer").slideToggle();
+        /* 
+        * Sauvegarder la position des blocs
+        * true = bloc déplié
+        */
+        document.cookie = $(this).attr('id') + "=" + $(this).find(".zwiico-minus").is(":visible");
     }).on("click", "span > input, input, textarea, label, option, button, a, .blockContainer", function(e) {
         // Empêcher les déclenchements dans les blocs
         e.stopPropagation();
@@ -99,4 +119,17 @@ $( document).ready(function() {
         }
     });
 
-});
\ No newline at end of file
+});
+
+
+
+    /**
+     * Lire un cookie s'il existe
+     */
+    function getCookie(name) {
+        var v = document.cookie.match('(^|;) ?' + name + '=([^;]*)(;|$)');
+        return v ? v[2] : null;
+    }
+
+
+
diff --git a/core/module/config/view/index/index.php b/core/module/config/view/index/index.php
index 2cd05d5e..464ed6ed 100755
--- a/core/module/config/view/index/index.php
+++ b/core/module/config/view/index/index.php
@@ -72,7 +72,7 @@
 </div>
 <div class="row">
 	<div class="col12">
-		<div class="block">
+		<div class="block" id="setup">
 			<h4><?php
 			echo template::ico('plus','right');
 			echo template::ico('minus','right');
@@ -241,7 +241,7 @@
 </div>
 <div class="row">
 	<div class="col12">
-		<div class="block">
+		<div class="block" id="ceo">
 			<h4><?php
 			echo template::ico('plus','right');
 			echo template::ico('minus','right');
@@ -284,7 +284,7 @@
 </div>
 <div class="row">
 	<div class="col12">
-		<div class="block">
+		<div class="block" id="network">
 			<h4><?php
 			echo template::ico('plus','right');
 			echo template::ico('minus','right');
@@ -318,7 +318,7 @@
 </div>
 <div class="row">
 	<div class="col12">
-		<div class="block">
+		<div class="block" id="smtp">
 			<h4><?php
 			echo template::ico('plus','right');
 			echo template::ico('minus','right');
@@ -385,7 +385,7 @@
 </div>
 <div class="row">
 	<div class="col12">
-		<div class="block">
+		<div class="block" id="login">
 			<h4><?php
 			echo template::ico('plus','right');
 			echo template::ico('minus','right');
@@ -432,7 +432,7 @@
 </div>
 <div class="row">
 	<div class="col12">
-		<div class="block">
+		<div class="block" id="logs">
 			<h4><?php
 			echo template::ico('plus','right');
 			echo template::ico('minus','right');
@@ -466,7 +466,7 @@
 </div>
 <div class="row">
 	<div class="col12">
-		<div class="block">
+		<div class="block" id="script">
 			<h4><?php
 			echo template::ico('plus','right');
 			echo template::ico('minus','right');
@@ -501,8 +501,8 @@
 	</div>
 </div>
 <div class="row">
-	<div class="col12">
-		<div class="block">
+	<div class="col12" >
+		<div class="block" id="system">
 			<h4><?php
 			echo template::ico('plus','right');
 			echo template::ico('minus','right');
diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php
index 4f2d07c9..7291dbd4 100755
--- a/core/module/page/view/edit/edit.js.php
+++ b/core/module/page/view/edit/edit.js.php
@@ -52,6 +52,27 @@ function protectModule() {
 */
 $( document ).ready(function() {
 
+    /**
+     * Initialisation des blocs
+     */
+
+    var i = ["info", "layout", "setup", "position", "advanced", "ceo" ];
+    $.each(i,function(e) {
+        if (getCookie(i[e]) === "true") {
+            $("#" + i[e]).find(".zwiico-plus").hide();
+            $("#" + i[e]).find(".zwiico-minus").show();
+            $("#" + i[e]).find(".blockContainer").show();
+        }
+	});
+
+	/**
+     * Lire un cookie s'il existe
+     */
+    function getCookie(name) {
+        var v = document.cookie.match('(^|;) ?' + name + '=([^;]*)(;|$)');
+        return v ? v[2] : null;
+    }
+
 	/**
      * Blocs dépliants
      */
@@ -59,7 +80,12 @@ $( document ).ready(function() {
     $("div .block").click(function(e) {
         $(this).find(".zwiico-plus").toggle();
         $(this).find(".zwiico-minus").toggle();
-        $(this).find(".blockContainer").slideToggle();
+		$(this).find(".blockContainer").slideToggle();
+		/*
+        * Sauvegarder la position des blocs
+        * true = bloc déplié
+        */
+	   document.cookie = $(this).attr('id') + "=" + $(this).find(".zwiico-minus").is(":visible");
     }).on("click", "span > input, input, textarea, label, option, button, a, .blockContainer", function(e) {
         // Empêcher les déclenchements dans les blocs
         e.stopPropagation();
diff --git a/core/module/page/view/edit/edit.php b/core/module/page/view/edit/edit.php
index d6c4bb28..93fc470f 100755
--- a/core/module/page/view/edit/edit.php
+++ b/core/module/page/view/edit/edit.php
@@ -27,8 +27,8 @@ echo template::formOpen('pageEditForm');
 	</div>
 	<div class="row">
 		<div class="col12">
-			<div class="block">
-				<h4>Informations générales</h4>
+			<div class="block" id="info">
+ 				<h4>Informations générales</h4>
 				<div class="row">
 					<div class="col8">
 						<?php echo template::text('pageEditTitle', [
@@ -95,7 +95,7 @@ echo template::formOpen('pageEditForm');
 	</div>
 	<div class="row">
 		<div class="col12" id="pageEditBlockLayout">
-			<div class="block" >
+			<div class="block" id="layout">
 				<h4><?php
 				echo template::ico('plus','right');
 				echo template::ico('minus','right');
@@ -158,7 +158,7 @@ echo template::formOpen('pageEditForm');
 	</div>
 	<div class="row">
 		<div class="col12"  id="pageEditMenu">
-			<div class="block">
+			<div class="block" id="position">
 				<h4><?php
 				echo template::ico('plus','right');
 				echo template::ico('minus','right');
@@ -204,7 +204,7 @@ echo template::formOpen('pageEditForm');
 	</div>
 	<div class='row' id="pageEditAdvancedWrapper">
 		<div class="col12">
-			<div class="block">
+			<div class="block" id="advanced">
 				<h4><?php
 				echo template::ico('plus','right');
 				echo template::ico('minus','right');
@@ -230,7 +230,7 @@ echo template::formOpen('pageEditForm');
 	</div>
 	<div class='row' id="pageEditSeoWrapper">
 		<div class="col12">
-			<div class="block">
+			<div class="block" id="ceo">
 				<h4><?php
 				echo template::ico('plus','right');
 				echo template::ico('minus','right');