diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php index 4922d356..a1d65380 100644 --- a/module/gallery/gallery.php +++ b/module/gallery/gallery.php @@ -275,7 +275,9 @@ class gallery extends common { ]), template::text('legend[' . $fileInfos->getFilename() . ']', [ 'value' => $this->getData(['module', $this->getUrl(0), $this->getUrl(2), 'legend', str_replace('.','',$fileInfos->getFilename())]) - ]) + ]), + '' + ]; } } @@ -366,14 +368,15 @@ class gallery extends common { } // Liste des galeries else { - // Tri des galeries + // Tri des galeries suivant l'ordre défini $g = $this->getData(['module', $this->getUrl(0)]); $p = helper::arrayCollumn(helper::arrayCollumn($g,'config'),'position'); asort($p,SORT_NUMERIC); $galleries = []; foreach ($p as $positionId => $item) { $galleries [$positionId] = $g[$positionId]; - } + } + // Construire le tableau foreach((array) $galleries as $galleryId => $gallery) { if(is_dir($gallery['config']['directory'])) { $iterator = new DirectoryIterator($gallery['config']['directory']); diff --git a/module/gallery/view/edit/edit.php b/module/gallery/view/edit/edit.php index ad3eacb6..36dd11bd 100644 --- a/module/gallery/view/edit/edit.php +++ b/module/gallery/view/edit/edit.php @@ -45,6 +45,6 @@ - + \ No newline at end of file diff --git a/site/file/source/galerie/landscape/desert.jpg b/site/file/source/galerie/landscape/desert.jpg old mode 100644 new mode 100755 diff --git a/site/file/source/galerie/landscape/iceberg.jpg b/site/file/source/galerie/landscape/iceberg.jpg old mode 100644 new mode 100755 diff --git a/site/file/source/galerie/landscape/meadow.jpg b/site/file/source/galerie/landscape/meadow.jpg old mode 100644 new mode 100755 diff --git a/site/file/thumb/galerie/landscape/desert.jpg b/site/file/thumb/galerie/landscape/desert.jpg index 6431f1bc..72c9a4cc 100644 Binary files a/site/file/thumb/galerie/landscape/desert.jpg and b/site/file/thumb/galerie/landscape/desert.jpg differ diff --git a/site/file/thumb/galerie/landscape/iceberg.jpg b/site/file/thumb/galerie/landscape/iceberg.jpg index 25601d39..69f56a5c 100644 Binary files a/site/file/thumb/galerie/landscape/iceberg.jpg and b/site/file/thumb/galerie/landscape/iceberg.jpg differ diff --git a/site/file/thumb/galerie/landscape/meadow.jpg b/site/file/thumb/galerie/landscape/meadow.jpg index 6c6fe2e4..66f41f68 100644 Binary files a/site/file/thumb/galerie/landscape/meadow.jpg and b/site/file/thumb/galerie/landscape/meadow.jpg differ