diff --git a/core/core.php b/core/core.php index 0edee764..d20d05f4 100644 --- a/core/core.php +++ b/core/core.php @@ -30,7 +30,7 @@ class common { // Désactive l'update auto // const ZWII_VERSION = '9.0.00-dev27'; // Numéro de version stable - const ZWII_VERSION = '9.0.02'; + const ZWII_VERSION = '9.0.03'; public static $actions = []; public static $coreModuleIds = [ @@ -3180,5 +3180,5 @@ class template { // Retourne le html return $html; } - } +?> \ No newline at end of file diff --git a/core/module/config/config.php b/core/module/config/config.php index 9aee9052..5437e3be 100755 --- a/core/module/config/config.php +++ b/core/module/config/config.php @@ -305,4 +305,5 @@ class configHelper extends helper { return $dirContent; } -} \ No newline at end of file +} +?> \ No newline at end of file diff --git a/core/module/install/install.php b/core/module/install/install.php index a0b50959..3262651b 100755 --- a/core/module/install/install.php +++ b/core/module/install/install.php @@ -194,5 +194,5 @@ class install extends common { 'view' => 'update' ]); } - -} \ No newline at end of file +} +?> \ No newline at end of file diff --git a/core/module/maintenance/maintenance.php b/core/module/maintenance/maintenance.php index b91765c5..f7c26816 100755 --- a/core/module/maintenance/maintenance.php +++ b/core/module/maintenance/maintenance.php @@ -30,4 +30,5 @@ class maintenance extends common { ]); } -} \ No newline at end of file +} +?> \ No newline at end of file diff --git a/core/module/page/page.php b/core/module/page/page.php index 6b7a69df..00587b51 100755 --- a/core/module/page/page.php +++ b/core/module/page/page.php @@ -37,16 +37,17 @@ class page extends common { // Position du module public static $modulePosition = [ 'bottom' => 'En bas', - 'top' => 'En haut', - 'free' => 'Libre' + 'top' => 'En haut', + 'free' => 'Libre' ]; public static $pageBlocks = [ - '12' => 'Page pleine', - '4-8' => 'Barre latérale 1/3 - Page 2/3', - '8-4' => 'Page 2/3 - Barre latérale 1/3', - '3-9' => 'Barre latérale 1/4 - Page 3/4', - '9-3' => 'Page 3/4 - Barre latérale 1/4', - '3-6-3' => 'Barre latérale 1/4 - Page 1/2 - Barre latérale 1/4' + '12' => 'Page pleine', + '4-8' => 'Barre latérale 1/3 - Page 2/3', + '8-4' => 'Page 2/3 - Barre latérale 1/3', + '3-9' => 'Barre latérale 1/4 - Page 3/4', + '9-3' => 'Page 3/4 - Barre latérale 1/4', + '3-6-3' => 'Barre latérale 1/4 - Page 1/2 - Barre latérale 1/4', + 'bar' => 'Barre latérale' ]; /** @@ -243,7 +244,6 @@ class page extends common { ]); // Barre renommée : changement le nom de la barre dans les pages mères if ($this->getinput('pageEditBlock') === 'bar') { - echo '
';
 					foreach ($this->getHierarchy() as $eachPageId=>$parentId) {
 						if ($this->getData(['page',$eachPageId,'barRight']) === $this->getUrl(2)) {
 							$this->setData(['page',$eachPageId,'barRight',$pageId]);
@@ -315,3 +315,4 @@ class page extends common {
 	}
 
 }
+?>
\ No newline at end of file
diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php
index 2395575e..f60ddd4e 100755
--- a/core/module/page/view/edit/edit.js.php
+++ b/core/module/page/view/edit/edit.js.php
@@ -32,8 +32,7 @@ $( document ).ready(function() {
 	*/
 	if($("#pageEditModuleId").val() === "") {
 		$("#pageEditModuleConfig").addClass("disabled");
-		$("#pageEditContentContainer").slideDown();
-		$("#pageEditBlock").append('');		
+		$("#pageEditContentContainer").slideDown();		
 	}
 	else {
 		$("#pageEditModuleConfig").removeClass("disabled");
diff --git a/core/module/page/view/edit/edit.php b/core/module/page/view/edit/edit.php
index 2d95248a..d83adb3c 100755
--- a/core/module/page/view/edit/edit.php
+++ b/core/module/page/view/edit/edit.php
@@ -181,4 +181,4 @@
 											
 		
 	
-
+
\ No newline at end of file
diff --git a/core/module/sitemap/sitemap.php b/core/module/sitemap/sitemap.php
index ed5ba2ae..61cfbdfb 100755
--- a/core/module/sitemap/sitemap.php
+++ b/core/module/sitemap/sitemap.php
@@ -29,4 +29,5 @@ class sitemap extends common {
 		]);
 	}
 
-}
\ No newline at end of file
+}
+?>
\ No newline at end of file
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index edc28695..af3e6ee4 100755
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -320,36 +320,26 @@ class theme extends common {
 			// Modification de la position du menu selon la position de la bannière
 			switch ($this->getInput('themeHeaderPosition')) {
 				case 'site' :
-					$this->setData(['theme', 'menu',
-						['position' => str_replace ('site','body',$this->getData(['theme','menu','position'])) ],				
-						'backgroundColor' => $this->getData('themeMenuBackgroundColor'),
-						'font' => $this->getData('themeMenuFont'),				
-						'fontSize' => $this->getData('themeMenuFontSize'),
-						'fontWeight' => $this->getData('themeMenuFontWeight'),
-						'height' => $this->getData('themeMenuHeight'),
-						'loginLink' => $this->getData('themeMenuLoginLink'),
-						'margin' => $this->getData('themeMenuMargin', helper::FILTER_BOOLEAN),
-						'textAlign' => $this->getData('themeMenuTextAlign'),
-						'textColor' => $this->getData('themeMenuTextColor'),
-						'textTransform' => $this->getData('themeMenuTextTransform'),
-					]);
+					$position = str_replace ('body','site',$this->getData(['theme','menu','position']));					
 				break;
 				case 'body' :
-					$this->setData(['theme', 'menu',
-						['position' => str_replace ('body','site',$this->getData(['theme','menu','position'])) ],				
-						'backgroundColor' => $this->getData('themeMenuBackgroundColor'),
-						'font' => $this->getData('themeMenuFont'),				
-						'fontSize' => $this->getData('themeMenuFontSize'),
-						'fontWeight' => $this->getData('themeMenuFontWeight'),
-						'height' => $this->getData('themeMenuHeight'),
-						'loginLink' => $this->getData('themeMenuLoginLink'),
-						'margin' => $this->getData('themeMenuMargin', helper::FILTER_BOOLEAN),
-						'textAlign' => $this->getData('themeMenuTextAlign'),
-						'textColor' => $this->getData('themeMenuTextColor'),
-						'textTransform' => $this->getData('themeMenuTextTransform'),
-					]);						
+					$position = str_replace ('site','body',$this->getData(['theme','menu','position']));								
 				break;
 			}
+			$this->setData(['theme', 'menu', [
+				'backgroundColor' => $this->getData(['theme', 'menu', 'backgroundColor']),
+				'font' => $this->getData(['theme', 'menu', 'font']),				
+				'fontSize' => $this->getData(['theme', 'menu', 'fontSize']),
+				'fontWeight' => $this->getData(['theme', 'menu', 'fontWeight']),
+				'height' => $this->getData(['theme', 'menu', 'height']),
+				'loginLink' => $this->getData(['theme', 'menu', 'loginLink']),
+				'margin' => $this->getData(['theme', 'menu', 'margin']),
+				'position' => $position,
+				'textAlign' => $this->getData(['theme', 'menu', 'textAlign']),
+				'textColor' => $this->getData(['theme', 'menu', 'textColor']),
+				'textTransform' => $this->getData(['theme','menu','textTransform']),
+				'fixed' => $this->getData(['theme','menu','fixed'])	
+			]]);
 			// Valeurs en sortie
 			$this->addOutput([
 				'notification' => 'Modifications enregistrées',
@@ -569,3 +559,4 @@ class theme extends common {
 	}
 
 }
+?>
\ No newline at end of file
diff --git a/core/module/user/user.php b/core/module/user/user.php
index 85619033..af610223 100755
--- a/core/module/user/user.php
+++ b/core/module/user/user.php
@@ -425,5 +425,5 @@ class user extends common {
 			]);
 		}
 	}
-
-}
\ No newline at end of file
+}
+?>
\ No newline at end of file
diff --git a/module/blog/blog.php b/module/blog/blog.php
index 57c205a4..271267c4 100755
--- a/module/blog/blog.php
+++ b/module/blog/blog.php
@@ -386,5 +386,5 @@ class blog extends common {
 			]);
 		}
 	}
-
-}
\ No newline at end of file
+}
+?>
\ No newline at end of file
diff --git a/module/form/form.php b/module/form/form.php
index 6af68148..63dc8b6d 100755
--- a/module/form/form.php
+++ b/module/form/form.php
@@ -370,5 +370,5 @@ class form extends common {
 			'view' => 'index',
 		]);
 	}
-
-}
\ No newline at end of file
+}
+?>
\ No newline at end of file
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index ec6c1ac7..903b2d61 100755
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -302,5 +302,5 @@ class galleriesHelper extends helper {
 		}
 		return $dirContent;
 	}
-
-}
\ No newline at end of file
+}
+?>
\ No newline at end of file
diff --git a/module/gallery/view/gallery/gallery.php b/module/gallery/view/gallery/gallery.php
index e3289c23..6dde60ee 100755
--- a/module/gallery/view/gallery/gallery.php
+++ b/module/gallery/view/gallery/gallery.php
@@ -30,4 +30,4 @@
 		
 	
 	
-
+
\ No newline at end of file
diff --git a/module/news/news.php b/module/news/news.php
index 54d5e79e..783bed7f 100755
--- a/module/news/news.php
+++ b/module/news/news.php
@@ -236,5 +236,5 @@ class news extends common {
 			'view' => 'index'
 		]);
 	}
-
-}
\ No newline at end of file
+}
+?>
\ No newline at end of file
diff --git a/module/redirection/redirection.php b/module/redirection/redirection.php
index 7cccd2ab..f9485dd4 100755
--- a/module/redirection/redirection.php
+++ b/module/redirection/redirection.php
@@ -70,5 +70,5 @@ class redirection extends common {
 			]);
 		}
 	}
-
-}
\ No newline at end of file
+}
+?>
\ No newline at end of file