From c425d90991787853d6fcdf5f371f5f328c28cc28 Mon Sep 17 00:00:00 2001
From: chankalan <chankalan@choc0.net>
Date: Mon, 6 Sep 2021 22:06:58 +0200
Subject: [PATCH] =?UTF-8?q?am=C3=A9lioration=20blog,=20pagination=20et=20l?=
 =?UTF-8?q?iste?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/libreavous.php                      | 265 ++++++++++++-----------
 squelettes/content/article-emission.html |   5 +-
 squelettes/scss/styles/_perso.scss       |  15 +-
 3 files changed, 152 insertions(+), 133 deletions(-)

diff --git a/base/libreavous.php b/base/libreavous.php
index f2e7298..1b4fd4f 100644
--- a/base/libreavous.php
+++ b/base/libreavous.php
@@ -10,88 +10,89 @@ function libreavous_declarer_champs_extras($champs = array()) {
 	}
 
 	$champs['spip_articles']['podcast_code'] = array(
-			'saisie' => 'input',
-			'options' => array(
-				'nom' => 'podcast_code',
-				'label' => 'Code',
-				'type' => 'text',
-				'size' => '40',
-				'autocomplete' => 'defaut',
-				'sql' => 'text DEFAULT \'\' NOT NULL',
-			),
-			'verifier' => array(
-			),
-		);
+		'saisie' => 'input',
+		'options' => array(
+			'nom' => 'podcast_code',
+			'label' => 'Code',
+			'type' => 'text',
+			'size' => '40',
+			'autocomplete' => 'defaut',
+			'sql' => 'text DEFAULT \'\' NOT NULL',
+		),
+		'verifier' => array(
+		),
+	);
 
 	$champs['spip_articles']['podcast_duree'] = array(
-			'saisie' => 'input',
-			'options' => array(
-				'nom' => 'podcast_duree',
-				'label' => 'Durée',
-				'type' => 'text',
-				'size' => '40',
-				'autocomplete' => 'defaut',
-				'sql' => 'text DEFAULT \'\' NOT NULL',
-			),
-			'verifier' => array(
-			),
-		);
+		'saisie' => 'input',
+		'options' => array(
+			'nom' => 'podcast_duree',
+			'label' => 'Durée',
+			'type' => 'text',
+			'size' => '40',
+			'autocomplete' => 'defaut',
+			'sql' => 'text DEFAULT \'\' NOT NULL',
+		),
+		'verifier' => array(
+		),
+	);
 
 	$champs['spip_articles']['podcast_mp3'] = array(
-			'saisie' => 'input',
-			'options' => array(
-				'nom' => 'podcast_mp3',
-				'label' => 'Taille mp3',
-				'type' => 'text',
-				'size' => '40',
-				'autocomplete' => 'defaut',
-				'sql' => 'text DEFAULT \'\' NOT NULL',
-			),
-			'verifier' => array(
-			),
-		);
+		'saisie' => 'input',
+		'options' => array(
+			'nom' => 'podcast_mp3',
+			'label' => 'Taille mp3',
+			'type' => 'text',
+			'size' => '40',
+			'autocomplete' => 'defaut',
+			'sql' => 'text DEFAULT \'\' NOT NULL',
+		),
+		'verifier' => array(
+		),
+	);
 
 	$champs['spip_articles']['podcast_ogg'] = array(
-			'saisie' => 'input',
-			'options' => array(
-				'nom' => 'podcast_ogg',
-				'label' => 'Taille Ogg',
-				'type' => 'text',
-				'size' => '40',
-				'autocomplete' => 'defaut',
-				'sql' => 'text DEFAULT \'\' NOT NULL',
-			),
-			'verifier' => array(
-			),
-		);
+		'saisie' => 'input',
+		'options' => array(
+			'nom' => 'podcast_ogg',
+			'label' => 'Taille Ogg',
+			'type' => 'text',
+			'size' => '40',
+			'autocomplete' => 'defaut',
+			'sql' => 'text DEFAULT \'\' NOT NULL',
+		),
+		'verifier' => array(
+		),
+	);
 
 	$champs['spip_articles']['podcast_transcription'] = array(
-			'saisie' => 'input',
-			'options' => array(
-				'nom' => 'podcast_transcription',
-				'label' => 'Lien transcription',
-				'type' => 'text',
-				'size' => '40',
-				'autocomplete' => 'defaut',
-				'sql' => 'text DEFAULT \'\' NOT NULL',
-			),
-			'verifier' => array(
-			),
-		);
+		'saisie' => 'input',
+		'options' => array(
+			'nom' => 'podcast_transcription',
+			'label' => 'Lien transcription',
+			'type' => 'text',
+			'size' => '40',
+			'autocomplete' => 'defaut',
+			'sql' => 'text DEFAULT \'\' NOT NULL',
+		),
+		'verifier' => array(
+		),
+	);
 
 	$champs['spip_articles']['podcast_personnes'] = array(
-			'saisie' => 'textarea',
-			'options' => array(
-				'nom' => 'podcast_personnes',
-				'label' => 'Personnes participantes',
-				'rows' => '10',
-				'cols' => '40',
-				'sql' => 'text DEFAULT \'\' NOT NULL',
-			),
-			'verifier' => array(
-			),
-		);
-		
+		'saisie' => 'textarea',
+		'options' => array(
+			'nom' => 'podcast_personnes',
+			'label' => 'Personnes participantes',
+			'rows' => '10',
+			'cols' => '40',
+			'sql' => 'text DEFAULT \'\' NOT NULL',
+			'inserer_barre' => 'edition',
+		),
+		'verifier' => array(
+		),
+	);
+
 	$champs['spip_articles']['podcast_references'] = array(
 		'saisie' => 'textarea',
 		'options' => array(
@@ -100,79 +101,81 @@ function libreavous_declarer_champs_extras($champs = array()) {
 			'rows' => '20',
 			'cols' => '40',
 			'sql' => 'text DEFAULT \'\' NOT NULL',
+			'inserer_barre' => 'edition',
 		),
 		'verifier' => array(
 		),
 	);
 
 	$champs['spip_articles']['podcast_galeriephotos'] = array(
-			'saisie' => 'input',
-			'options' => array(
-				'nom' => 'podcast_galeriephotos',
-				'label' => 'Galerie Photos',
-				'type' => 'text',
-				'size' => '40',
-				'sql' => 'text DEFAULT \'\' NOT NULL',
-			),
-			'verifier' => array(
-			),
-		);
+		'saisie' => 'input',
+		'options' => array(
+			'nom' => 'podcast_galeriephotos',
+			'label' => 'Galerie Photos',
+			'type' => 'text',
+			'size' => '40',
+			'sql' => 'text DEFAULT \'\' NOT NULL',
+		),
+		'verifier' => array(
+		),
+	);
 
 	$champs['spip_articles']['podcast_musique'] = array(
-			'saisie' => 'textarea',
-			'options' => array(
-				'nom' => 'podcast_musique',
-				'label' => 'Pauses musicales',
-				'rows' => '5',
-				'cols' => '40',
-				'sql' => 'text DEFAULT \'\' NOT NULL',
-			),
-			'verifier' => array(
-			),
-		);
+		'saisie' => 'textarea',
+		'options' => array(
+			'nom' => 'podcast_musique',
+			'label' => 'Pauses musicales',
+			'rows' => '5',
+			'cols' => '40',
+			'sql' => 'text DEFAULT \'\' NOT NULL',
+			'inserer_barre' => 'edition',
+		),
+		'verifier' => array(
+		),
+	);
 
 	$champs['spip_articles']['drupal_guid'] = array(
-			'saisie' => 'input',
-			'options' => array(
-				'nom' => 'drupal_guid',
-				'label' => 'GUID Drupral',
-				'type' => 'text',
-				'size' => '40',
-				'autocomplete' => 'defaut',
-				'sql' => 'text DEFAULT \'\' NOT NULL',
-			),
-			'verifier' => array(
-			),
-		);
+		'saisie' => 'input',
+		'options' => array(
+			'nom' => 'drupal_guid',
+			'label' => 'GUID Drupal',
+			'type' => 'text',
+			'size' => '40',
+			'autocomplete' => 'defaut',
+			'sql' => 'text DEFAULT \'\' NOT NULL',
+		),
+		'verifier' => array(
+		),
+	);
 
 	$champs['spip_articles']['drupal_pubdate'] = array(
-			'saisie' => 'input',
-			'options' => array(
-				'nom' => 'drupal_pubdate',
-				'label' => 'PubDate Drupal',
-				'type' => 'text',
-				'size' => '40',
-				'autocomplete' => 'defaut',
-				'sql' => 'text DEFAULT \'\' NOT NULL',
-			),
-			'verifier' => array(
-			),
-		);
+		'saisie' => 'input',
+		'options' => array(
+			'nom' => 'drupal_pubdate',
+			'label' => 'PubDate Drupal',
+			'type' => 'text',
+			'size' => '40',
+			'autocomplete' => 'defaut',
+			'sql' => 'text DEFAULT \'\' NOT NULL',
+		),
+		'verifier' => array(
+		),
+	);
 
 	$champs['spip_articles']['chronique'] = array(
-			'saisie' => 'input',
-			'options' => array(
-				'nom' => 'chronique',
-				'label' => _T('libreavous:chronique_label'),
-				'type' => 'text',
-				'size' => '40',
-				'autocomplete' => 'defaut',
-				'sql' => 'text DEFAULT \'\' NOT NULL',
-				'explication' => _T('libreavous:chronique_explications'),
-			),
-			'verifier' => array(
-			),
-		);
+		'saisie' => 'input',
+		'options' => array(
+			'nom' => 'chronique',
+			'label' => _T('libreavous:chronique_label'),
+			'type' => 'text',
+			'size' => '40',
+			'autocomplete' => 'defaut',
+			'sql' => 'text DEFAULT \'\' NOT NULL',
+			'explication' => _T('libreavous:chronique_explications'),
+		),
+		'verifier' => array(
+		),
+	);
 
 	return $champs;
 }
diff --git a/squelettes/content/article-emission.html b/squelettes/content/article-emission.html
index 551df68..0a40dc6 100644
--- a/squelettes/content/article-emission.html
+++ b/squelettes/content/article-emission.html
@@ -91,11 +91,14 @@
 		</B_photos>
 		
 		<div class="fb detail_emission">
-			[(#PODCAST_PERSONNES|oui)<a href="#personnesparticipantes" class="btn taille70 blanc"><:libreavous:personnes_participantes:></a>]
+			<p>[(#PODCAST_PERSONNES|oui)<a href="#personnesparticipantes" class="btn taille70 blanc"><:libreavous:personnes_participantes:></a>]
 			[(#PODCAST_REFERENCES|ou{#GET{references}|=={oui}}|oui)<a href="#references" class="btn taille70 blanc"><:libreavous:references:></a>]
 			[(#PODCAST_TRANSCRIPTION|oui)<a href="#transcription" class="btn taille70 blanc"><:libreavous:transcription:></a>]
 			[(#PODCAST_MUSIQUE|oui)<a href="#pausesmusicales" class="btn taille70 blanc"><:libreavous:pauses_musicales:></a>]
 			[(#CONFIG{libreavous/licence}|oui)<a href="#licence" class="btn taille70 blanc"><:libreavous:licence:></a>]
+			</p>
+			
+			[<div class="texte #EDIT{texte}">(#TEXTE)</div>]
 			
 			[<h2 id="personnesparticipantes">Personnes participantes</h2>
 			<div class="#EDIT{podcast_personnes}">(#PODCAST_PERSONNES|propre)</div>]
diff --git a/squelettes/scss/styles/_perso.scss b/squelettes/scss/styles/_perso.scss
index 014b0d9..11c6214 100644
--- a/squelettes/scss/styles/_perso.scss
+++ b/squelettes/scss/styles/_perso.scss
@@ -218,6 +218,14 @@ span.btn {
 			position:absolute;
 			margin-top:-2.6rem;
 		}
+		.article_blog & {
+			margin-top:0;
+			padding:$spacer ($spacer*2);
+			background-color:white;
+			.pagination .pagination-items a, .pagination .lien_pagination a {
+				color:$couleurPrincipale;
+			}
+		}
 	}
 }
 
@@ -330,6 +338,8 @@ h2 {
 	}
 }
 .liste.articles.blog {
+	padding:$spacer ($spacer*2);
+	background-color:white;
 	.liste-items {
 		list-style:none;
 		margin:0 0 ($spacer*2);
@@ -634,8 +644,11 @@ div.rating-cancel a {
 	color:$couleurSecondaire;
 }
 
-.pagination .pagination-items a {
+.pagination .pagination-items a, .pagination .lien_pagination a /* spip 3 et 4 */ {
 	color:white;
+	.composition_blog & {
+		color:$couleurPrincipale;
+	}
 }