From 3222aaf7d5d7d666f258e6fc09668bbf1ef8d699 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Wed, 2 Jan 2019 23:55:43 +0100
Subject: [PATCH] mise en place editeur dans site

---
 core/core.php                        |  7 +++++--
 core/module/page/page.php            |  9 +++------
 core/module/theme/theme.php          | 20 +++++++++++++++++---
 core/module/theme/view/site/site.php | 27 +++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/core/core.php b/core/core.php
index 12ff46a6..54fad575 100644
--- a/core/core.php
+++ b/core/core.php
@@ -349,7 +349,8 @@ class common {
 				'backgroundColor' => 'rgba(255, 255, 255, 1)',
 				'radius' => '0',
 				'shadow' => '0',
-				'width' => '1170px'
+				'width' => '1170px',
+				'blocks' => '100'
 			],
 			'text' => [
 				'font' => 'Open+Sans',
@@ -994,7 +995,9 @@ class common {
 		}	
 		// Version 9.0.0
 		if($this->getData(['core', 'dataVersion']) < 900) {
-			
+			$this->setData(['theme', 'site', 'blocks','100']);
+			$this->setData(['theme', 'site', 'contentLeft','']);
+			$this->setData(['theme', 'site', 'contentRight','']);
 			$this->setData(['core', 'dataVersion', 900]);
 			$this->SaveData();
 		}				
diff --git a/core/module/page/page.php b/core/module/page/page.php
index cccf8a38..bad7b1d4 100755
--- a/core/module/page/page.php
+++ b/core/module/page/page.php
@@ -24,19 +24,18 @@ class page extends common {
 	];
 	public static $moduleIds = [];
 
-	// Menu image
 	public static $typeMenu = [
 		'text' => 'Texte',
 		'icon' => 'Icône',
 		'icontitle' => 'Icône et bulle'
 	];
-	// menu image
 	// Position du module
 	public static $modulePosition = [
 	'bottom' => 'En bas',
 	'top' => 'En haut',
 	'free' => 'Libre'
 	];
+	
 	/**
 	 * Création
 	 */
@@ -46,12 +45,10 @@ class page extends common {
 		$this->setData([
 			'page',
 			$pageId,
-			[
-				//  Menu icon				
+			[		
 				'typeMenu' => 'text',
 				'iconUrl' => '',
-                'disable' => false,				
-				// Menu icon				
+                'disable' => false,								
 				'content' => 'Contenu de votre nouvelle page.',
 				'hideTitle' => false,
 				'metaDescription' => '',
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 7ee58d26..e7d0b5c0 100755
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -201,9 +201,18 @@ class theme extends common {
 		'contain' => 'Image entière',		
 		'cover' => 'Largeur adaptée au fond',
 		'100% 100%' => 'Taille adaptée au fond'
-
 	];
 
+	public static $siteBlocks = [
+		'100' => 'Une colonne',
+		'33-66' => 'Deux colonnes : 1/3 - 2/3',		
+		'66-33' => 'Deux colonnes : 2/3 - 1/3',
+		'25-75' => 'Deux colonnes : 1/4 - 3/4',
+		'75-25' => 'Deux colonnes : 3/4 - 1/2',
+		'25-50-25' => 'Trois colonnes : 1/4 - 1/2 - 1/4'
+	];
+
+
 	/**
 	 * Mode avancé
 	 */
@@ -424,7 +433,11 @@ class theme extends common {
 				'backgroundColor' => $this->getInput('themeSiteBackgroundColor'),
 				'radius' => $this->getInput('themeSiteRadius'),
 				'shadow' => $this->getInput('themeSiteShadow'),
-				'width' => $this->getInput('themeSiteWidth')
+				'width' => $this->getInput('themeSiteWidth'),
+				'blocks' => $this->getInput('themeSiteBlocks'),
+				'contentLeft' => (empty($this->getInput('themeSiteContentleft', null)) ? "<p></p>" : $this->getInput('themeSiteContentleft', null)),
+				'contentRight' => (empty($this->getInput('themeSiteContentright', null)) ? "<p></p>" : $this->getInput('themeSiteContentright', null))
+				
 			]]);
 			// Valeurs en sortie
 			$this->addOutput([
@@ -437,7 +450,8 @@ class theme extends common {
 		$this->addOutput([
 			'title' => 'Personnalisation du site',
 			'vendor' => [
-				'tinycolorpicker'
+				'tinycolorpicker',
+				'tinymce'
 			],
 			'view' => 'site'
 		]);
diff --git a/core/module/theme/view/site/site.php b/core/module/theme/view/site/site.php
index bf1e9f0f..2ae87269 100755
--- a/core/module/theme/view/site/site.php
+++ b/core/module/theme/view/site/site.php
@@ -131,4 +131,31 @@
 			</div>
 		</div>
 	</div>
+	<div class="row">
+		<div class="block">
+			<h4>Mise en page</h4>
+			<div class='row'>	
+				<div class="col3">
+					<?php echo template::select('themeSiteBlocks', $module::$siteBlocks, [
+										'label' => 'Colonnes',
+										'selected' => $this->getData(['theme', 'site', 'blocks'])
+							]); ?>
+				</div>
+			</div>
+			<div class='row'>
+				<div class="col6">
+					<?php echo template::textarea('themeSiteContentright', [
+							'class' => 'editorWysiwyg',
+							'value' => $this->getData(['theme', 'site', 'contentRight'])
+						]); ?>
+				</div>
+				<div class="col6">						
+					<?php echo template::textarea('themeSiteContentleft', [
+							'class' => 'editorWysiwyg',
+							'value' => $this->getData(['theme', 'site', 'contentLeft'])
+					]); ?>
+				</div>	
+			</div>
+		</div>
+	</div>
 <?php echo template::formClose(); ?>
\ No newline at end of file