diff --git a/core/class/template.class.php b/core/class/template.class.php
index 9072a2e9..0cb422bc 100644
--- a/core/class/template.class.php
+++ b/core/class/template.class.php
@@ -598,56 +598,62 @@ 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 = '
';
- // Début tableau
- $html .= '
';
- // Entêtes
- if($head) {
- // Début des entêtes
- $html .= '';
- $html .= '';
- $i = 0;
- foreach($head as $th) {
- $html .= '' . $th . ' | ';
- }
- // Fin des entêtes
- $html .= '
';
- $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 $rowsId Id pour la numérotation des rows (format : [id colonne1, id 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 = '';
+ // Début tableau
+ $html .= '
';
+ // Entêtes
+ if($head) {
+ // Début des entêtes
+ $html .= '';
+ $html .= '';
+ $i = 0;
+ foreach($head as $th) {
+ $html .= '' . $th . ' | ';
+ }
+ // Fin des entêtes
+ $html .= '
';
+ $html .= '';
}
- // Début contenu
- $html .= '';
- foreach($body as $tr) {
- $html .= '';
- $i = 0;
- foreach($tr as $td) {
- $html .= '' . $td . ' | ';
- }
- $html .= '
';
+ // Pas de tableau d'Id transmis, générer une numérotation
+ if (empty($rowsId)) {
+ $rowsId = range(0,count($body));
}
- // Fin contenu
- $html .= '';
- // Fin tableau
- $html .= '
';
- // Fin container
- $html .= '
';
- // Retourne le html
- return $html;
- }
+ // Début contenu
+ $j = 0;
+ foreach($body as $tr) {
+ // Id de ligne pour les tableaux drag and drop
+ $html .= '';
+ $i = 0;
+ foreach($tr as $td) {
+ $html .= '' . $td . ' | ';
+ }
+ $html .= '
';
+ }
+ // Fin contenu
+ $html .= '';
+ // Fin tableau
+ $html .= '
';
+ // Fin container
+ $html .= '
';
+ // Retourne le html
+ return $html;
+ }
/**
* Crée un champ texte court
diff --git a/core/core.php b/core/core.php
index a3e640c1..895b9a45 100644
--- a/core/core.php
+++ b/core/core.php
@@ -475,7 +475,7 @@ class common {
// La clef est une chaine
else {
foreach($this->input as $type => $values) {
- // Champ obligatoire
+ // Champ obligatoire
if($required) {
$this->addRequiredInputNotices($key);
}
@@ -1110,7 +1110,7 @@ class common {
// Forcer la régénération du thème
if (file_exists(self::DATA_DIR.'theme.css')) {
unlink (self::DATA_DIR.'theme.css');
- }
+ }
$this->setData(['core', 'dataVersion', 9227]);
}
// Version 10.0.00
@@ -1143,6 +1143,7 @@ class common {
}
$this->setData(['core', 'dataVersion', 10000]);
}
+
}
}
@@ -2400,4 +2401,4 @@ class layout extends common {
}
}
-}
+}
\ No newline at end of file
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index f3418fe2..6a39e494 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -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/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 de2ce3d8..b9055b83 100644
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -19,12 +19,13 @@ class gallery extends common {
'delete' => self::GROUP_MODERATOR,
'dirs' => self::GROUP_MODERATOR,
'edit' => self::GROUP_MODERATOR,
- 'index' => self::GROUP_VISITOR
+ 'filter' => self::GROUP_MODERATOR,
+ 'index' => self::GROUP_VISITOR
];
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',
];
@@ -34,16 +35,49 @@ class gallery extends common {
public static $galleries = [];
+ public static $galleriesId = [];
+
public static $pictures = [];
- const GALLERY_VERSION = '1.3';
+ 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;$isetData(['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() {
- // Liste des galeries
- $galleries = $this->getData(['module', $this->getUrl(0)]);
+ // 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
@@ -57,16 +91,10 @@ class gallery extends common {
$gallery['config']['directory'] = '' . $gallery['config']['directory'] . ' (dossier introuvable)';
}
// Met en forme le tableau
- self::$galleries[] = [
+ self::$galleries[] = [
+ 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')
@@ -77,31 +105,42 @@ 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
- ]);
+ 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),
+ 'homePicture' => '',
+ 'sort' => $this->getInput('galleryConfigSort'),
+ 'position' => 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',
- 'view' => 'config'
+ 'view' => 'config',
+ 'vendor' => [
+ 'tablednd'
+ ]
]);
}
@@ -196,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
]]);
@@ -308,8 +348,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/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")||'
',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:'
',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;ja.vertical&&this.dragObject.parentNode.insertBefore(this.dragObject,b.nextSibling)||00&&a(c).find("td:first").children(":first").remove()&&a(c).data("level",--d),0>b.horizontal&&d=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;ig-d&&c1&&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;e0&&(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;mi)h.push([e,i]),e=c(f[m-1].id);else if(j=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 9a3bd84c..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
*/
@@ -22,6 +40,8 @@ $(".galleryConfigDelete").on("click", function() {
});
});
+
+
/**
* Liste des dossiers
*/
@@ -62,4 +82,3 @@ 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 109021c6..c83da42f 100644
--- a/module/gallery/view/config/config.php
+++ b/module/gallery/view/config/config.php
@@ -44,11 +44,25 @@
+
+
- 'galleryTable']); ?>
+ 'galleryTable'],$module::$galleriesId); ?>
+
+ false
+ ]); ?>
+
+
+ 'Trier',
+ 'disabled' => true
+ ]); ?>
+
+
Version n°
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 @@
-
+
\ No newline at end of file
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
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @authorFrédéric Tempez
- * @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
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 @@