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

blocks et aide slider

This commit is contained in:
Deltacms 2022-12-03 23:33:28 +01:00
parent bf1623d4dd
commit bbb27096f6
6 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/core.php
View File

@ -2391,12 +2391,12 @@ class core extends common {
$css .= '.helpButton span:hover{color:' . $colors['darken'] . '}'; $css .= '.helpButton span:hover{color:' . $colors['darken'] . '}';
$css .= '.button:active,button[type=\'submit\']:active,.pagination a:active{background-color:' . $colors['veryDarken'] . '}'; $css .= '.button:active,button[type=\'submit\']:active,.pagination a:active{background-color:' . $colors['veryDarken'] . '}';
$colors = helper::colorVariants($this->getData(['theme', 'title', 'textColor'])); $colors = helper::colorVariants($this->getData(['theme', 'title', 'textColor']));
$css .= 'h1,h2,h3,h4,h5,h6,h1 a,h2 a,h3 a,h4 a,h5 a,h6 a,.block .blockTitle{color:' . $colors['normal'] . ';font-family:"' . $this->getData(['fonts', $this->getData(['theme', 'title', 'font']), 'name']) . '",sans-serif;font-weight:' . $this->getData(['theme', 'title', 'fontWeight']) . ';text-transform:' . $this->getData(['theme', 'title', 'textTransform']) . '}'; $css .= 'h1,h2,h3,h4,h5,h6,h1 a,h2 a,h3 a,h4 a,h5 a,h6 a,.blockTitle{color:' . $colors['normal'] . ';font-family:"' . $this->getData(['fonts', $this->getData(['theme', 'title', 'font']), 'name']) . '",sans-serif;font-weight:' . $this->getData(['theme', 'title', 'fontWeight']) . ';text-transform:' . $this->getData(['theme', 'title', 'textTransform']) . '}';
$css .= 'h1 a:hover,h2 a:hover,h3 a:hover,h4 a:hover,h5 a:hover,h6 a:hover{color:' . $colors['darken'] . '}'; $css .= 'h1 a:hover,h2 a:hover,h3 a:hover,h4 a:hover,h5 a:hover,h6 a:hover{color:' . $colors['darken'] . '}';
// Les blocs // Les blocs
$colors = helper::colorVariants($this->getData(['theme', 'block', 'backgroundTitleColor'])); $colors = helper::colorVariants($this->getData(['theme', 'block', 'backgroundTitleColor']));
$css .= '.block {border: 1px solid ' . $this->getdata(['theme','block','borderColor']) . ';background-color: ' . $this->getdata(['theme','block','backgroundColor']) .';border-radius: ' . $this->getdata(['theme','block','blockBorderRadius']) . ';box-shadow :' . $this->getdata(['theme','block','blockBorderShadow']) . ' ' . $this->getdata(['theme','block','borderColor']) . ';}'; $css .= '.block {border: 1px solid ' . $this->getdata(['theme','block','borderColor']) . ';background-color: ' . $this->getdata(['theme','block','backgroundColor']) .';border-radius: ' . $this->getdata(['theme','block','blockBorderRadius']) . ';box-shadow :' . $this->getdata(['theme','block','blockBorderShadow']) . ' ' . $this->getdata(['theme','block','borderColor']) . ';}';
$css .= '.block > h4, .block .blockTitle {background-color:'. $colors['normal'] . ';color:' . $colors['text'] .';border-radius: ' . $this->getdata(['theme','block','blockBorderRadius']) . ' ' . $this->getdata(['theme','block','blockBorderRadius']) . ' 0px 0px;}'; $css .= '.block > h4, .blockTitle {background-color:'. $colors['normal'] . ';color:' . $colors['text'] .';border-radius: ' . $this->getdata(['theme','block','blockBorderRadius']) . ' ' . $this->getdata(['theme','block','blockBorderRadius']) . ' 0px 0px;}';
$css .= '.block > p {margin: 0px -5px;}'; $css .= '.block > p {margin: 0px -5px;}';
//$css .= '.mce-tinymce {border: 1px solid ' . $this->getdata(['theme','block','borderColor']) .' !important;}'; //$css .= '.mce-tinymce {border: 1px solid ' . $this->getdata(['theme','block','borderColor']) .' !important;}';
@ -2572,7 +2572,7 @@ class core extends common {
$colors = helper::colorVariants($this->getData(['admin','backgroundColor'])); $colors = helper::colorVariants($this->getData(['admin','backgroundColor']));
$css .= '#site{background-color:' . $colors['normal']. ';}'; $css .= '#site{background-color:' . $colors['normal']. ';}';
$css .= '.row > div {font:' . $this->getData(['admin','fontSize']) . ' "' . $this->getData(['fonts', $this->getData(['admin', 'fontText']), 'name']) . '", sans-serif;}'; $css .= '.row > div {font:' . $this->getData(['admin','fontSize']) . ' "' . $this->getData(['fonts', $this->getData(['admin', 'fontText']), 'name']) . '", sans-serif;}';
$css .= 'body h1, h2, h3, .block > h4, .block .blockTitle, h5, h6 {font-family:' . $this->getData(['fonts', $this->getData(['admin', 'fontTitle']), 'name']) . ', sans-serif;color:' . $this->getData(['admin','colorTitle' ]) . ';}'; $css .= 'body h1, h2, h3, .block > h4, .blockTitle, h5, h6 {font-family:' . $this->getData(['fonts', $this->getData(['admin', 'fontTitle']), 'name']) . ', sans-serif;color:' . $this->getData(['admin','colorTitle' ]) . ';}';
// TinyMCE // TinyMCE
$css .= 'body:not(.editorWysiwyg),span .zwiico-help {color:' . $this->getData(['admin','colorText']) . ';}'; $css .= 'body:not(.editorWysiwyg),span .zwiico-help {color:' . $this->getData(['admin','colorText']) . ';}';
@ -2590,9 +2590,9 @@ class core extends common {
$colors = helper::colorVariants($this->getData(['admin','backgroundColorButtonGreen'])); $colors = helper::colorVariants($this->getData(['admin','backgroundColorButtonGreen']));
$css .= '.button.buttonGreen, button[type=submit] {background-color: ' . $colors['normal'] . ';color: ' . $colors['text'] . ';}.button.buttonGreen:hover, button[type=submit]:hover {background-color: ' . $colors['darken'] . ';color: ' . $colors['text'] .';}.button.buttonGreen:active, button[type=submit]:active {background-color: ' . $colors['darken'] . ';color: ' .$colors['text'] .';}'; $css .= '.button.buttonGreen, button[type=submit] {background-color: ' . $colors['normal'] . ';color: ' . $colors['text'] . ';}.button.buttonGreen:hover, button[type=submit]:hover {background-color: ' . $colors['darken'] . ';color: ' . $colors['text'] .';}.button.buttonGreen:active, button[type=submit]:active {background-color: ' . $colors['darken'] . ';color: ' .$colors['text'] .';}';
$colors = helper::colorVariants($this->getData(['admin','backgroundBlockColor'])); $colors = helper::colorVariants($this->getData(['admin','backgroundBlockColor']));
$css .= '.block {border: 1px solid ' . $this->getData(['admin','borderBlockColor']) . ';}.block > h4, .block .blockTitle {background-color: ' . $colors['normal'] . ';color:' . $colors['text'] . ';}'; $css .= '.block {border: 1px solid ' . $this->getData(['admin','borderBlockColor']) . ';}.block > h4, .blockTitle {background-color: ' . $colors['normal'] . ';color:' . $colors['text'] . ';}';
// en admin la couleur de fond du block est la couleur de la page admin, on supprime l'ombre et le radius du block définis pour le theme // en admin la couleur de fond du block est la couleur de la page admin, on supprime l'ombre et le radius du block définis pour le theme
$css .= '.block {border-radius: 0px;box-shadow: none;}.block > h4, .block .blockTitle {border-radius: 0px;}'; $css .= '.block {border-radius: 0px;box-shadow: none;}.block > h4, .blockTitle {border-radius: 0px;}';
$css .= '.block {background-color: ' . $this->getData(['admin','backgroundColor']) . ';}'; $css .= '.block {background-color: ' . $this->getData(['admin','backgroundColor']) . ';}';
$css .= 'table tr,input[type=email],input[type=text],input[type=password],select:not(#barSelectPage),textarea:not(.editorWysiwyg),.inputFile{background-color: ' . $colors['normal'] . ';color:' . $colors['text'] . ';border: 1px solid ' . $this->getData(['admin','borderBlockColor']) . ';}'; $css .= 'table tr,input[type=email],input[type=text],input[type=password],select:not(#barSelectPage),textarea:not(.editorWysiwyg),.inputFile{background-color: ' . $colors['normal'] . ';color:' . $colors['text'] . ';border: 1px solid ' . $this->getData(['admin','borderBlockColor']) . ';}';
// Bordure du contour TinyMCE // Bordure du contour TinyMCE

6
core/layout/common.css
View File

@ -1064,13 +1064,13 @@ footer #footerSocials .zwiico-github:hover {
margin-bottom: 0; margin-bottom: 0;
} }
.block > h4, .block .blockTitle { .block > h4, .blockTitle {
margin: -20px -20px 10px -20px; margin: -20px -20px 10px -20px;
padding: 10px; padding: 10px;
} }
.blockTitle > h1, .blockTitle > h2, .blockTitle > h3, .blockTitle > h4 ,.blockTitle > h5, .blockTitle > p { .blockTitle * {
margin: 0 -5px; margin: 0;
} }
/* Aides */ /* Aides */

2
core/vendor/filemanager/config/config.php vendored
View File

@ -485,7 +485,7 @@ $config = array(
//********************** //**********************
//Allowed extensions (lowercase insert) //Allowed extensions (lowercase insert)
//********************** //**********************
'ext_img' => array( 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'tiff','svg', 'ico', 'webp', 'avif' ), //Images 'ext_img' => array( 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'tiff','svg', 'ico', 'webp' ), //Images
'ext_file' => array( 'doc', 'docx', 'rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv', 'html', 'xhtml', 'psd', 'sql', 'log', 'fla', 'xml', 'ade', 'adp', 'mdb', 'accdb', 'ppt', 'pptx', 'odt', 'ots', 'ott', 'odb', 'odg', 'otp', 'otg', 'odf', 'ods', 'odp', 'css', 'ai', 'kmz', 'dwg', 'dxf', 'hpgl', 'plt', 'spl', 'step', 'stp', 'iges', 'igs', 'sat', 'cgm', 'ics', 'gpx', 'kml', 'ttf', 'otf', 'woff', 'woff2', ''), //Files 'ext_file' => array( 'doc', 'docx', 'rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv', 'html', 'xhtml', 'psd', 'sql', 'log', 'fla', 'xml', 'ade', 'adp', 'mdb', 'accdb', 'ppt', 'pptx', 'odt', 'ots', 'ott', 'odb', 'odg', 'otp', 'otg', 'odf', 'ods', 'odp', 'css', 'ai', 'kmz', 'dwg', 'dxf', 'hpgl', 'plt', 'spl', 'step', 'stp', 'iges', 'igs', 'sat', 'cgm', 'ics', 'gpx', 'kml', 'ttf', 'otf', 'woff', 'woff2', ''), //Files
'ext_video' => array( 'mov', 'mpeg', 'm4v', 'mp4', 'avi', 'mpg', 'wma', 'webm' ), //Video 'ext_video' => array( 'mov', 'mpeg', 'm4v', 'mp4', 'avi', 'mpg', 'wma', 'webm' ), //Video
'ext_music' => array( 'mp3', 'mpga', 'm4a', 'ac3', 'aiff', 'mid', 'ogg', 'wav' ), //Audio 'ext_music' => array( 'mp3', 'mpga', 'm4a', 'ac3', 'aiff', 'mid', 'ogg', 'wav' ), //Audio

6
module/gallery/gallery.php
View File

@ -19,7 +19,7 @@
class gallery extends common { class gallery extends common {
const VERSION = '4.2'; const VERSION = '4.3';
const REALNAME = 'Galerie'; const REALNAME = 'Galerie';
const DELETE = true; const DELETE = true;
const UPDATE = '0.0'; const UPDATE = '0.0';
@ -76,8 +76,8 @@ class gallery extends common {
// Mettre à jour la version // Mettre à jour la version
$this->setData(['module',$this->getUrl(0),'config', 'versionData', '4.0' ]); $this->setData(['module',$this->getUrl(0),'config', 'versionData', '4.0' ]);
} }
if (version_compare($versionData, '4.2', '<') ) { if (version_compare($versionData, '4.3', '<') ) {
$this->setData(['module',$this->getUrl(0),'config', 'versionData', '4.2' ]); $this->setData(['module',$this->getUrl(0),'config', 'versionData', '4.3' ]);
} }
} }

3
module/slider/view/config/config.help.html
View File

@ -6,5 +6,4 @@
une image trop grande va augmenter le temps de chargement du diaporama. Je vous conseille des images de largeur minimum 800px une image trop grande va augmenter le temps de chargement du diaporama. Je vous conseille des images de largeur minimum 800px
si votre paramétrage de la " Largeur maxi du diaporama " est à 800px.</p> si votre paramétrage de la " Largeur maxi du diaporama " est à 800px.</p>
<h3>PARAMETRAGE</h3> <h3>PARAMETRAGE</h3>
<p>Vidéo de présentation de la version réalisée pour Zwiicms</p> <iframe title="slider_FR" src="https://video.ploud.fr/videos/embed/45f263c5-6c1b-4a5d-a05e-7bd76e5232e3" allowfullscreen="" sandbox="allow-same-origin allow-scripts allow-popups" width="560" height="315" frameborder="0"></iframe>
<iframe width="333" height="185" src="https://www.youtube.com/embed/jLCe73DBbdQ" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen="allowfullscreen"></iframe>

3
module/slider/view/config/config.help_en.html
View File

@ -6,5 +6,4 @@
an image that is too large will increase the loading time of the slideshow. I advise you to use images with a minimum width of 800px an image that is too large will increase the loading time of the slideshow. I advise you to use images with a minimum width of 800px
if your setting of the "Maximum width of the slideshow" is 800px.</p> if your setting of the "Maximum width of the slideshow" is 800px.</p>
<h3>SETTINGS</h3> <h3>SETTINGS</h3>
<p>Video presentation of the version made for Zwiicms</p> <iframe title="slider_EN" src="https://video.ploud.fr/videos/embed/976895ef-966b-4075-9637-ad1c3422fca1" allowfullscreen="" sandbox="allow-same-origin allow-scripts allow-popups" width="560" height="315" frameborder="0"></iframe>
<iframe width="333" height="185" src="https://www.youtube.com/embed/jLCe73DBbdQ" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen="allowfullscreen"></iframe>