ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 143 Activity

jeu de couleurs + tinymce taille des polices ; supp bouton emoticon supp + theme en 1170px avec bannière perso

This commit is contained in:
fredtempez 2021-11-18 17:07:57 +01:00
parent 860ff8c35a
commit 66e4f2ffe9
4 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.php
View File

@ -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 = [];

26
core/module/install/ressource/defaultdata.php
View File

@ -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' => '<p>Bannière vide</p>',
'feature' => 'feature',
'featureContent' => '<div class="row" style="background-color: #ffbd00; vertical-align: middle;">
<p class="col10 textAlignCenter"><strong><span style="font-size: 30pt; color: #003f86; background-color: #ffbd00;"><span style="font-size: 24pt;">Zwii, le <em>CMS&nbsp;</em>pour bien d&eacute;buter</span><br /><span style="font-size: 18pt;"><span style="font-size: 14pt;">Installation facile :<br />Aucune base de donn&eacute;es &agrave; configurer.<br /><br /></span><br /><br /></span></span></strong></p>
<div class="col2"><p><img src="/ZwiiCMS/site/file/source/zwii-logosocial-2022.png" width="512" height="512" alt="" /></p></div></div>',
'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)',

2
core/module/theme/view/header/header.js.php
View File

@ -257,4 +257,4 @@ $("#themeHeaderFeature").on("change", function() {
$(".featureContainer").show();
$(".wallpaperContainer").hide();
}
}).trigger("change");
}).trigger("change");

24
core/vendor/tinymce/init.js vendored
View File

@ -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