diff --git a/core/core.php b/core/core.php index d48e585a..2c2fad2a 100644 --- a/core/core.php +++ b/core/core.php @@ -3332,7 +3332,7 @@ class template { $html .= ''; $i = 0; foreach($tr as $td) { - $html .= '' . $td . ''; + $html .= '' . $td . ''; } $html .= ''; } diff --git a/module/gallery/view/config/config.js.php b/module/gallery/view/config/config.js.php index 03c26eba..80bef565 100644 --- a/module/gallery/view/config/config.js.php +++ b/module/gallery/view/config/config.js.php @@ -6,6 +6,8 @@ * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2020, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.com/ */ @@ -62,11 +64,18 @@ directoryDOM.on("change", function() { /** - * Tri de la galerie + * Tri dynamique de la galerie */ - $( document ).ready(function() { - $('tbody > tr').sort(function (a, b) { - return +$('td#pos3', b).text() > +$('td#pos3', a).text(); - }).appendTo('tbody'); + 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); }); \ No newline at end of file diff --git a/module/gallery/view/config/config.php b/module/gallery/view/config/config.php index a124965c..4f00d51c 100644 --- a/module/gallery/view/config/config.php +++ b/module/gallery/view/config/config.php @@ -45,7 +45,7 @@ - + 'galleryTable']); ?> diff --git a/module/gallery/view/edit/edit.php b/module/gallery/view/edit/edit.php index c088032d..60f7dff4 100644 --- a/module/gallery/view/edit/edit.php +++ b/module/gallery/view/edit/edit.php @@ -17,7 +17,7 @@

Informations générales

-
+
'Nom', 'value' => $this->getData(['module', $this->getUrl(0), $this->getUrl(2), 'config', 'name']) @@ -33,13 +33,13 @@ 'noDirty' => true // Désactivé à cause des modifications en ajax ]); ?>
-
+
$this->getData(['module', $this->getUrl(0), $this->getUrl(2), 'config', '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.' ]); ?> -
+
diff --git a/module/gallery/view/index/index.js.php b/module/gallery/view/index/index.js.php new file mode 100644 index 00000000..17927eda --- /dev/null +++ b/module/gallery/view/index/index.js.php @@ -0,0 +1,25 @@ +/** + * 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 b2040e8b..a9269e6f 100644 --- a/module/gallery/view/index/index.php +++ b/module/gallery/view/index/index.php @@ -5,7 +5,7 @@
-
+