Merge branch '12300' into 12400

core/include/router.class.php

@@ -742,6 +742,11 @@ class core extends common
 									'style' => file_get_contents($stylePath)
 								]);
 							}
+							if ($output['style']) {
+								$this->addOutput([
+									'style' => file_get_contents($output['style'])
+								]);
+							}
 
 							// JS
 							$scriptPath = $modulePath . self::MODULE_DIR . $moduleId . '/view/' . $output['view'] . '/' . $output['view'] . '.js.php';
@@ -890,26 +895,11 @@ class core extends common
 				break;
 			// Layout allégé
 			case self::DISPLAY_LAYOUT_LIGHT:
-				ob_start();
 				require 'core/layout/light.php';
-
-				// Supprime les espaces, les sauts de ligne, les tabulations et autres caractères inutiles
-				$content = preg_replace('/\s+/u', ' ', ob_get_clean());
-
-				// Convertit la chaîne en UTF-8 pour conserver les caractères accentués
-				$content = mb_convert_encoding($content, 'UTF-8', 'UTF-8');
-				echo $content;
 				break;
 			// Layout principal
 			case self::DISPLAY_LAYOUT_MAIN:
-				ob_start();
 				require 'core/layout/main.php';
-				// Supprime les espaces, les sauts de ligne, les tabulations et autres caractères inutiles
-				$content = preg_replace('/\s+/u', ' ', ob_get_clean());
-
-				// Convertit la chaîne en UTF-8 pour conserver les caractères accentués
-				$content = mb_convert_encoding($content, 'UTF-8', 'UTF-8');
-				echo $content;
 				break;
 		}
 	}

core/module/install/ressource/defaultdata.php

@@ -918,7 +918,9 @@ class init extends common
 							'directory' => self::FILE_DIR . 'source/galerie/landscape',
 							'homePicture' => 'iceberg.jpg',
 							'sort' => 'SORT_ASC',
-							'position' => 1
+							'position' => 1,
+							'showPageContent' => false,
+							'fullScreen' => false
 						],
 						'legend' => [
 							'desertjpg' => 'Un désert',
@@ -937,7 +939,9 @@ class init extends common
 							'directory' => self::FILE_DIR . 'source/galerie/space',
 							'homePicture' => 'nebula.jpg',
 							'sort' => 'SORT_ASC',
-							'position' => 2
+							'position' => 2,
+							'showPageContent' => false,
+							'fullScreen' => false
 						],
 						'legend' => [
 							'earthjpg' => 'La Terre et la Lune',

module/gallery/changes.md

@@ -1,5 +1,6 @@
 # Version 3.8
 - Version compare null, dataversion not initialize
+- Bug de positionnement des boutons de retour
 # Version 3.7
 - Multilinguisme
 # Version 3.61

module/gallery/view/gallery/gallery.css

@@ -12,10 +12,3 @@
  * @link http://zwiicms.fr/
  */
 
-#topBackPosition.bottom {
-    display: none;
- }
-
-#bottomBackPosition.top{
-    display: none;
- }

module/gallery/view/gallery/gallery.php

@@ -1,8 +1,6 @@
-
+<div class="row <?php echo $module::$config['backAlign'] . ' ' . $module::$config['backPositionTop'];?>">
-<div id="topBackPosition" class="row <?php echo $module::$config['backPosition'] . ' ' . $module::$config['backAlign'];?>">
 	<div class="col1">
 		<?php echo template::button('galleryGalleryBack', [
-			'class' => 'buttonGrey',
 			'href' => helper::baseUrl() . $this->getUrl(0),
 			'value' => template::ico('left')
 		]); ?>
@@ -25,7 +23,7 @@
 	</div>
 <?php endforeach; ?>
 </div>
-<div id="bottomBackPosition" class="row <?php echo $module::$config['backPosition'] . ' ' . $module::$config['backAlign'];?>">
+<div class="row <?php echo $module::$config['backAlign'] . ' ' . $module::$config['backPositionBottom'];?>">
 	<div class="col1">
 		<?php echo template::button('galleryGalleryBack', [
 			'href' => helper::baseUrl() . $this->getUrl(0),