From 1f6a7f004002764fc6d211ff4c78f922f220b4b9 Mon Sep 17 00:00:00 2001 From: Fred <23246457+fredtempez@users.noreply.github.com> Date: Thu, 21 Mar 2019 13:46:42 +0100 Subject: [PATCH 1/9] =?UTF-8?q?[9.0.08]=20Libell=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/vendor/tinymce/langs/fr_FR.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/vendor/tinymce/langs/fr_FR.js b/core/vendor/tinymce/langs/fr_FR.js index 77bd8651..9c25f862 100755 --- a/core/vendor/tinymce/langs/fr_FR.js +++ b/core/vendor/tinymce/langs/fr_FR.js @@ -113,7 +113,7 @@ tinymce.addI18n('fr_FR',{ "Horizontal line": "Ligne horizontale", "Insert\/edit image": "Ins\u00e9rer\/modifier une image", "Image description": "Description", -"Image Title": "Titre", +"Image Title": "Légende", "Source": "Source", "Dimensions": "Dimensions", "Constrain proportions": "Conserver les proportions", @@ -259,4 +259,4 @@ tinymce.addI18n('fr_FR',{ "Tools": "Outils", "Powered by {0}": "Propuls\u00e9 par {0}", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zone Texte Riche. Appuyer sur ALT-F9 pour le menu. Appuyer sur ALT-F10 pour la barre d'outils. Appuyer sur ALT-0 pour de l'aide." -}); \ No newline at end of file +}); From 82262357e330b431da0ebde7d478238a96b6bbdb Mon Sep 17 00:00:00 2001 From: Fred <23246457+fredtempez@users.noreply.github.com> Date: Thu, 21 Mar 2019 13:52:15 +0100 Subject: [PATCH 2/9] =?UTF-8?q?[9.0.08]=20Libell=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/vendor/tinymce/langs/fr_FR.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/vendor/tinymce/langs/fr_FR.js b/core/vendor/tinymce/langs/fr_FR.js index 9c25f862..907a81e5 100755 --- a/core/vendor/tinymce/langs/fr_FR.js +++ b/core/vendor/tinymce/langs/fr_FR.js @@ -50,7 +50,7 @@ tinymce.addI18n('fr_FR',{ "Blocks": "Blocs", "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Le presse-papiers est maintenant en mode \"texte plein\". Les contenus seront coll\u00e9s sans retenir les formatages jusqu'\u00e0 ce que vous d\u00e9sactiviez cette option.", "Font Family": "Police", -"Font Sizes": "Taille de police", +"Font Sizes": "Tailles de police", "Class": "Classe", "Browse for an image": "Parcourir pour s\u00e9lectionner une image", "OR": "OU", @@ -161,7 +161,7 @@ tinymce.addI18n('fr_FR',{ "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre une adresse e-mail. Voulez-vous ajouter le pr\u00e9fixe mailto: n\u00e9cessaire?", "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre un lien externe. Voulez-vous ajouter le pr\u00e9fixe http:\/\/ n\u00e9cessaire?", "Link list": "Page", -"Rel": "Ouvrir dans", +"Rel": "Ouvrir avec", "Insert video": "Ins\u00e9rer une vid\u00e9o", "Insert\/edit video": "Ins\u00e9rer\/modifier une vid\u00e9o", "Insert\/edit media": "Ins\u00e9rer\/modifier un m\u00e9dia", From a3c36ccc4cd68542552d01132259d09731143786 Mon Sep 17 00:00:00 2001 From: Fred <23246457+fredtempez@users.noreply.github.com> Date: Thu, 21 Mar 2019 14:33:13 +0100 Subject: [PATCH 3/9] [9.0.08] changes --- CHANGES.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 030fcc5a..72c08e25 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,8 +2,11 @@ ## Version 9.0.08 - Modifications : - - Prise en compte taille des petits écrans, suppression des marges - - Backup theme.json avant une mise à jour auto + - Prise en compte de la taille des petits écrans, suppression des marges + - Backup theme.json avant une mise à jour automatique + - Réorganisation des écrans de paramètrage du thème, ordre de saisie, bulles d'aide et nouveaux libellés + - SimpleLightBox : miniatures cliquables permettant de parcourir toutes les images d'une page (comme dans la galerie) + - Barre d'administration : pages inactives en orange, repère pour les pages filles. - Ajouts : - Thèmes : pied de page choix de police et de styles - Corrections : @@ -13,7 +16,7 @@ - Correction : - Disparition du menu quand la bannière est masquée - Modifications : - - Barre d'administration, pages organisées + - Barre d'administration : pages organisées ## Version 9.0.06 - Correction : From 5ed1813510f8d2400a0d068828b42faa66737290 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 21 Mar 2019 19:55:36 +0100 Subject: [PATCH 4/9] =?UTF-8?q?[9.0.08]=20Chevron=20supprim=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core.php b/core/core.php index c92dea5b..ac2076ac 100644 --- a/core/core.php +++ b/core/core.php @@ -2367,7 +2367,7 @@ class layout extends common { $childKey . '"' . ($childKey === $currentPageId ? ' selected' : false) . ($this->getData(['page', $childKey, 'disable']) === true ? ' class="inactive"' : '') . - '>  ⟩  ' . + '>    ' . $this->getData(['page', $childKey, 'title']) . ''; } From c85953118145cdc443adee27dc2232d00ec4d280 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 21 Mar 2019 19:55:51 +0100 Subject: [PATCH 5/9] =?UTF-8?q?[9.0.08]=20libell=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/theme/theme.php | 9 +++++---- core/module/theme/view/body/body.php | 2 +- core/module/theme/view/site/site.php | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 47e09e30..d0cfc483 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -35,7 +35,7 @@ class theme extends common { 'right' => 'À droite' ]; public static $attachments = [ - 'scroll' => 'Normale', + 'scroll' => 'Standard', 'fixed' => 'Fixe' ]; public static $fonts = [ @@ -95,7 +95,7 @@ class theme extends common { '.7em' => 'Infime (70%)', '.8em' => 'Très petite (80%)', '.9em' => 'Petite (90%)', - '1em' => 'Normale (100%)', + '1em' => 'Standard (100%)', ]; public static $headerFontSizes = [ '1.6em' => 'Très petite (160%)', @@ -130,7 +130,7 @@ class theme extends common { public static $menuFontSizes = [ '.8em' => 'Très petite (80%)', '.9em' => 'Petite (90%)', - '1em' => 'Normale (100%)', + '1em' => 'Standard (100%)', '1.1em' => 'Moyenne (110%)', '1.2em' => 'Grande (120%)', '1.3em' => 'Très grande (130%)' @@ -186,7 +186,8 @@ class theme extends common { ]; public static $sizes = [ 'auto' => 'Automatique', - 'cover' => 'Largeur adaptée au fond' + 'cover' => 'Responsive', + '100% 100%' => 'Image étirée' ]; public static $textTransforms = [ 'none' => 'Standard', diff --git a/core/module/theme/view/body/body.php b/core/module/theme/view/body/body.php index 5126965e..6ab43b1d 100755 --- a/core/module/theme/view/body/body.php +++ b/core/module/theme/view/body/body.php @@ -52,7 +52,7 @@
'Fixation', + 'label' => 'Défilement', 'selected' => $this->getData(['theme', 'body', 'imageAttachment']) ]); ?>
diff --git a/core/module/theme/view/site/site.php b/core/module/theme/view/site/site.php index 083199c4..2dd04060 100755 --- a/core/module/theme/view/site/site.php +++ b/core/module/theme/view/site/site.php @@ -77,7 +77,7 @@
'Taille', - 'help' => 'Hauteur de référence pour la bannière, le menu et le pied de page', + 'help' => 'Taille de référence pour le site. Les tailles des polices de la bannière, de menu et de pied de page sont proportionnelles à cette taille.', 'selected' => $this->getData(['theme', 'text', 'fontSize']) ]); ?>
From 11ad97e89415775fc88d87bfc61d6db4a7d0a48f Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 21 Mar 2019 20:23:26 +0100 Subject: [PATCH 6/9] [9.0.08] RFM Thumb config --- core/vendor/filemanager/UploadHandler.php | 2 +- core/vendor/filemanager/config/config.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/vendor/filemanager/UploadHandler.php b/core/vendor/filemanager/UploadHandler.php index 670a5549..780c54d3 100755 --- a/core/vendor/filemanager/UploadHandler.php +++ b/core/vendor/filemanager/UploadHandler.php @@ -1437,7 +1437,7 @@ class UploadHandler $magicianObj -> saveImage($targetFile); } - $thumbResult = create_img($targetFile, $targetFileThumb, 266, 200); + $thumbResult = create_img($targetFile, $targetFileThumb, 122, 91); if ( $thumbResult!==true) { diff --git a/core/vendor/filemanager/config/config.php b/core/vendor/filemanager/config/config.php index 6689e4de..3ec54db0 100755 --- a/core/vendor/filemanager/config/config.php +++ b/core/vendor/filemanager/config/config.php @@ -458,11 +458,11 @@ $config = array( // just simply add a value in the array // The image creation path is always relative so if i'm inside source/test/test1 and I upload an image, the path start from here // - 'relative_image_creation' => false, //activate or not the creation of one or more image resized with relative path from upload folder - 'relative_path_from_current_pos' => array( './', './' ), //relative path of the image folder from the current position on upload folder + 'relative_image_creation' => true, //activate or not the creation of one or more image resized with relative path from upload folder + 'relative_path_from_current_pos' => array( './thumb', '' ), //relative path of the image folder from the current position on upload folder 'relative_image_creation_name_to_prepend' => array( '', '' ), //name to prepend on filename - 'relative_image_creation_name_to_append' => array( '_thumb', '_thumb1' ), //name to append on filename - 'relative_image_creation_width' => array( 300, 400 ), //width of image (you can leave empty if you set height) + 'relative_image_creation_name_to_append' => array( '', '' ), //name to append on filename + 'relative_image_creation_width' => array( 266, ''), //width of image (you can leave empty if you set height) 'relative_image_creation_height' => array( 200, '' ), //height of image (you can leave empty if you set width) /* # $option: 0 / exact = defined size; From e56d3c50d6b54fd86e0511a642373cbd06505e13 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 21 Mar 2019 20:24:07 +0100 Subject: [PATCH 7/9] gitignore --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fa6a397f..26a6a6f7 100644 --- a/.gitignore +++ b/.gitignore @@ -24,5 +24,4 @@ site/file/thumb/* # Trucs .htaccess .gitignore -core/vendor/tinymce/link_list.json -site/tmp/.htaccess +core/vendor/tinymce/link_list.json \ No newline at end of file From be58cb22b980991ef7a98b0eda56940555b4ba96 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 21 Mar 2019 20:24:27 +0100 Subject: [PATCH 8/9] gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 26a6a6f7..fc7be1e4 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,5 @@ site/file/thumb/* .idea/ # Trucs -.htaccess .gitignore core/vendor/tinymce/link_list.json \ No newline at end of file From cf5e6a43b06c32de77d030c03c9858dc358e6646 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 21 Mar 2019 20:42:31 +0100 Subject: [PATCH 9/9] =?UTF-8?q?[9.0.08]=20config=20=C3=A0=20revoir?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/vendor/filemanager/config/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/vendor/filemanager/config/config.php b/core/vendor/filemanager/config/config.php index 3ec54db0..084061d9 100755 --- a/core/vendor/filemanager/config/config.php +++ b/core/vendor/filemanager/config/config.php @@ -462,8 +462,8 @@ $config = array( 'relative_path_from_current_pos' => array( './thumb', '' ), //relative path of the image folder from the current position on upload folder 'relative_image_creation_name_to_prepend' => array( '', '' ), //name to prepend on filename 'relative_image_creation_name_to_append' => array( '', '' ), //name to append on filename - 'relative_image_creation_width' => array( 266, ''), //width of image (you can leave empty if you set height) - 'relative_image_creation_height' => array( 200, '' ), //height of image (you can leave empty if you set width) + 'relative_image_creation_width' => array( 300, 225), //width of image (you can leave empty if you set height) + 'relative_image_creation_height' => array( 225, 300 ), //height of image (you can leave empty if you set width) /* # $option: 0 / exact = defined size; # 1 / portrait = keep aspect set height;