Merge branch 'master_dev' of https://github.com/fredtempez/ZwiiCMS into master_dev
This commit is contained in:
fredtempez
commit
268b4a0883
2
.gitignore
vendored
2
.gitignore
vendored
@ -22,7 +22,5 @@ site/file/thumb/*
|
||||
.idea/
|
||||
|
||||
# Trucs
|
||||
.htaccess
|
||||
.gitignore
|
||||
core/vendor/tinymce/link_list.json
|
||||
site/tmp/.htaccess
|
||||
|
||||
@ -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 :
|
||||
|
||||
@ -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']) .
|
||||
'</option>';
|
||||
}
|
||||
|
||||
@ -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',
|
||||
|
||||
@ -52,7 +52,7 @@
|
||||
<div class="row">
|
||||
<div class="col6">
|
||||
<?php echo template::select('themeBodyImageAttachment', $module::$attachments, [
|
||||
'label' => 'Fixation',
|
||||
'label' => 'Défilement',
|
||||
'selected' => $this->getData(['theme', 'body', 'imageAttachment'])
|
||||
]); ?>
|
||||
</div>
|
||||
|
||||
@ -77,7 +77,7 @@
|
||||
<div class="col6">
|
||||
<?php echo template::select('themeTextFontSize', $module::$siteFontSizes, [
|
||||
'label' => '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'])
|
||||
]); ?>
|
||||
</div>
|
||||
|
||||
2
core/vendor/filemanager/UploadHandler.php
vendored
2
core/vendor/filemanager/UploadHandler.php
vendored
@ -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)
|
||||
{
|
||||
|
||||
10
core/vendor/filemanager/config/config.php
vendored
10
core/vendor/filemanager/config/config.php
vendored
@ -458,12 +458,12 @@ $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_height' => array( 200, '' ), //height of image (you can leave empty if you set width)
|
||||
'relative_image_creation_name_to_append' => array( '', '' ), //name to append on filename
|
||||
'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;
|
||||
|
||||
4
core/vendor/tinymce/langs/fr_FR.js
vendored
4
core/vendor/tinymce/langs/fr_FR.js
vendored
@ -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",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user