From 374439755c47ff6cdd567411b57783883b1a768f Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 5 Apr 2021 14:38:31 +0200 Subject: [PATCH] Gallery correction init --- module/gallery/gallery.php | 15 +++-- module/gallery/view/gallery/gallery.css | 79 ------------------------- module/gallery/view/index/index.css | 79 ------------------------- 3 files changed, 10 insertions(+), 163 deletions(-) delete mode 100755 module/gallery/view/gallery/gallery.css delete mode 100755 module/gallery/view/index/index.css diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php index 1da334b0..7ecdb7d2 100755 --- a/module/gallery/gallery.php +++ b/module/gallery/gallery.php @@ -149,10 +149,12 @@ class gallery extends common { */ private function update() { - // Installation des données par défaut + // Variables génériques $class = get_called_class(); $moduleId = $this->getUrl(0); - if ( $this->getData(['module', $this->getUrl(0), 'config',]) === null ) { + + // Installation des données de thème par défaut + if ( $this->getData(['module', $this->getUrl(0), 'config']) === null ) { require_once('module/gallery/ressource/defaultdata.php'); $this->setData(['module', $this->getUrl(0), 'config', theme::$defaultData]); @@ -164,10 +166,13 @@ class gallery extends common { // Nom de la feuille de style $fileCSS = self::DATA_DIR . 'modules/' . $class . '/' . $moduleId . '.css' ; $this->setData(['module', $this->getUrl(0), 'config', 'style', $fileCSS]); - } - // Générer la feuille de CSS - if (!file_exists(self::DATA_DIR . 'modules/' . $class . '/' . $moduleId . '.css' )) { + // Créer le dossier du module + if (!is_dir(self::DATA_DIR . 'modules/' . $class)) { + mkdir (self::DATA_DIR . 'modules/' . $class, 0777, true); + } + + // Générer la feuille de CSS $content = file_get_contents('module/gallery/ressource/vartheme.css'); $themeCss = file_get_contents('module/gallery/ressource/theme.css'); // Injection des variables diff --git a/module/gallery/view/gallery/gallery.css b/module/gallery/view/gallery/gallery.css deleted file mode 100755 index a9da4105..00000000 --- a/module/gallery/view/gallery/gallery.css +++ /dev/null @@ -1,79 +0,0 @@ -.galleryRow { - --thumbAlign: center; -} -.colPicture { - --thumbWidth: 18em; - --thumbMargin: .5em; -} -.galleryPicture, -.galleryGalleryPicture { - --thumbHeight: 15em; - --thumbBorder: .1em; - --thumbBorderColor: rgba(221, 221, 221, 1); - --thumbRadius: .3em; - --thumbShadows: 1px 1px 10px; - --thumbShadowsColor: rgba(125, 125, 125, 1); -} -.galleryName, -.galleryGalleryName { - --legendHeight: .375em; - --legendAlign: center; - --legendTextColor: rgba(255, 255, 255, 1); - --legendBgColor: rgba(0, 0, 0, .6); -} -.galleryPicture:hover, -.galleryGalleryPicture:hover { - --thumbOpacity: .7; -} -.galleryPicture, -.galleryGalleryPicture { - display: block; - border: var(--thumbBorder) solid var(--thumbBorderColor); - height: var(--thumbHeight); - background-size: cover; - background-repeat: no-repeat; - background-position: center; - position: relative; - -webkit-transition: opacity .3s ease-out; - transition: opacity .3s ease-out; - border-radius: var(--thumbRadius); - box-shadow: var(--thumbShadows) var(--thumbShadowsColor); - -webkit-box-shadow: var(--thumbShadows) var(--thumbShadowsColor); - -moz-box-shadow: var(--thumbShadows) var(--thumbShadowsColor); -} -.galleryPicture:hover, -.galleryGalleryPicture:hover { - opacity: var(--thumbOpacity); -} -.galleryName, -.galleryGalleryName { - position: absolute; - left: 0; - right: 0; - bottom: 0; - border-radius: 0 0 calc(var(--thumbRadius)/2) calc(var(--thumbRadius)/2); - padding: var(--legendHeight); - background: var(--legendBgColor); - color: var(--legendTextColor); - text-align: var(--legendAlign); -} - -.galleryRow { - display: flex; - flex-wrap: wrap; - justify-content: var(--thumbAlign); -} - -.colPicture { - width : var(--thumbWidth); - max-width: 50%; - padding: var(--thumbMargin); - } - - @media (max-width: 432px) { - .colPicture { - width: 90%; - max-width: 90%; - margin: 0.5em; - } - } \ No newline at end of file diff --git a/module/gallery/view/index/index.css b/module/gallery/view/index/index.css deleted file mode 100755 index a9da4105..00000000 --- a/module/gallery/view/index/index.css +++ /dev/null @@ -1,79 +0,0 @@ -.galleryRow { - --thumbAlign: center; -} -.colPicture { - --thumbWidth: 18em; - --thumbMargin: .5em; -} -.galleryPicture, -.galleryGalleryPicture { - --thumbHeight: 15em; - --thumbBorder: .1em; - --thumbBorderColor: rgba(221, 221, 221, 1); - --thumbRadius: .3em; - --thumbShadows: 1px 1px 10px; - --thumbShadowsColor: rgba(125, 125, 125, 1); -} -.galleryName, -.galleryGalleryName { - --legendHeight: .375em; - --legendAlign: center; - --legendTextColor: rgba(255, 255, 255, 1); - --legendBgColor: rgba(0, 0, 0, .6); -} -.galleryPicture:hover, -.galleryGalleryPicture:hover { - --thumbOpacity: .7; -} -.galleryPicture, -.galleryGalleryPicture { - display: block; - border: var(--thumbBorder) solid var(--thumbBorderColor); - height: var(--thumbHeight); - background-size: cover; - background-repeat: no-repeat; - background-position: center; - position: relative; - -webkit-transition: opacity .3s ease-out; - transition: opacity .3s ease-out; - border-radius: var(--thumbRadius); - box-shadow: var(--thumbShadows) var(--thumbShadowsColor); - -webkit-box-shadow: var(--thumbShadows) var(--thumbShadowsColor); - -moz-box-shadow: var(--thumbShadows) var(--thumbShadowsColor); -} -.galleryPicture:hover, -.galleryGalleryPicture:hover { - opacity: var(--thumbOpacity); -} -.galleryName, -.galleryGalleryName { - position: absolute; - left: 0; - right: 0; - bottom: 0; - border-radius: 0 0 calc(var(--thumbRadius)/2) calc(var(--thumbRadius)/2); - padding: var(--legendHeight); - background: var(--legendBgColor); - color: var(--legendTextColor); - text-align: var(--legendAlign); -} - -.galleryRow { - display: flex; - flex-wrap: wrap; - justify-content: var(--thumbAlign); -} - -.colPicture { - width : var(--thumbWidth); - max-width: 50%; - padding: var(--thumbMargin); - } - - @media (max-width: 432px) { - .colPicture { - width: 90%; - max-width: 90%; - margin: 0.5em; - } - } \ No newline at end of file