From f50689dd3878da2d8265a3c4b976525f64b08057 Mon Sep 17 00:00:00 2001
From: Deltacms <contact@deltacms.fr>
Date: Sat, 17 Feb 2024 18:47:48 +0100
Subject: [PATCH] affichage commentaires de page

---
 core/include/comment.inc.php | 19 ++++--------
 core/lang/en/lex_core.php    |  1 +
 core/lang/es/lex_core.php    |  1 +
 core/lang/fr/lex_core.php    |  2 ++
 core/layout/pageComment.css  | 60 +++++++++++++++++-------------------
 5 files changed, 39 insertions(+), 44 deletions(-)

diff --git a/core/include/comment.inc.php b/core/include/comment.inc.php
index bce710c..29a215e 100644
--- a/core/include/comment.inc.php
+++ b/core/include/comment.inc.php
@@ -1,7 +1,7 @@
 <?php // Commentaires de page, fichier inclus dans showComment() ?>
 
 <?php // Style lié au thème du site ?>
-<style>.msgs > hr {  --hr_color : <?=$this->getData(['theme', 'block', 'borderColor'])?>; }</style>
+<style>.msgs .block .dataNameDate {  --dataNameDate_font : <?=$this->getData(['theme', 'text', 'font'])?>; }</style>
 
 <?php
 // Lexique
@@ -177,21 +177,14 @@ if ( NULL !== $dataPage && is_array($dataPage) && $dataPage !== [] ) {
 	// Liste des pages
 	$pagesComment = $pagination['pages'];
 	// Inverse l'ordre du tableau
-	$dataIds = array_reverse(array_keys($dataPage));
 	$dataPage = array_reverse($dataPage);
 	// Données en fonction de la pagination et suppression des adresses e-mail
 	for($i = $pagination['first']; $i < $pagination['last']; $i++) {
 		$content = '';
-		foreach($dataPage[$i] as $input => $value) {
-			if (!empty($value) && strpos($value, 'Д') === false) $content .= '<div class=\'clef\'>' . $input . '</div> : <div class=\'valeur\'>' . $value . '</div>';
-		}
-		$horizontalRule = '';
-		if( $i < $pagination['last'] - 1) : $horizontalRule = '<hr>';
-		else : $horizontalRule = '<br>';
-		endif;
-		$data[] = [
-			$content.$horizontalRule
-		];
+		$dataKeys = array_keys($dataPage[$i]);
+		$content .= '<div class="msgs"><div class="block"><div class="dataNameDate blockTitle">'. $dataPage[$i][$dataKeys[0]] . '<span>'.  $text['core']['showComment'][12] .' </span>' . $dataPage[$i][$dataKeys[2]] .'</div>';
+		$content .= '<div class="dataComment">' . $dataPage[$i][$dataKeys[1]] . '</div></div></div><br>';
+		$data[] = [$content];
 	}
 }
 
@@ -289,7 +282,7 @@ echo template::formOpenFile('commentPageFormForm', $action);
 <?php
 // Affichage des messages
 if( $data ){
-	echo '<div  id="commentAnchor" class="block msgs">';
+	echo '<div  id="commentAnchor">';
 		foreach( $data as $key1=>$value1){
 			if( is_array($value1)){
 				foreach( $value1 as $key2=>$value2){
diff --git a/core/lang/en/lex_core.php b/core/lang/en/lex_core.php
index 1e67027..04c0cf7 100644
--- a/core/lang/en/lex_core.php
+++ b/core/lang/en/lex_core.php
@@ -42,6 +42,7 @@ $text['core']['showComment'][8] = 'Send';
 $text['core']['showComment'][9] = 'Name or nickname';
 $text['core']['showComment'][10] = 'Comment';
 $text['core']['showComment'][11] = 'Page ';
+$text['core']['showComment'][12] = ' posted this comment on ';
 // core.js.php
 $text['core_js'][0] = "Updating ?";
 // Select File
diff --git a/core/lang/es/lex_core.php b/core/lang/es/lex_core.php
index edbd270..e3421dd 100644
--- a/core/lang/es/lex_core.php
+++ b/core/lang/es/lex_core.php
@@ -42,6 +42,7 @@ $text['core']['showComment'][8] = 'Enviar';
 $text['core']['showComment'][9] = 'Nombre o apodo';
 $text['core']['showComment'][10] = 'Comentario';
 $text['core']['showComment'][11] = 'Página ';
+$text['core']['showComment'][12] = ' publicó este comentario en ';
 // core.js.php
 $text['core_js'][0] = "¿Realizar actualización?";
 // Seleccione Archivo
diff --git a/core/lang/fr/lex_core.php b/core/lang/fr/lex_core.php
index c7bf535..b78b6df 100644
--- a/core/lang/fr/lex_core.php
+++ b/core/lang/fr/lex_core.php
@@ -42,6 +42,8 @@ $text['core']['showComment'][8] = 'Envoyer';
 $text['core']['showComment'][9] = 'Nom ou pseudo';
 $text['core']['showComment'][10] = 'Commentaire';
 $text['core']['showComment'][11] = 'Page ';
+$text['core']['showComment'][12] = ' a posté ce commentaire le ';
+
 // core.js.php
 $text['core_js'][0] = "Effectuer la mise à jour ?";
 // Select File
diff --git a/core/layout/pageComment.css b/core/layout/pageComment.css
index 741d468..d67987a 100644
--- a/core/layout/pageComment.css
+++ b/core/layout/pageComment.css
@@ -32,40 +32,38 @@
 	border-radius: 2px;
 	border: 1px solid;
 }
-  /*formulaire*/
-  #commentPageFormForm {
-    max-width: 85vw;
-    margin: auto;
-  }
-  /* messages */
-  .msgs {
-    max-width: 85vw;
-    margin: auto;
-    overflow: hidden;
-    box-sizing: border-box;
-    border: ridge rgba(0,0,0,0.3) 2px;
-    padding: 5px;
-  }
-  div.clef {
-    font-weight: 600;
-    display: inline-block;
-    margin: 3px 0 2px;
-  }
-  div.valeur {
-    display: block;
-    padding: 3px;
-  }
-   div.valeur > p {
-    margin: 0;
-    line-height: 1.2;
-  }
 
-.msgs > hr {
-	width: 50%;
-	border: ridge var(--hr_color) 2px;
-	margin: 25px auto;
+/*formulaire*/
+#commentPageFormForm {
+	max-width: 85vw;
+	margin: auto;
 }
 
+/* messages */
+.msgs {
+	max-width: 85vw;
+	margin: auto;
+}
+
+.msgs .block .dataNameDate {
+	font-family: var(--dataNameDate_font );
+	font-weight: normal;
+}
+
+.msgs .block .dataNameDate span{
+	font-style: italic;
+}
+
+.msgs .block .dataComment{
+	
+}
+
+.msgs .block .dataComment > p {
+    margin: 0;
+    line-height: 1.2;	
+}
+
+
 #commentPageFormForm .editorWysiwygComment {
 	overflow: auto;
 	resize: vertical;