From e18de730de0036b35fa299e793e1406353672a50 Mon Sep 17 00:00:00 2001
From: chankalan <chankalan@choc0.net>
Date: Thu, 7 Oct 2021 15:13:14 +0200
Subject: [PATCH] =?UTF-8?q?radiolive=20simplifi=C3=A9=20et=20mis=20en=20fo?=
 =?UTF-8?q?rme,=20fix=20clearfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 paquet.xml                         | 2 +-
 squelettes/content/sommaire.html   | 4 ++--
 squelettes/inclure/radiolive.html  | 8 +-------
 squelettes/scss/styles/_perso.scss | 2 ++
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/paquet.xml b/paquet.xml
index a67ddb9..cf9cae8 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -1,7 +1,7 @@
 <paquet
 	prefix="libreavous"
 	categorie="squelette"
-	version="1.1.0"
+	version="1.1.1"
 	schema="0.1.9"
 	etat="dev"
 	compatibilite="[3.2.8;4.0.*]"
diff --git a/squelettes/content/sommaire.html b/squelettes/content/sommaire.html
index d0165d1..3a3df9d 100644
--- a/squelettes/content/sommaire.html
+++ b/squelettes/content/sommaire.html
@@ -16,14 +16,14 @@
 			<span class="bientot"><:libreavous:c_est_bientot:></span><br />]
 			[<span class="btn">[(#DATE|nom_jour) ][(#DATE|jour) ](#DATE|nom_mois)</span><br />]
 			<:libreavous:de_15h30_a_17h:>[(#ENV{date}|>={#DATE}|oui)<br />
-			<a href="#URL_ARTICLE" class="btn taille80 blanc"><:libreavous:page_de_l_emission:></a>]
+			<a href="#URL_ARTICLE" class="btn taille80 blanc[ (#ENV{date}|<={#GET{fin_emission}}|oui)spip_out]"><:libreavous:page_de_l_emission:></a>]
 		</p>
 			
 		<h1><span class="#EDIT{titre} article__titre">[(#TITRE|libreavous_supp_numero)]</span>[
 			<small class="#EDIT{soustitre} soustitre">(#SOUSTITRE)</small>
 		]</h1>
 		
-		<INCLURE{fond=inclure/radiolive} />
+		<INCLURE{fond=inclure/radiolive, debut_emission=#DATE, fin_emission=#GET{fin_emission}} />
 		
 	</header>
 	[(#REM) on ne met que le podcast_sommaire, les chapitres ne seront jamais présent lorsque l'émission est en cours... ]
diff --git a/squelettes/inclure/radiolive.html b/squelettes/inclure/radiolive.html
index 261eacc..fae8785 100644
--- a/squelettes/inclure/radiolive.html
+++ b/squelettes/inclure/radiolive.html
@@ -1,12 +1,6 @@
 #CACHE{0}
 #SET{live,off}
-[(#ENV{date}|nom_jour|=={mardi}|oui)
-	[(#ENV{date}|heures|>={15}|oui)
-		#SET{live,on}
-	][(#ENV{date}|heures|>={17}|oui)
-		#SET{live,off}
-	]
-][(#ENV{date}|<={#ENV{fin_emission}}|oui)
+[(#ENV{date}|<={#ENV{fin_emission}}|oui)
 	[(#ENV{date}|>={#ENV{debut_emission}}|oui)
 	#SET{live,on}]
 ][(#GET{live}|=={on}|oui)<div class="radiolive">
diff --git a/squelettes/scss/styles/_perso.scss b/squelettes/scss/styles/_perso.scss
index 4c6ee62..215e821 100644
--- a/squelettes/scss/styles/_perso.scss
+++ b/squelettes/scss/styles/_perso.scss
@@ -254,6 +254,7 @@ html .formulaire_spip input[type="text"] {
 	> * {
 		margin:0 0 2rem;
 		padding:1rem 4rem;
+		@include clearfix();
 		@include media($bp-medium) {
 			padding:1rem 2rem;
 		}
@@ -942,6 +943,7 @@ a:hover .fab, a:hover .fas {
 }
 /* modele radiolive */
 .radiolive {
+	@include clearfix();
 	p {
 		line-height:1.1;
 	}