Gallery v2 init

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;
+		$j = 0;
-		foreach($body as $tr) {			
+		foreach($body as $tr) {	
-			$html .= '<tr id="item' . ($j++) . '">';
+			// 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>';

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
+		// Traiement du tri
-		$galleries = $this->getData(['module', $this->getUrl(0)]);
+		// 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() {
+	public function add() {
-		
+		// Soumission du formulaire
-		$data = $_POST['data'];
+		if($this->isPost()) {
-		var_dump(json_decode($data));
+			if (!empty($this->getInput('galleryAddName')) ) {				
-		var_dump($_POST);
+				$galleryId = helper::increment($this->getInput('galleryAddName', helper::FILTER_ID, true), (array) $this->getData(['module', $this->getUrl(0)]));
-		die();
+				$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 {		
+		else {
-			foreach((array) $this->getData(['module', $this->getUrl(0)]) as $galleryId => $gallery) {
+			// 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) {

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;
+}

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());
+});

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>

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());
+			$("#galleryConfigResponse").val($.tableDnD.serialize());
-			var url= <?php echo json_encode(helper::baseUrl() . $this->getUrl(0) . '/filter'); ?>;
+		},
-			/*url = "http://localhost/ZwiiCMS/?galeries/filter";	*/
+		serializeRegexp:  "[^\_]*$"
-			$.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é.");
-				}
-			});
-		}
 	});
 });

module/gallery/view/config/config.php

@@ -1,54 +1,35 @@
-<?php echo template::formOpen('galleryConfigForm'); ?>
+<?php echo template::formOpen('galleryConfigOrder'); ?>
-	<div class="row">
+<div class="row">
-		<div class="col2">
+	<div class="col2">
-			<?php echo template::button('galleryConfigBack', [
+		<?php echo template::button('galleryConfigBack', [
-				'class' => 'buttonGrey',
+			'class' => 'buttonGrey',
-				'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0),
+			'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0),
-				'ico' => 'left',
+			'ico' => 'left',
-				'value' => 'Retour'
+			'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="col12">
+		<?php if($module::$galleries): ?>
-			<div class="block">
+			<?php echo template::table([1, 4, 5, 1, 1], $module::$galleries, ['','Nom', 'Dossier cible', '', ''], ['id' => 'galleryTable'],$module::$galleriesId); ?>
-				<h4>Nouvelle galerie</h4>
+			<?php echo template::hidden('galleryConfigResponse'); ?>
-				<div class="row">
+		<?php else: ?>
-					<div class="col4">
+			<?php echo template::speech('Aucune galerie.'); ?>
-						<?php echo template::text('galleryConfigName', [
+		<?php endif; ?>
-							'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 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; ?>