diff --git a/CHANGES.MD b/CHANGES.MD index 739d0e44..191df7e8 100644 --- a/CHANGES.MD +++ b/CHANGES.MD @@ -1,14 +1,12 @@ # ChangeLog -Préversion 8.3.13b : -* Modification : - - Option Adpatation de la bannière dans le thème Préversion 8.3.13 : * Modifications : - - Bannière responsive + - Bannière "responsive", nouvelles options - Options de position des menus selon la position de la bannière - - Mise à jout TinyMCE + - Bouton Edition dans un article du blog + - Mise à jour TinyMCE ## version 8.3.12 : * Modification : diff --git a/core/core.php b/core/core.php index 404babfd..12073628 100644 --- a/core/core.php +++ b/core/core.php @@ -24,7 +24,7 @@ class common { const GROUP_MEMBER = 1; const GROUP_MODERATOR = 2; const GROUP_ADMIN = 3; - const ZWII_VERSION = '8.3.12a'; + const ZWII_VERSION = '8.3.13'; public static $actions = []; public static $coreModuleIds = [ @@ -978,6 +978,9 @@ class core extends common { } $css .= 'header{background-size:' . $this->getData(['theme','header','imageContainer']).'}'; $css .= 'header{background-color:' . $colors['normal'] . ';height:' . $this->getData(['theme', 'header', 'height']) . ';line-height:' . $this->getData(['theme', 'header', 'height']) . ';text-align:' . $this->getData(['theme', 'header', 'textAlign']) . '}'; + // Modif CrowueWeb pour la bannière + $css .= '@media (max-width: 767px) {header{height:' . $this->getData(['theme', 'header', 'height'])/2 . 'px;line-height:' . $this->getData(['theme', 'header', 'height'])/2 . 'px;}}'; + // Fin modif Croque Web if($themeHeaderImage = $this->getData(['theme', 'header', 'image'])) { $css .= 'header{background-image:url("../file/source/' . $themeHeaderImage . '");background-position:' . $this->getData(['theme', 'header', 'imagePosition']) . ';background-repeat:' . $this->getData(['theme', 'header', 'imageRepeat']) . '}'; } diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 4a6a033d..15e20c64 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -188,7 +188,6 @@ class theme extends common { public static $headerWide = [ 'auto' => 'Automatique', - 'initial' => 'Taille initiale', 'contain' => 'Image entière', 'cover' => 'Largeur adaptée au fond', '100% 100%' => 'Taille adaptée au fond' diff --git a/core/module/theme/view/header/header.js.php b/core/module/theme/view/header/header.js.php index 3b4eaf6a..e800a0fb 100755 --- a/core/module/theme/view/header/header.js.php +++ b/core/module/theme/view/header/header.js.php @@ -16,10 +16,13 @@ $("input, select").on("change", function() { // Import des polices de caractères var headerFont = $("#themeHeaderFont").val(); + var css = "@import url('https://fonts.googleapis.com/css?family=" + headerFont + "');"; + // Adaptation aux média + css += "@media (max-width: 767px) {header{height:" + $("#themeHeaderHeight").val() + "/2;line-height:" + $("#themeHeaderHeight").val() + "/2;}}"; // Couleurs, image, alignement et hauteur de la bannière css += "header{background-color:" + $("#themeHeaderBackgroundColor").val() + ";text-align:" + $("#themeHeaderTextAlign").val() + ";height:" + $("#themeHeaderHeight").val() + ";line-height:" + $("#themeHeaderHeight").val() + "}"; - + var themeHeaderImage = $("#themeHeaderImage").val(); if(themeHeaderImage) { css += "header{background-image:url('site/file/source/" + themeHeaderImage + "');background-repeat:" + $("#themeHeaderImageRepeat").val() + ";background-position:" + $("#themeHeaderImagePosition").val() + "}"; diff --git a/core/vendor/filemanager/css/.DS_Store b/core/vendor/filemanager/css/.DS_Store deleted file mode 100644 index 5008ddfc..00000000 Binary files a/core/vendor/filemanager/css/.DS_Store and /dev/null differ diff --git a/core/vendor/filemanager/img/.DS_Store b/core/vendor/filemanager/img/.DS_Store deleted file mode 100644 index 70970e56..00000000 Binary files a/core/vendor/filemanager/img/.DS_Store and /dev/null differ diff --git a/core/vendor/filemanager/img/ico/.DS_Store b/core/vendor/filemanager/img/ico/.DS_Store deleted file mode 100644 index 5008ddfc..00000000 Binary files a/core/vendor/filemanager/img/ico/.DS_Store and /dev/null differ diff --git a/core/vendor/filemanager/img/ico_dark/.DS_Store b/core/vendor/filemanager/img/ico_dark/.DS_Store deleted file mode 100644 index 5008ddfc..00000000 Binary files a/core/vendor/filemanager/img/ico_dark/.DS_Store and /dev/null differ diff --git a/module/blog/view/article/article.css b/module/blog/view/article/article.css index b5136694..bd40018a 100755 --- a/module/blog/view/article/article.css +++ b/module/blog/view/article/article.css @@ -10,4 +10,12 @@ } #blogArticleOr { padding: 10px; -} \ No newline at end of file +} +/* Modif CroqueWeb */ +@media (max-width: 767px) { + #blogArticlePicture { + height:150px; + max-width: 100%;} + } +/* fin modif croqueweb */ + diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php index c92403dc..5876b4fa 100755 --- a/module/blog/view/article/article.php +++ b/module/blog/view/article/article.php @@ -91,9 +91,30 @@ +getUser('group') >= self::GROUP_ADMIN): ?>