[9.0.09] code cleaning add Lity and Contain
This commit is contained in:
commit
2ce51b6613
5
.gitignore
vendored
5
.gitignore
vendored
@ -1,5 +1,6 @@
|
|||||||
# Fichiers temporaires
|
# Fichiers temporaires
|
||||||
site/tmp/*
|
site/tmp/*.zip
|
||||||
|
site/tmp/*.gz
|
||||||
|
|
||||||
# Sauvegardes
|
# Sauvegardes
|
||||||
site/backup/*
|
site/backup/*
|
||||||
@ -7,8 +8,6 @@ site/backup/*
|
|||||||
# Fichiers de données
|
# Fichiers de données
|
||||||
site/data/*
|
site/data/*
|
||||||
|
|
||||||
# Fichiers temporaires
|
|
||||||
site/temp/*
|
|
||||||
|
|
||||||
# Fichiers uploadés
|
# Fichiers uploadés
|
||||||
site/file/source/*
|
site/file/source/*
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
# ChangeLog
|
# ChangeLog
|
||||||
|
|
||||||
|
## Version 9.0.09
|
||||||
|
- Corrections :
|
||||||
|
- Nettoyage du code, petites corrections.
|
||||||
|
|
||||||
## Version 9.0.08
|
## Version 9.0.08
|
||||||
- Modifications :
|
- Modifications :
|
||||||
- Core : les données par défaut ne sont chargées qu'à installation afin d'alléger l'empreinte mémoire du noyau
|
- Core : les données par défaut ne sont chargées qu'à installation afin d'alléger l'empreinte mémoire du noyau
|
||||||
|
@ -329,7 +329,7 @@ core.start = function() {
|
|||||||
}).trigger("resize");
|
}).trigger("resize");
|
||||||
|
|
||||||
// Ajouter l'attribut data-lity afin de faire la liaison avec lity
|
// Ajouter l'attribut data-lity afin de faire la liaison avec lity
|
||||||
//$("a[rel='data-lity']").attr("data-lity","");
|
$("a[rel='data-lity']").attr("data-lity","");
|
||||||
|
|
||||||
// Ajouter la classe Gallery afin de faire la liaison avec simplelightbox
|
// Ajouter la classe Gallery afin de faire la liaison avec simplelightbox
|
||||||
$("a[rel='gallery']").addClass("gallery","");
|
$("a[rel='gallery']").addClass("gallery","");
|
||||||
|
@ -28,7 +28,7 @@ class common {
|
|||||||
const GROUP_ADMIN = 3;
|
const GROUP_ADMIN = 3;
|
||||||
|
|
||||||
// Numéro de version stable
|
// Numéro de version stable
|
||||||
const ZWII_VERSION = '9.0.08';
|
const ZWII_VERSION = '9.0.09';
|
||||||
|
|
||||||
public static $actions = [];
|
public static $actions = [];
|
||||||
public static $coreModuleIds = [
|
public static $coreModuleIds = [
|
||||||
@ -734,7 +734,7 @@ class common {
|
|||||||
}
|
}
|
||||||
// Version 9.0.0
|
// Version 9.0.0
|
||||||
if($this->getData(['core', 'dataVersion']) < 9000) {
|
if($this->getData(['core', 'dataVersion']) < 9000) {
|
||||||
//$this->setData(['theme', 'site', 'block','12']);
|
$this->deleteData(['theme', 'site', 'block']);
|
||||||
if ($this->getData(['theme','menu','position']) === 'body-top') {
|
if ($this->getData(['theme','menu','position']) === 'body-top') {
|
||||||
$this->setData(['theme','menu','position','top']);
|
$this->setData(['theme','menu','position','top']);
|
||||||
}
|
}
|
||||||
@ -754,11 +754,15 @@ class common {
|
|||||||
$this->setData(['theme', 'footer', 'fontWeight','normal']);
|
$this->setData(['theme', 'footer', 'fontWeight','normal']);
|
||||||
$this->setData(['theme', 'footer', 'fontSize','0.8em']);
|
$this->setData(['theme', 'footer', 'fontSize','0.8em']);
|
||||||
$this->setData(['theme', 'footer', 'font','Open+Sans']);
|
$this->setData(['theme', 'footer', 'font','Open+Sans']);
|
||||||
// Effacer une option de la première v9
|
|
||||||
$this->deleteData(['theme', 'site', 'block',]);
|
|
||||||
$this->setData(['core', 'dataVersion', 9008]);
|
$this->setData(['core', 'dataVersion', 9008]);
|
||||||
$this->SaveData();
|
$this->SaveData();
|
||||||
}
|
}
|
||||||
|
// Version 9.0.09
|
||||||
|
if($this->getData(['core', 'dataVersion']) < 9009) {
|
||||||
|
$this->setData(['core', 'dataVersion', 9009]);
|
||||||
|
$this->SaveData();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -883,7 +887,7 @@ class core extends common {
|
|||||||
if($this->getData(['theme', 'menu', 'margin'])) {
|
if($this->getData(['theme', 'menu', 'margin'])) {
|
||||||
if(
|
if(
|
||||||
$this->getData(['theme', 'menu', 'position']) === 'site-first'
|
$this->getData(['theme', 'menu', 'position']) === 'site-first'
|
||||||
OR $this->getData(['theme', 'header', 'position']) === 'body'
|
OR $this->getData(['theme', 'menu', 'position']) === 'site-second'
|
||||||
) {
|
) {
|
||||||
$css .= 'nav{margin:20px 20px 0 20px}';
|
$css .= 'nav{margin:20px 20px 0 20px}';
|
||||||
}
|
}
|
||||||
|
@ -205,7 +205,7 @@ class theme extends common {
|
|||||||
'auto auto' => 'Automatique',
|
'auto auto' => 'Automatique',
|
||||||
//'contain' => 'Responsive (contain)',
|
//'contain' => 'Responsive (contain)',
|
||||||
'cover' => 'Responsive',
|
'cover' => 'Responsive',
|
||||||
'100% 100%' => 'Image étirée',
|
'100% 100%' => 'Image étirée'
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
2
core/vendor/filemanager/config/config.php
vendored
2
core/vendor/filemanager/config/config.php
vendored
@ -450,7 +450,7 @@ $config = array(
|
|||||||
# 3 / auto = auto;
|
# 3 / auto = auto;
|
||||||
# 4 / crop= resize and crop;
|
# 4 / crop= resize and crop;
|
||||||
*/
|
*/
|
||||||
'fixed_image_creation_option' => array( 'landscape', 'portrait' ), //set the type of the crop
|
'fixed_image_creation_option' => array( 'landscape' ), //set the type of the crop
|
||||||
|
|
||||||
|
|
||||||
// New image resized creation with relative path inside to upload folder after uploading (thumbnails in relative mode)
|
// New image resized creation with relative path inside to upload folder after uploading (thumbnails in relative mode)
|
||||||
|
4
core/vendor/tinymce/init.js
vendored
4
core/vendor/tinymce/init.js
vendored
@ -34,8 +34,8 @@ tinymce.init({
|
|||||||
// Target pour lightbox
|
// Target pour lightbox
|
||||||
rel_list: [
|
rel_list: [
|
||||||
{title: 'None', value: ''},
|
{title: 'None', value: ''},
|
||||||
// {title: 'Lightbox', value: 'data-lity'},
|
{title: 'Popup Lity', value: 'data-lity'},
|
||||||
{title: 'SimpleLightbox', value: 'gallery'}
|
{title: 'Diaporama SimpleLightbox', value: 'gallery'}
|
||||||
],
|
],
|
||||||
// Titre des image
|
// Titre des image
|
||||||
image_title: true,
|
image_title: true,
|
||||||
|
2
core/vendor/tinymce/langs/fr_FR.js
vendored
2
core/vendor/tinymce/langs/fr_FR.js
vendored
@ -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 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?",
|
"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",
|
"Link list": "Page",
|
||||||
"Rel": "Ouvrir avec",
|
"Rel": "Afficher dans",
|
||||||
"Insert video": "Ins\u00e9rer une vid\u00e9o",
|
"Insert video": "Ins\u00e9rer une vid\u00e9o",
|
||||||
"Insert\/edit video": "Ins\u00e9rer\/modifier une vid\u00e9o",
|
"Insert\/edit video": "Ins\u00e9rer\/modifier une vid\u00e9o",
|
||||||
"Insert\/edit media": "Ins\u00e9rer\/modifier un m\u00e9dia",
|
"Insert\/edit media": "Ins\u00e9rer\/modifier un m\u00e9dia",
|
||||||
|
5
site/tmp/.htaccess
Normal file
5
site/tmp/.htaccess
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
# Bloque l'accès htaccess
|
||||||
|
<Files .htaccess>
|
||||||
|
Order deny,allow
|
||||||
|
Deny from all
|
||||||
|
</Files>
|
Loading…
Reference in New Issue
Block a user