diff --git a/.gitignore b/.gitignore
index 7cd6ab3b..f2ff9be2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,8 +12,8 @@ site/data/fr/*.json
# Fichiers uploadés
-site/file/source/*
-site/file/thumb/*
+site/file/source/
+site/file/thumb/
# Dossiers vides dans GitHub
!.gitkeep
diff --git a/core/core.php b/core/core.php
index 6b89b8d9..0c83c5df 100644
--- a/core/core.php
+++ b/core/core.php
@@ -33,10 +33,10 @@ class common {
// Miniatures de la gallery
const THUMBS_SEPARATOR = 'mini_';
- const THUMBS_WIDTH = 320;
+ const THUMBS_WIDTH = 640;
// Numéro de version
- const ZWII_VERSION = '10.0.064';
+ const ZWII_VERSION = '10.0.065';
const ZWII_UPDATE_CHANNEL = "v10";
public static $actions = [];
diff --git a/core/vendor/filemanager/config/config.php b/core/vendor/filemanager/config/config.php
index 7a6ced0c..119a3590 100755
--- a/core/vendor/filemanager/config/config.php
+++ b/core/vendor/filemanager/config/config.php
@@ -515,8 +515,8 @@ $config = array(
'fixed_path_from_filemanager' => array( '../../../site/file/thumb/' ), //fixed path of the image folder from the current position on upload folder
'fixed_image_creation_name_to_prepend' => array( 'mini_' ), //name to prepend on filename
'fixed_image_creation_to_append' => array( '' ), //name to appendon filename
- 'fixed_image_creation_width' => array( 320 ), //width of image
- 'fixed_image_creation_height' => array( 240), //height of image
+ 'fixed_image_creation_width' => array( 640 ), //width of image
+ 'fixed_image_creation_height' => array( 480 ), //height of image
/*
# $option: 0 / exact = defined size;
# 1 / portrait = keep aspect set height;
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index 526589c7..e6ecb053 100644
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -29,8 +29,8 @@ class gallery extends common {
public static $sort = [
self::SORT_ASC => 'Alphabétique ',
- self::SORT_DSC => 'Alphabétique inversé',
- self::SORT_HAND => 'Tri manuel'
+ self::SORT_DSC => 'Alphabétique inverse',
+ self::SORT_HAND => 'Manuel'
];
public static $directories = [];
@@ -314,7 +314,7 @@ class gallery extends common {
template::text('legend[' . $fileInfos->getFilename() . ']', [
'value' => $this->getData(['module', $this->getUrl(0), $this->getUrl(2), 'legend', str_replace('.','',$fileInfos->getFilename())])
]),
- ''
+ ''
];
self::$picturesId [] = str_replace('.','',$fileInfos->getFilename());
}
diff --git a/module/gallery/view/edit/edit.php b/module/gallery/view/edit/edit.php
index 6e6ac09d..8a9ff9b6 100644
--- a/module/gallery/view/edit/edit.php
+++ b/module/gallery/view/edit/edit.php
@@ -37,8 +37,7 @@
$this->getData(['module', $this->getUrl(0), $this->getUrl(2), 'config', 'sort']),
'label' => 'Tri des images',
- 'help' => 'Les images sont triées par nom de fichier grâce à la méthode naturelle qui donne de meilleurs résultats lorsque les images sont numérotées.
- N\'oubliez pas d\'enregistrer pour sauvegarder le tri manuel des images'
+ 'help' => 'Les tris alphabétiques conviennent également aux images numérotées.
Cliquez sur \'Enregistrer\' pour valider le tri.'
]); ?>
diff --git a/site/tmp/.htaccess b/site/tmp/.htaccess
old mode 100644
new mode 100755