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

Merge branch '10400' into data_engine

This commit is contained in:
Fred Tempez 2020-11-01 07:59:02 +01:00
parent b192070782 ae98d2f1ae
commit 746163e0d1
8 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -20,8 +20,10 @@
- Thème : import d'un thème, d'administration impossible.
- Thème : import d'un thème, nettoyage du dossier tmp.
- Thème administration : modification de l'appel du code CSS permettant une mise à jour du thème sans vider le cache.
- Thème du menu : alignement inopérant.
- Amélioration :
- Mise en page du corps des mails de notification.
- Paramètres de localisation.
- Mise à jour :
- TinyMCE 4.9.11

2
core/core.php
View File

@ -1603,7 +1603,7 @@ class core extends common {
}
$css .= 'nav #burgerText{color:' . $colors['text'] . '}';
$css .= 'nav .navLevel1 a.active {border-radius:' . $this->getData(['theme', 'menu', 'radius']) . '}';
$css .= '#menu{text-align:' . $this->getData(['theme', 'menu', 'textAlign']) . '}';
$css .= '#menuLeft{float:' . $this->getData(['theme', 'menu', 'textAlign']) . '}';
if($this->getData(['theme', 'menu', 'margin'])) {
if(
$this->getData(['theme', 'menu', 'position']) === 'site-first'

6
core/layout/blank.php
View File

@ -2,12 +2,12 @@
<!DOCTYPE html>
<html prefix="og: http://ogp.me/ns#" lang="fr">
<head>
<meta charset="utf-8">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<?php $layout->showMetaTitle(); ?>
<?php $layout->showMetaDescription(); ?>
<?php $layout->showMetaType(); ?>
<?php $layout->showMetaImage(); ?>
<?php $layout->showMetaType(); ?>
<?php $layout->showMetaImage(); ?>
<?php $layout->showFavicon(); ?>
<?php $layout->showVendor(); ?>
<?php $layout->showStyle(); ?>

6
core/layout/common.css
View File

@ -590,12 +590,12 @@ nav a:hover {
}
nav #menuLeft {
display: flex;
float: left;
display: inline-flex;
/*float: left;*/
}
nav #menuRight {
display: flex;
display: inline-flex;
float: right;
}

2
core/layout/light.php
View File

@ -2,7 +2,7 @@
<!DOCTYPE html>
<html prefix="og: http://ogp.me/ns#" lang="fr">
<head>
<meta charset="utf-8">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<?php $layout->showMetaTitle(); ?>
<?php $layout->showMetaDescription(); ?>

2
core/layout/main.php
View File

@ -2,7 +2,7 @@
<!DOCTYPE html>
<html prefix="og: http://ogp.me/ns#" lang="fr">
<head>
<meta charset="utf-8">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<?php $layout->showMetaTitle(); ?>
<?php $layout->showMetaDescription(); ?>

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

@ -54,7 +54,7 @@ $("input, select").on("change", function() {
// Taille, hauteur, épaisseur et capitalisation de caractères du menu
css += "#toggle span,#menu a{padding:" + $("#themeMenuHeight").val() + ";font-family:'" + menuFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeMenuFontWeight").val() + ";font-size:" + $("#themeMenuFontSize").val() + ";text-transform:" + $("#themeMenuTextTransform").val() + "}";
// Alignement du menu
css += "#menu{text-align:" + $("#themeMenuTextAlign").val() + "}";
css += "#menuLeft{float:" + $("#themeMenuTextAlign").val() + "}";
// Marge
if($("#themeMenuMargin").is(":checked")) {
if(

2
index.php
View File

@ -25,7 +25,7 @@ if(version_compare(PHP_VERSION, '5.6.0', '<')) {
*Localisation
*/
date_default_timezone_set('Europe/Paris');
setlocale(LC_ALL, 'fr','fr_FR','fr_FR.utf8','fr-FR','fra');
setlocale (LC_ALL, 'fr_FR.utf8','fr_Fr');
/**
* Initialisation de Zwii