diff --git a/CHANGES.md b/CHANGES.md index f3672e7..b6a756b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,7 +5,7 @@ - Une troisième langue d'administration est disponible : espagnol / castillan, - Thème / Menu : le menu en petit écran (burger) dispose maintenant de ses propres paramètres, - Modules du coeur et de page : renforcement de la sécurité, - - Module de type galerie: 'Album' remplace 'Gallery', les vignettes respectent le format des photos. Gallery est disponible en téléchargement sur https://deltacms.fr/modules, + - Module de type galerie: 'Album' remplace 'Gallery', les vignettes respectent le format des photos, 'Album' permet la géolocalisation des photos. Gallery est disponible en téléchargement sur https://deltacms.fr/modules, - Langues : la traduction automatique est supprimée, ce qui parachève la dégooglisation de Deltacms, - Edition de page / emplacement dans le menu : une page désactivée est signalée par le curseur 'not-allowed' et par une typographie italique en petit écran, son lien est inactif, - Nouveaux gabarits pour l'éditeur Tinymce : accordéon à 3 et 4 paragraphes, diff --git a/core/module/install/ressource/database_en/base/content/photo-album.html b/core/module/install/ressource/database_en/base/content/photo-album.html new file mode 100644 index 0000000..5fe2129 --- /dev/null +++ b/core/module/install/ressource/database_en/base/content/photo-album.html @@ -0,0 +1 @@ +

This page contains a photo album module. Click on one of the albums below to see the photos it contains.

\ No newline at end of file diff --git a/core/module/install/ressource/database_en/base/module.json b/core/module/install/ressource/database_en/base/module.json index 7dca570..6d18bd0 100644 --- a/core/module/install/ressource/database_en/base/module.json +++ b/core/module/install/ressource/database_en/base/module.json @@ -160,27 +160,35 @@ "style": "site\/data\/search\/erreur404\/theme.css" } }, - "galeries": { - "greece": { - "config": { - "name": "Greece", - "directory": "site\/file\/source\/galerie\/grece", - "homePicture": null, - "sort": "SORT_ASC", - "position": 0 - }, - "legend": [], - "order": [] - }, + "photo-album": { "knock-knock": { "config": { "name": "Knock knock", "directory": "site\/file\/source\/galerie\/toctoc", - "homePicture": null, + "homePicture": "a.jpg", "sort": "SORT_ASC", "position": 2 }, - "legend": [], + "legend": { + "ajpg": "", + "bjpg": "", + "cjpg": "" + }, + "order": [] + }, + "geolocation": { + "config": { + "name": "Geolocation", + "directory": "site\/file\/source\/galerie\/geotag", + "homePicture": "estaens_2.jpg", + "sort": "SORT_ASC", + "position": 2 + }, + "legend": { + "estaens_1jpg": "", + "estaens_2jpg": "", + "estaens_3jpg": "" + }, "order": [] } } diff --git a/core/module/install/ressource/database_en/base/page.json b/core/module/install/ressource/database_en/base/page.json index 9f358ea..38945e7 100644 --- a/core/module/install/ressource/database_en/base/page.json +++ b/core/module/install/ressource/database_en/base/page.json @@ -128,32 +128,6 @@ "hideMenuSide": false, "hideMenuChildren": false }, - "galeries": { - "typeMenu": "text", - "iconUrl": "", - "disable": false, - "content": "galeries.html", - "hideTitle": false, - "breadCrumb": false, - "metaDescription": "", - "metaTitle": "", - "moduleId": "album", - "modulePosition": "bottom", - "parentPageId": "", - "position": 5, - "group": 0, - "groupEdit": 2, - "targetBlank": false, - "title": "Image galleries", - "shortTitle": "Galleries", - "block": "12", - "barLeft": "", - "barRight": "", - "displayMenu": "none", - "hideMenuSide": false, - "hideMenuHead": false, - "hideMenuChildren": false - }, "deltacms": { "typeMenu": "text", "iconUrl": "", @@ -410,6 +384,32 @@ "hideMenuSide": false, "hideMenuHead": false, "hideMenuChildren": false + }, + "photo-album": { + "typeMenu": "text", + "iconUrl": "", + "disable": false, + "content": "photo-album.html", + "hideTitle": false, + "breadCrumb": false, + "metaDescription": "", + "metaTitle": "", + "moduleId": "album", + "modulePosition": "bottom", + "parentPageId": "", + "position": 5, + "group": 0, + "groupEdit": 2, + "targetBlank": false, + "title": "Photo album", + "shortTitle": "Album", + "block": "12", + "barLeft": "", + "barRight": "", + "displayMenu": "none", + "hideMenuSide": false, + "hideMenuHead": false, + "hideMenuChildren": false } } } \ No newline at end of file diff --git a/core/module/install/ressource/database_es/base/content/album-de-fotos.html b/core/module/install/ressource/database_es/base/content/album-de-fotos.html new file mode 100644 index 0000000..56ab232 --- /dev/null +++ b/core/module/install/ressource/database_es/base/content/album-de-fotos.html @@ -0,0 +1 @@ +

Esta página contiene un módulo de álbum de fotos. Haga clic en uno de los álbumes siguientes para ver las fotos que contiene.

\ No newline at end of file diff --git a/core/module/install/ressource/database_es/base/module.json b/core/module/install/ressource/database_es/base/module.json index f7796a0..42d860c 100644 --- a/core/module/install/ressource/database_es/base/module.json +++ b/core/module/install/ressource/database_es/base/module.json @@ -158,27 +158,35 @@ ], "draft": "" }, - "galeria": { + "album-de-fotos": { "toque-toque": { "config": { "name": "Toque toque", "directory": "site\/file\/source\/galerie\/toctoc", - "homePicture": null, + "homePicture": "a.jpg", "sort": "SORT_ASC", "position": 0 }, - "legend": [], + "legend": { + "ajpg": "", + "bjpg": "", + "cjpg": "" + }, "order": [] }, - "grecia": { + "geolocalizacion": { "config": { - "name": "Grecia", - "directory": "site\/file\/source\/galerie\/grece", - "homePicture": null, + "name": "Geolocalización", + "directory": "site\/file\/source\/galerie\/geotag", + "homePicture": "estaens_2.jpg", "sort": "SORT_ASC", "position": 2 }, - "legend": [], + "legend": { + "estaens_1jpg": "", + "estaens_2jpg": "", + "estaens_3jpg": "" + }, "order": [] } } diff --git a/core/module/install/ressource/database_es/base/page.json b/core/module/install/ressource/database_es/base/page.json index 9297f06..371d1b3 100644 --- a/core/module/install/ressource/database_es/base/page.json +++ b/core/module/install/ressource/database_es/base/page.json @@ -237,32 +237,6 @@ "hideMenuHead": false, "hideMenuChildren": true }, - "galeria": { - "typeMenu": "text", - "iconUrl": "", - "disable": false, - "content": "galeria.html", - "hideTitle": false, - "breadCrumb": false, - "metaDescription": "", - "metaTitle": "", - "moduleId": "album", - "modulePosition": "bottom", - "parentPageId": "", - "position": 5, - "group": 0, - "groupEdit": 2, - "targetBlank": false, - "title": "Galeria", - "shortTitle": "Galeria", - "block": "12", - "barLeft": "", - "barRight": "", - "displayMenu": "none", - "hideMenuSide": false, - "hideMenuHead": false, - "hideMenuChildren": false - }, "pagina-privada": { "typeMenu": "text", "iconUrl": "", @@ -418,6 +392,32 @@ "hideMenuSide": false, "hideMenuHead": false, "hideMenuChildren": false + }, + "album-de-fotos": { + "typeMenu": "text", + "iconUrl": "", + "disable": false, + "content": "album-de-fotos.html", + "hideTitle": false, + "breadCrumb": false, + "metaDescription": "", + "metaTitle": "", + "moduleId": "album", + "modulePosition": "bottom", + "parentPageId": "", + "position": 5, + "group": 0, + "groupEdit": 2, + "targetBlank": false, + "title": "Álbum de fotos", + "shortTitle": "Álbum", + "block": "12", + "barLeft": "", + "barRight": "", + "displayMenu": "none", + "hideMenuSide": false, + "hideMenuHead": false, + "hideMenuChildren": false } } } \ No newline at end of file diff --git a/core/module/install/ressource/database_fr/base/module.json b/core/module/install/ressource/database_fr/base/module.json index b79855f..4f2c3ee 100644 --- a/core/module/install/ressource/database_fr/base/module.json +++ b/core/module/install/ressource/database_fr/base/module.json @@ -148,22 +148,30 @@ "config": { "name": "Toc toc", "directory": "site\/file\/source\/galerie\/toctoc", - "homePicture": null, + "homePicture": "a.jpg", "sort": "SORT_ASC", "position": 0 }, - "legend": [], + "legend": { + "ajpg": "", + "bjpg": "", + "cjpg": "" + }, "order": [] }, "geolocalisation": { "config": { "name": "Géolocalisation", "directory": "site\/file\/source\/galerie\/geotag", - "homePicture": null, + "homePicture": "estaens_2.jpg", "sort": "SORT_ASC", "position": 3 }, - "legend": [], + "legend": { + "estaens_1jpg": "", + "estaens_2jpg": "", + "estaens_3jpg": "" + }, "order": [] } } diff --git a/core/module/install/ressource/files.tar.gz b/core/module/install/ressource/files.tar.gz index 8735e2c..a3b4291 100644 Binary files a/core/module/install/ressource/files.tar.gz and b/core/module/install/ressource/files.tar.gz differ diff --git a/core/module/install/ressource/themes/theme_banniere_animee_85vw.zip b/core/module/install/ressource/themes/theme_banniere_animee_85vw.zip index dbd856c..ce3378f 100644 Binary files a/core/module/install/ressource/themes/theme_banniere_animee_85vw.zip and b/core/module/install/ressource/themes/theme_banniere_animee_85vw.zip differ diff --git a/core/module/install/ressource/themes/theme_default.zip b/core/module/install/ressource/themes/theme_default.zip index 5808fa4..2630d90 100644 Binary files a/core/module/install/ressource/themes/theme_default.zip and b/core/module/install/ressource/themes/theme_default.zip differ diff --git a/core/module/install/ressource/themes/theme_sansbanniere_fluide.zip b/core/module/install/ressource/themes/theme_sansbanniere_fluide.zip index 84a07a2..7fb3e4e 100644 Binary files a/core/module/install/ressource/themes/theme_sansbanniere_fluide.zip and b/core/module/install/ressource/themes/theme_sansbanniere_fluide.zip differ diff --git a/core/module/install/ressource/themes/theme_sombre_islande_fluide.zip b/core/module/install/ressource/themes/theme_sombre_islande_fluide.zip index 4eba17d..024faa3 100644 Binary files a/core/module/install/ressource/themes/theme_sombre_islande_fluide.zip and b/core/module/install/ressource/themes/theme_sombre_islande_fluide.zip differ diff --git a/core/module/theme/resource/custom.css b/core/module/theme/resource/custom.css index 8ccec76..e545a8d 100644 --- a/core/module/theme/resource/custom.css +++ b/core/module/theme/resource/custom.css @@ -239,3 +239,32 @@ figure.image figcaption { text-align: center; } */ + +/* Module Agenda : grille de l'agenda */ +.fc-unthemed th, .fc-unthemed td, .fc-unthemed thead, .fc-unthemed tbody, .fc-unthemed .fc-divider, .fc-unthemed .fc-row, .fc-unthemed .fc-content, .fc-unthemed .fc-popover, .fc-unthemed .fc-list-view, .fc-unthemed .fc-list-heading td, .fc .fc-row .fc-content-skeleton td{ + border-color: rgba(146, 52, 101, 1); +} + +/* Module Album photo */ + +/* Cases contenant les vignettes */ +.galleryPicture, .galleryGalleryPicture { +/*exemple background-color: green;*/ +} +.galleryPicture:hover, .galleryGalleryPicture:hover { +/*exemple background-color: yellow;*/ +} +/* Nom ou légende de l'image */ +.galleryName, .galleryGalleryName { +/*exemple color: white;*/ +} +.galleryName:hover, .galleryGalleryName:hover { +/*exemple color: black;*/ +} +/* Nom ou légende des images redimensionnées */ +.picResized { +/*exemple color: red;*/ +} +.picResized:hover{ +/*exemple color: orange;*/ +} diff --git a/module/album/album.php b/module/album/album.php index b4468d9..aaedc98 100644 --- a/module/album/album.php +++ b/module/album/album.php @@ -5,7 +5,7 @@ */ setlocale(LC_NUMERIC,'English','en_US','en_US.UTF-8'); class album extends common { - const VERSION = '2.3'; + const VERSION = '2.4'; const REALNAME = 'Album Photo'; const DELETE = true; const UPDATE = '0.0'; diff --git a/module/album/plugins/thumbnailer.php b/module/album/plugins/thumbnailer.php index ae80db8..2058b8c 100644 --- a/module/album/plugins/thumbnailer.php +++ b/module/album/plugins/thumbnailer.php @@ -1,20 +1,21 @@ diff --git a/module/album/view/gallery/gallery.js.php b/module/album/view/gallery/gallery.js.php index 4a06532..20c1b46 100644 --- a/module/album/view/gallery/gallery.js.php +++ b/module/album/view/gallery/gallery.js.php @@ -11,3 +11,33 @@ $(".galleryGalleryPicture").simpleLightbox({ captionsData: "caption", closeText: "×" }); + + $(function () { +// @Lionel 2019 + +var taille = "getData(['theme','site', 'width']); ?>"; + + switch(taille) + { + case '75vw': + $('a.galleryPicture').css('height', '165px');//view/index + $('a.galleryGalleryPicture').css('height', '110px');//view/gallery + $('div.galleryGalleryName').css('font-size', '0.8em');//view/gallery + break; + case '85vw': + $('a.galleryPicture').css('height', '200px'); + $('a.galleryGalleryPicture').css('height', '135px'); + $('div.galleryGalleryName').css('font-size', '0.85em'); + break; + case '95vw': + $('a.galleryPicture').css('height', '235px'); + $('a.galleryGalleryPicture').css('height', '160px'); + $('div.galleryGalleryName').css('font-size', '0.9em'); + break; + default: + $('a.galleryPicture').css('height', '250px'); + $('a.galleryGalleryPicture').css('height', '185px'); + $('div.galleryGalleryName').css('font-size', '1em'); + break; + } +});