diff --git a/core/core.php b/core/core.php
index d8aa6352..f69f3ea1 100644
--- a/core/core.php
+++ b/core/core.php
@@ -45,7 +45,7 @@ class common {
// Numéro de version
const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/';
- const ZWII_VERSION = '11.2.00.1';
+ const ZWII_VERSION = '11.2.00.2';
const ZWII_UPDATE_CHANNEL = "test";
public static $actions = [];
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index 3c3145f8..563f08f3 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -142,7 +142,7 @@ class init extends common {
'template' => '3'
],
'header' => [
- 'backgroundColor' => 'rgba(32, 59, 82, 1)',
+ 'backgroundColor' => 'rgba(0, 63, 134, 1)',
'font' => 'Oswald',
'fontSize' => '2em',
'fontWeight' => 'normal',
@@ -157,15 +157,17 @@ class init extends common {
'textHide' => false,
'textTransform' => 'none',
'linkHomePage' => true,
- 'imageContainer' => 'auto',
+ 'imageContainer' => 'cover',
'tinyHidden' => true,
- 'feature' => 'wallpaper',
- 'featureContent' => '
Bannière vide
',
+ 'feature' => 'feature',
+ 'featureContent' => '
+
Zwii, le CMS pour bien débuter
Installation facile :
Aucune base de données à configurer.
+
',
'width' => 'container'
],
'menu' => [
- 'backgroundColor' => 'rgba(32, 59, 82, 1)',
- 'backgroundColorSub' => 'rgba(32, 59, 82, 1)',
+ 'backgroundColor' => 'rgba(0, 63, 134, 1)',
+ 'backgroundColorSub' => 'rgba(0, 63, 134, 1)',
'font' => 'Open+Sans',
'fontSize' => '1em',
'fontWeight' => 'normal',
@@ -190,7 +192,7 @@ class init extends common {
'backgroundColor' => 'rgba(255, 255, 255, 1)',
'radius' => '0px',
'shadow' => '0px 0px 0px',
- 'width' => '960px'
+ 'width' => '1170px'
],
'block' => [
'backgroundColor' => 'rgba(236, 239, 241, 1)',
@@ -200,16 +202,16 @@ class init extends common {
'font' => 'Open+Sans',
'fontSize' => '13px',
'textColor' => 'rgba(33, 34, 35, 1)',
- 'linkColor' => 'rgba(74, 105, 189, 1)'
+ 'linkColor' => 'rgba(0, 63, 134, 1)'
],
'title' => [
'font' => 'Oswald',
'fontWeight' => 'normal',
- 'textColor' => 'rgba(74, 105, 189, 1)',
+ 'textColor' => 'rgba(0, 63, 134, 1)',
'textTransform' => 'none'
],
'button' => [
- 'backgroundColor' => 'rgba(32, 59, 82, 1)'
+ 'backgroundColor' => 'rgba(0, 63, 134, 1)'
],
'version' => 0
],
@@ -219,8 +221,8 @@ class init extends common {
'fontSize' => '13px',
'fontTitle' => 'Oswald',
'colorText' => 'rgba(33, 34, 35, 1)',
- 'colorTitle' => 'rgba(74, 105, 189, 1)',
- 'backgroundColorButton' => 'rgba(74, 105, 189, 1)',
+ 'colorTitle' => 'rgba(0, 63, 134, 1)',
+ 'backgroundColorButton' => 'rgba(0, 63, 134, 1)',
'backgroundColorButtonGrey' => 'rgba(170, 180, 188, 1)',
'backgroundColorButtonRed' => 'rgba(217, 95, 78, 1)',
'backgroundColorButtonGreen' => 'rgba(162, 223, 57, 1)',
diff --git a/core/module/theme/view/header/header.js.php b/core/module/theme/view/header/header.js.php
index 8ac5768b..a0983a24 100644
--- a/core/module/theme/view/header/header.js.php
+++ b/core/module/theme/view/header/header.js.php
@@ -257,4 +257,4 @@ $("#themeHeaderFeature").on("change", function() {
$(".featureContainer").show();
$(".wallpaperContainer").hide();
}
-}).trigger("change");
\ No newline at end of file
+}).trigger("change");
diff --git a/core/vendor/tinymce/init.js b/core/vendor/tinymce/init.js
index aa68dd95..571fc400 100755
--- a/core/vendor/tinymce/init.js
+++ b/core/vendor/tinymce/init.js
@@ -25,16 +25,11 @@ tinymce.init({
// Langue
language: "fr_FR",
// 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",
+ plugins: "advlist anchor autolink autoresize autosave codemirror colorpicker contextmenu fullscreen hr image imagetools link lists media paste searchreplace stickytoolbar tabfocus table template textcolor nonbreaking",
// Contenu de la barre d'outils
- 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: {
- keywords: ["brain", "mind", "explode", "blown"],
- char: "🤯"
- }
- },
+ toolbar: "restoredraft | undo redo | formatselect fontsizeselect | bold italic underline forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist | table template | image media link | code fullscreen",
+ fontsize_formats:
+ "8pt 9pt 10pt 11pt 12pt 14pt 18pt 24pt 30pt 36pt 48pt 60pt 72pt 96pt",
// CodeMirror
codemirror: {
indentOnInit: true, // Whether or not to indent code on init.
@@ -262,16 +257,9 @@ tinymce.init({
// Langue
language: "fr_FR",
// Plugins
- plugins: "advlist anchor autolink autoresize autosave colorpicker contextmenu fullscreen hr lists paste searchreplace stickytoolbar tabfocus template textcolor visualblocks emoticons",
+ plugins: "advlist anchor autolink autoresize autosave colorpicker contextmenu fullscreen hr lists paste searchreplace stickytoolbar tabfocus template textcolor visualblocks",
// Contenu de la barre d'outils
- toolbar: "restoredraft | undo redo | formatselect bold italic forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist emoticons | visualblocks fullscreen",
- // Emoticons
- emoticons_append: {
- custom_mind_explode: {
- keywords: ["brain", "mind", "explode", "blown"],
- char: "🤯"
- }
- },
+ toolbar: "restoredraft | undo redo | formatselect bold italic forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist | visualblocks fullscreen",
// Titre des images
image_title: true,
// Pages internes