Deltacms/Deltacms
Deltacms
/
Deltacms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge branch '4404'

This commit is contained in:
Deltacms 2023-01-26 08:24:06 +01:00
parent 0522c07431 e27ef07794
commit e1c1a99d75
50 changed files with 700 additions and 1583 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CHANGES.md
View File

@ -1,5 +1,16 @@
# Changelog
## Version 4.4.04 de Deltacms
- Modifications :
- Edition / Tinymce : nouveau blocs de texte 3-6-3,
- Thème / site : modification des options 'Largeur du site' qui passent en valeurs relatives 75vw, 85vw, 95vw, 100%,
- Modules de page / thème : le thème des modules de page est maintenant modifiable par custom.css,
- Site fluide sur petit écran : nouveau seuil à 800px, nettoyage et réorganisation du fichier css principal,
- Configuration / configuration : modification de la mise à jour automatique pour prendre en compte les incompatibilités du serveur.
- Corrections :
- Module Form : en absence de champ 'File' un fichier fantôme était émis, logo associé au message compatible avec androïd,
- Thème / gestion / sauvegarde : le dossier et les images de la bannière animée sont sauvegardés dans le zip.
## Version 4.4.03 de Deltacms
- Modifications :
- Thème / bannière : nouvelle option, une bannière animée avec Swiper,

2
README.md
View File

@ -1,5 +1,5 @@
# DeltaCMS 4.4.03
# DeltaCMS 4.4.04
DeltaCMS est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation.
L'administration du site est bilingue anglais ou français, le site peut être rédigé dans une des principales langues européennes.

2
core/class/template.class.php
View File

@ -611,7 +611,7 @@ class template {
'ico' => 'check',
'id' => $nameId,
'name' => $nameId,
'uniqueSubmission' => false, //true avant 9.1.08
'uniqueSubmission' => false,
'value' => 'Enregistrer'
], $attributes);
// Retourne le html

70
core/core.php
View File

@ -49,7 +49,7 @@ class common {
// Numéro de version
const DELTA_UPDATE_URL = 'https://update.deltacms.fr/master/';
const DELTA_VERSION = '4.4.03';
const DELTA_VERSION = '4.4.04';
const DELTA_UPDATE_CHANNEL = "v4";
public static $actions = [];
@ -120,7 +120,8 @@ class common {
'tippy',
'zwiico',
'imagemap',
'simplelightbox'
'simplelightbox',
'swiper'
],
'view' => ''
];
@ -950,7 +951,7 @@ class common {
// Update robots.txt file in output directory
if ($this->getData(['config','seo', 'robots']) === true) {
unlink('robots.txt');
if(file_exists('robots.txt')) unlink('robots.txt');
$sitemap->updateRobots();
} else {
file_put_contents('robots.txt','User-agent: *' . PHP_EOL . 'Disallow: /');
@ -1432,12 +1433,12 @@ class common {
if($this->getData(['theme', 'footer', 'socialsPosition']) === 'right') { $this->showSocials(true); }
if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'right') { $this->showCopyright(true); }
echo '</div>';
if($this->getData(['theme', 'footer', 'textPosition']) === 'hide') { $this->showFooterText(false); }
if($this->getData(['theme', 'footer', 'socialsPosition']) === 'hide') { $this->showSocials(false); }
if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'hide') { $this->showCopyright(false); }
// Fermeture du contenaire
echo '</div></div>';
echo '</footer>';
@ -1450,7 +1451,7 @@ class common {
if($footerText = $this->getData(['theme', 'footer', 'text']) OR $this->getUrl(0) === 'theme') {
$style = '';
if( $visibility === false ) $style = 'style="display: none;"';
echo '<div id="footerText"' . $style . '>' . $footerText . '</div>';
echo '<div id="footerText" ' . $style . '>' . $footerText . '</div>';
}
}
@ -1583,8 +1584,8 @@ class common {
}
if($socials !== '') {
$style = '';
if( $visibility === false ) $style = 'style="display: none;"';
echo '<div id="footerSocials"' . $style . '>' . $socials . '</div>';
if( $visibility === false ) $style = 'style="display: none;"';
echo '<div id="footerSocials" ' . $style . '>' . $socials . '</div>';
}
}
@ -1599,17 +1600,16 @@ class common {
if($favicon &&
file_exists(self::FILE_DIR.'source/' . $favicon)
) {
echo '<link rel="shortcut icon" media="(prefers-color-scheme:light)" href="' . helper::baseUrl(false) . self::FILE_DIR.'source/' . $favicon . '">';
echo '<link rel="icon" media="(prefers-color-scheme:light)" href="' . helper::baseUrl(false) . self::FILE_DIR.'source/' . $favicon . '">';
} else {
echo '<link rel="shortcut icon" media="(prefers-color-scheme:light)" href="' . helper::baseUrl(false) . 'core/vendor/zwiico/ico/favicon.ico">';
echo '<link rel="icon" media="(prefers-color-scheme:light)" href="' . helper::baseUrl(false) . 'core/vendor/zwiico/ico/favicon.ico">';
}
// Dark scheme
$faviconDark = $this->getData(['config', 'faviconDark']);
if(!empty($faviconDark) &&
file_exists(self::FILE_DIR.'source/' . $faviconDark)
) {
echo '<link rel="shortcut icon" media="(prefers-color-scheme:dark)" href="' . helper::baseUrl(false) . self::FILE_DIR.'source/' . $faviconDark . '">';
//echo '<script src="https://unpkg.com/favicon-switcher@1.2.2/dist/index.js" crossorigin="anonymous" type="application/javascript"></script>';
echo '<link rel="icon" media="(prefers-color-scheme:dark)" href="' . helper::baseUrl(false) . self::FILE_DIR.'source/' . $faviconDark . '">';
echo '<script src="' . helper::baseUrl(false) . 'core/vendor/favicon-switcher/favicon-switcher.js" crossorigin="anonymous" type="application/javascript"></script>';
}
}
@ -1923,9 +1923,6 @@ class common {
}
/**
* Affiche le meta titre
*/
/**
* Affiche les balises title et meta name
*/
public function showMetaTitle() {
@ -2086,15 +2083,21 @@ class common {
// Une mise à jour est disponible + recherche auto activée + 1 jour de délai
if ( $this->getData(['config','autoUpdate']) === true
AND $today > $this->getData(['core','lastAutoUpdate']) + 86400 ) {
if ( helper::checkNewVersion(common::DELTA_UPDATE_CHANNEL) ) {
$this->setData(['core','updateAvailable', true]);
$this->setData(['core','lastAutoUpdate',$today]);
$version = helper::getOnlineVersion();
if( $version === false){
// Le serveur ne supporte pa la mise à jour automatique
$this->setData(['config','autoUpdate',false]);
} else {
if ( version_compare(common::DELTA_VERSION,$version) === -1 ) {
$this->setData(['core','updateAvailable', true]);
$this->setData(['core','lastAutoUpdate',$today]);
}
}
}
// Afficher le bouton : Mise à jour détectée + activée
if ( $this->getData(['core','updateAvailable']) === true &&
$this->getData(['config','autoUpdate']) === true ) {
$rightItems .= '<li><a id="barUpdate" href="' . helper::baseUrl() . 'install/update" data-tippy-content="'.$text['core']['showBar'][15]. common::DELTA_VERSION .' vers '. helper::getOnlineVersion(common::DELTA_UPDATE_CHANNEL) .'">' . template::ico('update colorRed') . '</a></li>';
$rightItems .= '<li><a id="barUpdate" href="' . helper::baseUrl() . 'install/update" data-tippy-content="'.$text['core']['showBar'][15]. common::DELTA_VERSION .' vers '. helper::getOnlineVersion() .'">' . template::ico('update colorRed') . '</a></li>';
}
}
if($this->getUser('group') >= self::GROUP_EDITOR) {
@ -2126,9 +2129,9 @@ class common {
if($this->output['style']) {
echo '<base href="' . helper::baseUrl(true) .'">';
if (strpos($this->output['style'], 'admin.css') >= 1 ) {
echo '<link rel="stylesheet" href="' . self::DATA_DIR . 'admin.css?' . md5_file(self::DATA_DIR .'admin.css') . '">';
echo '<link rel="stylesheet" href="' . self::DATA_DIR . 'admin.css' . '">'.PHP_EOL;
}
echo '<style type="text/css">' . helper::minifyCss($this->output['style']) . '</style>';
echo '<style>' . helper::minifyCss($this->output['style']) . '</style>';
}
}
@ -2148,8 +2151,6 @@ class common {
echo '<script>' . helper::minifyJs($vars) . '</script>';
// Librairies
$moduleId = $this->getData(['page', $this->getUrl(0), 'moduleId']);
// Ajout si bannière animée
if($this->getData(['theme', 'header', 'feature']) === 'swiper') $this->output['vendor'] = array_merge ( $this->output['vendor'] , array('swiper') );
foreach($this->output['vendor'] as $vendorName) {
// Coeur
if(file_exists('core/vendor/' . $vendorName . '/inc.json')) {
@ -2329,7 +2330,7 @@ class core extends common {
$format = 'woff2';
break;
}
$css .= '@font-face{ font-family: "'. $this->getData(['fonts', $value, 'name' ]) .'"; src: url("'. helper::baseUrl(false). 'site/file/source/fonts/' . $file;
$css .= '@font-face{ font-family: "'. $this->getData(['fonts', $value, 'name' ]) .'"; src: url("../file/source/fonts/' . $file;
$css .= '") format("'. $format . '"); font-weight: normal; font-style: normal;}';
$css .= ' ';
}
@ -2363,7 +2364,9 @@ class core extends common {
//$css .= 'a:hover:not(.inputFile, button){color:' . $colors['darken'] . '}';
$css .= 'body,.row > div{font-size:' . $this->getData(['theme', 'text', 'fontSize']) . '}';
$css .= 'body{color:' . $this->getData(['theme', 'text', 'textColor']) . '}';
$css .= 'select,input[type=\'password\'],input[type=\'email\'],input[type=\'text\'],.inputFile,select,textarea{color:' . $this->getData(['theme', 'text', 'textColor']) .';background-color:'.$this->getData(['theme', 'site', 'backgroundColor']).';}';
$css .= 'select,input[type=\'password\'],input[type=\'email\'],input[type=\'text\'],.inputFile,select,textarea{color:' . $this->getData(['theme', 'text', 'textColor']) .';background-color:'.$this->getData(['theme', 'site', 'backgroundColor']).';border-color:'.$this->getData(['theme', 'block', 'borderColor']).';}';
$css .= 'select:focus-visible,input[type=\'password\']:focus-visible,input[type=\'email\']:focus-visible,input[type=\'text\']:focus-visible,.inputFile:focus-visible,textarea:focus-visible{border-color:'.$this->getData(['theme', 'block', 'borderColor']).';}';
$css .= 'select:hover,input[type=\'password\']:hover,input[type=\'email\']:hover,input[type=\'text\']:hover,.inputFile:hover,textarea:hover{border-color:'.$this->getData(['theme', 'block', 'borderColor']).';}';
// spécifiques au module de blog
$css .= '.blogDate {color:' . $this->getData(['theme', 'text', 'textColor']) . ';}.blogPicture img{border:1px solid ' . $this->getData(['theme', 'text', 'textColor']) . '; box-shadow: 1px 1px 5px ' . $this->getData(['theme', 'text', 'textColor']) . ';}';
// Couleur fixée dans admin.css
@ -2373,25 +2376,24 @@ class core extends common {
// Marge supplémentaire lorsque le pied de page est fixe
if ( $this->getData(['theme', 'footer', 'fixed']) === true &&
$this->getData(['theme', 'footer', 'position']) === 'body') {
//$css .= '@media (min-width: 769px) { #site {margin-bottom: ' . ((str_replace ('px', '', $this->getData(['theme', 'footer', 'height']) ) * 2 ) + 31 ) . 'px}}';
//$css .= '@media (max-width: 768px) { #site {margin-bottom: ' . ((str_replace ('px', '', $this->getData(['theme', 'footer', 'height']) ) * 2 ) + 93 ) . 'px}}';
$marginBottomLarge = ((str_replace ('px', '', $this->getData(['theme', 'footer', 'height']) ) * 2 ) + 31 ) . 'px';
$marginBottomSmall = ((str_replace ('px', '', $this->getData(['theme', 'footer', 'height']) ) * 2 ) + 93 ) . 'px';
} else {
$marginBottomSmall = $margin;
$marginBottomLarge = $margin;
}
$css .= '@media screen and (max-width: 799px) { .container { max-width: 100vw; } }';
$css .= $this->getData(['theme', 'site', 'width']) === '100%'
? '@media (min-width: 769px) {#site{margin:0 auto ' . $marginBottomLarge . ' 0 !important;}}@media (max-width: 768px) {#site{margin:0 auto ' . $marginBottomSmall . ' 0 !important;}}#site.light{margin:5% auto !important;} body{margin:0 auto !important;} #bar{margin:0 auto !important;} body > header{margin:0 auto !important;} body > nav {margin: 0 auto !important;} body > footer {margin:0 auto !important;}'
: '@media (min-width: 769px) {#site{margin: ' . $margin . ' auto ' . $marginBottomLarge . ' auto !important;}}@media (max-width: 768px) {#site{margin:0 auto ' . $marginBottomSmall . ' auto !important;}}#site.light{margin: 5% auto !important;} body{margin:0px 10px;} #bar{margin: 0 -10px;} body > header{margin: 0 -10px;} body > nav {margin: 0 -10px;} body > footer {margin: 0 -10px;} ';
$css .= $this->getData(['theme', 'site', 'width']) === '750px'
? '@media (min-width: 800px) {#site{margin:0 auto ' . $marginBottomLarge . ' 0 !important;}}@media (max-width: 799px) {#site{margin:0 auto ' . $marginBottomSmall . ' 0 !important;}}#site.light{margin:5% auto !important;} body{margin:0 auto !important;} #bar{margin:0 auto !important;} body > header{margin:0 auto !important;} body > nav {margin: 0 auto !important;} body > footer {margin:0 auto !important;}'
: '@media (min-width: 800px) {#site{margin: ' . $margin . ' auto ' . $marginBottomLarge . ' auto !important;}}@media (max-width: 799px) {#site{margin:0 auto ' . $marginBottomSmall . ' auto !important;}}#site.light{margin: 5% auto !important;} body{margin:0px 10px;} #bar{margin: 0 -10px;} body > header{margin: 0 -10px;} body > nav {margin: 0 -10px;} body > footer {margin: 0 -10px;} ';
$css .= $this->getData(['theme', 'site', 'width']) === '75vw'
? '.button, button{font-size:0.8em;}'
: '';
$css .= '#site{background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';border-radius:' . $this->getData(['theme', 'site', 'radius']) . ';box-shadow:' . $this->getData(['theme', 'site', 'shadow']) . ' #212223;}';
$colors = helper::colorVariants($this->getData(['theme', 'button', 'backgroundColor']));
$css .= '.speechBubble,.button,.button:hover,button[type=\'submit\'],.pagination a,.pagination a:hover,input[type=\'checkbox\']:checked + label:before,input[type=\'radio\']:checked + label:before,.helpContent{background-color:' . $colors['normal'] . ';color:' . $colors['text'] . '}';
$css .= '.helpButton span{color:' . $colors['normal'] . '}';
$css .= 'input[type=\'text\']:hover,input[type=\'password\']:hover,.inputFile:hover,select:hover,textarea:hover{border-color:' . $colors['normal'] . '}';
//$css .= 'input[type=\'text\']:hover,input[type=\'password\']:hover,.inputFile:hover,select:hover,textarea:hover{border-color:' . $colors['normal'] . '}';
$css .= '.speechBubble:before{border-color:' . $colors['normal'] . ' transparent transparent transparent}';
$css .= '.button:hover,button[type=\'submit\']:hover,.pagination a:hover,input[type=\'checkbox\']:not(:active):checked:hover + label:before,input[type=\'checkbox\']:active + label:before,input[type=\'radio\']:checked:hover + label:before,input[type=\'radio\']:not(:checked):active + label:before{background-color:' . $colors['darken'] . '}';
$css .= '.helpButton span:hover{color:' . $colors['darken'] . '}';
@ -2511,7 +2513,7 @@ class core extends common {
$css .= 'footer #footersite > div {margin:' . $this->getData(['theme', 'footer', 'height']) . ' 0}';
$css .= 'footer #footerbody > div {margin:' . $this->getData(['theme', 'footer', 'height']) . ' 0}';
$css .= '@media (max-width: 768px) {footer #footerbody > div { padding: 2px }}';
$css .= '@media (max-width: 799px) {footer #footerbody > div { padding: 2px }}';
$css .= '#footerSocials{text-align:' . $this->getData(['theme', 'footer', 'socialsAlign']) . '}';
$css .= '#footerText > p {text-align:' . $this->getData(['theme', 'footer', 'textAlign']) . '}';
$css .= '#footerCopyright{text-align:' . $this->getData(['theme', 'footer', 'copyrightAlign']) . '}';
@ -2567,7 +2569,7 @@ class core extends common {
$format = 'woff2';
break;
}
$css .= '@font-face{ font-family: "'. $value['name'] .'"; src: url("'. helper::baseUrl(false). 'site/file/source/fonts/' . $value['file'];
$css .= '@font-face{ font-family: "'. $value['name'] .'"; src: url("../file/source/fonts/' . $value['file'];
$css .= '") format("'. $format . '"); font-weight: normal; font-style: normal;}';
$css .= ' ';
}
@ -2586,7 +2588,7 @@ class core extends common {
$css .= 'input[type="checkbox"]:checked + label::before,.speechBubble{background-color:' . $colors['normal'] . ';color:' . $colors['text'] . ';}';
$css .= '.speechBubble::before {border-color:' . $colors['normal'] . ' transparent transparent transparent;}';
$css .= '.button {background-color:' . $colors['normal'] . ';color:' . $colors['text'] . ';}.button:hover {background-color:' . $colors['darken'] . ';color:' . $colors['text'] . ';}.button:active {background-color:' . $colors['veryDarken'] . ';color:' . $colors['text'] . ';}';
$css .= '.buttonPreview {background-color:' . $colors['normal'] . '!important;color:' . $colors['text'] . '!important;}.buttonPreview:hover {background-color:' . $colors['darken'] . '!important;color:' . $colors['text'] . '!important;}.buttonPreview:active {background-color:' . $colors['veryDarken'] . '!important;color:' . $colors['text'] . '!important;}';
$css .= '.buttonPreview {background-color:' . $colors['normal'] . '!important;color:' . $colors['text'] . '!important;}.buttonPreview:hover {background-color:' . $colors['darken'] . '!important;color:' . $colors['text'] . '!important;}.buttonPreview:active {background-color:' . $colors['veryDarken'] . '!important;color:' . $colors['text'] . '!important;}';
$colors = helper::colorVariants($this->getData(['admin','backgroundColorButtonGrey']));
$css .= '.button.buttonGrey {background-color: ' . $colors['normal'] . ';color: ' . $colors['text'] . ';}.button.buttonGrey:hover {background-color:' . $colors['darken'] . ';color:' . $colors['text'] . ';}.button.buttonGrey:active {background-color:' . $colors['veryDarken'] . ';color:' . $colors['text'] . ';}';
$colors = helper::colorVariants($this->getData(['admin','backgroundColorButtonRed']));

8
core/include/update.inc.php
View File

@ -105,4 +105,12 @@ if ($this->getData(['core', 'dataVersion']) < 4403) {
// Mise à jour
$this->setData(['core', 'dataVersion', 4403]);
}
if ($this->getData(['core', 'dataVersion']) < 4404) {
if( $this->getData(['theme', 'site', 'width']) === '750px') $this->setData(['theme', 'site', 'width', '75vw']);
if( $this->getData(['theme', 'site', 'width']) === '960px') $this->setData(['theme', 'site', 'width', '85vw']);
if( $this->getData(['theme', 'site', 'width']) === '1170px') $this->setData(['theme', 'site', 'width', '95vw']);
// Mise à jour
$this->setData(['core', 'dataVersion', 4404]);
}
?>

13
core/layout/blank.php
View File

@ -1,23 +1,22 @@
<!DOCTYPE html>
<html prefix="og: http://ogp.me/ns#" lang="<?php echo $this->getData(['config', 'i18n', 'langAdmin']);?>">
<html lang="<?php echo $this->getData(['config', 'i18n', 'langAdmin']);?>">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<?php
$this->showMetaTitle();
$this->showMetaPropertyFacebook();
?>
<?php
$this->showFavicon();
$this->showVendor();
$this->showStyle();
?>
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/common.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/mediaqueries.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/blank.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>theme.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>custom.css"></head>
<?php $this->showStyle(); ?>
<link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>custom.css">
</head>
<body>
<?php $this->showContent(); ?>
<?php $this->showScript(); ?>
</body>
</html>
</html>

1111
core/layout/common.css
View File

File diff suppressed because it is too large Load Diff

8
core/layout/light.php
View File

@ -1,20 +1,18 @@
<!DOCTYPE html>
<html prefix="og: http://ogp.me/ns#" lang="<?php echo $this->getData(['config', 'i18n', 'langAdmin']);?>">
<html lang="<?php echo $this->getData(['config', 'i18n', 'langAdmin']);?>">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<?php
$this->showMetaTitle();
$this->showMetaPropertyFacebook();
?>
<?php
$this->showFavicon();
$this->showVendor();
$this->showStyle();
?>
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/common.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/mediaqueries.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/light.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>theme.css">
<?php $this->showStyle(); ?>
<link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>custom.css">
</head>
<body>

3
core/layout/mail.php
View File

@ -103,8 +103,7 @@
<?php
if($this->getData(['module', $this->getUrl(0), 'config', 'signature' ]) === 'logo' && is_file( 'site/file/source/'. $this->getData(['module', $this->getUrl(0), 'config', 'logoUrl' ]))){
$imageFile = helper::baseUrl(false).'site/file/source/'. $this->getData(['module', $this->getUrl(0), 'config', 'logoUrl' ]) ;
$imageBase64 = base64_encode(file_get_contents($imageFile));
?><img src=" data:image/<?php echo pathinfo($imageFile, PATHINFO_EXTENSION); ?>;base64,<?php echo $imageBase64; ?>" border="0" width="<?php echo $this->getData(['module', $this->getUrl(0), 'config', 'logoWidth']) ?>%" >
?><img src="<?php echo $imageFile; ?>" border="0" alt="logo" width="<?php echo $this->getData(['module', $this->getUrl(0), 'config', 'logoWidth']) ?>%" >
<?php
}
else{

27
core/layout/main.php
View File

@ -12,12 +12,14 @@ else { echo '<html lang="'.$lang.'">'; }
$this->showMetaTitle();
if( $this->getData(['config', 'social', 'headFacebook' ]) === true) $this->showMetaPropertyFacebook();
?>
<?php
<?php
$this->showFavicon();
$this->showVendor();
$this->showVendor(); echo PHP_EOL;
?>
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/common.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/mediaqueries.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>theme.css">
<?php $this->showStyle(); ?>
<link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>custom.css">
<!-- Détection RSS -->
<?php if ( ( $this->getData(['page', $this->getUrl(0), 'moduleId']) === 'blog'
@ -25,11 +27,10 @@ else { echo '<html lang="'.$lang.'">'; }
AND $this->getData(['module', $this->getUrl(0), 'config', 'feeds']) === TRUE ): ?>
<link rel="alternate" type="application/rss+xml" href="'<?php echo helper::baseUrl(). $this->getUrl(0) . '/rss';?>" title="fLUX rss">
<?php endif; ?>
<?php $this->showStyle(); echo PHP_EOL; ?>
<?php if (file_exists(self::DATA_DIR .'head.inc.html')) {
include(self::DATA_DIR .'head.inc.html');
}?>
<?php
<?php
if( isset ($_SESSION['screenshot'] )){
if( $_SESSION['screenshot'] === 'on'){?>
<script src="./core/vendor/screenshot/html2canvas.min.js"></script>
@ -43,11 +44,11 @@ else { echo '<html lang="'.$lang.'">'; }
<!-- Notifications -->
<?php $this->showNotification(); ?>
<!-- Taille du Logo pour le menu burger -->
<?php $fileLogo = './site/file/source/'. $this->getData(['theme', 'menu', 'burgerLogo']);
if( $this->getData(['theme','menu','burgerContent']) === 'logo'
&& file_exists( $fileLogo)
<?php $fileLogo = './site/file/source/'. $this->getData(['theme', 'menu', 'burgerLogo']);
if( $this->getData(['theme','menu','burgerContent']) === 'logo'
&& file_exists( $fileLogo)
&& $this->getData(['theme', 'menu', 'burgerLogo']) !== '' ){
$fontsize = $this->getData(['theme', 'text', 'fontSize']);
$pospx = strpos($fontsize, 'px');
@ -67,7 +68,7 @@ else { echo '<html lang="'.$lang.'">'; }
$widthLogo = 30;
}
} ?>
<!-- div screenshot -->
<?php if( isset ($_SESSION['screenshot'] )){
if( $_SESSION['screenshot'] === 'on'){ ?>
@ -135,7 +136,7 @@ else { echo '<html lang="'.$lang.'">'; }
<!-- Swiper -->
<?php if( ! $homePageOnly) echo $this->getData(['theme','header','swiperContent']);?>
<?php } ?>
</header>
</header>
<?php endif; ?>
<!-- Menu dans le fond du site après la bannière -->
@ -222,7 +223,7 @@ else { echo '<html lang="'.$lang.'">'; }
<div id="menu" class="container"><?php $this->showMenu(); ?></div>
</nav>
<?php endif; ?>
<!-- Corps de page -->
<?php $this->showSection();?>
@ -238,10 +239,10 @@ else { echo '<html lang="'.$lang.'">'; }
</div>
<div><button id="screenshot" class="buttonScreenshot" type="button" ><img src="<?php echo helper::baseUrl(false); ?>core/vendor/screenshot/appareil_photo.png" width="100px"/></button></div>
<?php }}?>
<!-- Lien remonter en haut -->
<div id="backToTop"><?php echo template::ico('up'); ?></div>
<!-- Affichage du consentement aux cookies-->
<!-- Affichage du consentement aux cookies-->
<?php $this->showCookies(); ?>
<!-- Les scripts -->
<?php $this->showScript();?>

280
core/layout/mediaqueries.css Normal file
View File

@ -0,0 +1,280 @@
/**
* This file is part of DeltaCMS.
* For full copyright and license information, please see the LICENSE
* file that was distributed with this source code.
* @author Sylvain Lelièvre <lelievresylvain@free.fr>
* @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
* @license GNU General Public License, version 3
* @link https://deltacms.fr/
*
* Delta was created from version 11.2.00.24 of ZwiiCMS
* @author Rémi Jean <remi.jean@outlook.com>
* @copyright Copyright (C) 2008-2018, Rémi Jean
* @author Frédéric Tempez <frederic.tempez@outlook.com>
* @copyright Copyright (C) 2018-2021, Frédéric Tempez
*/
/* Ecrans >= 800px */
@media (min-width: 800px) {
body {
margin: 0;
}
/* Barre de membre */
#bar #barLeft {
float: left;
}
#bar #barRight {
float: right;
font-size: 12px;
}
/* Bannière */
body > header {
margin: 0;
}
header {
margin: 0;
}
/* Items du menu */
.smallScreenFlags {
display: none;
}
nav #menu {
display: block;
}
/* Corps */
section {
padding: 20px;
}
/* Grille */
.col1 {
width: 8.33333333%;
}
.col2 {
width: 16.66666667%;
}
.col3 {
width: 25%;
}
.col4 {
width: 33.33333333%;
}
.col5 {
width: 41.66666667%;
}
.col6 {
width: 50%;
}
.col7 {
width: 58.33333333%;
}
.col8 {
width: 66.66666667%;
}
.col9 {
width: 75%;
}
.col10 {
width: 83.33333333%;
}
.col11 {
width: 91.66666667%;
}
.col12 {
width: 100%;
}
.offset1 {
margin-left: 8.33333333%;
}
.offset2 {
margin-left: 16.66666667%;
}
.offset3 {
margin-left: 25%;
}
.offset4 {
margin-left: 33.33333333%;
}
.offset5 {
margin-left: 41.66666667%;
}
.offset6 {
margin-left: 50%;
}
.offset7 {
margin-left: 58.33333333%;
}
.offset8 {
margin-left: 66.66666667%;
}
.offset9 {
margin-left: 75%;
}
.offset10 {
margin-left: 83.33333333%;
}
.offset11 {
margin-left: 91.66666667%;
}
}
/* Ecrans < 800px */
@media (max-width: 799px) {
/* Suppression des marges */
body {
margin: 0 auto !important ;
}
#site {
margin-top: 0 !important ;
}
body > header {
margin: 0 auto !important ;
}
.tippy-tooltip {
font-size: 0.8rem !important ;
}
section {
padding: 10px !important ;
}
/* siteContainer */
.siteContainer {
display: flex;
flex-direction: column;
}
.siteContainer > #contentLeft {
order: 1;
}
.siteContainer > #contentRight {
order: 3;
}
.siteContainer > #contentSite {
order: 2;
}
/* Tableaux */
.table thead {
font-size: 0.8em;
}
/* Barre de membre */
#bar {
text-align: center;
margin: 0 auto !important ;
}
#bar ul {
height: auto;
}
#bar #barSelectPage {
width: 40%;
font-size: 1em;
}
#bar #barLeft {
font-size: 1.2em;
float: none;
}
#bar #barRight {
font-size: 1.4em;
}
#bar #displayUsername {
display: none;
}
/* Items du menu */
body > nav {
margin: 0 auto !important ;
}
nav #toggle,
nav #menuLeft {
display: block;
float: none;
}
nav #menuLeft {
flex-direction: column;
float: none;
}
nav #menuRight {
font-size: 2em;
}
nav #menu {
display: none;
text-align: left;
}
nav li {
display: block;
}
nav li ul {
z-index: 1;
opacity: 1;
position: static;
min-width: inherit;
padding-left: 20px;
}
/* Taille du menu hamburger */
nav .zwiico-menu {
font-size: 1.5em;
}
nav .zwiico-cancel {
font-size: 1.5em;
}
/* Position du bloc dans le site sur les petits écrans */
.smallScreenFlags {
display: inline-block;
position: relative;
left: 10px;
}
.smallScreenInline {
display: inline-block;
}
.i18nFlag {
width: 25px;
margin: 0 10px 0 -10px;
}
.i18nFlagSelected {
width: 30px;
margin: 0 10px 0 -10px;
}
.zwiico-login {
margin-right: 20px;
}
/* Conserve le pied de page sur une ligne */
body > footer {
margin: 0 auto !important ;
}
footer .col4 {
width: 100%;
}
#footerCopyright,
#footerText,
#footerSocials {
display: flex;
justify-content: center;
}
/* Message sur les cookies */
#cookieConsent {
width: 90%;
}
/* Bannière masquable en petit écran */
.bannerDisplay {
display: none;
}
}
/* Autres tailles d'écrans */
/* Tableau sur les écrans de petites tailles */
@media (max-width: 668px) {
.table thead {
display: none;
}
}
/* Tableau sur les écrans de très petites tailles */
@media (max-width: 480px) {
.table tr {
display: block;
margin-bottom: 10px;
}
.table td {
display: block;
text-align: right;
width: auto;
}
}

2
core/module/config/lang/en/lex_config.php
View File

@ -127,7 +127,7 @@ $text['core_config_view']['setup'][10] = 'Mandatory activation under French law
$text['core_config_view']['setup'][11] = 'Smart URLs';
$text['core_config_view']['setup'][12] = 'First check that your server allows URL rewriting (which is not the case with Free)';
$text['core_config_view']['setup'][13] = 'Search for an online update';
$text['core_config_view']['setup'][14] = 'The check is daily. Option disabled if server configuration does not allow it.';
$text['core_config_view']['setup'][14] = 'Enabled option the check is daily. Option disabled you will have to do the updates by FTP. If after activation the box is unchecked it means that your server does not allow it.';
$text['core_config_view']['setup'][15] = 'Preserve the root htaccess file';
$text['core_config_view']['setup'][16] = 'On auto-update, keep the root htaccess file';
$text['core_config_view']['setup'][17] = 'Reinstall';

2
core/module/config/lang/fr/lex_config.php
View File

@ -127,7 +127,7 @@ $text['core_config_view']['setup'][10] = 'Activation obligatoire selon les lois
$text['core_config_view']['setup'][11] = 'URL intelligentes';
$text['core_config_view']['setup'][12] = 'Vérifiez d\'abord que votre serveur autorise l\'URL rewriting (ce qui n\'est pas le cas chez Free).';
$text['core_config_view']['setup'][13] = 'Rechercher une mise à jour en ligne';
$text['core_config_view']['setup'][14] = 'La vérification est quotidienne. Option désactivée si la configuration du serveur ne le permet pas.';
$text['core_config_view']['setup'][14] = 'Option activée la vérification est quotidienne. Option désactivée vous devrez faire les mises à jour par FTP. Si après une activation la case est décochée c\'est que votre serveur ne le permet pas.';
$text['core_config_view']['setup'][15] = 'Préserver le fichier htaccess racine';
$text['core_config_view']['setup'][16] = 'Lors d\'une mise à jour automatique, conserve le fichier htaccess de la racine du site.';
$text['core_config_view']['setup'][17] = 'Réinstaller';

11
core/module/config/view/setup/setup.php
View File

@ -66,13 +66,18 @@ include('./core/module/config/lang/'. $this->getData(['config', 'i18n', 'langAdm
</a>
</span>
</div>
<?php $updateError = helper::urlGetContents(common::DELTA_UPDATE_URL . common::DELTA_UPDATE_CHANNEL . '/version');?>
<?php
if( $this->getData(['config', 'autoUpdate']) === true){
$updateError = helper::urlGetContents(common::DELTA_UPDATE_URL . common::DELTA_UPDATE_CHANNEL . '/version');
if( $updateError === false) $this->setData(['config', 'autoUpdate', false]);
} else {
$updateError = false;
}?>
<div class="row">
<div class="col4">
<?php echo template::checkbox('configAutoUpdate', true, $text['core_config_view']['setup'][13], [
'checked' => $this->getData(['config', 'autoUpdate']),
'help' => $text['core_config_view']['setup'][14],
'disabled' => !$updateError
'help' => $text['core_config_view']['setup'][14]
]); ?>
</div>
<div class="col4">

2
core/module/install/ressource/database_en/base/module.json
View File

@ -141,7 +141,7 @@
"logoUrl": "",
"logoWidth": "40",
"maxSizeUpload": "500000",
"versionData": "4.5",
"versionData": "4.6",
"uploadJpg": true,
"uploadPng": true,
"uploadPdf": false,

2
core/module/install/ressource/database_fr/base/module.json
View File

@ -141,7 +141,7 @@
"logoUrl": "",
"logoWidth": "40",
"maxSizeUpload": "1000000",
"versionData": "4.5",
"versionData": "4.6",
"uploadJpg": true,
"uploadPng": true,
"uploadPdf": false,

2
core/module/install/ressource/defaultdata.php
View File

@ -69,7 +69,7 @@ class init extends common {
]
],
'core' => [
'dataVersion' => 4403,
'dataVersion' => 4404,
'lastBackup' => 0,
'lastClearTmp' => 0,
'lastAutoUpdate' => 0,

BIN
core/module/install/ressource/themes/theme_banniere_animee_85vw.zip Normal file
View File

Binary file not shown.

BIN
core/module/install/ressource/themes/theme_default.zip
View File

Binary file not shown.

BIN
core/module/install/ressource/themes/theme_hirondelles_960px.zip
View File

Binary file not shown.

BIN
core/module/install/ressource/themes/theme_montagne_960px.zip
View File

Binary file not shown.

BIN
core/module/install/ressource/themes/theme_sansbanniere_fluide.zip
View File

Binary file not shown.

BIN
core/module/install/ressource/themes/theme_sombre_islande_fluide.zip Normal file
View File

Binary file not shown.

16
core/module/install/ressource/themes/themes.json
View File

@ -2,17 +2,17 @@
"defaut" : {
"name": "Hirondelles 100%",
"filename": "default"
},
"montagne": {
"name": "Montagne 960px",
"filename": "theme_montagne_960px.zip"
},
"hirondelles": {
"name": "Hirondelles 960px",
"filename": "theme_hirondelles_960px.zip"
},
"fluide": {
"name": "Sans bannière 100%",
"filename": "theme_sansbanniere_fluide.zip"
},
"sombre": {
"name": "Sombre Islande 100%",
"filename": "theme_sombre_islande_fluide.zip"
},
"pablo_banniere_animee": {
"name": "Bannière animèe 85%",
"filename": "theme_banniere_animee_85vw.zip"
}
}

24
core/module/theme/lang/en/lex_theme.php
View File

@ -11,7 +11,7 @@ $text['core_theme_view']['addFonts'][7] = 'The font file is sent, or not, from a
$text['core_theme_view']['addFonts'][8] = 'You must first upload the font file, ttf, woff, otf, eot or woff2 to the fonts folder with the file manager';
$text['core_theme_view']['addFonts'][9] = 'Select a font';
$text['core_theme_view']['addFonts'][10] = 'License';
$text['core_theme_view']['addFonts'][11] = 'License type of the font';
$text['core_theme_view']['addFonts'][11] = 'License type of the font';
$text['core_theme_view']['addFonts'][12] = "Are you sure you want to delete this font ?";
$text['core_theme_view']['admin'][0] = 'Back';
$text['core_theme_view']['admin'][1] = 'Help';
@ -33,7 +33,7 @@ $text['core_theme_view']['admin'][17] = 'Validation button';
$text['core_theme_view']['admin'][18] = 'Text formatting';
$text['core_theme_view']['admin'][19] = 'Text font';
$text['core_theme_view']['admin'][20] = 'Size';
$text['core_theme_view']['admin'][21] = 'Title font';
$text['core_theme_view']['admin'][21] = 'Title font';
$text['core_theme_view']['admin'][22] = "Are you sure you want to reset the administration theme to its original state ?";
$text['core_theme_view']['advanced'][0] = 'Back';
$text['core_theme_view']['advanced'][1] = 'Help';
@ -49,13 +49,13 @@ $text['core_theme_view']['body'][5] = 'Background';
$text['core_theme_view']['body'][6] = 'The horizontal slider sets the transparency level';
$text['core_theme_view']['body'][7] = 'Top icon background';
$text['core_theme_view']['body'][8] = 'Top icon';
$text['core_theme_view']['body'][9] = 'Image';
$text['core_theme_view']['body'][9] = 'Image';
$text['core_theme_view']['body'][10] = 'Select an image';
$text['core_theme_view']['body'][11] = 'Background';
$text['core_theme_view']['body'][12] = 'Repeat';
$text['core_theme_view']['body'][13] = 'Position';
$text['core_theme_view']['body'][14] = 'Scroll';
$text['core_theme_view']['body'][15] = 'Size';
$text['core_theme_view']['body'][15] = 'Size';
$text['core_theme_view']['editFonts'][0] = 'Back';
$text['core_theme_view']['editFonts'][1] = 'Help';
$text['core_theme_view']['editFonts'][2] = 'Save';
@ -199,6 +199,7 @@ $text['core_theme_view']['manage'][11] = 'Download theme';
$text['core_theme_view']['manage'][12] = 'Site theme';
$text['core_theme_view']['manage'][13] = 'Administration theme';
$text['core_theme_view']['manage'][14] = "Are you sure you want to reset the site theme to its original state ?";
$text['core_theme_view']['manage'][15] = "Your custom.css file will be overwritten, you will be able to find it in the automatic backup that will be created, continue?";
$text['core_theme_view']['menu'][0] = 'Back';
$text['core_theme_view']['menu'][1] = 'Help';
$text['core_theme_view']['menu'][2] = 'Save';
@ -225,7 +226,7 @@ $text['core_theme_view']['menu'][22] = 'Text';
$text['core_theme_view']['menu'][23] = 'Horizontal slider sets transparency level';
$text['core_theme_view']['menu'][24] = 'Background';
$text['core_theme_view']['menu'][25] = 'Submenu background';
$text['core_theme_view']['menu'][26] = 'Text active page';
$text['core_theme_view']['menu'][26] = 'Text active page';
$text['core_theme_view']['menu'][27] = 'The background colour of the active page can be set automatically or according to a defined colour, such as the background colour of the pages.';
$text['core_theme_view']['menu'][28] = 'Background colour of the page selected in the menu.<br>The horizontal slider sets the transparency level.';
$text['core_theme_view']['menu'][29] = 'Active page background';
@ -253,7 +254,7 @@ $text['core_theme_view']['site'][10] = 'Background';
$text['core_theme_view']['site'][11] = 'Text';
$text['core_theme_view']['site'][12] = 'Title';
$text['core_theme_view']['site'][13] = 'Links';
$text['core_theme_view']['site'][14] = 'Color visible in the absence of an image';
$text['core_theme_view']['site'][14] = 'Color visible in the absence of an image';
$text['core_theme_view']['site'][15] = 'Background of blocks';
$text['core_theme_view']['site'][16] = 'Block border';
$text['core_theme_view']['site'][17] = 'Block corner rounding';
@ -270,7 +271,8 @@ $text['core_theme_view']['site'][27] = 'Style';
$text['core_theme_view']['site'][28] = 'Character case';
$text['core_theme_view']['site'][29] = 'Size';
$text['core_theme_view']['site'][30] = 'Reference size for the site. The font sizes of the banner, menu and footer are proportional to this size';
$text['core_theme_view']['site'][31] = 'Title formatting';
$text['core_theme_view']['site'][31] = 'Title formatting';
$text['core_theme_view']['site'][32] = 'The width 75vw, 85vw or 95vw applies to a screen size >= 800px';
$text['core_theme']['admin'][0] = 'Saved changes';
$text['core_theme']['admin'][1] = 'Administration';
$text['core_theme']['advanced'][0] = 'Saved changes';
@ -518,9 +520,9 @@ $textTransforms = [
'capitalize' => 'Capitalize every word'
];
$siteWidths = [
'750px' => 'Small (750 pixels)',
'960px' => 'Medium (960 pixels)',
'1170px' => 'Large (1170 pixels)',
'75vw' => 'Small (75 vw)',
'85vw' => 'Medium (85 vw)',
'95vw' => 'Large (95 vw)',
'100%' => 'Fluide (100%)'
];
$headerWide = [
@ -554,4 +556,4 @@ $minWidthTab = [
'150px' => '150px',
'200px' => '200px'
];
?>
?>

10
core/module/theme/lang/fr/lex_theme.php
View File

@ -199,6 +199,7 @@ $text['core_theme_view']['manage'][11] = 'Télécharger le thème';
$text['core_theme_view']['manage'][12] = 'Thème du site';
$text['core_theme_view']['manage'][13] = 'Thème de l\'administration';
$text['core_theme_view']['manage'][14] = "Êtes-vous sûr de vouloir réinitialiser à son état d\'origine le thème du site ?";
$text['core_theme_view']['manage'][15] = "Votre fichier custom.css va être écrasé, vous pourrez le retrouver dans la sauvegarde automatique qui va être créée, continuez ?";
$text['core_theme_view']['menu'][0] = 'Retour';
$text['core_theme_view']['menu'][1] = 'Aide';
$text['core_theme_view']['menu'][2] = 'Enregistrer';
@ -271,6 +272,7 @@ $text['core_theme_view']['site'][28] = 'Casse';
$text['core_theme_view']['site'][29] = 'Taille';
$text['core_theme_view']['site'][30] = '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.';
$text['core_theme_view']['site'][31] = 'Mise en forme des titres';
$text['core_theme_view']['site'][32] = 'La largeur 75vw, 85vw ou 95vw s\'applique sur un écran de taille >= 800px';
$text['core_theme']['admin'][0] = 'Modifications enregistrées';
$text['core_theme']['admin'][1] = 'Administration';
$text['core_theme']['advanced'][0] = 'Modifications enregistrées';
@ -517,9 +519,9 @@ $textTransforms = [
'capitalize' => 'Majuscule à chaque mot'
];
$siteWidths = [
'750px' => 'Petite (750 pixels)',
'960px' => 'Moyenne (960 pixels)',
'1170px' => 'Grande (1170 pixels)',
'75vw' => 'Petite (75 vw)',
'85vw' => 'Moyenne (85 vw)',
'95vw' => 'Grande (95 vw)',
'100%' => 'Fluide (100%)'
];
$headerWide = [
@ -553,4 +555,4 @@ $minWidthTab = [
'150px' => '150px',
'200px' => '200px'
];
?>
?>

22
core/module/theme/theme.php
View File

@ -715,10 +715,9 @@ class theme extends common {
$data = $this->import(self::FILE_DIR.'source/' . $zipFilename);
if ($data['success']) {
header("Refresh:0");
// Régénérer theme.css
if (file_exists(self::DATA_DIR . 'theme.css')) {
unlink(self::DATA_DIR . 'theme.css');
}
// Régénérer theme.css et admin.css
if (file_exists(self::DATA_DIR . 'theme.css')) unlink(self::DATA_DIR . 'theme.css');
//$this->setData(['admin', 'maj', true]);
} else {
// Valeurs en sortie
$this->addOutput([
@ -905,14 +904,25 @@ class theme extends common {
if( $value ==='src'){
$images[$ii] = $tab [$key + 1];
$ii++;
}
}
}
}
// ajout des images dans le zip
foreach( $images as $key=>$value){
$value = str_replace( './site', 'site' , $value);
$zip->addFile( $value, $value );
}
}
// Extraction des images de la bannière animée avec swiper
if( $this->getData(['theme','header','feature'])=== 'swiper') {
$dir = $this->getData(['theme', 'header', 'swiperImagesDir']);
$scandir = scandir('./'.$dir);
foreach($scandir as $file){
if(preg_match("#\.(jpg|jpeg|png|gif|tiff|svg|webp)$#",strtolower($file))){
$value = $dir.'/'.$file;
$zip->addFile( $value, $value );
}
}
}
break;
}
$ret = $zip->close();

9
core/module/theme/view/manage/manage.js.php
View File

@ -22,4 +22,13 @@ $("#configManageReset").on("click", function() {
return core.confirm(textConfirm, function() {
$(location).attr("href", _this.attr("href"));
});
});
/**
* Confirmation de changement de thème
*/
$("#themeImportSubmit").on("click", function() {
return core.confirm(textConfirm2, function() {
$('#themeManageForm').submit();
});
});

1
core/module/theme/view/manage/manage.php
View File

@ -98,4 +98,5 @@ echo template::formOpen('themeManageForm'); ?>
<?php echo template::formClose(); ?>
<script>
var textConfirm = <?php echo '"'.$text['core_theme_view']['manage'][14].'"'; ?>;
var textConfirm2 = <?php echo '"'.$text['core_theme_view']['manage'][15].'"'; ?>;
</script>

2
core/module/theme/view/site/site.js.php
View File

@ -64,7 +64,7 @@ $("input, select").on("change",function() {
*/
// Taille du site
if ($("#themeSiteWidth").val() === "750px") {
if ($("#themeSiteWidth").val() === "75vw") {
css += ".button, button{font-size:0.8em;}";
} else {
css += ".button, button{font-size:1em;}";

1
core/module/theme/view/site/site.php
View File

@ -47,6 +47,7 @@ echo template::formOpen('themeSiteForm'); ?>
<div class="col4">
<?php echo template::select('themeSiteWidth', $siteWidths, [
'label' => $text['core_theme_view']['site'][4],
'help' => $text['core_theme_view']['site'][32],
'selected' => $this->getData(['theme', 'site', 'width'])
]); ?>
</div>

2
core/module/user/view/login/login.css
View File

@ -9,7 +9,7 @@
border: 1px solid;
}
@media screen and (max-width: 768px) {
@media screen and (max-width: 799px) {
.userOuter{
width: 100%;
}

6
core/module/user/view/login/login.js.php
View File

@ -75,12 +75,14 @@ $( ".humanBotClose" ).click(function() {
$(document).ready(function(){
borderColor = "<?php echo $this->getData(['theme', 'block', 'borderColor']); ?>";
bgColor = "<?php echo $this->getData(['theme', 'site', 'backgroundColor']); ?>";
$(".userOuter").css("background-color", bgColor);
$(".userOuter").css("border","solid 1px");
$(".userOuter").css("border-color", borderColor);
/* Modifier la couleur au survol */
$( ".userOuter" ).mouseenter(function() {
$(".userOuter").css("background-color", borderColor);
$(".userOuter").css("border-radius","5px");
});
$( ".userOuter" ).mouseleave(function() {
$(".userOuter").css("background-color", bgColor);
$(".userOuter").css("border-radius","0px");
});
});

21
core/vendor/swiper/swiperEffectVertical.js vendored
View File

@ -6,25 +6,24 @@ $(document).ready(function(){
var heightMod ,
widthMod,
wclient;
wclient = document.body.clientWidth;
wclient = window.innerWidth;
switch ( verticalBannerWidthSite )
{
case "750px":
widthMod = 750;
case "75vw":
widthMod = 0.75 * wclient;
break;
case "960px":
widthMod = 960;
case "85vw":
widthMod = 0.85 * wclient;
break;
case "1170px":
widthMod = 1170;
case "95vw":
widthMod = 0.95 * wclient;
break;
default:
widthMod = wclient;
widthMod = wclient;
}
if( wclient < widthMod) widthMod = wclient;
heightMod = verticalBannerHeightImg * ( widthMod / verticalBannerWidthImg );
$("#headerSwiper .swiper-wrapper").css("width", widthMod);
$("#headerSwiper .swiper-wrapper").css("height", heightMod);
$("#headerSwiper .swiper").css("width", widthMod);
$("#headerSwiper .swiper").css("height", heightMod);
}
$.wrapper();
$(window).resize(function(){

7
core/vendor/tinymce/init.js vendored
View File

@ -88,6 +88,7 @@ tinymce.init({
// Fichiers CSS à intégrer à l'éditeur
content_css: [
baseUrl + "core/layout/common.css",
baseUrl + "core/layout/mediaqueries.css",
baseUrl + "core/vendor/tinymce/content.css",
baseUrl + "site/data/theme.css",
baseUrl + "site/data/custom.css"
@ -177,6 +178,11 @@ tinymce.init({
url: baseUrl + "core/vendor/tinymce/templates/3blocks.html",
description: "3 blocs de texte, de même hauteur, avec un titre en ligne."
},
{
title: "Blocs de texte : 3 - 6 - 3",
url: baseUrl + "core/vendor/tinymce/templates/363blocks.html",
description: "3 blocs de texte, de même hauteur, dissymétriques, avec un titre en ligne."
},
{
title: "Blocs de texte : 3 - 3 - 3 - 3",
url: baseUrl + "core/vendor/tinymce/templates/4blocks.html",
@ -297,6 +303,7 @@ tinymce.init({
// Fichiers CSS à intégrer à l'éditeur
content_css: [
baseUrl + "core/layout/common.css",
baseUrl + "core/layout/mediaqueries.css",
baseUrl + "core/vendor/tinymce/content.css",
baseUrl + "site/data/theme.css",
baseUrl + "site/data/custom.css"

22
core/vendor/tinymce/templates/363blocks.html vendored Normal file
View File

@ -0,0 +1,22 @@
<div class="row" style="display: flex; flex-wrap: wrap;">
<div class="col3">
<div class="block" style="height: 100%;">
<div class="blockTitle"><p>Titre du bloc</p></div>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam interdum, neque non vulputate hendrerit, arcu turpis dapibus nisl, id scelerisque metus lectus vitae nisi. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec feugiat dolor et turpis finibus condimentum. Cras sit amet ligula sagittis justo.</p>
</div>
</div>
<div class="col6">
<div class="block" style="height: 100%;">
<div class="blockTitle"><p>Titre du bloc</p></div>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam interdum, neque non vulputate hendrerit, arcu turpis dapibus nisl, id scelerisque metus lectus vitae nisi. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec feugiat dolor et turpis finibus condimentum. Cras sit amet ligula sagittis justo.</p>
</div>
</div>
<div class="col3">
<div class="block" style="height: 100%;">
<div class="blockTitle"><p>Titre du bloc</p></div>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam interdum, neque non vulputate hendrerit, arcu turpis dapibus nisl, id scelerisque metus lectus vitae nisi. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec feugiat dolor et turpis finibus condimentum. Cras sit amet ligula sagittis justo.</p>
</div>
</div>
</div>
<p>Conserver jusqu'à la fin de la mise en page pour faciliter les insertions.</p>
<p><br/></p>

10
module/agenda/agenda.php
View File

@ -36,7 +36,7 @@ class agenda extends common {
'index' => self::GROUP_VISITOR
];
const VERSION = '5.6';
const VERSION = '5.7';
const REALNAME = 'Agenda';
const DELETE = true;
const UPDATE = '4.1';
@ -116,9 +116,9 @@ class agenda extends common {
copy( './module/agenda/ressource/file/source/agenda/adresses/.htaccess', './site/file/source/agenda/adresses/.htaccess');
$this->setData(['module', $this->getUrl(0), 'config', 'versionData','5.2']);
}
// Mise à jour vers la version 5.5
if (version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '5.5', '<') ) {
$this->setData(['module', $this->getUrl(0), 'config', 'versionData','5.5']);
// Mise à jour vers la version 5.7
if (version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '5.7', '<') ) {
$this->setData(['module', $this->getUrl(0), 'config', 'versionData','5.7']);
}
}
@ -800,7 +800,7 @@ class agenda extends common {
include('./module/agenda/lang/'. $this->getData(['config', 'i18n', 'langAdmin']) . '/lex_agenda.php');
// Mise à jour des données de module
if (null !== $this->getData(['module', $this->getUrl(0), 'config', 'versionData'])
&& version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '5.2', '<')){
&& version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '5.7', '<')){
$this->update();
}
//Pour récupération des données ajax jquery date ou id

258
module/agenda/vendor/js/init01.js vendored
View File

@ -1,258 +0,0 @@
/**
* Initialisation de TinyMCE
*/
tinymce.init({
// Classe où appliquer l'éditeur
selector: ".editorWysiwyg",
// Aperçu dans le pied de page
setup:function(ed) {
ed.on('change', function(e) {
if (ed.id === 'themeFooterText') {
$("#footerText").html(tinyMCE.get('themeFooterText').getContent());
}
});
},
// Langue
language: "fr_FR",
// Plugins
plugins: "advlist anchor autolink autoresize autosave colorpicker contextmenu fullscreen hr lists paste searchreplace stickytoolbar tabfocus template textcolor visualblocks",
// Contenu de la barre d'outils
toolbar: "restoredraft | undo redo | styleselect | bold italic forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist | visualblocks fullscreen",
// Cibles de la target
target_list: [
{title: 'None', value: ''},
{title: 'Nouvel onglet', value: '_blank'}
],
// Target pour lightbox
rel_list: [
{title: 'None', value: ''},
{title: 'Popup intégrée (Lity)', value: 'data-lity'},
{title: 'Diaporama d\'images (SimpleLightbox)', value: 'gallery'}
],
// Titre des images
image_title: true,
// Pages internes
link_list: baseUrl + "core/vendor/tinymce/links.php",
// Contenu du menu contextuel
contextmenu: "cut copy paste pastetext | selectall searchreplace ",
// Fichiers CSS à intégrer à l'éditeur
content_css: [
baseUrl + "core/layout/common.css",
baseUrl + "core/vendor/tinymce/content.css",
baseUrl + "site/data/theme.css",
baseUrl + "site/data/custom.css"
],
// Classe à ajouter à la balise body dans l'iframe
body_class: "editorWysiwyg",
// Cache les menus
menubar: false,
// URL menu contextuel
link_context_toolbar: true,
// Cache la barre de statut
statusbar: false,
// Autorise tous les éléments
valid_elements :"*[*]",
valid_children : "*[*]",
// Autorise l'ajout de script
// extended_valid_elements: "script[language|type|src]",
// Bloque le dimensionnement des médias (car automatiquement en fullsize avec fitvids pour le responsive)
media_dimensions: true,
// Désactiver la dimension des images
image_dimensions: true,
// Active l'onglet avancé lors de l'ajout d'une image
image_advtab: true,
// Urls relatives
relative_urls: true,
// Url de base
document_base_url: baseUrl,
// Gestionnaire de fichiers
//filemanager_access_key: privateKey,
//external_filemanager_path: baseUrl + "core/vendor/filemanager/",
//external_plugins: {
// "filemanager": baseUrl + "core/vendor/filemanager/plugin.min.js"
//},
// Thème mobile
// mobile: {
// theme: "mobile",
// plugins: [ 'autosave', 'lists', 'autolink' ],
// toolbar: [ 'undo', 'bold', 'italic', 'styleselect' ]
//},
// Contenu du bouton insérer
insert_button_items: "image link media template inserttable | hr | anchor",
// Contenu du bouton formats
style_formats: [
{title: "Headers", items: [
{title: "Header 1", format: "h1"},
{title: "Header 2", format: "h2"},
{title: "Header 3", format: "h3"},
{title: "Header 4", format: "h4"}
]},
{title: "Inline", items: [
{title: "Bold", icon: "bold", format: "bold"},
{title: "Italic", icon: "italic", format: "italic"},
{title: "Underline", icon: "underline", format: "underline"},
{title: "Strikethrough", icon: "strikethrough", format: "strikethrough"},
{title: "Superscript", icon: "superscript", format: "superscript"},
{title: "Subscript", icon: "subscript", format: "subscript"},
{title: "Code", icon: "code", format: "code"}
]},
{title: "Blocks", items: [
{title: "Paragraph", format: "p"},
{title: "Blockquote", format: "blockquote"},
{title: "Div", format: "div"},
{title: "Pre", format: "pre"}
]},
{title: "Alignment", items: [
{title: "Left", icon: "alignleft", format: "alignleft"},
{title: "Center", icon: "aligncenter", format: "aligncenter"},
{title: "Right", icon: "alignright", format: "alignright"},
{title: "Justify", icon: "alignjustify", format: "alignjustify"}
]}
],
// Templates
templates: [
{
title: "Bloc de texte",
url: baseUrl + "core/vendor/tinymce/templates/block.html",
description: "Bloc de texte avec un titre."
},
{
title: "Blocs de texte : 6 - 6",
url: baseUrl + "core/vendor/tinymce/templates/2blocks.html",
description: "2 blocs de texte avec un titre en ligne."
},
{
title: "Blocs de texte : 4 - 4 - 4",
url: baseUrl + "core/vendor/tinymce/templates/3blocks.html",
description: "3 blocs de texte avec un titre en ligne."
},
{
title: "Blocs de texte : 3 - 3 - 3 - 3",
url: baseUrl + "core/vendor/tinymce/templates/4blocks.html",
description: "4 blocs de texte avec un titre en ligne."
},
{
title: "Effet accordéon",
url: baseUrl + "core/vendor/tinymce/templates/accordion.html",
description: "Bloc de texte avec effet accordéon."
},
{
title: "Grille symétrique : 6 - 6",
url: baseUrl + "core/vendor/tinymce/templates/col6.html",
description: "Grille adaptative sur 12 colonnes, sur mobile elles passent les unes en dessous des autres."
},
{
title: "Grille symétrique : 4 - 4 - 4",
url: baseUrl + "core/vendor/tinymce/templates/col4.html",
description: "Grille adaptative sur 12 colonnes, sur mobile elles passent les unes en dessous des autres."
},
{
title: "Grille symétrique : 3 - 3 - 3 - 3",
url: baseUrl + "core/vendor/tinymce/templates/col3.html",
description: "Grille adaptative sur 12 colonnes, sur mobile elles passent les unes en dessous des autres."
},
{
title: "Grille asymétrique : 4 - 8",
url: baseUrl + "core/vendor/tinymce/templates/col4-8.html",
description: "Grille adaptative sur 12 colonnes, sur mobile elles passent les unes en dessous des autres."
},
{
title: "Grille asymétrique : 8 - 4",
url: baseUrl + "core/vendor/tinymce/templates/col8-4.html",
description: "Grille adaptative sur 12 colonnes, sur mobile elles passent les unes en dessous des autres."
},
{
title: "Grille asymétrique : 2 - 10",
url: baseUrl + "core/vendor/tinymce/templates/col2-10.html",
description: "Grille adaptative sur 12 colonnes, sur mobile elles passent les unes en dessous des autres."
},
{
title: "Grille asymétrique : 10 - 2",
url: baseUrl + "core/vendor/tinymce/templates/col10-2.html",
description: "Grille adaptative sur 12 colonnes, sur mobile elles passent les unes en dessous des autres."
}
]
});
tinymce.PluginManager.add('stickytoolbar', function(editor, url) {
editor.on('init', function() {
setSticky();
});
$(window).on('scroll', function() {
setSticky();
});
function setSticky() {
var container = editor.editorContainer;
var toolbars = $(container).find('.mce-toolbar-grp');
var statusbar = $(container).find('.mce-statusbar');
if (isSticky()) {
$(container).css({
paddingTop: toolbars.outerHeight()
});
if (isAtBottom()) {
toolbars.css({
top: 'auto',
bottom: statusbar.outerHeight(),
position: 'absolute',
width: '100%',
borderBottom: 'none'
});
} else {
toolbars.css({
top: 45,
bottom: 'auto',
position: 'fixed',
width: $(container).width(),
borderBottom: '1px solid rgba(0,0,0,0.2)'
});
}
} else {
$(container).css({
paddingTop: 0
});
toolbars.css({
top:0,
position: 'relative',
width: 'auto',
borderBottom: 'none'
});
}
}
function isSticky() {
var container = editor.editorContainer,
editorTop = container.getBoundingClientRect().top;
if (editorTop < 0) {
return true;
}
return false;
}
function isAtBottom() {
var container = editor.editorContainer,
editorTop = container.getBoundingClientRect().top;
var toolbarHeight = $(container).find('.mce-toolbar-grp').outerHeight();
var footerHeight = $(container).find('.mce-statusbar').outerHeight();
var hiddenHeight = -($(container).outerHeight() - toolbarHeight - footerHeight);
if (editorTop < hiddenHeight) {
return true;
}
return false;
}
});

274
module/agenda/vendor/js/init23.js vendored
View File

@ -1,274 +0,0 @@
/**
* Initialisation de TinyMCE
*/
tinymce.init({
// Classe où appliquer l'éditeur
selector: ".editorWysiwyg",
// Aperçu dans le pied de page
setup:function(ed) {
ed.on('change', function(e) {
if (ed.id === 'themeFooterText') {
$("#footerText").html(tinyMCE.get('themeFooterText').getContent());
}
});
},
// Langue
language: "fr_FR",
// Plugins
plugins: "advlist anchor autolink autoresize autosave codemirror colorpicker contextmenu fullscreen hr image imagetools link lists media paste searchreplace stickytoolbar tabfocus table template textcolor visualblocks",
// Contenu de la barre d'outils
toolbar: "restoredraft | undo redo | styleselect | bold italic forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist | insert | code visualblocks fullscreen",
// CodeMirror
codemirror: {
indentOnInit: true, // Whether or not to indent code on init.
fullscreen: false, // Default setting is false
path: 'codemirror', // Path to CodeMirror distribution
config: { // CodeMirror config object
mode: 'application/x-httpd-php',
lineNumbers: true
},
width: 800, // Default value is 800
height: 500, // Default value is 550
files: [ // Additional JS files to load
baseUrl + 'core/vendor/tinymce/mode/clike/clike.js',
baseUrl + 'core/vendor/tinymce/mode/php/php.js'
]
},
// Cibles de la target
target_list: [
{title: 'None', value: ''},
{title: 'Nouvel onglet', value: '_blank'}
],
// Target pour lightbox
rel_list: [
{title: 'None', value: ''},
{title: 'Popup intégrée (Lity)', value: 'data-lity'},
{title: 'Diaporama d\'images (SimpleLightbox)', value: 'gallery'}
],
// Titre des image
image_title: true,
// Pages internes
link_list: baseUrl + "core/vendor/tinymce/links.php",
// Contenu du menu contextuel
contextmenu: "cut copy paste pastetext | selectall searchreplace | link image inserttable | cell row column deletetable",
// Fichiers CSS à intégrer à l'éditeur
content_css: [
baseUrl + "core/layout/common.css",
baseUrl + "core/vendor/tinymce/content.css",
baseUrl + "site/data/theme.css",
baseUrl + "site/data/custom.css"
],
// Classe à ajouter à la balise body dans l'iframe
body_class: "editorWysiwyg",
// Cache les menus
menubar: false,
// URL menu contextuel
link_context_toolbar: true,
// Cache la barre de statut
statusbar: false,
// Autorise tous les éléments
valid_elements :"*[*]",
valid_children : "*[*]",
// Autorise l'ajout de script
// extended_valid_elements: "script[language|type|src]",
// Bloque le dimensionnement des médias (car automatiquement en fullsize avec fitvids pour le responsive)
media_dimensions: true,
// Désactiver la dimension des images
image_dimensions: true,
// Active l'onglet avancé lors de l'ajout d'une image
image_advtab: true,
// Urls relatives
relative_urls: true,
// Url de base
document_base_url: baseUrl,
// Gestionnaire de fichiers
filemanager_access_key: privateKey,
external_filemanager_path: baseUrl + "core/vendor/filemanager/",
external_plugins: {
"filemanager": baseUrl + "core/vendor/filemanager/plugin.min.js"
},
// Thème mobile
// mobile: {
// theme: "mobile",
// plugins: [ 'autosave', 'lists', 'autolink' ],
// toolbar: [ 'undo', 'bold', 'italic', 'styleselect' ]
//},
// Contenu du bouton insérer
insert_button_items: "image link media template inserttable | hr | anchor",
// Contenu du bouton formats
style_formats: [
{title: "Headers", items: [
{title: "Header 1", format: "h1"},
{title: "Header 2", format: "h2"},
{title: "Header 3", format: "h3"},
{title: "Header 4", format: "h4"}
]},
{title: "Inline", items: [
{title: "Bold", icon: "bold", format: "bold"},
{title: "Italic", icon: "italic", format: "italic"},
{title: "Underline", icon: "underline", format: "underline"},
{title: "Strikethrough", icon: "strikethrough", format: "strikethrough"},
{title: "Superscript", icon: "superscript", format: "superscript"},
{title: "Subscript", icon: "subscript", format: "subscript"},
{title: "Code", icon: "code", format: "code"}
]},
{title: "Blocks", items: [
{title: "Paragraph", format: "p"},
{title: "Blockquote", format: "blockquote"},
{title: "Div", format: "div"},
{title: "Pre", format: "pre"}
]},
{title: "Alignment", items: [
{title: "Left", icon: "alignleft", format: "alignleft"},
{title: "Center", icon: "aligncenter", format: "aligncenter"},
{title: "Right", icon: "alignright", format: "alignright"},
{title: "Justify", icon: "alignjustify", format: "alignjustify"}
]}
],
// Templates
templates: [
{
title: "Bloc de texte",
url: baseUrl + "core/vendor/tinymce/templates/block.html",
description: "Bloc de texte avec un titre."
},
{
title: "Blocs de texte : 6 - 6",
url: baseUrl + "core/vendor/tinymce/templates/2blocks.html",
description: "2 blocs de texte avec un titre en ligne."
},
{
title: "Blocs de texte : 4 - 4 - 4",
url: baseUrl + "core/vendor/tinymce/templates/3blocks.html",
description: "3 blocs de texte avec un titre en ligne."
},
{
title: "Blocs de texte : 3 - 3 - 3 - 3",
url: baseUrl + "core/vendor/tinymce/templates/4blocks.html",
description: "4 blocs de texte avec un titre en ligne."
},
{
title: "Effet accordéon",
url: baseUrl + "core/vendor/tinymce/templates/accordion.html",
description: "Bloc de texte avec effet accordéon."
},
{
title: "Grille symétrique : 6 - 6",
url: baseUrl + "core/vendor/tinymce/templates/col6.html",
description: "Grille adaptative sur 12 colonnes, sur mobile elles passent les unes en dessous des autres."
},
{
title: "Grille symétrique : 4 - 4 - 4",
url: baseUrl + "core/vendor/tinymce/templates/col4.html",
description: "Grille adaptative sur 12 colonnes, sur mobile elles passent les unes en dessous des autres."
},
{
title: "Grille symétrique : 3 - 3 - 3 - 3",
url: baseUrl + "core/vendor/tinymce/templates/col3.html",
description: "Grille adaptative sur 12 colonnes, sur mobile elles passent les unes en dessous des autres."
},
{
title: "Grille asymétrique : 4 - 8",
url: baseUrl + "core/vendor/tinymce/templates/col4-8.html",
description: "Grille adaptative sur 12 colonnes, sur mobile elles passent les unes en dessous des autres."
},
{
title: "Grille asymétrique : 8 - 4",
url: baseUrl + "core/vendor/tinymce/templates/col8-4.html",
description: "Grille adaptative sur 12 colonnes, sur mobile elles passent les unes en dessous des autres."
},
{
title: "Grille asymétrique : 2 - 10",
url: baseUrl + "core/vendor/tinymce/templates/col2-10.html",
description: "Grille adaptative sur 12 colonnes, sur mobile elles passent les unes en dessous des autres."
},
{
title: "Grille asymétrique : 10 - 2",
url: baseUrl + "core/vendor/tinymce/templates/col10-2.html",
description: "Grille adaptative sur 12 colonnes, sur mobile elles passent les unes en dessous des autres."
}
]
});
tinymce.PluginManager.add('stickytoolbar', function(editor, url) {
editor.on('init', function() {
setSticky();
});
$(window).on('scroll', function() {
setSticky();
});
function setSticky() {
var container = editor.editorContainer;
var toolbars = $(container).find('.mce-toolbar-grp');
var statusbar = $(container).find('.mce-statusbar');
if (isSticky()) {
$(container).css({
paddingTop: toolbars.outerHeight()
});
if (isAtBottom()) {
toolbars.css({
top: 'auto',
bottom: statusbar.outerHeight(),
position: 'absolute',
width: '100%',
borderBottom: 'none'
});
} else {
toolbars.css({
top: 45,
bottom: 'auto',
position: 'fixed',
width: $(container).width(),
borderBottom: '1px solid rgba(0,0,0,0.2)'
});
}
} else {
$(container).css({
paddingTop: 0
});
toolbars.css({
top:0,
position: 'relative',
width: 'auto',
borderBottom: 'none'
});
}
}
function isSticky() {
var container = editor.editorContainer,
editorTop = container.getBoundingClientRect().top;
if (editorTop < 0) {
return true;
}
return false;
}
function isAtBottom() {
var container = editor.editorContainer,
editorTop = container.getBoundingClientRect().top;
var toolbarHeight = $(container).find('.mce-toolbar-grp').outerHeight();
var footerHeight = $(container).find('.mce-statusbar').outerHeight();
var hiddenHeight = -($(container).outerHeight() - toolbarHeight - footerHeight);
if (editorTop < hiddenHeight) {
return true;
}
return false;
}
});

2
module/agenda/view/creation/creation.php
View File

@ -168,7 +168,7 @@ echo template::formOpen('creation_events'); ?>
<!--Fermeture de la <div class="row"> si test false-->
</div>
<div>
<div class="blockTitle"><?php echo $text['agenda_view']['creation'][23]; ?></div>
<div class="col12"><h2><?php echo $text['agenda_view']['creation'][23]; ?></h2></div>
</div>
<?php ;} ?>

2
module/agenda/view/index/index.css
View File

@ -78,7 +78,7 @@ table th{
}
/* font-size des jours dans la ligne supérieure et du mois dans le titre en petit écran */
@media (max-width: 768px) {
@media (max-width: 799px) {
.fc-center h2{
font-size: 1.2em;
text-align: center;

4
module/blog/view/article/article.css
View File

@ -46,7 +46,7 @@
color: grey;
height: 100%;
}
@media (max-width: 767px) {
@media (max-width: 799px) {
.blogArticlePicture {
height:auto;
max-width: 100%;}
@ -73,7 +73,7 @@
border: 1px solid;
}
@media screen and (max-width: 768px) {
@media screen and (max-width: 799px) {
.blogOuter{
width: 100%;
}

6
module/blog/view/article/article.js.php
View File

@ -94,13 +94,15 @@ $( ".humanBotClose" ).click(function() {
$(document).ready(function(){
borderColor = "<?php echo $this->getData(['theme', 'block', 'borderColor']); ?>";
bgColor = "<?php echo $this->getData(['theme', 'site', 'backgroundColor']); ?>";
$(".blogOuter").css("background-color", bgColor);
$(".blogOuter").css("border","solid 1px");
$(".blogOuter").css("border-color", borderColor);
/* Modifier la couleur au survol */
$( ".blogOuter" ).mouseenter(function() {
$(".blogOuter").css("background-color", borderColor);
$(".blogOuter").css("border-radius","5px");
});
$( ".blogOuter" ).mouseleave(function() {
$(".blogOuter").css("background-color", bgColor);
$(".blogOuter").css("border-radius","0px");
});
});

2
module/blog/view/index/index.css
View File

@ -42,7 +42,7 @@
color: grey;
*/
}
@media (max-width: 768px) {
@media (max-width: 799px) {
.blogContent {
display: none;
}

9
module/form/form.php
View File

@ -18,7 +18,7 @@
class form extends common {
const VERSION = '4.5';
const VERSION = '4.6';
const REALNAME = 'Formulaire';
const DELETE = true;
const UPDATE = '0.0';
@ -85,8 +85,8 @@ class form extends common {
$this->setData(['module', $this->getUrl(0), 'config', 'uploadTxt',false]);
$this->setData(['module', $this->getUrl(0), 'config', 'versionData','4.1']);
}
if( version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '4.5', '<') ){
$this->setData(['module', $this->getUrl(0), 'config', 'versionData', '4.5']);
if( version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '4.6', '<') ){
$this->setData(['module', $this->getUrl(0), 'config', 'versionData', '4.6']);
}
}
@ -375,6 +375,7 @@ class form extends common {
$data = [];
$replyTo = null;
$content = '';
$file_name = '';
// $notice concerne la pièce jointe et le captcha
$notice = '';
foreach($this->getData(['module', $this->getUrl(0), 'input']) as $index => $input) {
@ -493,7 +494,7 @@ class form extends common {
// Préparation des données pour la création dans la base
$data[$this->getData(['module', $this->getUrl(0), 'input', $index, 'name'])] = $value;
// Préparation des données pour le mail
$content .= '<strong>' . $this->getData(['module', $this->getUrl(0), 'input', $index, 'name']) . ' :</strong> ' . $value . '<br>';
if( $value !== '') $content .= '<strong>' . $this->getData(['module', $this->getUrl(0), 'input', $index, 'name']) . ' :</strong> ' . $value . '<br>';
}
// Bot présumé, la page sera actualisée avec l'affichage du captcha

2
module/form/view/index/index.css
View File

@ -45,7 +45,7 @@
border: 1px solid;
}
@media screen and (max-width: 768px) {
@media screen and (max-width: 799px) {
.formOuter{
width: 100%;
}

8
module/form/view/index/index.js.php
View File

@ -64,14 +64,16 @@ $( ".humanBotClose" ).click(function() {
$(document).ready(function(){
borderColor = "<?php echo $this->getData(['theme', 'block', 'borderColor']); ?>";
bgColor = "<?php echo $this->getData(['theme', 'site', 'backgroundColor']); ?>";
$(".formOuter").css("border-color", borderColor);
$(".formInputFile").css("border-color", borderColor);
$(".formOuter").css("background-color", bgColor);
$(".formOuter").css("border","solid 1px");
$(".formOuter").css("border-color", borderColor);
/* Modifier la couleur au survol */
$( ".formOuter" ).mouseenter(function() {
$(".formOuter").css("background-color", borderColor);
$(".formOuter").css("border-radius","5px");
});
$( ".formOuter" ).mouseleave(function() {
$(".formOuter").css("background-color", bgColor);
$(".formOuter").css("border-radius","0px");
});
});

1
module/news/ressource/defaultdata.php
View File

@ -8,6 +8,7 @@ class init extends news {
'height' => -1,
'versionData' => self::VERSION,
'hiddeTitle' => false,
'hideMedia' => false,
'sameHeight' => false,
'noMargin' => true
];

4
module/news/view/index/index.css
View File

@ -56,6 +56,10 @@
color: grey;
}
.newsTitle{
margin-left: 5px;
}
/*
* Flux RSS
*/

2
module/statislite/view/index/index.css
View File

@ -34,7 +34,7 @@
.v20 { width: 20%; }
.v10 { width: 10%; }
@media screen and (max-width: 768px) {
@media screen and (max-width: 799px) {
.v100 { width: 100%; }
.v90 { width: 90%; }
.v80 { width: 80%; }