From 932b78650ae05ac78d0f97e13bad4b62105a7937 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Tue, 24 Mar 2020 17:48:54 +0100
Subject: [PATCH 01/20] =?UTF-8?q?manque=20r=C3=A9cup=C3=A9ration=20donn?=
 =?UTF-8?q?=C3=A9es=20ajax?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php                                 | 10 +++---
 module/form/vendor/html-sortable/lisezmoi.txt |  1 +
 module/gallery/gallery.php                    | 25 +++++++++++----
 module/gallery/vendor/tablednd/inc.json       |  3 ++
 module/gallery/vendor/tablednd/lisez-moi.txt  |  1 +
 .../gallery/vendor/tablednd/tablednd.min.js   |  2 ++
 module/gallery/view/config/config.js.php      | 32 ++++++++++++-------
 7 files changed, 51 insertions(+), 23 deletions(-)
 create mode 100644 module/form/vendor/html-sortable/lisezmoi.txt
 create mode 100644 module/gallery/vendor/tablednd/inc.json
 create mode 100644 module/gallery/vendor/tablednd/lisez-moi.txt
 create mode 100644 module/gallery/vendor/tablednd/tablednd.min.js

diff --git a/core/core.php b/core/core.php
index e8093bd8..006f566d 100644
--- a/core/core.php
+++ b/core/core.php
@@ -3327,7 +3327,7 @@ class template {
 		if($head) {
 			// Début des entêtes
 			$html .= '<thead>';
-			$html .= '<tr>';
+			$html .= '<tr class="nodrag">';
 			$i = 0;
 			foreach($head as $th) {
 				$html .= '<th class="col' . $cols[$i++] . '">' . $th . '</th>';
@@ -3337,12 +3337,12 @@ class template {
 			$html .= '</thead>';
 		}
 		// Début contenu
-		$html .= '<tbody>';
-		foreach($body as $tr) {
-			$html .= '<tr>';
+		$j = 1;
+		foreach($body as $tr) {			
+			$html .= '<tr id="item' . ($j++) . '">';
 			$i = 0;
 			foreach($tr as $td) {
-				$html .= '<td " class="pos' . ($i+1) . ' col' . $cols[$i++] . '">' . $td . '</td>';
+				$html .= '<td class="col' . $cols[$i++] . '">' . $td . '</td>';
 			}
 			$html .= '</tr>';
 		}
diff --git a/module/form/vendor/html-sortable/lisezmoi.txt b/module/form/vendor/html-sortable/lisezmoi.txt
new file mode 100644
index 00000000..83c36b44
--- /dev/null
+++ b/module/form/vendor/html-sortable/lisezmoi.txt
@@ -0,0 +1 @@
+https://github.com/lukasoppermann/html5sortable
\ No newline at end of file
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index b1c3b30a..73f5b913 100644
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -16,9 +16,10 @@ class gallery extends common {
 
 	public static $actions = [
 		'config' => self::GROUP_MODERATOR,
+		'filter' =>self::GROUP_MODERATOR,		
 		'delete' => self::GROUP_MODERATOR,
 		'dirs' => self::GROUP_MODERATOR,
-		'edit' => self::GROUP_MODERATOR,
+		'edit' => self::GROUP_MODERATOR,		
 		'index' => self::GROUP_VISITOR
 	];
 
@@ -44,8 +45,6 @@ class gallery extends common {
 	public function config() {
 		// Liste des galeries
 		$galleries = $this->getData(['module', $this->getUrl(0)]);
-		$countGalleries = count($this->getData(['module',$this->getUrl(0)]));
-
 		if($galleries) {	
 			foreach($galleries as $galleryId => $gallery) {
 				// Erreur dossier vide
@@ -58,9 +57,6 @@ class gallery extends common {
 				else {
 					$gallery['config']['directory'] = '<span class="galleryConfigError">' . $gallery['config']['directory'] . ' (dossier introuvable)</span>';
 				}
-				// Ordre des galeries
-				// Element 0 chaine vide
-				$galeryOrder  = range(1,count($this->getData(['module',$this->getUrl(0)])));
 				// Met en forme le tableau
 				self::$galleries[] = [						
 					$gallery['config']['name'],
@@ -99,10 +95,25 @@ class gallery extends common {
 		// Valeurs en sortie
 		$this->addOutput([
 			'title' => 'Configuration du module',
-			'view' => 'config'
+			'view' => 'config',
+			'vendor' => [
+				'tablednd'
+			]
 		]);
 	}
 
+	/**
+	 * Fonction AJAX tri des galeries
+	 */
+	public function filter() {
+		
+		$data = $_POST['data'];
+		var_dump(json_decode($data));
+		var_dump($_POST);
+		die();
+		
+	}
+
 	/**
 	 * Suppression
 	 */
diff --git a/module/gallery/vendor/tablednd/inc.json b/module/gallery/vendor/tablednd/inc.json
new file mode 100644
index 00000000..aea2b720
--- /dev/null
+++ b/module/gallery/vendor/tablednd/inc.json
@@ -0,0 +1,3 @@
+[
+	"tablednd.min.js"
+]
\ No newline at end of file
diff --git a/module/gallery/vendor/tablednd/lisez-moi.txt b/module/gallery/vendor/tablednd/lisez-moi.txt
new file mode 100644
index 00000000..dfa8616a
--- /dev/null
+++ b/module/gallery/vendor/tablednd/lisez-moi.txt
@@ -0,0 +1 @@
+https://github.com/isocra/TableDnD
\ No newline at end of file
diff --git a/module/gallery/vendor/tablednd/tablednd.min.js b/module/gallery/vendor/tablednd/tablednd.min.js
new file mode 100644
index 00000000..225739f4
--- /dev/null
+++ b/module/gallery/vendor/tablednd/tablednd.min.js
@@ -0,0 +1,2 @@
+/*! jquery.tablednd.js 30-12-2017 */
+!function(a,b,c,d){var e="touchstart mousedown",f="touchmove mousemove",g="touchend mouseup";a(c).ready(function(){function b(a){for(var b={},c=a.match(/([^;:]+)/g)||[];c.length;)b[c.shift()]=c.shift().trim();return b}a("table").each(function(){"dnd"===a(this).data("table")&&a(this).tableDnD({onDragStyle:a(this).data("ondragstyle")&&b(a(this).data("ondragstyle"))||null,onDropStyle:a(this).data("ondropstyle")&&b(a(this).data("ondropstyle"))||null,onDragClass:a(this).data("ondragclass")===d&&"tDnD_whileDrag"||a(this).data("ondragclass"),onDrop:a(this).data("ondrop")&&new Function("table","row",a(this).data("ondrop")),onDragStart:a(this).data("ondragstart")&&new Function("table","row",a(this).data("ondragstart")),onDragStop:a(this).data("ondragstop")&&new Function("table","row",a(this).data("ondragstop")),scrollAmount:a(this).data("scrollamount")||5,sensitivity:a(this).data("sensitivity")||10,hierarchyLevel:a(this).data("hierarchylevel")||0,indentArtifact:a(this).data("indentartifact")||'<div class="indent">&nbsp;</div>',autoWidthAdjust:a(this).data("autowidthadjust")||!0,autoCleanRelations:a(this).data("autocleanrelations")||!0,jsonPretifySeparator:a(this).data("jsonpretifyseparator")||"\t",serializeRegexp:a(this).data("serializeregexp")&&new RegExp(a(this).data("serializeregexp"))||/[^\-]*$/,serializeParamName:a(this).data("serializeparamname")||!1,dragHandle:a(this).data("draghandle")||null})})}),jQuery.tableDnD={currentTable:null,dragObject:null,mouseOffset:null,oldX:0,oldY:0,build:function(b){return this.each(function(){this.tableDnDConfig=a.extend({onDragStyle:null,onDropStyle:null,onDragClass:"tDnD_whileDrag",onDrop:null,onDragStart:null,onDragStop:null,scrollAmount:5,sensitivity:10,hierarchyLevel:0,indentArtifact:'<div class="indent">&nbsp;</div>',autoWidthAdjust:!0,autoCleanRelations:!0,jsonPretifySeparator:"\t",serializeRegexp:/[^\-]*$/,serializeParamName:!1,dragHandle:null},b||{}),a.tableDnD.makeDraggable(this),this.tableDnDConfig.hierarchyLevel&&a.tableDnD.makeIndented(this)}),this},makeIndented:function(b){var c,d,e=b.tableDnDConfig,f=b.rows,g=a(f).first().find("td:first")[0],h=0,i=0;if(a(b).hasClass("indtd"))return null;d=a(b).addClass("indtd").attr("style"),a(b).css({whiteSpace:"nowrap"});for(var j=0;j<f.length;j++)i<a(f[j]).find("td:first").text().length&&(i=a(f[j]).find("td:first").text().length,c=j);for(a(g).css({width:"auto"}),j=0;j<e.hierarchyLevel;j++)a(f[c]).find("td:first").prepend(e.indentArtifact);for(g&&a(g).css({width:g.offsetWidth}),d&&a(b).css(d),j=0;j<e.hierarchyLevel;j++)a(f[c]).find("td:first").children(":first").remove();return e.hierarchyLevel&&a(f).each(function(){(h=a(this).data("level")||0)<=e.hierarchyLevel&&a(this).data("level",h)||a(this).data("level",0);for(var b=0;b<a(this).data("level");b++)a(this).find("td:first").prepend(e.indentArtifact)}),this},makeDraggable:function(b){var c=b.tableDnDConfig;c.dragHandle&&a(c.dragHandle,b).each(function(){a(this).bind(e,function(d){return a.tableDnD.initialiseDrag(a(this).parents("tr")[0],b,this,d,c),!1})})||a(b.rows).each(function(){a(this).hasClass("nodrag")?a(this).css("cursor",""):a(this).bind(e,function(d){if("TD"===d.target.tagName)return a.tableDnD.initialiseDrag(this,b,this,d,c),!1}).css("cursor","move")})},currentOrder:function(){var b=this.currentTable.rows;return a.map(b,function(b){return(a(b).data("level")+b.id).replace(/\s/g,"")}).join("")},initialiseDrag:function(b,d,e,h,i){this.dragObject=b,this.currentTable=d,this.mouseOffset=this.getMouseOffset(e,h),this.originalOrder=this.currentOrder(),a(c).bind(f,this.mousemove).bind(g,this.mouseup),i.onDragStart&&i.onDragStart(d,e)},updateTables:function(){this.each(function(){this.tableDnDConfig&&a.tableDnD.makeDraggable(this)})},mouseCoords:function(a){return a.originalEvent.changedTouches?{x:a.originalEvent.changedTouches[0].clientX,y:a.originalEvent.changedTouches[0].clientY}:a.pageX||a.pageY?{x:a.pageX,y:a.pageY}:{x:a.clientX+c.body.scrollLeft-c.body.clientLeft,y:a.clientY+c.body.scrollTop-c.body.clientTop}},getMouseOffset:function(a,c){var d,e;return c=c||b.event,e=this.getPosition(a),d=this.mouseCoords(c),{x:d.x-e.x,y:d.y-e.y}},getPosition:function(a){var b=0,c=0;for(0===a.offsetHeight&&(a=a.firstChild);a.offsetParent;)b+=a.offsetLeft,c+=a.offsetTop,a=a.offsetParent;return b+=a.offsetLeft,c+=a.offsetTop,{x:b,y:c}},autoScroll:function(a){var d=this.currentTable.tableDnDConfig,e=b.pageYOffset,f=b.innerHeight?b.innerHeight:c.documentElement.clientHeight?c.documentElement.clientHeight:c.body.clientHeight;c.all&&(void 0!==c.compatMode&&"BackCompat"!==c.compatMode?e=c.documentElement.scrollTop:void 0!==c.body&&(e=c.body.scrollTop)),a.y-e<d.scrollAmount&&b.scrollBy(0,-d.scrollAmount)||f-(a.y-e)<d.scrollAmount&&b.scrollBy(0,d.scrollAmount)},moveVerticle:function(a,b){0!==a.vertical&&b&&this.dragObject!==b&&this.dragObject.parentNode===b.parentNode&&(0>a.vertical&&this.dragObject.parentNode.insertBefore(this.dragObject,b.nextSibling)||0<a.vertical&&this.dragObject.parentNode.insertBefore(this.dragObject,b))},moveHorizontal:function(b,c){var d,e=this.currentTable.tableDnDConfig;if(!e.hierarchyLevel||0===b.horizontal||!c||this.dragObject!==c)return null;d=a(c).data("level"),0<b.horizontal&&d>0&&a(c).find("td:first").children(":first").remove()&&a(c).data("level",--d),0>b.horizontal&&d<e.hierarchyLevel&&a(c).prev().data("level")>=d&&a(c).children(":first").prepend(e.indentArtifact)&&a(c).data("level",++d)},mousemove:function(b){var c,d,e,f,g,h=a(a.tableDnD.dragObject),i=a.tableDnD.currentTable.tableDnDConfig;return b&&b.preventDefault(),!!a.tableDnD.dragObject&&("touchmove"===b.type&&event.preventDefault(),i.onDragClass&&h.addClass(i.onDragClass)||h.css(i.onDragStyle),d=a.tableDnD.mouseCoords(b),f=d.x-a.tableDnD.mouseOffset.x,g=d.y-a.tableDnD.mouseOffset.y,a.tableDnD.autoScroll(d),c=a.tableDnD.findDropTargetRow(h,g),e=a.tableDnD.findDragDirection(f,g),a.tableDnD.moveVerticle(e,c),a.tableDnD.moveHorizontal(e,c),!1)},findDragDirection:function(a,b){var c=this.currentTable.tableDnDConfig.sensitivity,d=this.oldX,e=this.oldY,f=d-c,g=d+c,h=e-c,i=e+c,j={horizontal:a>=f&&a<=g?0:a>d?-1:1,vertical:b>=h&&b<=i?0:b>e?-1:1};return 0!==j.horizontal&&(this.oldX=a),0!==j.vertical&&(this.oldY=b),j},findDropTargetRow:function(b,c){for(var d=0,e=this.currentTable.rows,f=this.currentTable.tableDnDConfig,g=0,h=null,i=0;i<e.length;i++)if(h=e[i],g=this.getPosition(h).y,d=parseInt(h.offsetHeight)/2,0===h.offsetHeight&&(g=this.getPosition(h.firstChild).y,d=parseInt(h.firstChild.offsetHeight)/2),c>g-d&&c<g+d)return b.is(h)||f.onAllowDrop&&!f.onAllowDrop(b,h)||a(h).hasClass("nodrop")?null:h;return null},processMouseup:function(){if(!this.currentTable||!this.dragObject)return null;var b=this.currentTable.tableDnDConfig,d=this.dragObject,e=0,h=0;a(c).unbind(f,this.mousemove).unbind(g,this.mouseup),b.hierarchyLevel&&b.autoCleanRelations&&a(this.currentTable.rows).first().find("td:first").children().each(function(){(h=a(this).parents("tr:first").data("level"))&&a(this).parents("tr:first").data("level",--h)&&a(this).remove()})&&b.hierarchyLevel>1&&a(this.currentTable.rows).each(function(){if((h=a(this).data("level"))>1)for(e=a(this).prev().data("level");h>e+1;)a(this).find("td:first").children(":first").remove(),a(this).data("level",--h)}),b.onDragClass&&a(d).removeClass(b.onDragClass)||a(d).css(b.onDropStyle),this.dragObject=null,b.onDrop&&this.originalOrder!==this.currentOrder()&&a(d).hide().fadeIn("fast")&&b.onDrop(this.currentTable,d),b.onDragStop&&b.onDragStop(this.currentTable,d),this.currentTable=null},mouseup:function(b){return b&&b.preventDefault(),a.tableDnD.processMouseup(),!1},jsonize:function(a){var b=this.currentTable;return a?JSON.stringify(this.tableData(b),null,b.tableDnDConfig.jsonPretifySeparator):JSON.stringify(this.tableData(b))},serialize:function(){return a.param(this.tableData(this.currentTable))},serializeTable:function(a){for(var b="",c=a.tableDnDConfig.serializeParamName||a.id,d=a.rows,e=0;e<d.length;e++){b.length>0&&(b+="&");var f=d[e].id;f&&a.tableDnDConfig&&a.tableDnDConfig.serializeRegexp&&(f=f.match(a.tableDnDConfig.serializeRegexp)[0],b+=c+"[]="+f)}return b},serializeTables:function(){var b=[];return a("table").each(function(){this.id&&b.push(a.param(a.tableDnD.tableData(this)))}),b.join("&")},tableData:function(b){var c,d,e,f,g=b.tableDnDConfig,h=[],i=0,j=0,k=null,l={};if(b||(b=this.currentTable),!b||!b.rows||!b.rows.length)return{error:{code:500,message:"Not a valid table."}};if(!b.id&&!g.serializeParamName)return{error:{code:500,message:"No serializable unique id provided."}};f=g.autoCleanRelations&&b.rows||a.makeArray(b.rows),d=g.serializeParamName||b.id,e=d,c=function(a){return a&&g&&g.serializeRegexp?a.match(g.serializeRegexp)[0]:a},l[e]=[],!g.autoCleanRelations&&a(f[0]).data("level")&&f.unshift({id:"undefined"});for(var m=0;m<f.length;m++)if(g.hierarchyLevel){if(0===(j=a(f[m]).data("level")||0))e=d,h=[];else if(j>i)h.push([e,i]),e=c(f[m-1].id);else if(j<i)for(var n=0;n<h.length;n++)h[n][1]===j&&(e=h[n][0]),h[n][1]>=i&&(h[n][1]=0);i=j,a.isArray(l[e])||(l[e]=[]),k=c(f[m].id),k&&l[e].push(k)}else(k=c(f[m].id))&&l[e].push(k);return l}},jQuery.fn.extend({tableDnD:a.tableDnD.build,tableDnDUpdate:a.tableDnD.updateTables,tableDnDSerialize:a.proxy(a.tableDnD.serialize,a.tableDnD),tableDnDSerializeAll:a.tableDnD.serializeTables,tableDnDData:a.proxy(a.tableDnD.tableData,a.tableDnD)})}(jQuery,window,window.document);
\ No newline at end of file
diff --git a/module/gallery/view/config/config.js.php b/module/gallery/view/config/config.js.php
index 80bef565..a2983968 100644
--- a/module/gallery/view/config/config.js.php
+++ b/module/gallery/view/config/config.js.php
@@ -67,15 +67,25 @@ directoryDOM.on("change", function() {
  * Tri dynamique de la galerie
  */
 $( document ).ready(function() {
-	var $tbody = $('#galleryTable tbody');
-	$tbody.find('tr').sort(function (a, b) {
-		var tda = $(a).find('td.pos3:eq(0)').text();
-		var tdb = $(b).find('td.pos3:eq(0)').text();
-		// if a < b return 1
-		return tda > tdb ? 1
-			   // else if a > b return -1
-			   : tda < tdb ? -1
-			   // else they are equal - return 0    
-			   : 0;
-	}).appendTo($tbody);
+	$("#galleryTable").tableDnD({
+		onDrop: function(table, row) {
+			console.log($.tableDnD.serialize());
+			var url= <?php echo json_encode(helper::baseUrl() . $this->getUrl(0) . '/filter'); ?>;
+			/*url = "http://localhost/ZwiiCMS/?galeries/filter";	*/
+			$.ajax({
+				url: url,
+				data: $.tableDnD.serialize(),
+				type: "POST",
+				success: function (data) {
+					// Je charge les données dans box
+					alert("ok");
+				},
+				// La fonction à appeler si la requête n'a pas abouti
+				error: function() {
+					// J'affiche un message d'erreur
+					alert("Désolé, aucun résultat trouvé.");
+				}
+			});
+		}
+	});
 });
\ No newline at end of file

From e3da2f3dba8fdfa7c59c5d59966469c558b24481 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Fri, 27 Mar 2020 15:06:35 +0100
Subject: [PATCH 02/20] Gallery v2 init

---
 core/core.php                            |  10 +-
 module/gallery/gallery.php               | 119 ++++++++++++++++-------
 module/gallery/view/add/add.css          |  21 ++++
 module/gallery/view/add/add.js.php       |  53 ++++++++++
 module/gallery/view/add/add.php          |  48 +++++++++
 module/gallery/view/config/config.js.php |  64 +-----------
 module/gallery/view/config/config.php    |  77 ++++++---------
 7 files changed, 246 insertions(+), 146 deletions(-)
 create mode 100644 module/gallery/view/add/add.css
 create mode 100644 module/gallery/view/add/add.js.php
 create mode 100644 module/gallery/view/add/add.php

diff --git a/core/core.php b/core/core.php
index 006f566d..0c443de4 100644
--- a/core/core.php
+++ b/core/core.php
@@ -3312,7 +3312,7 @@ class template {
 	 * @param array $attributes Attributs ($key => $value)
 	 * @return string
 	 */
-	public static function table(array $cols = [], array $body = [], array $head = [], array $attributes = []) {
+	public static function table(array $cols = [], array $body = [], array $head = [], array $attributes = [], array $rowsId = []) {
 		// Attributs par défaut
 		$attributes = array_merge([
 			'class' => '',
@@ -3337,9 +3337,11 @@ class template {
 			$html .= '</thead>';
 		}
 		// Début contenu
-		$j = 1;
-		foreach($body as $tr) {			
-			$html .= '<tr id="item' . ($j++) . '">';
+		$j = 0;
+		foreach($body as $tr) {	
+			// Id de ligne pour les tableaux drag and drop		
+			$html .= '<tr id="' . $rowsId[$j] . '">';
+			$j++;
 			$i = 0;
 			foreach($tr as $td) {
 				$html .= '<td class="col' . $cols[$i++] . '">' . $td . '</td>';
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index 73f5b913..699166c7 100644
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -16,7 +16,7 @@ class gallery extends common {
 
 	public static $actions = [
 		'config' => self::GROUP_MODERATOR,
-		'filter' =>self::GROUP_MODERATOR,		
+		'add' => self::GROUP_MODERATOR,
 		'delete' => self::GROUP_MODERATOR,
 		'dirs' => self::GROUP_MODERATOR,
 		'edit' => self::GROUP_MODERATOR,		
@@ -35,16 +35,45 @@ class gallery extends common {
 
 	public static $galleries = [];
 
+	public static $galleriesId = [];
+
 	public static $pictures = [];
 
-	const GALLERY_VERSION = '1.3';	
+	const GALLERY_VERSION = '2.0';	
 
 	/**
 	 * Configuration
 	 */
 	public function config() {
-		// Liste des galeries
-		$galleries = $this->getData(['module', $this->getUrl(0)]);
+		// Traiement du tri
+		// Soumission du formulaire
+		if(	$this->isPost() &&
+			$this->getInput('galleryConfigResponse') !== NULL )  {
+			$data = explode('&',($this->getInput('galleryConfigResponse')));
+			$data = str_replace('galleryTable%5B%5D=','',$data);
+			for($i=0;$i<count($data);$i++) {
+				$this->setData(['module', $this->getUrl(0), $data[$i], [
+					'config' => [
+						'name' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','name']),
+						'directory' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','directory']),
+						'homePicture' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','homePicture']),
+						'sort' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','sort']),
+						'position' => $i + 1 
+					],
+					'legend' => $this->getData(['module',$this->getUrl(0),$data[$i],'legend'])
+				]]);
+			}		
+			$this->saveData();	
+		}
+		// Tri des galeries 
+		$g = $this->getData(['module', $this->getUrl(0)]);
+		$p = helper::arrayCollumn(helper::arrayCollumn($g,'config'),'position');
+		asort($p,SORT_NUMERIC);		
+		$galleries = [];
+		foreach ($p as $positionId => $item) {
+			$galleries [$positionId] = $g[$positionId];			
+		}
+		// Traitement de l'affichage
 		if($galleries) {	
 			foreach($galleries as $galleryId => $gallery) {
 				// Erreur dossier vide
@@ -58,7 +87,11 @@ class gallery extends common {
 					$gallery['config']['directory'] = '<span class="galleryConfigError">' . $gallery['config']['directory'] . ' (dossier introuvable)</span>';
 				}
 				// Met en forme le tableau
-				self::$galleries[] = [						
+				self::$galleries[] = [			
+					template::button($galleryId, [
+						'value' => template::ico('sort'),
+						'class' => 'disabled'
+					]),
 					$gallery['config']['name'],
 					$gallery['config']['directory'],
 					template::button('galleryConfigEdit' . $galleryId , [
@@ -71,27 +104,10 @@ class gallery extends common {
 						'value' => template::ico('cancel')
 					])
 				];
+				// Tableau des id des galleries pour le drag and drop
+				self::$galleriesId[] = $galleryId;
 			}
-		}
-		// Soumission du formulaire
-		if($this->isPost()) {
-			$galleryId = helper::increment($this->getInput('galleryConfigName', helper::FILTER_ID, true), (array) $this->getData(['module', $this->getUrl(0)]));
-			$this->setData(['module', $this->getUrl(0), $galleryId, [
-				'config' => [
-					'name' => $this->getInput('galleryConfigName'),
-					'directory' => $this->getInput('galleryConfigDirectory', helper::FILTER_STRING_SHORT, true),
-					'sort' => $this->getInput('galleryConfigSort'),
-					'order' => count($this->getData(['module',$this->getUrl(0)])) + 1
-				],
-				'legend' => []
-			]]);
-			// Valeurs en sortie
-			$this->addOutput([
-				'redirect' => helper::baseUrl() . $this->getUrl(),
-				'notification' => 'Modifications enregistrées',
-				'state' => true
-			]);
-		}
+		}	
 		// Valeurs en sortie
 		$this->addOutput([
 			'title' => 'Configuration du module',
@@ -103,15 +119,40 @@ class gallery extends common {
 	}
 
 	/**
-	 * Fonction AJAX tri des galeries
+	 * Ajouter une galerie
+	 * 
 	 */
-	public function filter() {
-		
-		$data = $_POST['data'];
-		var_dump(json_decode($data));
-		var_dump($_POST);
-		die();
-		
+	public function add() {
+		// Soumission du formulaire
+		if($this->isPost()) {
+			if (!empty($this->getInput('galleryAddName')) ) {				
+				$galleryId = helper::increment($this->getInput('galleryAddName', helper::FILTER_ID, true), (array) $this->getData(['module', $this->getUrl(0)]));
+				$this->setData(['module', $this->getUrl(0), $galleryId, [
+					'config' => [
+						'name' => $this->getInput('galleryAddName',helper::FILTER_STRING_SHORT,true),
+						'directory' => $this->getInput('galleryAddDirectory', helper::FILTER_STRING_SHORT, true),
+						'sort' => $this->getInput('galleryAddSort'),
+						'order' => count($this->getData(['module',$this->getUrl(0)])) + 1
+					],
+					'legend' => []
+				]]);
+				$success = true; 
+			} else {
+				$success = false;
+			}
+			// Valeurs en sortie
+			$this->addOutput([
+				'redirect' => $success === true ? helper::baseUrl() . $this->getUrl()  . '/config' : helper::baseUrl() . $this->getUrl() . '/add',
+				'notification' => $success === true ? 'Modifications enregistrées' : 'Le nom de la galerie est obligatoire',
+				'state' => $success
+			]);
+		} else {
+			// valeurs en sortie
+			$this->addOutput([
+				'title' => 'Ajouter une galerie',
+				'view' => 'add'
+			]);
+		}
 	}
 
 	/**
@@ -317,8 +358,16 @@ class gallery extends common {
 
 		}
 		// Liste des galeries
-		else {		
-			foreach((array) $this->getData(['module', $this->getUrl(0)]) as $galleryId => $gallery) {
+		else {
+			// Tri des galeries 
+			$g = $this->getData(['module', $this->getUrl(0)]);
+			$p = helper::arrayCollumn(helper::arrayCollumn($g,'config'),'position');
+			asort($p,SORT_NUMERIC);		
+			$galleries = [];
+			foreach ($p as $positionId => $item) {
+				$galleries [$positionId] = $g[$positionId];			
+			}	
+			foreach((array) $galleries as $galleryId => $gallery) {
 				if(is_dir($gallery['config']['directory'])) {
 					$iterator = new DirectoryIterator($gallery['config']['directory']);
 					foreach($iterator as $fileInfos) {
diff --git a/module/gallery/view/add/add.css b/module/gallery/view/add/add.css
new file mode 100644
index 00000000..b8d5a798
--- /dev/null
+++ b/module/gallery/view/add/add.css
@@ -0,0 +1,21 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.com/
+ */
+
+
+@import url("core/layout/admin.css");
+
+.galleryConfigError {
+	color: #F3674A;
+	font-weight: bold;
+}
\ No newline at end of file
diff --git a/module/gallery/view/add/add.js.php b/module/gallery/view/add/add.js.php
new file mode 100644
index 00000000..1f0d8235
--- /dev/null
+++ b/module/gallery/view/add/add.js.php
@@ -0,0 +1,53 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.com/
+ */
+
+/**
+ * Liste des dossiers
+ */
+var oldResult = [];
+var directoryDOM = $("#galleryAddDirectory");
+var directoryOldDOM = $("#galleryAddDirectoryOld");
+function dirs() {
+	$.ajax({
+		type: "POST",
+		url: "<?php echo helper::baseUrl() . $this->getUrl(0); ?>/dirs",
+		success: function(result) {
+			if($(result).not(oldResult).length !== 0 || $(oldResult).not(result).length !== 0) {
+				directoryDOM.empty();
+				for(var i = 0; i < result.length; i++) {
+					directoryDOM.append(function(i) {
+						var option = $("<option>").val(result[i]).text(result[i]);
+						if(directoryOldDOM.val() === result[i]) {
+							option.prop("selected", true);
+						}
+						return option;
+					}(i))
+				}
+				oldResult = result;
+			}
+		}
+	});
+}
+dirs();
+// Actualise la liste des dossiers toutes les trois secondes
+setInterval(function() {
+	dirs();
+}, 3000);
+
+/**
+ * Stock le dossier choisi pour le re-sélectionner en cas d'actualisation ajax de la liste des dossiers
+ */
+directoryDOM.on("change", function() {
+	directoryOldDOM.val($(this).val());
+});
diff --git a/module/gallery/view/add/add.php b/module/gallery/view/add/add.php
new file mode 100644
index 00000000..a15d23b5
--- /dev/null
+++ b/module/gallery/view/add/add.php
@@ -0,0 +1,48 @@
+<?php echo template::formOpen('galleryAddForm'); ?>
+	<?php echo template::formOpen('galleryAddOrder'); ?>
+	<div class="row">
+		<div class="col2">
+			<?php echo template::button('galleryAddBack', [
+				'class' => 'buttonGrey',
+				'href' => helper::baseUrl() .  $this->getUrl(0) . '/config',
+				'ico' => 'left',
+				'value' => 'Retour'
+			]); ?>
+		</div>
+		<div class="col2 offset8">
+			<?php echo template::submit('galleryAddSubmit'); ?>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col12">
+			<div class="block">
+				<h4>Nouvelle galerie</h4>
+				<div class="row">
+					<div class="col4">
+						<?php echo template::text('galleryAddName', [
+							'label' => 'Nom'
+						]); ?>
+					</div>
+					<div class="col4">
+						<?php echo template::hidden('galleryAddDirectoryOld', [
+							'noDirty' => true // Désactivé à cause des modifications en ajax
+						]); ?>
+						<?php echo template::select('galleryAddDirectory', [], [
+							'label' => 'Dossier cible',
+							'noDirty' => true // Désactivé à cause des modifications en ajax
+						]); ?>
+					</div>
+					<div class="col4">
+						<?php echo template::select('galleryAddSort', $module::$sort, [
+							'label' => 'Tri des images',
+							'help' => 'Les images sont triées par nom de fichier grâce à la méthode naturelle qui donne de meilleurs résultats lorsque les images sont numérotées.'
+						]); ?>	
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+    <?php echo template::formClose(); ?>
+<div class="moduleVersion">Version n°
+	<?php echo $module::GALLERY_VERSION; ?>
+</div>
\ No newline at end of file
diff --git a/module/gallery/view/config/config.js.php b/module/gallery/view/config/config.js.php
index a2983968..4c78d524 100644
--- a/module/gallery/view/config/config.js.php
+++ b/module/gallery/view/config/config.js.php
@@ -22,70 +22,16 @@ $(".galleryConfigDelete").on("click", function() {
 	});
 });
 
-/**
- * Liste des dossiers
- */
-var oldResult = [];
-var directoryDOM = $("#galleryConfigDirectory");
-var directoryOldDOM = $("#galleryConfigDirectoryOld");
-function dirs() {
-	$.ajax({
-		type: "POST",
-		url: "<?php echo helper::baseUrl() . $this->getUrl(0); ?>/dirs",
-		success: function(result) {
-			if($(result).not(oldResult).length !== 0 || $(oldResult).not(result).length !== 0) {
-				directoryDOM.empty();
-				for(var i = 0; i < result.length; i++) {
-					directoryDOM.append(function(i) {
-						var option = $("<option>").val(result[i]).text(result[i]);
-						if(directoryOldDOM.val() === result[i]) {
-							option.prop("selected", true);
-						}
-						return option;
-					}(i))
-				}
-				oldResult = result;
-			}
-		}
-	});
-}
-dirs();
-// Actualise la liste des dossiers toutes les trois secondes
-setInterval(function() {
-	dirs();
-}, 3000);
-
-/**
- * Stock le dossier choisi pour le re-sélectionner en cas d'actualisation ajax de la liste des dossiers
- */
-directoryDOM.on("change", function() {
-	directoryOldDOM.val($(this).val());
-});
-
 
 /**
  * Tri dynamique de la galerie
  */
 $( document ).ready(function() {
-	$("#galleryTable").tableDnD({
+
+	$("#galleryTable").tableDnD({		
 		onDrop: function(table, row) {
-			console.log($.tableDnD.serialize());
-			var url= <?php echo json_encode(helper::baseUrl() . $this->getUrl(0) . '/filter'); ?>;
-			/*url = "http://localhost/ZwiiCMS/?galeries/filter";	*/
-			$.ajax({
-				url: url,
-				data: $.tableDnD.serialize(),
-				type: "POST",
-				success: function (data) {
-					// Je charge les données dans box
-					alert("ok");
-				},
-				// La fonction à appeler si la requête n'a pas abouti
-				error: function() {
-					// J'affiche un message d'erreur
-					alert("Désolé, aucun résultat trouvé.");
-				}
-			});
-		}
+			$("#galleryConfigResponse").val($.tableDnD.serialize());
+		},
+		serializeRegexp:  "[^\_]*$"
 	});
 });
\ No newline at end of file
diff --git a/module/gallery/view/config/config.php b/module/gallery/view/config/config.php
index 109021c6..867918bd 100644
--- a/module/gallery/view/config/config.php
+++ b/module/gallery/view/config/config.php
@@ -1,54 +1,35 @@
-<?php echo template::formOpen('galleryConfigForm'); ?>
-	<div class="row">
-		<div class="col2">
-			<?php echo template::button('galleryConfigBack', [
-				'class' => 'buttonGrey',
-				'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0),
-				'ico' => 'left',
-				'value' => 'Retour'
+<?php echo template::formOpen('galleryConfigOrder'); ?>
+<div class="row">
+	<div class="col2">
+		<?php echo template::button('galleryConfigBack', [
+			'class' => 'buttonGrey',
+			'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0),
+			'ico' => 'left',
+			'value' => 'Retour'
+		]); ?>
+	</div>
+	<div class="col2 offset6">
+		<?php echo template::button('galleryConfigAdd', [
+			'class' => 'button',
+			'href' => helper::baseUrl() . $this->getUrl(0) .'/add',
+			'ico' => 'plus',
+			'value' => 'Galerie'
+		]); ?>
+	</div>
+	<div class="col2">
+		<?php echo template::submit('galleryConfigSubmit', [
+				'ico' => '',
+				'value' => "Trier"
 			]); ?>
-		</div>
 	</div>
-	<div class="row">
-		<div class="col12">
-			<div class="block">
-				<h4>Nouvelle galerie</h4>
-				<div class="row">
-					<div class="col4">
-						<?php echo template::text('galleryConfigName', [
-							'label' => 'Nom'
-						]); ?>
-					</div>
-					<div class="col4">
-						<?php echo template::hidden('galleryConfigDirectoryOld', [
-							'noDirty' => true // Désactivé à cause des modifications en ajax
-						]); ?>
-						<?php echo template::select('galleryConfigDirectory', [], [
-							'label' => 'Dossier cible',
-							'noDirty' => true // Désactivé à cause des modifications en ajax
-						]); ?>
-					</div>
-					<div class="col3">
-						<?php echo template::select('galleryConfigSort', $module::$sort, [
-							'label' => 'Tri des images',
-							'help' => 'Les images sont triées par nom de fichier grâce à la méthode naturelle qui donne de meilleurs résultats lorsque les images sont numérotées.'
-						]); ?>	
-					</div>
-					<div class="col1 verticalAlignBottom">
-						<?php echo template::submit('galleryConfigSubmit', [
-							'ico' => '',
-							'value' => template::ico('plus')
-						]); ?>
-					</div>
-				</div>
-			</div>
-		</div>
+	<div class="col12">
+		<?php if($module::$galleries): ?>
+			<?php echo template::table([1, 4, 5, 1, 1], $module::$galleries, ['','Nom', 'Dossier cible', '', ''], ['id' => 'galleryTable'],$module::$galleriesId); ?>
+			<?php echo template::hidden('galleryConfigResponse'); ?>
+		<?php else: ?>
+			<?php echo template::speech('Aucune galerie.'); ?>
+		<?php endif; ?>
 	</div>
-	<?php if($module::$galleries): ?>
-	<?php echo template::table([4, 6, 1, 1], $module::$galleries, ['Nom', 'Dossier cible', '', ''], ['id' => 'galleryTable']); ?>
-	<?php else: ?>
-		<?php echo template::speech('Aucune galerie.'); ?>
-	<?php endif; ?>
 <?php echo template::formClose(); ?>
 <div class="moduleVersion">Version n°
 	<?php echo $module::GALLERY_VERSION; ?>

From 5d8ad82ad68f315c92ba1ccee83db280e11ff07b Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Fri, 27 Mar 2020 18:58:47 +0100
Subject: [PATCH 03/20] =?UTF-8?q?V=C3=A9rification=20erreur=20de=20saisie?=
 =?UTF-8?q?=20nom=20gallerie=20WIP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php                   |  2 +-
 module/gallery/gallery.php      | 11 +++++------
 module/gallery/view/add/add.php |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/core.php b/core/core.php
index 0c443de4..5bf16094 100644
--- a/core/core.php
+++ b/core/core.php
@@ -474,7 +474,7 @@ class common {
 		// La clef est une chaine
 		else {
 			foreach($this->input as $type => $values) {
-				// Champ obligatoire
+				// Champ obligatoire				
 				if($required) {
 					$this->addRequiredInputNotices($key);
 				}
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index 699166c7..20396f69 100644
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -125,11 +125,12 @@ class gallery extends common {
 	public function add() {
 		// Soumission du formulaire
 		if($this->isPost()) {
+			$success = false;
 			if (!empty($this->getInput('galleryAddName')) ) {				
 				$galleryId = helper::increment($this->getInput('galleryAddName', helper::FILTER_ID, true), (array) $this->getData(['module', $this->getUrl(0)]));
 				$this->setData(['module', $this->getUrl(0), $galleryId, [
 					'config' => [
-						'name' => $this->getInput('galleryAddName',helper::FILTER_STRING_SHORT,true),
+						'name' => $this->getInput('galleryAddName',helper::FILTER_STRING_SHORT, true),
 						'directory' => $this->getInput('galleryAddDirectory', helper::FILTER_STRING_SHORT, true),
 						'sort' => $this->getInput('galleryAddSort'),
 						'order' => count($this->getData(['module',$this->getUrl(0)])) + 1
@@ -137,14 +138,12 @@ class gallery extends common {
 					'legend' => []
 				]]);
 				$success = true; 
-			} else {
-				$success = false;
 			}
 			// Valeurs en sortie
 			$this->addOutput([
-				'redirect' => $success === true ? helper::baseUrl() . $this->getUrl()  . '/config' : helper::baseUrl() . $this->getUrl() . '/add',
-				'notification' => $success === true ? 'Modifications enregistrées' : 'Le nom de la galerie est obligatoire',
-				'state' => $success
+				'redirect' =>  $success ? helper::baseUrl() . $this->getUrl(0)  . '/config' : helper::baseUrl() . $this->getUrl(0)  . '/add',
+				'notification' => $success ? 'Modifications enregistrées' : 'Le nom de la galerie est obligatoire',
+				'state' => $success  
 			]);
 		} else {
 			// valeurs en sortie
diff --git a/module/gallery/view/add/add.php b/module/gallery/view/add/add.php
index a15d23b5..d641b777 100644
--- a/module/gallery/view/add/add.php
+++ b/module/gallery/view/add/add.php
@@ -20,7 +20,7 @@
 				<div class="row">
 					<div class="col4">
 						<?php echo template::text('galleryAddName', [
-							'label' => 'Nom'
+							'label' => 'Nom de la galerie'
 						]); ?>
 					</div>
 					<div class="col4">

From 79940a73934fe3f6be1cdd95d8af2f2240e799f6 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Sat, 28 Mar 2020 10:16:59 +0100
Subject: [PATCH 04/20] =?UTF-8?q?Initialisation=20des=20champs=20galerie?=
 =?UTF-8?q?=20version=20inf=C3=A9rieure?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/core/core.php b/core/core.php
index 9e6a92e1..43c99422 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1090,6 +1090,43 @@ class common {
 			$this->setData(['core', 'dataVersion', 9223]);
 			$this->saveData();
 		}
+		// Version 9.3.00
+		if($this->getData(['core', 'dataVersion']) < 9300) {
+			// Numérotation des galeries
+			// Lire toutes les pages et trouver celle avec le module gallery
+			// Parcourir les galeries du modules
+			// Verifier la présence des champs : sort et postion
+
+			// Tableau avec les pages
+			$pageList = array();
+			foreach ($this->getHierarchy(null,null,null) as $parentKey=>$parentValue) {
+				$pageList [] = $parentKey;
+				foreach ($parentValue as $childKey) {
+					$pageList [] = $childKey;
+				}
+			}			
+			// Parcourir toutes les pages
+			foreach ($pageList as $parentKey => $parent) {
+				//La page a une galerie
+				if ($this->getData(['page',$parent,'moduleId']) === 'gallery' ) {
+					// Parcourir les dossiers de la galerie
+					$tempData =  $this->getData(['module', $parent]);	
+					$i = 1;
+					foreach ($tempData as $galleryKey => $galleryItem) {
+						if ( $this->getdata(['module',$parent,$galleryKey,'config','sort']) === NULL)  {
+							$this->setdata(['module',$parent,$galleryKey,'config','sort','SORT_ASC']);
+						}
+						if ( $this->getdata(['module',$parent,$galleryKey,'config','position']) === NULL) {
+							$this->setdata(['module',$parent,$galleryKey,'config','position',$i++]);
+						}						
+					}					
+				}
+			}
+
+			$this->setData(['core', 'dataVersion', 9300]);
+			$this->saveData();
+		}
+
 	}
 }
 

From 1af1553fc610a319e70d614c6bce80ad345123a5 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Tue, 31 Mar 2020 12:42:36 +0200
Subject: [PATCH 05/20] gitignore

---
 .gitignore | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..7cd6ab3b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,33 @@
+# Fichiers temporaires
+site/tmp/*.zip
+site/tmp/*.gz
+
+# Sauvegardes
+site/backup/*
+
+# Fichiers de données
+site/data/*.json
+site/data/*.css
+site/data/fr/*.json
+
+
+# Fichiers uploadés
+site/file/source/*
+site/file/thumb/*
+
+# Dossiers vides dans GitHub
+!.gitkeep
+/.git
+
+# PHPStorm
+.idea/
+
+# Trucs
+core/vendor/tinymce/link_list.json
+site/tmp/.htaccess
+.vscode/*
+site/data/body.inc.html
+site/data/head.inc.html
+sitemap.xml.gz
+sitemap.xml
+robots.txt

From 2c0f96ee05f7495abf336a7d42200a914467f3da Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Wed, 1 Apr 2020 13:43:15 +0200
Subject: [PATCH 06/20] =?UTF-8?q?Gallery=202.0=20:=20formulaire=20non=20s?=
 =?UTF-8?q?=C3=A9par=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/gallery/gallery.php               | 131 ++++++++++-------------
 module/gallery/view/add/add.css          |  21 ----
 module/gallery/view/add/add.js.php       |  53 ---------
 module/gallery/view/add/add.php          |  48 ---------
 module/gallery/view/config/config.js.php |  65 +++++++++--
 module/gallery/view/config/config.php    |  91 +++++++++++-----
 6 files changed, 174 insertions(+), 235 deletions(-)
 delete mode 100644 module/gallery/view/add/add.css
 delete mode 100644 module/gallery/view/add/add.js.php
 delete mode 100644 module/gallery/view/add/add.php

diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index 20396f69..7f4e10ab 100644
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -16,11 +16,11 @@ class gallery extends common {
 
 	public static $actions = [
 		'config' => self::GROUP_MODERATOR,
-		'add' => self::GROUP_MODERATOR,
 		'delete' => self::GROUP_MODERATOR,
 		'dirs' => self::GROUP_MODERATOR,
-		'edit' => self::GROUP_MODERATOR,		
-		'index' => self::GROUP_VISITOR
+		'edit' => self::GROUP_MODERATOR,
+		'filter' => self::GROUP_MODERATOR,
+		'index' => self::GROUP_VISITOR		
 	];
 
 	public static $sort = [
@@ -41,30 +41,34 @@ class gallery extends common {
 
 	const GALLERY_VERSION = '2.0';	
 
+
+
+	public function filter() {
+	// Traitement du tri
+		$data = explode('&',($this->getInput('galleryConfigFilterResponse')));
+		$data = str_replace('galleryTable%5B%5D=','',$data);
+		for($i=0;$i<count($data);$i++) {
+			$this->setData(['module', $this->getUrl(0), $data[$i], [
+				'config' => [
+					'name' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','name']),
+					'directory' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','directory']),
+					'homePicture' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','homePicture']),
+					'sort' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','sort']),
+					'position' => $i + 1 
+				],
+				'legend' => $this->getData(['module',$this->getUrl(0),$data[$i],'legend'])
+			]]);
+		}		
+		$this->saveData();
+		// Valeurs en sortie
+		// Recharge la page
+		header('Refresh: 0;url='. helper::baseUrl() . $this->getUrl() );	
+	}
+
 	/**
 	 * Configuration
 	 */
 	public function config() {
-		// Traiement du tri
-		// Soumission du formulaire
-		if(	$this->isPost() &&
-			$this->getInput('galleryConfigResponse') !== NULL )  {
-			$data = explode('&',($this->getInput('galleryConfigResponse')));
-			$data = str_replace('galleryTable%5B%5D=','',$data);
-			for($i=0;$i<count($data);$i++) {
-				$this->setData(['module', $this->getUrl(0), $data[$i], [
-					'config' => [
-						'name' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','name']),
-						'directory' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','directory']),
-						'homePicture' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','homePicture']),
-						'sort' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','sort']),
-						'position' => $i + 1 
-					],
-					'legend' => $this->getData(['module',$this->getUrl(0),$data[$i],'legend'])
-				]]);
-			}		
-			$this->saveData();	
-		}
 		// Tri des galeries 
 		$g = $this->getData(['module', $this->getUrl(0)]);
 		$p = helper::arrayCollumn(helper::arrayCollumn($g,'config'),'position');
@@ -87,11 +91,8 @@ class gallery extends common {
 					$gallery['config']['directory'] = '<span class="galleryConfigError">' . $gallery['config']['directory'] . ' (dossier introuvable)</span>';
 				}
 				// Met en forme le tableau
-				self::$galleries[] = [			
-					template::button($galleryId, [
-						'value' => template::ico('sort'),
-						'class' => 'disabled'
-					]),
+				self::$galleries[] = [	
+					template::ico('sort'),				
 					$gallery['config']['name'],
 					$gallery['config']['directory'],
 					template::button('galleryConfigEdit' . $galleryId , [
@@ -107,7 +108,31 @@ class gallery extends common {
 				// Tableau des id des galleries pour le drag and drop
 				self::$galleriesId[] = $galleryId;
 			}
-		}	
+		}
+		// Soumission du formulaire
+
+		if($this->isPost()) {
+			if ($this->getInput('galleryConfigFilterResponse')) {
+				self::filter();
+			} else {
+				$galleryId = helper::increment($this->getInput('galleryConfigName', helper::FILTER_ID, true), (array) $this->getData(['module', $this->getUrl(0)]));
+				$this->setData(['module', $this->getUrl(0), $galleryId, [
+					'config' => [
+						'name' => $this->getInput('galleryConfigName'),
+						'directory' => $this->getInput('galleryConfigDirectory', helper::FILTER_STRING_SHORT, true),
+						'sort' => $this->getInput('galleryConfigSort'),
+						'order' => count($this->getData(['module',$this->getUrl(0)])) + 1
+					],
+					'legend' => []
+				]]);
+				// Valeurs en sortie
+				$this->addOutput([
+					'redirect' => helper::baseUrl() . $this->getUrl(),
+					'notification' => 'Modifications enregistrées',
+					'state' => true
+				]);
+			}
+		}
 		// Valeurs en sortie
 		$this->addOutput([
 			'title' => 'Configuration du module',
@@ -118,42 +143,6 @@ class gallery extends common {
 		]);
 	}
 
-	/**
-	 * Ajouter une galerie
-	 * 
-	 */
-	public function add() {
-		// Soumission du formulaire
-		if($this->isPost()) {
-			$success = false;
-			if (!empty($this->getInput('galleryAddName')) ) {				
-				$galleryId = helper::increment($this->getInput('galleryAddName', helper::FILTER_ID, true), (array) $this->getData(['module', $this->getUrl(0)]));
-				$this->setData(['module', $this->getUrl(0), $galleryId, [
-					'config' => [
-						'name' => $this->getInput('galleryAddName',helper::FILTER_STRING_SHORT, true),
-						'directory' => $this->getInput('galleryAddDirectory', helper::FILTER_STRING_SHORT, true),
-						'sort' => $this->getInput('galleryAddSort'),
-						'order' => count($this->getData(['module',$this->getUrl(0)])) + 1
-					],
-					'legend' => []
-				]]);
-				$success = true; 
-			}
-			// Valeurs en sortie
-			$this->addOutput([
-				'redirect' =>  $success ? helper::baseUrl() . $this->getUrl(0)  . '/config' : helper::baseUrl() . $this->getUrl(0)  . '/add',
-				'notification' => $success ? 'Modifications enregistrées' : 'Le nom de la galerie est obligatoire',
-				'state' => $success  
-			]);
-		} else {
-			// valeurs en sortie
-			$this->addOutput([
-				'title' => 'Ajouter une galerie',
-				'view' => 'add'
-			]);
-		}
-	}
-
 	/**
 	 * Suppression
 	 */
@@ -357,16 +346,8 @@ class gallery extends common {
 
 		}
 		// Liste des galeries
-		else {
-			// Tri des galeries 
-			$g = $this->getData(['module', $this->getUrl(0)]);
-			$p = helper::arrayCollumn(helper::arrayCollumn($g,'config'),'position');
-			asort($p,SORT_NUMERIC);		
-			$galleries = [];
-			foreach ($p as $positionId => $item) {
-				$galleries [$positionId] = $g[$positionId];			
-			}	
-			foreach((array) $galleries as $galleryId => $gallery) {
+		else {		
+			foreach((array) $this->getData(['module', $this->getUrl(0)]) as $galleryId => $gallery) {
 				if(is_dir($gallery['config']['directory'])) {
 					$iterator = new DirectoryIterator($gallery['config']['directory']);
 					foreach($iterator as $fileInfos) {
diff --git a/module/gallery/view/add/add.css b/module/gallery/view/add/add.css
deleted file mode 100644
index b8d5a798..00000000
--- a/module/gallery/view/add/add.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * This file is part of Zwii.
- *
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- *
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2020, Frédéric Tempez
- * @license GNU General Public License, version 3
- * @link http://zwiicms.com/
- */
-
-
-@import url("core/layout/admin.css");
-
-.galleryConfigError {
-	color: #F3674A;
-	font-weight: bold;
-}
\ No newline at end of file
diff --git a/module/gallery/view/add/add.js.php b/module/gallery/view/add/add.js.php
deleted file mode 100644
index 1f0d8235..00000000
--- a/module/gallery/view/add/add.js.php
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * This file is part of Zwii.
- *
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- *
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2020, Frédéric Tempez
- * @license GNU General Public License, version 3
- * @link http://zwiicms.com/
- */
-
-/**
- * Liste des dossiers
- */
-var oldResult = [];
-var directoryDOM = $("#galleryAddDirectory");
-var directoryOldDOM = $("#galleryAddDirectoryOld");
-function dirs() {
-	$.ajax({
-		type: "POST",
-		url: "<?php echo helper::baseUrl() . $this->getUrl(0); ?>/dirs",
-		success: function(result) {
-			if($(result).not(oldResult).length !== 0 || $(oldResult).not(result).length !== 0) {
-				directoryDOM.empty();
-				for(var i = 0; i < result.length; i++) {
-					directoryDOM.append(function(i) {
-						var option = $("<option>").val(result[i]).text(result[i]);
-						if(directoryOldDOM.val() === result[i]) {
-							option.prop("selected", true);
-						}
-						return option;
-					}(i))
-				}
-				oldResult = result;
-			}
-		}
-	});
-}
-dirs();
-// Actualise la liste des dossiers toutes les trois secondes
-setInterval(function() {
-	dirs();
-}, 3000);
-
-/**
- * Stock le dossier choisi pour le re-sélectionner en cas d'actualisation ajax de la liste des dossiers
- */
-directoryDOM.on("change", function() {
-	directoryOldDOM.val($(this).val());
-});
diff --git a/module/gallery/view/add/add.php b/module/gallery/view/add/add.php
deleted file mode 100644
index d641b777..00000000
--- a/module/gallery/view/add/add.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php echo template::formOpen('galleryAddForm'); ?>
-	<?php echo template::formOpen('galleryAddOrder'); ?>
-	<div class="row">
-		<div class="col2">
-			<?php echo template::button('galleryAddBack', [
-				'class' => 'buttonGrey',
-				'href' => helper::baseUrl() .  $this->getUrl(0) . '/config',
-				'ico' => 'left',
-				'value' => 'Retour'
-			]); ?>
-		</div>
-		<div class="col2 offset8">
-			<?php echo template::submit('galleryAddSubmit'); ?>
-		</div>
-	</div>
-	<div class="row">
-		<div class="col12">
-			<div class="block">
-				<h4>Nouvelle galerie</h4>
-				<div class="row">
-					<div class="col4">
-						<?php echo template::text('galleryAddName', [
-							'label' => 'Nom de la galerie'
-						]); ?>
-					</div>
-					<div class="col4">
-						<?php echo template::hidden('galleryAddDirectoryOld', [
-							'noDirty' => true // Désactivé à cause des modifications en ajax
-						]); ?>
-						<?php echo template::select('galleryAddDirectory', [], [
-							'label' => 'Dossier cible',
-							'noDirty' => true // Désactivé à cause des modifications en ajax
-						]); ?>
-					</div>
-					<div class="col4">
-						<?php echo template::select('galleryAddSort', $module::$sort, [
-							'label' => 'Tri des images',
-							'help' => 'Les images sont triées par nom de fichier grâce à la méthode naturelle qui donne de meilleurs résultats lorsque les images sont numérotées.'
-						]); ?>	
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-    <?php echo template::formClose(); ?>
-<div class="moduleVersion">Version n°
-	<?php echo $module::GALLERY_VERSION; ?>
-</div>
\ No newline at end of file
diff --git a/module/gallery/view/config/config.js.php b/module/gallery/view/config/config.js.php
index af89322b..1957247c 100644
--- a/module/gallery/view/config/config.js.php
+++ b/module/gallery/view/config/config.js.php
@@ -12,6 +12,24 @@
  * @link http://zwiicms.com/
  */
 
+/**
+ * Tri dynamique de la galerie
+ */
+$( document ).ready(function() {
+	$("#galleryTable").tableDnD({		
+		onDrop: function(table, row) {
+			$("#galleryConfigFilterResponse").val($.tableDnD.serialize());
+		},
+		serializeRegexp:  "[^\_]*$"
+	});
+});
+
+// Activer le bouton de tri uniquement après un tri
+$("#galleryTable").mouseup(function(e) {
+	e.preventDefault();
+	$(":input[type='submit']").prop('disabled', false);
+});
+
 /**
  * Confirmation de suppression
  */
@@ -23,15 +41,44 @@ $(".galleryConfigDelete").on("click", function() {
 });
 
 
-/**
- * Tri dynamique de la galerie
- */
-$( document ).ready(function() {
 
-	$("#galleryTable").tableDnD({		
-		onDrop: function(table, row) {
-			$("#galleryConfigResponse").val($.tableDnD.serialize());
-		},
-		serializeRegexp:  "[^\_]*$"
+/**
+ * Liste des dossiers
+ */
+var oldResult = [];
+var directoryDOM = $("#galleryConfigDirectory");
+var directoryOldDOM = $("#galleryConfigDirectoryOld");
+function dirs() {
+	$.ajax({
+		type: "POST",
+		url: "<?php echo helper::baseUrl() . $this->getUrl(0); ?>/dirs",
+		success: function(result) {
+			if($(result).not(oldResult).length !== 0 || $(oldResult).not(result).length !== 0) {
+				directoryDOM.empty();
+				for(var i = 0; i < result.length; i++) {
+					directoryDOM.append(function(i) {
+						var option = $("<option>").val(result[i]).text(result[i]);
+						if(directoryOldDOM.val() === result[i]) {
+							option.prop("selected", true);
+						}
+						return option;
+					}(i))
+				}
+				oldResult = result;
+			}
+		}
 	});
+}
+dirs();
+// Actualise la liste des dossiers toutes les trois secondes
+setInterval(function() {
+	dirs();
+}, 3000);
+
+/**
+ * Stock le dossier choisi pour le re-sélectionner en cas d'actualisation ajax de la liste des dossiers
+ */
+directoryDOM.on("change", function() {
+	directoryOldDOM.val($(this).val());
 });
+
diff --git a/module/gallery/view/config/config.php b/module/gallery/view/config/config.php
index 867918bd..0d3a7a4b 100644
--- a/module/gallery/view/config/config.php
+++ b/module/gallery/view/config/config.php
@@ -1,34 +1,67 @@
-<?php echo template::formOpen('galleryConfigOrder'); ?>
-<div class="row">
-	<div class="col2">
-		<?php echo template::button('galleryConfigBack', [
-			'class' => 'buttonGrey',
-			'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0),
-			'ico' => 'left',
-			'value' => 'Retour'
-		]); ?>
-	</div>
-	<div class="col2 offset6">
-		<?php echo template::button('galleryConfigAdd', [
-			'class' => 'button',
-			'href' => helper::baseUrl() . $this->getUrl(0) .'/add',
-			'ico' => 'plus',
-			'value' => 'Galerie'
-		]); ?>
-	</div>
-	<div class="col2">
-		<?php echo template::submit('galleryConfigSubmit', [
-				'ico' => '',
-				'value' => "Trier"
+<?php echo template::formOpen('galleryConfigForm'); ?>
+	<div class="row">
+		<div class="col2">
+			<?php echo template::button('galleryConfigBack', [
+				'class' => 'buttonGrey',
+				'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0),
+				'ico' => 'left',
+				'value' => 'Retour'
 			]); ?>
+		</div>
 	</div>
-	<div class="col12">
-		<?php if($module::$galleries): ?>
-			<?php echo template::table([1, 4, 5, 1, 1], $module::$galleries, ['','Nom', 'Dossier cible', '', ''], ['id' => 'galleryTable'],$module::$galleriesId); ?>
-			<?php echo template::hidden('galleryConfigResponse'); ?>
-		<?php else: ?>
-			<?php echo template::speech('Aucune galerie.'); ?>
-		<?php endif; ?>
+	<div class="row">
+		<div class="col12">
+			<div class="block">
+				<h4>Nouvelle galerie</h4>
+				<div class="row">
+					<div class="col4">
+						<?php echo template::text('galleryConfigName', [
+							'label' => 'Nom'
+						]); ?>
+					</div>
+					<div class="col4">
+						<?php echo template::hidden('galleryConfigDirectoryOld', [
+							'noDirty' => true // Désactivé à cause des modifications en ajax
+						]); ?>
+						<?php echo template::select('galleryConfigDirectory', [], [
+							'label' => 'Dossier cible',
+							'noDirty' => true // Désactivé à cause des modifications en ajax
+						]); ?>
+					</div>
+					<div class="col3">
+						<?php echo template::select('galleryConfigSort', $module::$sort, [
+							'label' => 'Tri des images',
+							'help' => 'Les images sont triées par nom de fichier grâce à la méthode naturelle qui donne de meilleurs résultats lorsque les images sont numérotées.'
+						]); ?>	
+					</div>
+					<div class="col1 verticalAlignBottom">
+						<?php echo template::submit('galleryConfigSubmit', [
+							'ico' => '',
+							'value' => template::ico('plus')
+						]); ?>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+<?php echo template::formClose(); ?>	
+<?php echo template::formOpen('galleryConfigFilterForm'); ?>
+	<?php if($module::$galleries): ?>
+	<?php echo template::table([1,4, 6, 1, 1], $module::$galleries, ['','Nom', 'Dossier cible', '', ''], ['id' => 'galleryTable'],$module::$galleriesId); ?>
+	<?php echo template::hidden('galleryConfigFilterResponse'); ?>
+	<?php echo template::hidden('galleryConfigFilterSubmit',[
+				'value' => false
+			]); ?>
+	<?php else: ?>
+		<?php echo template::speech('Aucune galerie.'); ?>
+	<?php endif; ?>
+	<div class="row">
+		<div class="col2 offset10">
+			<?php echo template::submit('galleryConfigFilterSubmit', [
+				'value' => 'Trier',
+				'disabled' => true
+			]); ?>
+		</div>
 	</div>
 <?php echo template::formClose(); ?>
 <div class="moduleVersion">Version n°

From d3b07ddb88b5169c7beb03e95acff3739fb452b1 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Wed, 1 Apr 2020 13:47:37 +0200
Subject: [PATCH 07/20] Largeur tableau

---
 module/gallery/view/config/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/gallery/view/config/config.php b/module/gallery/view/config/config.php
index 0d3a7a4b..c83da42f 100644
--- a/module/gallery/view/config/config.php
+++ b/module/gallery/view/config/config.php
@@ -47,7 +47,7 @@
 <?php echo template::formClose(); ?>	
 <?php echo template::formOpen('galleryConfigFilterForm'); ?>
 	<?php if($module::$galleries): ?>
-	<?php echo template::table([1,4, 6, 1, 1], $module::$galleries, ['','Nom', 'Dossier cible', '', ''], ['id' => 'galleryTable'],$module::$galleriesId); ?>
+	<?php echo template::table([1, 4, 5, 1, 1], $module::$galleries, ['','Nom', 'Dossier cible', '', ''], ['id' => 'galleryTable'],$module::$galleriesId); ?>
 	<?php echo template::hidden('galleryConfigFilterResponse'); ?>
 	<?php echo template::hidden('galleryConfigFilterSubmit',[
 				'value' => false

From 5cfea185de95f3b1f09e2ab3657cd982530ff4c4 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Wed, 1 Apr 2020 16:40:37 +0200
Subject: [PATCH 08/20] Tris dans l'index manquant

---
 module/gallery/gallery.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index 7f4e10ab..13fa442c 100644
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -346,8 +346,16 @@ class gallery extends common {
 
 		}
 		// Liste des galeries
-		else {		
-			foreach((array) $this->getData(['module', $this->getUrl(0)]) as $galleryId => $gallery) {
+		else {
+			// Tri des galeries 
+			$g = $this->getData(['module', $this->getUrl(0)]);
+			$p = helper::arrayCollumn(helper::arrayCollumn($g,'config'),'position');
+			asort($p,SORT_NUMERIC);		
+			$galleries = [];
+			foreach ($p as $positionId => $item) {
+				$galleries [$positionId] = $g[$positionId];			
+			}		
+			foreach((array) $galleries as $galleryId => $gallery) {
 				if(is_dir($gallery['config']['directory'])) {
 					$iterator = new DirectoryIterator($gallery['config']['directory']);
 					foreach($iterator as $fileInfos) {

From c460cb0bed2ef3c01364cb9616f58de9a6c02bb1 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Thu, 2 Apr 2020 19:05:10 +0200
Subject: [PATCH 09/20] merge master

---
 core/layout/light.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/layout/light.php b/core/layout/light.php
index ed20d743..187f190b 100755
--- a/core/layout/light.php
+++ b/core/layout/light.php
@@ -15,6 +15,7 @@
 	<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/light.css">
 	<link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>theme.css?<?php echo md5_file(self::DATA_DIR.'theme.css'); ?>">
 	<link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>custom.css?<?php echo md5_file(self::DATA_DIR.'custom.css'); ?>">
+	<?php $layout->showStyle(); ?>
 </head>
 <body>
 <?php $layout->showNotification(); ?>

From 8c58135cdac78c0080189310922e29682c59b94e Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Thu, 2 Apr 2020 21:42:32 +0200
Subject: [PATCH 10/20] [9.2.27] data version

---
 core/core.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/core.php b/core/core.php
index ca82c926..89d5300a 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1090,13 +1090,13 @@ class common {
 			$this->setData(['core', 'dataVersion', 9223]);
 			$this->saveData();
 		}
-		// Version 9.3.00
-		if($this->getData(['core', 'dataVersion']) < 9300) {
+		// Version 9.2.27
+		if($this->getData(['core', 'dataVersion']) < 9227) {
 			// Forcer la régénération du thème
 			if (file_exists(self::DATA_DIR.'theme.css') === false) {
 				unlink (self::DATA_DIR.'theme.css');
 			}
-			$this->setData(['core', 'dataVersion', 9300]);
+			$this->setData(['core', 'dataVersion', 9227]);
 			$this->saveData();
 		}	
 	}

From 2053074e0bba0f0f0dd3c488cbfbab341be9fba4 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Thu, 2 Apr 2020 22:32:46 +0200
Subject: [PATCH 11/20] Adaptation v10

---
 core/class/template.class.php | 102 +++++++++++++++++-----------------
 1 file changed, 52 insertions(+), 50 deletions(-)

diff --git a/core/class/template.class.php b/core/class/template.class.php
index 9072a2e9..b550386e 100644
--- a/core/class/template.class.php
+++ b/core/class/template.class.php
@@ -598,56 +598,58 @@ class template {
     }
 
     /**
-    * Crée un tableau
-    * @param array $cols Cols des colonnes (format: [col colonne1, col colonne2, etc])
-    * @param array $body Contenu (format: [[contenu1, contenu2, etc], [contenu1, contenu2, etc]])
-    * @param array $head Entêtes (format : [[titre colonne1, titre colonne2, etc])
-    * @param array $attributes Attributs ($key => $value)
-    * @return string
-    */
-    public static function table(array $cols = [], array $body = [], array $head = [], array $attributes = []) {
-        // Attributs par défaut
-        $attributes = array_merge([
-            'class' => '',
-            'classWrapper' => '',
-            'id' => ''
-        ], $attributes);
-        // Début du wrapper
-        $html = '<div id="' . $attributes['id'] . 'Wrapper" class="tableWrapper ' . $attributes['classWrapper']. '">';
-        // Début tableau
-        $html .= '<table id="' . $attributes['id'] . '" class="table ' . $attributes['class']. '">';
-        // Entêtes
-        if($head) {
-            // Début des entêtes
-            $html .= '<thead>';
-            $html .= '<tr>';
-            $i = 0;
-            foreach($head as $th) {
-                $html .= '<th class="col' . $cols[$i++] . '">' . $th . '</th>';
-            }
-            // Fin des entêtes
-            $html .= '</tr>';
-            $html .= '</thead>';
-        }
-        // Début contenu
-        $html .= '<tbody>';
-        foreach($body as $tr) {
-            $html .= '<tr>';
-            $i = 0;
-            foreach($tr as $td) {
-                $html .= '<td class="col' . $cols[$i++] . '">' . $td . '</td>';
-            }
-            $html .= '</tr>';
-        }
-        // Fin contenu
-        $html .= '</tbody>';
-        // Fin tableau
-        $html .= '</table>';
-        // Fin container
-        $html .= '</div>';
-        // Retourne le html
-        return $html;
-    }
+	 * Crée un tableau
+	 * @param array $cols Cols des colonnes (format: [col colonne1, col colonne2, etc])
+	 * @param array $body Contenu (format: [[contenu1, contenu2, etc], [contenu1, contenu2, etc]])
+	 * @param array $head Entêtes (format : [[titre colonne1, titre colonne2, etc])
+	 * @param array $attributes Attributs ($key => $value)
+	 * @return string
+	 */
+	public static function table(array $cols = [], array $body = [], array $head = [], array $attributes = [], array $rowsId = []) {
+		// Attributs par défaut
+		$attributes = array_merge([
+			'class' => '',
+			'classWrapper' => '',
+			'id' => ''
+		], $attributes);
+		// Début du wrapper
+		$html = '<div id="' . $attributes['id'] . 'Wrapper" class="tableWrapper ' . $attributes['classWrapper']. '">';
+		// Début tableau
+		$html .= '<table id="' . $attributes['id'] . '" class="table ' . $attributes['class']. '">';
+		// Entêtes
+		if($head) {
+			// Début des entêtes
+			$html .= '<thead>';
+			$html .= '<tr class="nodrag">';
+			$i = 0;
+			foreach($head as $th) {
+				$html .= '<th class="col' . $cols[$i++] . '">' . $th . '</th>';
+			}
+			// Fin des entêtes
+			$html .= '</tr>';
+			$html .= '</thead>';
+		}
+		// Début contenu
+		$j = 0;
+		foreach($body as $tr) {	
+			// Id de ligne pour les tableaux drag and drop		
+			$html .= '<tr id="' . $rowsId[$j] . '">';
+			$j++;
+			$i = 0;
+			foreach($tr as $td) {
+				$html .= '<td class="col' . $cols[$i++] . '">' . $td . '</td>';
+			}
+			$html .= '</tr>';
+		}
+		// Fin contenu
+		$html .= '</tbody>';
+		// Fin tableau
+		$html .= '</table>';
+		// Fin container
+		$html .= '</div>';
+		// Retourne le html
+		return $html;
+	}
 
     /**
     * Crée un champ texte court

From 1d94e5015f080ca8b72915a39c5e10078ede559e Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Thu, 2 Apr 2020 22:57:47 +0200
Subject: [PATCH 12/20] JS vide

---
 module/gallery/view/index/index.js.php | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 module/gallery/view/index/index.js.php

diff --git a/module/gallery/view/index/index.js.php b/module/gallery/view/index/index.js.php
deleted file mode 100644
index 17927eda..00000000
--- a/module/gallery/view/index/index.js.php
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * This file is part of Zwii.
- *
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- *
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @authorFrédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2020, Frédéric Tempez
- * @license GNU General Public License, version 3
- * @link http://zwiicms.com/
- */
-
-$( document ).ready(function() {
-/*
-    asc=false;   
-    var sorted=$('.pictureBox').sort(function(a,b){
-        return (asc ==
-               ($(a).data('sort') <  $(b).data('sort'))) ? 1 : -1;
-    });
-    asc = asc ? false : true;
-    $('body').html(sorted);
-    */
-});
\ No newline at end of file

From c66f28027b086275b4b891f57bb3ad4a090bde02 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 3 Apr 2020 18:50:44 +0200
Subject: [PATCH 13/20] erreur installation default

---
 core/core.php                                 | 23 ++++++++-----------
 core/module/install/ressource/defaultdata.php | 10 +++++---
 module/gallery/gallery.php                    | 10 ++------
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/core/core.php b/core/core.php
index 02715994..a36cb3ee 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1108,22 +1108,22 @@ class common {
 		// Version 9.2.27
 		if($this->getData(['core', 'dataVersion']) < 9227) {
 			// Forcer la régénération du thème
-			if (file_exists(self::DATA_DIR.'theme.css') === false) {
+			if (file_exists(self::DATA_DIR.'theme.css')) {
 				unlink (self::DATA_DIR.'theme.css');
-			}
+			}		
+			$this->setData(['core', 'dataVersion', 9227]);
+		}			
+		// Version 10.0.00
+		if($this->getData(['core', 'dataVersion']) < 10000) {
+			$this->setData(['config', 'faviconDark','faviconDark.ico']);
 			// Numérotation des galeries
-			// Lire toutes les pages et trouver celle avec le module gallery
-			// Parcourir les galeries du modules
-			// Verifier la présence des champs : sort et postion
-
-			// Tableau avec les pages
 			$pageList = array();
 			foreach ($this->getHierarchy(null,null,null) as $parentKey=>$parentValue) {
 				$pageList [] = $parentKey;
 				foreach ($parentValue as $childKey) {
 					$pageList [] = $childKey;
 				}
-			}			
+			}	
 			// Parcourir toutes les pages
 			foreach ($pageList as $parentKey => $parent) {
 				//La page a une galerie
@@ -1140,12 +1140,7 @@ class common {
 						}						
 					}					
 				}
-			}			
-			$this->setData(['core', 'dataVersion', 9227]);
-		}			
-		// Version 10.0.00
-		if($this->getData(['core', 'dataVersion']) < 10000) {
-			$this->setData(['config', 'faviconDark','faviconDark.ico']);
+			}	
 			$this->setData(['core', 'dataVersion', 10000]);	
 		}	
 
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index f3418fe2..9f94acd8 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -27,7 +27,7 @@ class init extends common {
 			'proxyType' => "tcp://"
 		],
 		'core' => [
-			'dataVersion' => 10000,
+			'dataVersion' => 0,
 			'lastBackup' => 0,
 			'lastClearTmp' => 0,
 			'lastAutoUpdate' => 0,
@@ -537,7 +537,9 @@ class init extends common {
 				'beaux-paysages' => [
 					'config' => [
 						'name' => 'Beaux paysages',
-						'directory' => self::FILE_DIR.'source/galerie/landscape'
+						'directory' => self::FILE_DIR.'source/galerie/landscape',
+						'sort' => 'SORT_ASC',
+						'position' => 1
 					],
 					'legend' => [
 						'desertjpg' => 'Un désert',
@@ -548,7 +550,9 @@ class init extends common {
 				'espace' => [
 					'config' => [
 						'name' => 'Espace',
-						'directory' => self::FILE_DIR.'source/galerie/space'
+						'directory' => self::FILE_DIR.'source/galerie/space',
+						'sort' => 'SORT_ASC',
+						'position' => 2
 					],
 					'legend' => [
 						'earthjpg' => 'La Terre et la Lune',
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index 1c43d3ef..60d159be 100644
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -95,13 +95,6 @@ class gallery extends common {
 					template::ico('sort'),				
 					$gallery['config']['name'],
 					$gallery['config']['directory'],
-					//$gallery['config']['order'],
-					/*
-					template::select('galleryConfigOrder', $galeryOrder , [
-						'selected' => $gallery['config']['order'],
-						'class' => 'configOrder'
-
-					]),*/
 					template::button('galleryConfigEdit' . $galleryId , [
 						'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $galleryId  . '/' . $_SESSION['csrf'],
 						'value' => template::ico('pencil')
@@ -127,8 +120,9 @@ class gallery extends common {
 					'config' => [
 						'name' => $this->getInput('galleryConfigName'),
 						'directory' => $this->getInput('galleryConfigDirectory', helper::FILTER_STRING_SHORT, true),
+						'homePicture' => '',
 						'sort' => $this->getInput('galleryConfigSort'),
-						'order' => count($this->getData(['module',$this->getUrl(0)])) + 1
+						'position' => count($this->getData(['module',$this->getUrl(0)])) + 1
 					],
 					'legend' => []
 				]]);

From 067b4c56f933b1d8ecfbaa51b29afb2640a61ffe Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 3 Apr 2020 18:54:43 +0200
Subject: [PATCH 14/20] Default data

---
 core/module/install/ressource/defaultdata.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index 9f94acd8..6a39e494 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -27,7 +27,7 @@ class init extends common {
 			'proxyType' => "tcp://"
 		],
 		'core' => [
-			'dataVersion' => 0,
+			'dataVersion' => 10000,
 			'lastBackup' => 0,
 			'lastClearTmp' => 0,
 			'lastAutoUpdate' => 0,

From 17985b35149e7ec0b144d04e1c637d7a18b08f07 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 3 Apr 2020 23:53:40 +0200
Subject: [PATCH 15/20] fix  showstyle redondant

---
 core/layout/light.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/layout/light.php b/core/layout/light.php
index 4a2bedd6..9ea591b1 100755
--- a/core/layout/light.php
+++ b/core/layout/light.php
@@ -15,7 +15,6 @@
 	<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/light.css">
 	<link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>theme.css?<?php echo md5_file(self::DATA_DIR.'theme.css'); ?>">
 	<link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>custom.css?<?php echo md5_file(self::DATA_DIR.'custom.css'); ?>">
-	<?php $layout->showStyle(); ?>
 </head>
 <body>
 <?php $layout->showNotification(); ?>

From 869bff6a3650e4bf8a5ff37ec3df247a74e36c4c Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Sat, 4 Apr 2020 10:27:14 +0200
Subject: [PATCH 16/20] Order -> position

---
 module/gallery/view/index/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/gallery/view/index/index.php b/module/gallery/view/index/index.php
index a9269e6f..49126f56 100644
--- a/module/gallery/view/index/index.php
+++ b/module/gallery/view/index/index.php
@@ -5,7 +5,7 @@
 		<?php if($i % 2 === 1): ?>
 			<div class="row">
 		<?php endif; ?>		
-			<div class="col6" div="pos<?php echo $gallery['config']['order']; ?>" >
+			<div class="col6" div="pos<?php echo $gallery['config']['position']; ?>" >
 				<a
 					href="<?php echo helper::baseUrl() . $this->getUrl(0); ?>/<?php echo $galleryId; ?>"
 					class="galleryPicture"

From 8b864fe9f90cd1b14bd718e2db227614c5e8df7c Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Sat, 4 Apr 2020 15:54:19 +0200
Subject: [PATCH 17/20] =?UTF-8?q?parametre=20template::table=20et=20=C3=A9?=
 =?UTF-8?q?dition=20de=20galerie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/class/template.class.php | 4 +++-
 module/gallery/gallery.php    | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/class/template.class.php b/core/class/template.class.php
index b550386e..290edf67 100644
--- a/core/class/template.class.php
+++ b/core/class/template.class.php
@@ -628,7 +628,9 @@ class template {
 			// Fin des entêtes
 			$html .= '</tr>';
 			$html .= '</thead>';
-		}
+        }
+        // Pas de tableau d'Id transmis, générer une numérotation
+        $rowsId = range(0,count($body));
 		// Début contenu
 		$j = 0;
 		foreach($body as $tr) {	
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index 60d159be..458fb4cc 100644
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -235,7 +235,8 @@ class gallery extends common {
 						'name' => $this->getInput('galleryEditName', helper::FILTER_STRING_SHORT, true),
 						'directory' => $this->getInput('galleryEditDirectory', helper::FILTER_STRING_SHORT, true),
 						'homePicture' => $homePictures[$file],
-						'sort' => $this->getInput('galleryEditSort')
+						'sort' => $this->getInput('galleryEditSort'),
+						'position' => count($this->getData(['module',$this->getUrl(0)])) + 1
 					],
 					'legend' => $legends
 				]]);

From ab8f5b5dca5f519355235ab18533cc96e127e308 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Sat, 4 Apr 2020 15:56:46 +0200
Subject: [PATCH 18/20] =?UTF-8?q?parametre=20template::table=20et=20=C3=A9?=
 =?UTF-8?q?dition=20de=20galerie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/class/template.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/class/template.class.php b/core/class/template.class.php
index 290edf67..cab07c7a 100644
--- a/core/class/template.class.php
+++ b/core/class/template.class.php
@@ -630,7 +630,9 @@ class template {
 			$html .= '</thead>';
         }
         // Pas de tableau d'Id transmis, générer une numérotation
-        $rowsId = range(0,count($body));
+        if (empty($rowsId)) {
+            $rowsId = range(0,count($body));
+        }
 		// Début contenu
 		$j = 0;
 		foreach($body as $tr) {	

From e11fc3d1010a2f363356f6a60f086b4bf70592bf Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Sat, 4 Apr 2020 15:58:09 +0200
Subject: [PATCH 19/20] =?UTF-8?q?parametre=20template::table=20et=20=C3=A9?=
 =?UTF-8?q?dition=20de=20galerie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/class/template.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/class/template.class.php b/core/class/template.class.php
index cab07c7a..27370bf5 100644
--- a/core/class/template.class.php
+++ b/core/class/template.class.php
@@ -602,6 +602,7 @@ class template {
 	 * @param array $cols Cols des colonnes (format: [col colonne1, col colonne2, etc])
 	 * @param array $body Contenu (format: [[contenu1, contenu2, etc], [contenu1, contenu2, etc]])
 	 * @param array $head Entêtes (format : [[titre colonne1, titre colonne2, etc])
+     * @param array $rowsId Id pour la numérotation des rows (format : [id colonne1, id colonne2, etc])
 	 * @param array $attributes Attributs ($key => $value)
 	 * @return string
 	 */

From 6330400c63bd3731cd61f93904ec1550977bbc64 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Sat, 4 Apr 2020 16:13:03 +0200
Subject: [PATCH 20/20] =?UTF-8?q?Libell=C3=A9s=20+=20optimisation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/class/template.class.php     | 3 +--
 module/gallery/gallery.php        | 4 ++--
 module/gallery/view/edit/edit.php | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/class/template.class.php b/core/class/template.class.php
index 27370bf5..0cb422bc 100644
--- a/core/class/template.class.php
+++ b/core/class/template.class.php
@@ -638,8 +638,7 @@ class template {
 		$j = 0;
 		foreach($body as $tr) {	
 			// Id de ligne pour les tableaux drag and drop		
-			$html .= '<tr id="' . $rowsId[$j] . '">';
-			$j++;
+			$html .= '<tr id="' . $rowsId[$j++] . '">';
 			$i = 0;
 			foreach($tr as $td) {
 				$html .= '<td class="col' . $cols[$i++] . '">' . $td . '</td>';
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index 458fb4cc..b9055b83 100644
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -24,8 +24,8 @@ class gallery extends common {
 	];
 
 	public static $sort = [
-		'SORT_ASC' => 'Alphabétique naturel',
-		'SORT_DSC' => 'Alphabétique naturel inverse',
+		'SORT_ASC' => 'Alphabétique ',
+		'SORT_DSC' => 'Alphabétique inversé',
 		'none' => 'Aucun tri',
 	];
 
diff --git a/module/gallery/view/edit/edit.php b/module/gallery/view/edit/edit.php
index 60f7dff4..ad3eacb6 100644
--- a/module/gallery/view/edit/edit.php
+++ b/module/gallery/view/edit/edit.php
@@ -45,6 +45,6 @@
 		</div>
 	</div>
 	<?php if($module::$pictures): ?>
-		<?php echo template::table([4, 1, 7], $module::$pictures, ['Image', 'Album','Légende']); ?>
+		<?php echo template::table([4, 1, 7], $module::$pictures, ['Image', 'Couverture','Légende']); ?>
 	<?php endif; ?>
 <?php echo template::formClose(); ?>
\ No newline at end of file