ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 146 Activity

Merge branch 'dev' into 12-dev

This commit is contained in:
fredtempez 2022-03-22 17:01:33 +01:00
parent 8174a0dc2a b1dabba247
commit cee76c53ce
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
module/gallery/gallery.php
View File

@ -42,6 +42,8 @@ class gallery extends common {
public static $thumbs = []; public static $thumbs = [];
public static $config = [];
public static $actions = [ public static $actions = [
'config' => self::GROUP_MODERATOR, 'config' => self::GROUP_MODERATOR,
'delete' => self::GROUP_MODERATOR, 'delete' => self::GROUP_MODERATOR,
@ -602,7 +604,6 @@ class gallery extends common {
// Mise à jour des données de module // Mise à jour des données de module
$this->update(); $this->update();
// Une seule galerie, bifurquer sur celle-ci // Une seule galerie, bifurquer sur celle-ci
$gallery = count($this->getData(['module', $this->getUrl(0), 'content'])) === 1 $gallery = count($this->getData(['module', $this->getUrl(0), 'content'])) === 1
? array_key_first($this->getData(['module', $this->getUrl(0), 'content'])) ? array_key_first($this->getData(['module', $this->getUrl(0), 'content']))
@ -621,6 +622,10 @@ class gallery extends common {
else { else {
// Images de la galerie // Images de la galerie
$directory = $this->getData(['module', $this->getUrl(0), 'content', $gallery, 'config', 'directory']); $directory = $this->getData(['module', $this->getUrl(0), 'content', $gallery, 'config', 'directory']);
// Définir les options
self::$config['homePicture'] = $this->getData(['module',$this->getUrl(0),'content', $gallery,'config','homePicture']);
self::$config['fullScreen'] = $this->getData(['module',$this->getUrl(0),'content', $gallery,'config','fullScreen']) === true ? 'fullScreen' : '';
self::$config['mono'] = count($this->getData(['module', $this->getUrl(0), 'content'])) === 1;
if(is_dir($directory)) { if(is_dir($directory)) {
$iterator = new DirectoryIterator($directory); $iterator = new DirectoryIterator($directory);
foreach($iterator as $fileInfos) { foreach($iterator as $fileInfos) {
@ -637,6 +642,7 @@ class gallery extends common {
self::$thumbs[$directory . '/' . $fileInfos->getFilename()] = file_exists( str_replace('source','thumb',$directory) . '/' . self::THUMBS_SEPARATOR . strtolower($fileInfos->getFilename())) self::$thumbs[$directory . '/' . $fileInfos->getFilename()] = file_exists( str_replace('source','thumb',$directory) . '/' . self::THUMBS_SEPARATOR . strtolower($fileInfos->getFilename()))
? str_replace('source','thumb',$directory) . '/' . self::THUMBS_SEPARATOR . strtolower($fileInfos->getFilename()) ? str_replace('source','thumb',$directory) . '/' . self::THUMBS_SEPARATOR . strtolower($fileInfos->getFilename())
: str_replace('source','thumb',$directory) . '/' . strtolower($fileInfos->getFilename()); : str_replace('source','thumb',$directory) . '/' . strtolower($fileInfos->getFilename());
} }
} }
// Tri des images par ordre alphabétique // Tri des images par ordre alphabétique

5
module/gallery/view/gallery/gallery.js.php
View File

@ -24,9 +24,8 @@ var b = new SimpleLightbox('.galleryGalleryPicture', {
}); });
$( document ).ready(function() { $( document ).ready(function() {
// Démarre en mode plein écran // Démarre en mode plein écran
var fullscreen = <?php echo json_encode($this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'config', 'fullScreen'])); ?>; if ( $("#pictureContainer").hasClass("fullScreen") ) {
if ( fullscreen === true) {
$('a#homePicture')[0].click(); $('a#homePicture')[0].click();
} }
}); });

8
module/gallery/view/gallery/gallery.php
View File

@ -1,4 +1,5 @@
<?php if ( count($this->getData(['module', $this->getUrl(0), 'content'])) !== 1): ?>
<?php if ( $module::$config['mono'] !== true): ?>
<div class="row"> <div class="row">
<div class="col1"> <div class="col1">
<?php echo template::button('galleryGalleryBack', [ <?php echo template::button('galleryGalleryBack', [
@ -9,13 +10,12 @@
</div> </div>
</div> </div>
<?php endif; ?> <?php endif; ?>
<div class="row galleryRow"> <div id="pictureContainer" class="row galleryRow <?php echo ($module::$config['fullScreen']);?> ">
<?php foreach($module::$pictures as $picture => $legend): ?> <?php foreach($module::$pictures as $picture => $legend): ?>
<div class="colPicture"> <div class="colPicture">
<a <a
href="<?php echo helper::baseUrl(false) . $picture; ?>" href="<?php echo helper::baseUrl(false) . $picture; ?>"
<?php if ( $picture === $this->getdata(['module',$this->getUrl(0),'content',$this->getUrl(1),'config','homePicture']) ) { <?php if ( strpos($picture, $module::$config['homePicture']) > 1) { echo 'id="homePicture"'; } ?>
echo 'id="homePicture"'; } ?>
class="galleryGalleryPicture" class="galleryGalleryPicture"
style="background-image:url('<?php echo helper::baseUrl(false) . $module::$thumbs[$picture]; ?>')" style="background-image:url('<?php echo helper::baseUrl(false) . $module::$thumbs[$picture]; ?>')"
data-caption="<?php echo $legend; ?>" data-caption="<?php echo $legend; ?>"