From 04602aacea7c22735292cb92d36b68a84b069c99 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Wed, 18 Nov 2020 12:16:28 +0100 Subject: [PATCH 1/3] Version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 673ce1f2..a3ae516d 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![](https://img.shields.io/github/last-commit/fredtempez/ZwiiCMS/master) ![](https://img.shields.io/github/release-date/fredtempez/ZwiiCMS) -# ZwiiCMS 10.3.05 +# ZwiiCMS 10.3.06 Zwii est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation. From 5962ef846e43c32d92a73f3d065dd459eee9e20b Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Wed, 18 Nov 2020 12:38:10 +0100 Subject: [PATCH 2/3] Changes 10306 --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 14a63e4c..e4e3cfd6 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,7 +4,7 @@ - Correction : - Edition de page avec module, le changement de mise en page désactive le bouton d'option du module. - Modification : - - Modules News et Blog : ajout de flux RSS. + - Modules News et Blog : ajout de l'option flux RSS. L'option est activée par défaut. ## version 10.3.05 - Correction : From 3b2c78e17862829316eb124b38581a1eb83f5626 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Wed, 18 Nov 2020 18:30:13 +0100 Subject: [PATCH 3/3] Merge branch '10307' --- CHANGES.md | 4 ++++ README.md | 2 +- core/core.php | 4 ++-- core/module/sitemap/view/index/index.php | 28 ++++++++++++------------ core/vendor/tinymce/init.js | 2 +- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e4e3cfd6..c0d110af 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # Changelog +## Version 10.3.07 +- Petites corrections +- Bouton format dans TinyMCE + ## version 10.3.06 - Correction : - Edition de page avec module, le changement de mise en page désactive le bouton d'option du module. diff --git a/README.md b/README.md index a3ae516d..41bece89 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![](https://img.shields.io/github/last-commit/fredtempez/ZwiiCMS/master) ![](https://img.shields.io/github/release-date/fredtempez/ZwiiCMS) -# ZwiiCMS 10.3.06 +# ZwiiCMS 10.3.07 Zwii est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation. diff --git a/core/core.php b/core/core.php index 46ae9324..89078323 100644 --- 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.06'; + const ZWII_VERSION = '10.3.07'; const ZWII_UPDATE_CHANNEL = "v10"; public static $actions = []; @@ -1896,7 +1896,7 @@ class core extends common { 'title' => $title, // Meta description = 160 premiers caractères de l'article 'metaDescription' => $this->getData(['page',$this->getUrl(0),'moduleId']) === 'blog' && !empty($this->getUrl(1)) - ? strip_tags(substr($this->getData(['module',$this->getUrl(0),$this->getUrl(1),'content']) ,0,159)) + ? strip_tags(substr($this->getData(['module',$this->getUrl(0),'posts',$this->getUrl(1),'content']) ,0,159)) : $this->getData(['page', $this->getUrl(0), 'metaDescription']), 'metaTitle' => $this->getData(['page', $this->getUrl(0), 'metaTitle']), 'typeMenu' => $this->getData(['page', $this->getUrl(0), 'typeMenu']), diff --git a/core/module/sitemap/view/index/index.php b/core/module/sitemap/view/index/index.php index 862b9eec..1d620335 100644 --- a/core/module/sitemap/view/index/index.php +++ b/core/module/sitemap/view/index/index.php @@ -1,40 +1,40 @@
    getHierarchy(null,true,null) as $parentId => $childIds): ?>
  • - getData(['page', $parentId, 'disable']) === false && $this->getUser('group') >= $this->getData(['page', $parentId, 'group'])) - { ?> + { ?> getData(['page', $parentId, 'title']); ?> - getData(['page', $parentId, 'title']); + echo $this->getData(['page', $parentId, 'title']); } ?>
    • - getData(['page', $childId, 'disable']) === false && $this->getUser('group') >= $this->getData(['page', $parentId, 'group'])) - { ?> + getData(['page', $childId, 'disable']) === false && $this->getUser('group') >= $this->getData(['page', $parentId, 'group'])) + { ?> getData(['page', $childId, 'title']); ?> - getData(['page', $childId, 'title']); }?> - + getData(['page', $childId, 'title']); }?> +
        getData(['page', $childId, 'moduleId']) === 'blog') { ?> - + getData(['module',$childId]) as $articleId => $article): ?> - getData(['module',$childId,$articleId,'state']) === true) {?> + getData(['module',$childId,'posts',$articleId,'state']) === true) {?>
        • - + -
      +
    • @@ -42,7 +42,7 @@ getData(['page', $parentId, 'moduleId']) === 'blog' && !empty($this->getData(['module',$parentId])) ) { ?> getData(['module',$parentId]) as $articleId => $article): ?> - getData(['module',$parentId,$articleId,'state']) === true ): ?> + getData(['module',$parentId,'posts',$articleId,'state']) === true ): ?>
    • diff --git a/core/vendor/tinymce/init.js b/core/vendor/tinymce/init.js index fafb074b..3358a75b 100755 --- a/core/vendor/tinymce/init.js +++ b/core/vendor/tinymce/init.js @@ -20,7 +20,7 @@ tinymce.init({ // Plugins plugins: "advlist anchor autolink autoresize autosave codemirror colorpicker contextmenu fullscreen hr image imagetools link lists media paste searchreplace stickytoolbar tabfocus table template textcolor emoticons nonbreaking", // Contenu de la barre d'outils - toolbar: "restoredraft | undo redo | bold italic underline forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist emoticons | table template | image media link | code fullscreen", + toolbar: "restoredraft | undo redo | formatselect bold italic underline forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist emoticons | table template | image media link | code fullscreen", // Emoticons emoticons_append: { custom_mind_explode: {