From 8d224d2ab6b06817350d1fe774dd45cd456d41c2 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Sat, 13 Apr 2019 22:25:10 +0200
Subject: [PATCH] [9.1.0.dev36] page edit order labels

---
 core/module/page/view/edit/edit.php | 26 +++++++++++++-------------
 core/vendor/tinymce/link_list.json  |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/core/module/page/view/edit/edit.php b/core/module/page/view/edit/edit.php
index 9369515c..78512103 100755
--- a/core/module/page/view/edit/edit.php
+++ b/core/module/page/view/edit/edit.php
@@ -46,22 +46,13 @@
 							<div class="col2 verticalAlignBottom">
 								<?php echo template::button('pageEditModuleConfig', [
 									'disabled' => (bool) $this->getData(['page', $this->getUrl(2), 'moduleId']) === false,
-									'uniqueSubmission' => true,
+									'uniqueSubmission' => true,	
 									'value' => template::ico('gear')
 								]); ?>
 							</div>
 						</div>
 					</div>
 				</div>
-				<div class="row">
-					<div class="col6">			
-					<?php echo template::select('configModulePosition', $module::$modulePosition,[
-							'help' => 'En position libre ajoutez manuellement le module en plaçant deux crochets [] à l\'endroit voulu dans votre page.',
-							'label' => 'Position du module dans la page',
-							'selected' => $this->getData(['page', $this->getUrl(2), 'modulePosition'])
-						]); ?>
-					</div>
-				</div>
 				<div class="row">
 					<div class="col6">							
 						<?php echo template::select('pageTypeMenu', $module::$typeMenu,[
@@ -70,13 +61,22 @@
 								'selected' => $this->getData(['page', $this->getUrl(2), 'typeMenu'])
 						]); ?>
 					</div>
-					<div class="col6">
+					<div class="col6">			
+					<?php echo template::select('configModulePosition', $module::$modulePosition,[
+							'help' => 'En position libre ajoutez manuellement le module en plaçant deux crochets [] à l\'endroit voulu dans votre page.',
+							'label' => 'Position du module dans la page',
+							'selected' => $this->getData(['page', $this->getUrl(2), 'modulePosition'])
+						]); ?>
+					</div>
+				</div>
+				<div class="row">
+				<div class="col6">
 						<?php echo template::file('pageIconUrl', [
 							'label' => 'Icône du menu',
 							'value' => $this->getData(['page', $this->getUrl(2), 'iconUrl'])
 						]); ?>
-					</div>
-				</div>
+					</div>				
+				</div>				
 			</div>
 		</div>
 	</div>
diff --git a/core/vendor/tinymce/link_list.json b/core/vendor/tinymce/link_list.json
index 572c1e6a..eca74d2c 100644
--- a/core/vendor/tinymce/link_list.json
+++ b/core/vendor/tinymce/link_list.json
@@ -1 +1 @@
-[{"title":"Accueil","value":"?accueil","menu":[{"title":"Enfant","value":"?enfant"},{"title":"Mise en page","value":"?mise-en-page"}]},{"title":"Priv\u00e9e","value":"?privee"},{"title":"Blog","value":"?blog"},{"title":"Galeries","value":"?galeries"},{"title":"Site de Zwii","value":"?site-de-zwii"},{"title":"Contact","value":"?contact"}]
\ No newline at end of file
+[{"title":"Accueil","value":"?accueil","menu":[{"title":"Galeries","value":"?galeries"},{"title":"Enfant","value":"?enfant"},{"title":"Mise en page","value":"?mise-en-page"},{"title":"Menu lat\u00e9ral","value":"?menu-lateral"}]},{"title":"Priv\u00e9e","value":"?privee"},{"title":"Blog","value":"?blog"},{"title":"Site de Zwii","value":"?site-de-zwii"},{"title":"Contact","value":"?contact"}]
\ No newline at end of file