From eaccb4bb9deecda2c3a22b592bcf2da3d2eb68a1 Mon Sep 17 00:00:00 2001
From: Fred Tempez <frederic.tempez@outlook.com>
Date: Sat, 13 Nov 2021 09:06:37 +0100
Subject: [PATCH] Noms des variables

---
 core/layout/main.php                          | 6 +++---
 core/module/install/ressource/defaultdata.php | 4 ++--
 core/module/theme/theme.php                   | 8 ++++----
 core/module/theme/view/header/header.js.php   | 2 +-
 core/module/theme/view/header/header.php      | 4 ++--
 core/module/theme/view/menu/menu.js.php       | 2 +-
 core/module/theme/view/menu/menu.php          | 4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/layout/main.php b/core/layout/main.php
index cad2d20d..9d6a0d84 100644
--- a/core/layout/main.php
+++ b/core/layout/main.php
@@ -56,7 +56,7 @@
 					$menuClass = $this->getData(['theme', 'menu', 'position']) === 'top' ? 'class="container-large"'  : 'class="container"';
 					$menuClass = ($this->getData(['theme', 'menu', 'position']) === 'body-first' || 
 								 $this->getData(['theme', 'menu', 'position']) === 'body-second' ) &&
-								 $this->getData(['theme', 'menu', 'container']) === 'none' // étendue sur la page
+								 $this->getData(['theme', 'menu', 'width']) === 'none' // étendue sur la page
 								 ? 'class="container-large"'  : 'class="container"';				 
 				?>
 				<div id="menu" <?php echo $menuClass; ?> >
@@ -70,7 +70,7 @@
 			<?php 
 				$headerClass =  $this->getData(['theme', 'header', 'position']) === 'hide' ? 'displayNone' : '';
 				$headerClass .= $this->getData(['theme', 'header', 'tinyHidden']) ? ' bannerDisplay ' : '';
-				$headerClass .= $this->getData(['theme', 'header', 'container']) === 'none' ? '' : 'container';
+				$headerClass .= $this->getData(['theme', 'header', 'width']) === 'none' ? '' : 'container';
 			?>
 			<header <?php echo empty($headerClass) ? '' : 'class="' . $headerClass . '"';?>>
 			<?php echo ($this->getData(['theme','header','linkHomePage']) && $this->getData(['theme','header','feature']) === 'wallpaper' ) ?  '<a href="' . helper::baseUrl(false) . '">' : ''; ?>
@@ -107,7 +107,7 @@
 					$menuClass = $this->getData(['theme', 'menu', 'position']) === 'top' ? 'class="container-large"'  : 'class="container"';
 					$menuClass = ($this->getData(['theme', 'menu', 'position']) === 'body-first' || 
 								 $this->getData(['theme', 'menu', 'position']) === 'body-second' ) &&
-								 $this->getData(['theme', 'menu', 'container']) === 'none' // étendue sur la page
+								 $this->getData(['theme', 'menu', 'width']) === 'none' // étendue sur la page
 								 ? 'class="container-large"'  : 'class="container"';				 
 				?>
 				<div id="menu" <?php echo $menuClass; ?> >
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index bed64394..149725e6 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -160,7 +160,7 @@ class init extends common {
 				'tinyHidden' => true,
 				'feature' => 'wallpaper',
 				'featureContent' => '<p>Bannière vide</p>',
-				'container' => 'container'
+				'width' => 'container'
 			],
 			'menu' => [
 				'backgroundColor' => 'rgba(32, 59, 82, 1)',
@@ -183,7 +183,7 @@ class init extends common {
 				'memberBar' => true,
 				'burgerLogo' => '',
 				'burgerContent' => 'title',
-				'container' => 'container'
+				'width' => 'container'
 			],
 			'site' => [
 				'backgroundColor' => 'rgba(255, 255, 255, 1)',
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 33e9d73e..a728f34a 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -69,7 +69,7 @@ class theme extends common {
 		'Ubuntu' => 'Ubuntu',
 		'Vollkorn' => 'Vollkorn'
 	];
-	public static $containers = [
+	public static $widths = [
 		'container' => 'Limitée au site',
 		'none' => 'Etendue sur la page'
 	];
@@ -229,7 +229,7 @@ class theme extends common {
 		'uppercase' => 'Majuscules',
 		'capitalize' => 'Majuscule à chaque mot'
 	];
-	public static $widths = [
+	public static $headerMenuWidths = [
 		'750px' => 'Petite (750 pixels)',
 		'960px' => 'Moyenne (960 pixels)',
 		'1170px' => 'Grande (1170 pixels)',
@@ -443,7 +443,7 @@ class theme extends common {
 				'fontSize' => $this->getInput('themeHeaderFontSize'),
 				'fontWeight' => $this->getInput('themeHeaderFontWeight'),
 				'height' => $this->getInput('themeHeaderHeight'),
-				'container' => $this->getInput('themeHeaderContainer'),
+				'width' => $this->getInput('themeHeaderWidth'),
 				'image' => $this->getInput('themeHeaderImage'),
 				'imagePosition' => $this->getInput('themeHeaderImagePosition'),
 				'imageRepeat' => $this->getInput('themeHeaderImageRepeat'),
@@ -516,7 +516,7 @@ class theme extends common {
 				'fontSize' => $this->getInput('themeMenuFontSize'),
 				'fontWeight' => $this->getInput('themeMenuFontWeight'),
 				'height' => $this->getInput('themeMenuHeight'),
-				'container' => $this->getInput('themeMenuContainer'),
+				'width' => $this->getInput('themeMenuWidth'),
 				'loginLink' => $this->getInput('themeMenuLoginLink', helper::FILTER_BOOLEAN),
 				'margin' => $this->getInput('themeMenuMargin', helper::FILTER_BOOLEAN),
 				'position' => $this->getInput('themeMenuPosition'),
diff --git a/core/module/theme/view/header/header.js.php b/core/module/theme/view/header/header.js.php
index 806b9202..e94c5988 100644
--- a/core/module/theme/view/header/header.js.php
+++ b/core/module/theme/view/header/header.js.php
@@ -175,7 +175,7 @@ $("input, select").on("change", function() {
 	}
 
 	// Largeur du header
-	switch ($("#themeHeaderContainer").val()) {
+	switch ($("#themeHeaderWidth").val()) {
 		case "container":
 			$("header").addClass("container");
 			break;
diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php
index 787bca17..9469ee20 100644
--- a/core/module/theme/view/header/header.php
+++ b/core/module/theme/view/header/header.php
@@ -63,9 +63,9 @@
                     </div>
                 </div>
                 <div class="col4">
-                    <?php echo template::select('themeHeaderContainer', $module::$containers, [
+                    <?php echo template::select('themeHeaderWidth', $module::$widths, [
 							'label' => 'Largeur',
-							'selected' => $this->getData(['theme', 'header', 'container'])
+							'selected' => $this->getData(['theme', 'header', 'width'])
 						]); ?>
                 </div>
             </div>
diff --git a/core/module/theme/view/menu/menu.js.php b/core/module/theme/view/menu/menu.js.php
index 25f08e62..8a26f19d 100644
--- a/core/module/theme/view/menu/menu.js.php
+++ b/core/module/theme/view/menu/menu.js.php
@@ -123,7 +123,7 @@ $("input, select").on("change", function() {
 	}
 
 	//  Largeur étendue
-	if ($("#themeMenuContainer").val() === 'none') {
+	if ($("#themeMenuWidth").val() === 'none') {
 		$("#menu").removeClass();
 	} else {
 		$("#menu").addClass("container");
diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php
index aceee652..d037a764 100644
--- a/core/module/theme/view/menu/menu.php
+++ b/core/module/theme/view/menu/menu.php
@@ -41,9 +41,9 @@
                     ?>
                 </div>
                 <div class="col6">
-                    <?php echo template::select('themeMenuContainer', $module::$containers, [
+                    <?php echo template::select('themeMenuWidth', $module::$widths, [
 							'label' => 'Largeur',
-							'selected' => $this->getData(['theme', 'menu', 'container'])
+							'selected' => $this->getData(['theme', 'menu', 'width'])
 						]); ?>
                 </div>
             </div>