From 3516939180f011f4246977f0d3cb1d4d8897a057 Mon Sep 17 00:00:00 2001
From: chankalan <chankalan@choc0.net>
Date: Mon, 6 Sep 2021 21:54:01 +0200
Subject: [PATCH] =?UTF-8?q?am=C3=A9liorer=20la=20navigation=20dans=20le=20?=
 =?UTF-8?q?blog=20-=20liste=20articles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 paquet.xml                                       | 2 +-
 squelettes/inclure/liste/articles-auteur.html    | 2 +-
 squelettes/inclure/liste/articles-recherche.html | 2 +-
 squelettes/inclure/liste/articles-resume.html    | 6 +++---
 squelettes/inclure/resume/article.html           | 4 ++--
 squelettes/scss/blocs/_content.scss              | 3 ++-
 squelettes/scss/styles/_styles.scss              | 9 +++++++++
 7 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/paquet.xml b/paquet.xml
index 991864c..c33904f 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -1,7 +1,7 @@
 <paquet
 	prefix="baz_april"
 	categorie="squelette"
-	version="2.5.4"
+	version="2.5.5"
 	schema="1.0.1"
 	etat="stable"
 	compatibilite="[3.2.0;4.0.*]"
diff --git a/squelettes/inclure/liste/articles-auteur.html b/squelettes/inclure/liste/articles-auteur.html
index 891d8f0..f36d588 100644
--- a/squelettes/inclure/liste/articles-auteur.html
+++ b/squelettes/inclure/liste/articles-auteur.html
@@ -5,7 +5,7 @@
 	<h2 class="h2"><:articles_auteur:> (#GRAND_TOTAL)</h2>
 	<ul class="liste-items">
 		<BOUCLE_articles(ARTICLES) {id_auteur} {!par popularite} {pagination 10}>
-		<li class="item clearfix"><a href="#URL_ARTICLE">#TITRE</a></li>
+		<li class="item"><a href="#URL_ARTICLE">#TITRE</a></li>
 		</BOUCLE_articles>
 	</ul>
 	[<nav class="pagination" role="pagination">(#PAGINATION)</nav>]
diff --git a/squelettes/inclure/liste/articles-recherche.html b/squelettes/inclure/liste/articles-recherche.html
index 97441ef..9492387 100644
--- a/squelettes/inclure/liste/articles-recherche.html
+++ b/squelettes/inclure/liste/articles-recherche.html
@@ -5,7 +5,7 @@
 	<h2 class="h2"><:articles:> (#GRAND_TOTAL)</h2>
 	<ul class="liste-items">
 		<BOUCLE_articles(ARTICLES) {recherche} {par points}{inverse} {pagination 20}>
-		<li class="item clearfix"><INCLURE{fond=inclure/resume/article,id_article,recherche=#ENV{recherche},composition,env} /></li>
+		<li class="item"><INCLURE{fond=inclure/resume/article,id_article,recherche=#ENV{recherche},composition,env} /></li>
 		</BOUCLE_articles>
 	</ul>
 	[<nav class="pagination" role="pagination">(#PAGINATION)</nav>]
diff --git a/squelettes/inclure/liste/articles-resume.html b/squelettes/inclure/liste/articles-resume.html
index 54e33bd..0189c5c 100644
--- a/squelettes/inclure/liste/articles-resume.html
+++ b/squelettes/inclure/liste/articles-resume.html
@@ -1,11 +1,11 @@
 <B_articles>
 <div class="liste_articles">#ANCRE_PAGINATION
 	[<h2 class="h2">(#ENV{titre})</h2>]
-	<div>
+	<ul class="liste-items">
 	<BOUCLE_articles(ARTICLES){id_rubrique!=-1}{id_rubrique?}{id_secteur?}{id_mot?}{lang}{tri_rubrique}{0,#ENV{nb,1001}}{pagination #ENV{parpage,10}}>
-		#INCLURE{fond=inclure/resume/article, id_article, env, couper=#ENV{couper}, compteur=#COMPTEUR_BOUCLE, h=h3}
+		<li class="item"><INCLURE{fond=inclure/resume/article, id_article, env, couper=#ENV{couper}, compteur=#COMPTEUR_BOUCLE, h=h3,pagination=oui,expose=#EXPOSE} /></li>
 	</BOUCLE_articles>
-	</div>
+	</ul>
 	[<nav class="pagination" role="pagination">(#PAGINATION{page_precedent_suivant})</nav>]
 	[(#ENV{voirtous}|oui)#MODELE{bouton,lienobjet=#ENV{lienobjet}|sinon{rubrique},lienidobjet=#ENV{lienidobjet}|sinon{#ENV{id_rubrique}}|sinon{#ENV{id_secteur}},align=#ENV{align,right},class=voirtous #ENV{class},icone=#ENV{icone},texte=#ENV{voirtous}}]
 </div>
diff --git a/squelettes/inclure/resume/article.html b/squelettes/inclure/resume/article.html
index a28ba1b..94e85be 100644
--- a/squelettes/inclure/resume/article.html
+++ b/squelettes/inclure/resume/article.html
@@ -8,9 +8,9 @@
 	]
 		[(#ENV{compteur}|=={1}|et{#ENV{hero}|=={oui}}|oui)</a>][(#LOGO_ARTICLE_NORMAL|oui)</div>]
 	<div class="article-resume__texte">
-		<[(#ENV{h,h2})] class="article-resume__titre"><a href="#URL_ARTICLE" class="[(#ENV{hero}|=={oui}|oui)[(#ENV{compteur}|=={1}|non)block-link]][(#ENV{hero}|=={oui}|non)block-link][ (#ENV{class_link})]">#TITRE</a></[(#ENV{h,h2})]>
+		<[(#ENV{h,h2})] class="article-resume__titre"><a href="[(#ENV{pagination}|=={oui}|oui)[(#URL_ARTICLE|parametre_url{debut_articles,@#ID_ARTICLE})]][(#ENV{pagination}|!={oui}|oui)#URL_ARTICLE]" class="[(#ENV{hero}|=={oui}|oui)[(#ENV{compteur}|=={1}|non)block-link]][(#ENV{hero}|=={oui}|non)block-link][ (#ENV{class_link})][ (#ENV{expose})]">#TITRE</a></[(#ENV{h,h2})]>
 		[<p class="article-resume__soustitre">(#SOUSTITRE)</p>][(#ENV{compteur}|=={1}|et{#ENV{hero}|=={oui}}|oui)[(#COMPOSITION|=={blog}|non)
-		<a href="#URL_ARTICLE" class="btn[ (#ENV{class_link})]"><:baz_april:lire:></a>]]
+		<a href="#URL_ARTICLE" class="btn[ (#ENV{class_link})][ (#EXPOSE)]"><:baz_april:lire:></a>]]
 		<div class="article-resume__infos">
 			[<span class="article-resume__date">(#DATE|nom_jour|ucfirst) [(#DATE|affdate)]</span>]
 		</div>[(#COMPOSITION|=={blog}|oui)
diff --git a/squelettes/scss/blocs/_content.scss b/squelettes/scss/blocs/_content.scss
index 92ff104..8adcae0 100644
--- a/squelettes/scss/blocs/_content.scss
+++ b/squelettes/scss/blocs/_content.scss
@@ -70,8 +70,9 @@
     margin-bottom: 0;
 	margin-top:0;
     @include link-color-text;
-    a:hover {
+    a:hover, a.on {
         text-decoration: none;
+		color:$couleurPrincipaleOn;
     }
 }
 
diff --git a/squelettes/scss/styles/_styles.scss b/squelettes/scss/styles/_styles.scss
index beee90b..3b04628 100644
--- a/squelettes/scss/styles/_styles.scss
+++ b/squelettes/scss/styles/_styles.scss
@@ -20,6 +20,15 @@
 	font-size:130%;
 }
 
+.liste-items {
+	padding:0;
+	margin:0;
+	list-style:none;
+	.article-resume {
+		margin:0;
+	}
+}
+
 
 .formulaire_spip.formulaire_recherche {
 	margin:2rem 0;