From 91579cf0bc04b9db9668c873195b53b400a933bf Mon Sep 17 00:00:00 2001 From: SylvainLelievre Date: Mon, 8 Nov 2021 17:59:33 +0100 Subject: [PATCH 1/5] =?UTF-8?q?Mise=20=C3=A0=20jour=20du=20lien=20vers=20l?= =?UTF-8?q?a=20documentation=20dans=20user/view/import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/user/view/import/import.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/core/module/user/view/import/import.php b/core/module/user/view/import/import.php index a563c66c..a193d2cd 100644 --- a/core/module/user/view/import/import.php +++ b/core/module/user/view/import/import.php @@ -8,13 +8,15 @@ 'value' => 'Retour' ]); ?> -
- 'buttonHelp', - 'ico' => 'help', - 'value' => 'Aide' - ]); ?> -
+
+ 'https://doc.zwiicms.fr/importation-d-une-liste-d-utilisateurs', + 'target' => '_blank', + 'ico' => 'help', + 'value' => 'Aide', + 'class' => 'buttonHelp' + ]); ?> +
'Importer' From 9d785957cb7ae0d44d698331ad2aef9f466f55c0 Mon Sep 17 00:00:00 2001 From: SylvainLelievre Date: Mon, 8 Nov 2021 18:09:22 +0100 Subject: [PATCH 2/5] =?UTF-8?q?Mise=20=C3=A0=20jour=20du=20lien=20vers=20l?= =?UTF-8?q?a=20documentation=20dans=20user/view/import=20suite?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/user/view/import/import.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/module/user/view/import/import.php b/core/module/user/view/import/import.php index a193d2cd..81e6a929 100644 --- a/core/module/user/view/import/import.php +++ b/core/module/user/view/import/import.php @@ -23,10 +23,6 @@ ]); ?>
- -
- -
From fea3ff40756db9284ef65a5c81770db4885cf76b Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Tue, 9 Nov 2021 13:29:53 +0100 Subject: [PATCH 3/5] site theme option bug margin --- core/module/theme/view/site/site.js.php | 37 ++++++++----------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/core/module/theme/view/site/site.js.php b/core/module/theme/view/site/site.js.php index fb5e4b77..8eaeaef1 100644 --- a/core/module/theme/view/site/site.js.php +++ b/core/module/theme/view/site/site.js.php @@ -11,35 +11,23 @@ * @link http://zwiicms.fr/ */ - /* - * Chargement de l'aperçu - */ -$(document).ready(function() { - - /** - * Option de marge si la taille n'est pas fluide - */ - if ($('#themeSiteWidth').val() === '100%') { - $("#themeSiteMargin").prop("checked", true); - $("#themeSiteMargin").addClass("disabled"); - } else { - $("#themeSiteMargin").addClass("enabled"); - } - - // Charger l'aperçu initial - previewDOM(); - -}); /** * Aperçu en direct */ -$("input, select").on("change",function() { - previewDOM(); -}); + $("input, select").on("change",function() { -function previewDOM() { + /** + * Option de marge si la taille n'est pas fluide + */ + if ($('#themeSiteWidth').val() === '100%') { + console.log ("pop"); + $("#themeSiteMarginWrapper").prop("checked", true); + $("#themeSiteMarginWrapper").hide(); + } else { + $("#themeSiteMarginWrapper").show(); + } /** * Aperçu dans la boîte @@ -96,7 +84,6 @@ function previewDOM() { // Couleur ou image de fond var backgroundImage = getData(['theme','body','image'])); ?>; - console.log(backgroundImage); var backgroundcolor = getdata(['theme','body','backgroundColor'])); ?>; if(backgroundImage) { css += "div.bodybackground{background-image:url(" + backgroundImage + ");background-repeat:" + $("#themeBodyImageRepeat").val() + ";background-position:" + $("#themeBodyImagePosition").val() + ";background-attachment:" + $("#themeBodyImageAttachment").val() + ";background-size:" + $("#themeBodyImageSize").val() + "}"; @@ -125,4 +112,4 @@ function previewDOM() { .text(css) .appendTo("head"); -}; +}).trigger("change"); \ No newline at end of file From 51fdad314a9af6e1e60122accca68e243e0e2c27 Mon Sep 17 00:00:00 2001 From: SylvainLelievre Date: Wed, 10 Nov 2021 08:03:31 +0100 Subject: [PATCH 4/5] =?UTF-8?q?Boutons=20d'aide=20pour=20le=20th=C3=A8me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/theme/view/body/body.php | 13 +++++++++++-- core/module/theme/view/footer/footer.php | 11 ++++++++++- core/module/theme/view/header/header.php | 13 +++++++++++-- core/module/theme/view/index/index.php | 24 +++++++++++++++++++++++- core/module/theme/view/menu/menu.php | 11 ++++++++++- core/module/theme/view/site/site.php | 13 +++++++++++-- 6 files changed, 76 insertions(+), 9 deletions(-) diff --git a/core/module/theme/view/body/body.php b/core/module/theme/view/body/body.php index aa717fa1..172d8981 100644 --- a/core/module/theme/view/body/body.php +++ b/core/module/theme/view/body/body.php @@ -8,7 +8,16 @@ 'value' => 'Retour' ]); ?>
-
+
+ 'https://doc.zwiicms.fr/arriere-plan', + 'target' => '_blank', + 'ico' => 'help', + 'value' => 'Aide', + 'class' => 'buttonHelp' + ]); ?> +
+
@@ -96,4 +105,4 @@
- \ No newline at end of file + diff --git a/core/module/theme/view/footer/footer.php b/core/module/theme/view/footer/footer.php index ff97d425..5c7e2bf2 100644 --- a/core/module/theme/view/footer/footer.php +++ b/core/module/theme/view/footer/footer.php @@ -8,7 +8,16 @@ 'value' => 'Retour' ]); ?> -
+
+ 'https://doc.zwiicms.fr/pied-de-page', + 'target' => '_blank', + 'ico' => 'help', + 'value' => 'Aide', + 'class' => 'buttonHelp' + ]); ?> +
+
diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php index 87e2a974..d95f2d97 100644 --- a/core/module/theme/view/header/header.php +++ b/core/module/theme/view/header/header.php @@ -8,7 +8,16 @@ 'value' => 'Retour' ]); ?> -
+
+ 'https://doc.zwiicms.fr/banniere', + 'target' => '_blank', + 'ico' => 'help', + 'value' => 'Aide', + 'class' => 'buttonHelp' + ]); ?> +
+
@@ -53,7 +62,7 @@ $this->getData(['theme', 'header', 'tinyHidden']) ]); ?> - +
diff --git a/core/module/theme/view/index/index.php b/core/module/theme/view/index/index.php index 60be6151..03ae5274 100644 --- a/core/module/theme/view/index/index.php +++ b/core/module/theme/view/index/index.php @@ -45,6 +45,17 @@ ]); ?>
+
+
+ 'https://doc.zwiicms.fr/theme-2', + 'target' => '_blank', + 'ico' => 'help', + 'value' => 'Aide', + 'class' => 'buttonHelp' + ]); ?> +
+
@@ -80,4 +91,15 @@ ]); ?>
- \ No newline at end of file +
+
+ 'https://doc.zwiicms.fr/theme-2', + 'target' => '_blank', + 'ico' => 'help', + 'value' => 'Aide', + 'class' => 'buttonHelp' + ]); ?> +
+
+ diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php index 87746bb6..3a765f2b 100644 --- a/core/module/theme/view/menu/menu.php +++ b/core/module/theme/view/menu/menu.php @@ -8,7 +8,16 @@ 'value' => 'Retour' ]); ?> -
+
+ 'https://doc.zwiicms.fr/menu', + 'target' => '_blank', + 'ico' => 'help', + 'value' => 'Aide', + 'class' => 'buttonHelp' + ]); ?> +
+
diff --git a/core/module/theme/view/site/site.php b/core/module/theme/view/site/site.php index 94ef50b3..636668b5 100644 --- a/core/module/theme/view/site/site.php +++ b/core/module/theme/view/site/site.php @@ -8,7 +8,16 @@ 'value' => 'Retour' ]); ?> -
+
+ 'https://doc.zwiicms.fr/site61863d315ffe0', + 'target' => '_blank', + 'ico' => 'help', + 'value' => 'Aide', + 'class' => 'buttonHelp' + ]); ?> +
+
@@ -194,4 +203,4 @@ - \ No newline at end of file + From af0f00744a2cb316ac4c6e3003cee5efc8353927 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Wed, 10 Nov 2021 09:58:11 +0100 Subject: [PATCH 5/5] =?UTF-8?q?Index=20du=20th=C3=A8me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/theme/view/index/index.css | 3 +- core/module/theme/view/index/index.php | 116 ++++++++++++------------- 2 files changed, 58 insertions(+), 61 deletions(-) diff --git a/core/module/theme/view/index/index.css b/core/module/theme/view/index/index.css index c24d1e12..e7cbdb9e 100755 --- a/core/module/theme/view/index/index.css +++ b/core/module/theme/view/index/index.css @@ -36,7 +36,8 @@ nav li ul { } #themeShowAll, -#themeBack, +#themeHelp, +#themeBack, #themeManage, #themeAdmin, #themeAdvanced { diff --git a/core/module/theme/view/index/index.php b/core/module/theme/view/index/index.php index 03ae5274..85f0a16f 100644 --- a/core/module/theme/view/index/index.php +++ b/core/module/theme/view/index/index.php @@ -5,7 +5,7 @@ ): ?>
-
+
'buttonGrey', 'href' => helper::baseUrl(false), @@ -13,32 +13,16 @@ 'value' => 'Accueil' ]); ?>
-
- 'brush', - 'href' => helper::baseUrl() . $this->getUrl(0) . '/admin', - 'value' => 'Administration' +
+ 'https://doc.zwiicms.fr/theme-2', + 'target' => '_blank', + 'ico' => 'help', + 'value' => 'Aide', + 'class' => 'buttonHelp' ]); ?>
-
-
-
- 'cogs', - 'href' => helper::baseUrl() . $this->getUrl(0) . '/manage', - 'value' => 'Gestion' - ]); ?> -
-
- 'code', - 'href' => helper::baseUrl() . $this->getUrl(0) . '/advanced', - 'value' => 'Éditeur CSS' - ]); ?> -
-
-
-
+
'eye', 'value' => 'Zones cachées' @@ -46,20 +30,33 @@
-
- 'https://doc.zwiicms.fr/theme-2', - 'target' => '_blank', - 'ico' => 'help', - 'value' => 'Aide', - 'class' => 'buttonHelp' +
+ 'cogs', + 'href' => helper::baseUrl() . $this->getUrl(0) . '/manage', + 'value' => 'Gestion' + ]); ?> +
+
+ 'brush', + 'href' => helper::baseUrl() . $this->getUrl(0) . '/admin', + 'value' => 'Administration' + ]); ?> + +
+
+ 'code', + 'href' => helper::baseUrl() . $this->getUrl(0) . '/advanced', + 'value' => 'Éditeur CSS' ]); ?>
-
+
'buttonGrey', 'href' => helper::baseUrl(false), @@ -67,33 +64,8 @@ 'value' => 'Accueil' ]); ?>
-
- 'brush', - 'href' => helper::baseUrl() . $this->getUrl(0) . '/admin', - 'value' => 'Administration' - ]); ?> -
-
-
-
- helper::baseUrl() . $this->getUrl(0) . '/manage', - 'ico' => 'cogs', - 'value' => 'Gestion' - ]); ?> -
-
- helper::baseUrl() . $this->getUrl(0) . '/advanced', - 'value' => 'Éditeur CSS', - 'ico' => 'code' - ]); ?> -
-
-
-
- + 'https://doc.zwiicms.fr/theme-2', 'target' => '_blank', 'ico' => 'help', @@ -102,4 +74,28 @@ ]); ?>
+
+
+ 'cogs', + 'href' => helper::baseUrl() . $this->getUrl(0) . '/manage', + 'value' => 'Gestion' + ]); ?> +
+
+ 'brush', + 'href' => helper::baseUrl() . $this->getUrl(0) . '/admin', + 'value' => 'Administration' + ]); ?> + +
+
+ 'code', + 'href' => helper::baseUrl() . $this->getUrl(0) . '/advanced', + 'value' => 'Éditeur CSS' + ]); ?> +
+