From 129ea5c11ac5ffb3adbdf5eb860f3aca8a0c35ea Mon Sep 17 00:00:00 2001
From: chankalan <chankalan@choc0.net>
Date: Fri, 3 Sep 2021 11:30:49 +0200
Subject: [PATCH] pagination + blog : liste et aside

---
 paquet.xml                                  |  2 +-
 squelettes/aside/article-blog.html          | 28 ++++++++++++---------
 squelettes/inclure/resume/article.html      |  6 ++---
 squelettes/scss/components/_pagination.scss |  6 +++++
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/paquet.xml b/paquet.xml
index d5bb21d..0ee354b 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -1,7 +1,7 @@
 <paquet
 	prefix="baz_april"
 	categorie="squelette"
-	version="2.5.2"
+	version="2.5.3"
 	schema="1.0.1"
 	etat="stable"
 	compatibilite="[3.2.0;4.0.*]"
diff --git a/squelettes/aside/article-blog.html b/squelettes/aside/article-blog.html
index ac3ba9e..fe52aeb 100644
--- a/squelettes/aside/article-blog.html
+++ b/squelettes/aside/article-blog.html
@@ -1,17 +1,21 @@
-<BOUCLE_article(ARTICLES){id_article}>
-
+<BOUCLE_article(ARTICLES){id_article}><BOUCLE_test(ARTICLES){id_rubrique}{1,2}>
+#SET{plusdun,oui}</BOUCLE_test>
+[(#PS|ou{#GET{plusdun}|=={oui}}|oui)<aside class="page_aside">]
 	[<div class="ps">
 		<div class="#EDIT{ps} article__ps">(#PS|image_reduire{#CONST{_CONTENT_WIDTH},0})</div>
 	</div>]
 	
+	[(#REM) Articles dans la meme rubrique ]
+	<B_articles_rubrique>
+	<div class="liste articles blog">
+	#ANCRE_PAGINATION
+	<ul class="liste-items">
+		<BOUCLE_articles_rubrique(ARTICLES) {id_rubrique} {tri_rubrique} {pagination 5}>
+		<li class="item"><INCLURE{fond=inclure/resume/article,id_article} /></li>
+		</BOUCLE_articles_rubrique>
+	</ul>
+	[<p class="pagination">(#PAGINATION{page})</p>]
+	</div>
+	</B_articles_rubrique>
+[(#PS|ou{#GET{plusdun}|=={oui}}|oui)</aside>]
 </BOUCLE_article>
-[(#REM) Articles dans la meme rubrique ]
-<B_articles_rubrique>
-		#ANCRE_PAGINATION
-		<ul>
-			<BOUCLE_articles_rubrique(ARTICLES) {id_rubrique} {tri_rubrique} {pagination 5}>
-			<li><INCLURE{fond=inclure/resume/article,id_article} /></li>
-			</BOUCLE_articles_rubrique>
-		</ul>
-		[<p class="pagination">(#PAGINATION{page})</p>]
-</B_articles_rubrique>
diff --git a/squelettes/inclure/resume/article.html b/squelettes/inclure/resume/article.html
index de31278..a28ba1b 100644
--- a/squelettes/inclure/resume/article.html
+++ b/squelettes/inclure/resume/article.html
@@ -1,15 +1,15 @@
 <BOUCLE_articles(ARTICLES) {id_article}>
 <article class="article-resume[ article-resume--(#ENV{class})] block-link-parent[(#ENV{compteur}|=={1}|et{#ENV{hero}|=={oui}}|oui) hero]">
-	<div class="article-resume__logo">[(#ENV{compteur}|=={1}|et{#ENV{hero}|=={oui}}|oui)<a href="#URL_ARTICLE" title="#TITRE">]
+	[(#LOGO_ARTICLE_NORMAL|oui)<div class="article-resume__logo">][(#ENV{compteur}|=={1}|et{#ENV{hero}|=={oui}}|oui)<a href="#URL_ARTICLE" title="#TITRE">]
 	[(#ENV{compteur}|=={1}|et{#ENV{hero}|=={oui}}|oui)
 		[(#LOGO_ARTICLE_NORMAL|sinon{#CHEMIN{images/nologo.png}}|image_recadre{#CONST{_IMAGE_RATIO}, -, focus}|image_reduire{240})]
 	][(#ENV{compteur}|=={1}|et{#ENV{hero}|=={oui}}|non)
 		[(#LOGO_ARTICLE_NORMAL|sinon{#CHEMIN{images/nologo.png}}|image_recadre{#CONST{_IMAGE_RATIO}, -, focus}|image_reduire{140})]
 	]
-		[(#ENV{compteur}|=={1}|et{#ENV{hero}|=={oui}}|oui)</a>]</div>
+		[(#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})]>
-		<p class="article-resume__soustitre">#SOUSTITRE</p>[(#ENV{compteur}|=={1}|et{#ENV{hero}|=={oui}}|oui)[(#COMPOSITION|=={blog}|non)
+		[<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>]]
 		<div class="article-resume__infos">
 			[<span class="article-resume__date">(#DATE|nom_jour|ucfirst) [(#DATE|affdate)]</span>]
diff --git a/squelettes/scss/components/_pagination.scss b/squelettes/scss/components/_pagination.scss
index 252779e..13c683b 100644
--- a/squelettes/scss/components/_pagination.scss
+++ b/squelettes/scss/components/_pagination.scss
@@ -60,6 +60,12 @@
 
 }
 
+.pagination_ancre {
+	@include visuallyhidden;
+	padding:0 !important;
+	margin:0 !important;
+}
+
 .col .prev,
 .col .next {
     display: none;