diff --git a/CHANGES.md b/CHANGES.md index a56a398..d74e32f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,7 +5,7 @@ - Ajout du groupe éditeur, autorisations limitées à l'édition des pages, l'ajout de fichiers, l'accès aux pages privées membre et éditeur, - Adaptation des modules de page à ce nouveau groupe avec des actions autorisées très limitées, - Nouvelle option dans l'édition d'une page, permissions : sélection du groupe requis pour modifier la page, - - Module Gallery, sélection du dossier incluant les images : exclusion de certains dossiers, + - Modules Gallery et Slider, sélection du dossier : seuls les dossiers incluant au moins une image sont proposés et exclusion de certains dossiers - Corrections : - Affichage du sous-menu avec un alignement du contenu à droite : il y avait un décalage du site quand les pages situées à la droite du menu possédaient des pages enfants. diff --git a/core/vendor/zwiico/ico/favicon.ico b/core/vendor/zwiico/ico/favicon.ico deleted file mode 100644 index 218421a..0000000 Binary files a/core/vendor/zwiico/ico/favicon.ico and /dev/null differ diff --git a/core/vendor/zwiico/ico/faviconDark.ico b/core/vendor/zwiico/ico/faviconDark.ico deleted file mode 100644 index 2063f4b..0000000 Binary files a/core/vendor/zwiico/ico/faviconDark.ico and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/a.png b/core/vendor/zwiico/png/alpha/a.png deleted file mode 100644 index f593d09..0000000 Binary files a/core/vendor/zwiico/png/alpha/a.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/b.png b/core/vendor/zwiico/png/alpha/b.png deleted file mode 100644 index 81cf288..0000000 Binary files a/core/vendor/zwiico/png/alpha/b.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/c.png b/core/vendor/zwiico/png/alpha/c.png deleted file mode 100644 index dff57e3..0000000 Binary files a/core/vendor/zwiico/png/alpha/c.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/d.png b/core/vendor/zwiico/png/alpha/d.png deleted file mode 100644 index 9b105b7..0000000 Binary files a/core/vendor/zwiico/png/alpha/d.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/e.png b/core/vendor/zwiico/png/alpha/e.png deleted file mode 100644 index 81b55ec..0000000 Binary files a/core/vendor/zwiico/png/alpha/e.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/f.png b/core/vendor/zwiico/png/alpha/f.png deleted file mode 100644 index fa4a06c..0000000 Binary files a/core/vendor/zwiico/png/alpha/f.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/g.png b/core/vendor/zwiico/png/alpha/g.png deleted file mode 100644 index 2d7b592..0000000 Binary files a/core/vendor/zwiico/png/alpha/g.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/h.png b/core/vendor/zwiico/png/alpha/h.png deleted file mode 100644 index 9088d4b..0000000 Binary files a/core/vendor/zwiico/png/alpha/h.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/i.png b/core/vendor/zwiico/png/alpha/i.png deleted file mode 100644 index 670cafc..0000000 Binary files a/core/vendor/zwiico/png/alpha/i.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/j.png b/core/vendor/zwiico/png/alpha/j.png deleted file mode 100644 index 9840f7d..0000000 Binary files a/core/vendor/zwiico/png/alpha/j.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/k.png b/core/vendor/zwiico/png/alpha/k.png deleted file mode 100644 index fdbcf58..0000000 Binary files a/core/vendor/zwiico/png/alpha/k.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/l.png b/core/vendor/zwiico/png/alpha/l.png deleted file mode 100644 index ca755c7..0000000 Binary files a/core/vendor/zwiico/png/alpha/l.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/m.png b/core/vendor/zwiico/png/alpha/m.png deleted file mode 100644 index 740fe25..0000000 Binary files a/core/vendor/zwiico/png/alpha/m.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/n.png b/core/vendor/zwiico/png/alpha/n.png deleted file mode 100644 index 6de25a7..0000000 Binary files a/core/vendor/zwiico/png/alpha/n.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/o.png b/core/vendor/zwiico/png/alpha/o.png deleted file mode 100644 index a8162d3..0000000 Binary files a/core/vendor/zwiico/png/alpha/o.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/p.png b/core/vendor/zwiico/png/alpha/p.png deleted file mode 100644 index 0ad3549..0000000 Binary files a/core/vendor/zwiico/png/alpha/p.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/q.png b/core/vendor/zwiico/png/alpha/q.png deleted file mode 100644 index f9c9a1c..0000000 Binary files a/core/vendor/zwiico/png/alpha/q.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/r.png b/core/vendor/zwiico/png/alpha/r.png deleted file mode 100644 index 8f72644..0000000 Binary files a/core/vendor/zwiico/png/alpha/r.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/s.png b/core/vendor/zwiico/png/alpha/s.png deleted file mode 100644 index 84d4e49..0000000 Binary files a/core/vendor/zwiico/png/alpha/s.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/t.png b/core/vendor/zwiico/png/alpha/t.png deleted file mode 100644 index 8a643cc..0000000 Binary files a/core/vendor/zwiico/png/alpha/t.png and /dev/null differ diff --git a/core/vendor/zwiico/png/alpha/u.png b/core/vendor/zwiico/png/alpha/u.png deleted file mode 100644 index 53af242..0000000 Binary files a/core/vendor/zwiico/png/alpha/u.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/a.png b/core/vendor/zwiico/png/num/a.png deleted file mode 100644 index a9b6726..0000000 Binary files a/core/vendor/zwiico/png/num/a.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/b.png b/core/vendor/zwiico/png/num/b.png deleted file mode 100644 index fee7c02..0000000 Binary files a/core/vendor/zwiico/png/num/b.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/c.png b/core/vendor/zwiico/png/num/c.png deleted file mode 100644 index 2208fe5..0000000 Binary files a/core/vendor/zwiico/png/num/c.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/d.png b/core/vendor/zwiico/png/num/d.png deleted file mode 100644 index 879ec3e..0000000 Binary files a/core/vendor/zwiico/png/num/d.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/e.png b/core/vendor/zwiico/png/num/e.png deleted file mode 100644 index f3e67e0..0000000 Binary files a/core/vendor/zwiico/png/num/e.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/f.png b/core/vendor/zwiico/png/num/f.png deleted file mode 100644 index e659351..0000000 Binary files a/core/vendor/zwiico/png/num/f.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/g.png b/core/vendor/zwiico/png/num/g.png deleted file mode 100644 index cba1212..0000000 Binary files a/core/vendor/zwiico/png/num/g.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/h.png b/core/vendor/zwiico/png/num/h.png deleted file mode 100644 index ee1437d..0000000 Binary files a/core/vendor/zwiico/png/num/h.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/i.png b/core/vendor/zwiico/png/num/i.png deleted file mode 100644 index 09dac6b..0000000 Binary files a/core/vendor/zwiico/png/num/i.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/j.png b/core/vendor/zwiico/png/num/j.png deleted file mode 100644 index 2dd0ada..0000000 Binary files a/core/vendor/zwiico/png/num/j.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/k.png b/core/vendor/zwiico/png/num/k.png deleted file mode 100644 index 3bffa77..0000000 Binary files a/core/vendor/zwiico/png/num/k.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/l.png b/core/vendor/zwiico/png/num/l.png deleted file mode 100644 index 793ed53..0000000 Binary files a/core/vendor/zwiico/png/num/l.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/m.png b/core/vendor/zwiico/png/num/m.png deleted file mode 100644 index d1a95f7..0000000 Binary files a/core/vendor/zwiico/png/num/m.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/n.png b/core/vendor/zwiico/png/num/n.png deleted file mode 100644 index 344df24..0000000 Binary files a/core/vendor/zwiico/png/num/n.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/o.png b/core/vendor/zwiico/png/num/o.png deleted file mode 100644 index 2bb1064..0000000 Binary files a/core/vendor/zwiico/png/num/o.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/p.png b/core/vendor/zwiico/png/num/p.png deleted file mode 100644 index 1d31afc..0000000 Binary files a/core/vendor/zwiico/png/num/p.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/q.png b/core/vendor/zwiico/png/num/q.png deleted file mode 100644 index bf46e2c..0000000 Binary files a/core/vendor/zwiico/png/num/q.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/r.png b/core/vendor/zwiico/png/num/r.png deleted file mode 100644 index ed99bf1..0000000 Binary files a/core/vendor/zwiico/png/num/r.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/s.png b/core/vendor/zwiico/png/num/s.png deleted file mode 100644 index ed3f7fc..0000000 Binary files a/core/vendor/zwiico/png/num/s.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/t.png b/core/vendor/zwiico/png/num/t.png deleted file mode 100644 index 966f682..0000000 Binary files a/core/vendor/zwiico/png/num/t.png and /dev/null differ diff --git a/core/vendor/zwiico/png/num/u.png b/core/vendor/zwiico/png/num/u.png deleted file mode 100644 index 60f5b42..0000000 Binary files a/core/vendor/zwiico/png/num/u.png and /dev/null differ diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php index 40da7e7..83536b3 100644 --- a/module/gallery/gallery.php +++ b/module/gallery/gallery.php @@ -259,7 +259,7 @@ class gallery extends common { self::$galleries[] = [ template::ico('sort'), $gallery['config']['name'], - $gallery['config']['directory'], + str_replace('site/file/source/','',$gallery['config']['directory']), template::button('galleryConfigEdit' . $galleryId , [ 'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $galleryId . '/' . $_SESSION['csrf'], 'value' => template::ico('pencil') diff --git a/module/gallery/view/config/config.js.php b/module/gallery/view/config/config.js.php index e38292b..c21bd51 100644 --- a/module/gallery/view/config/config.js.php +++ b/module/gallery/view/config/config.js.php @@ -63,7 +63,9 @@ function dirs() { directoryDOM.empty(); for(var i = 0; i < result.length; i++) { directoryDOM.append(function(i) { - var option = $("