Mise en forme de la page rubrique et corrections css et pied de page

git-svn-id: svn://svn.spip.net/spip-zone/_galaxie_/party.spip.net@60350 ac52e18a-acf5-0310-9fe8-c4428f23b10a

squelettes/2012/article.html

@@ -42,12 +42,14 @@
 			
 			[(#REM) Les prochains evenements ]
 			<B_event_list>
-			<h2>Prochaines dates :</h2>
-			<ul>
-				<BOUCLE_event_list(EVENEMENTS) {id_article}{id_evenement!=#ENV{id_evenement}} {agendafull date_debut, date_fin, (#ENV{date}|annee)} {statut=publie}{par date_fin}{age<7} {0,10}>
-				<li><a href="[(#URL_ARTICLE|parametre_url{id_evenement,#ID_EVENEMENT})]">#TITRE</a>[ &ndash; (#DATE_DEBUT|Agenda_affdate_debut_fin{#DATE_FIN,#HORAIRE})][ &ndash; (#LIEU)]</li>
+			<h2>Prochaines dates&nbsp;:</h2>
+			<ul class="liste-items events">
+				<BOUCLE_event_list(EVENEMENTS) {id_article}{id_evenement!=#ENV{id_evenement}}{statut=publie}{par date_fin}{par date_fin}{!evenement_passe}{pagination 5}>
+				<li class="event">[<span class="date">(#DATE_DEBUT|Agenda_affdate_debut_fin{#DATE_FIN,#HORAIRE})</span>]<a href="[(#URL_ARTICLE|parametre_url{id_evenement,#ID_EVENEMENT})]">#TITRE</a>[
+				<br />(#LIEU)]</li>
 				</BOUCLE_event_list>
 			</ul>
+			[<p class="pagination">(#PAGINATION)</p>]
 			</B_event_list>
 				<INCLURE{fond=inc_signatures}{id_article}>
 			<//B_event_list>

squelettes/2012/css/feria-blue.css

@@ -4,6 +4,7 @@ body { background-color: #8AADD7; }
 
 #header { background: no-repeat url(header-blue.png) center top #8AADD7; }
 h1, h1 a { color: #799FCF; }
+#page {background: #ffffff url(../images/separateur-spip-party-blue.jpg) left right no-repeat;}
 
 ul.menu li.current_page_item a,
 ul.menu li.current_page_item a:hover { color: #799FCF; }
@@ -13,10 +14,6 @@ div.sb_comments ul li a:hover { color: #799FCF; }
 
 a { color: #799FCF; }
 
-.primary {
-padding-bottom: 60px;
-background: transparent url(../images/separateur-spip-party-blue.jpg) bottom right no-repeat;
-}
 
 #partycalendar .ui-state-highlight a { background: #799FCF;border-color: #799FCF;}
 

squelettes/2012/css/feria-purple.css

@@ -5,6 +5,7 @@ body { background-color: #913D92; }
 #header { background: no-repeat url(header-purple.jpg) center top #913D92; }
 h1, h1 a { color: #913D92; }
 
+#page {background: transparent url(../images/separateur-spip-party-purple.jpg) bottom left no-repeat;}
 ul.menu li.current_page_item a,
 ul.menu li.current_page_item a:hover { color: #bd1a8d; }
 
@@ -13,11 +14,6 @@ div.sb_comments ul li a:hover { color: #913D92; } /*color: #800040;*/
 
 a { color: #913D92; }
 
-.primary {
-padding-bottom: 60px;
-background: transparent url(../images/separateur-spip-party-purple.jpg) bottom right no-repeat;
-}
-
 #partycalendar .ui-state-highlight a { background: #913D92;border-color: #913D92;}
 
 .formulaire_signature { background-color: #DAC2DA; }

squelettes/2012/css/feria-yellow.css

@@ -4,6 +4,7 @@ body { background-color: #F1C44F; }
 
 #header { background: no-repeat url(header-apero.jpg) center top #F1C44F; }
 h1, h1 a { color: #ff8000; }
+#page {background: #ffffff url(../images/separateur-spip-party-yellow.jpg) bottom left no-repeat;}
 
 ul.menu li.current_page_item a,
 ul.menu li.current_page_item a:hover { color: #F0C44F; }
@@ -13,11 +14,6 @@ div.sb_comments ul li a:hover { color: #ff8000; }
 
 a { color: #ff8000; }
 
-.primary {
-padding-bottom: 60px;
-background: transparent url(../images/separateur-spip-party-yellow.jpg) bottom right no-repeat;
-}
-
 #partycalendar .ui-state-highlight a { background: #F0C44F;border-color: #F0C44F;}
 
 .formulaire_signature { background-color: #FBECCD; }

squelettes/2012/css/theme.css

@@ -75,7 +75,9 @@ body.flex #page { /* For the flexible-width setting. Not IE compatible */
 	margin: 0;
 	position: relative;
 	height: 199px;
-	background: no-repeat url(header-blue.png) center top #8AADD7; }
+	background: no-repeat url(header-blue.png) center top #8AADD7;
+    overflow: hidden;
+}
 
 .primary {
 	width: 64%;
@@ -83,7 +85,9 @@ body.flex #page { /* For the flexible-width setting. Not IE compatible */
 	_width: 500px; /* IE Hack */
 	float: left;
 	padding: 20px 2% 10px 2%;
-	margin: 0; }
+    padding-bottom: 60px;
+	margin: 0;
+}
 
 .secondary {
 	font: 1em/1.5em 'Lucida Grande', Verdana, Arial, Sans-Serif;
@@ -145,9 +149,10 @@ h3.spip {font-size:160%;}
 	letter-spacing: -1px;
 	font-weight: bold; }
 
-.page_index .item.article {padding-left:80px;margin: 0 0 3em;min-height: 80px;position: relative;}
-.page_index .item.article .spip_logos {position: absolute;top:0;left:0;}
-.page_index .item.article .introduction {margin-bottom: 0;}
+/* home page */
+.page_index div.item.article {padding-left:80px;margin: 0 0 3em;min-height: 80px;position: relative;}
+.page_index div.item.article .spip_logos {position: absolute;top:0;left:0;}
+.page_index div.item.article .introduction {margin-bottom: 0;}
 
 .page_item h1, .primary h2 { /* For use on Pages */
 	margin: 0; padding: 0;
@@ -192,20 +197,17 @@ span.metadata { display: inline; }
 
 /*- Primary Contents */
 
+.pagination {text-align: right;}
 .itemtext { clear: both; }
+.page_item .primary .itemtext {font: 1em/1.5em 'Lucida Grande', Verdana, Arial, Sans-Serif;}
 
-.page_item .primary .itemtext {
-	font: 1em/1.5em 'Lucida Grande', Verdana, Arial, Sans-Serif;
-	/*text-align: justify;*/ }
-
-.page_item .primary .itemtext p,
-.page_item .primary .itemtext ul,
-.page_item .primary .itemtext ol,
-.page_item .primary .itemtext div {
-	margin: 1em 0; }
+ul.plan {margin: 1.5em 0;padding: 0.75em 0;border-top: 1px solid #eee;border-bottom: 1px solid #eee;}
+ul.plan,ul.plan ul {list-style-type: disc;padding-left: 25px;}
+ul.plan li {padding: 0.375em 0;}
 
-.page_index .primary .itemtext li { margin: 1.4em 0; }
-.page_index .primary .itemtext li p { /*margin: 0; padding: 0;*/ }
+.liste-items.events .event {padding:0.375em 0;padding-left: 150px;}
+.liste-items.events .event:hover {background-color: #eee;}
+.liste-items.events .event .date {display:block;float: left;width: 140px;margin-left: -150px;}
 
 /* Liste en 2 colonnes */
 .demilist ul { margin: 0; padding: 0 !important; list-style: none; }

squelettes/2012/inc_articles.html

@@ -0,0 +1,11 @@
+<B_articles>
+<ul class="liste-items articles">
+	<BOUCLE_articles(ARTICLES) {id_rubrique?} {!par date}{pagination 5}>
+	<li class="item article"><a href="#URL_ARTICLE">#TITRE</a>
+	<span class="date">&mdash; [(#DATE|affdate_court)]</span>
+	[(#INTRODUCTION{100})]
+	</li>
+	</BOUCLE_articles>
+</ul>
+[<p class="pagination">(#PAGINATION{precedent_suivant})</p>]
+</B_articles>

squelettes/2012/inc_pied_de_page.html

@@ -2,5 +2,5 @@
 Listes de discussion : <BOUCLE_rub(RUBRIQUES){id_secteur=1}{par titre}>
 <BOUCLE_listes(SITES){id_rubrique}{id_mot=26}><a href="#URL_SITE"[ title="(#NOM_SITE|couper{80}|texte_backend)"]>#TITRE</a> | </BOUCLE_listes>
 </BOUCLE_rub>...<br />
-<a href="#URL_SITE_SPIP/oo">&Eacute;dition en mode texte</a> | <a href="#URL_PAGE{plan}"><:plan_site:></a> | <a href="http://www.spip.net"><:site_realise_avec_spip:></a> | <a href="http://www.aucuneid.net/bones" title="Bones">Squelette BONES</a> + <a href="http://getk2.com">K2</a> by <a href="http://binarybonsai.com">Michael</a> and <a href="http://chrisjdavis.org">Chris</a>
+<a href="#URL_PAGE{plan}"><:plan_site:></a> | <a href="http://www.spip.net"><:site_realise_avec_spip:></a> | <a href="http://www.aucuneid.net/bones" title="Bones">Squelette BONES</a> + <a href="http://getk2.com">K2</a> by <a href="http://binarybonsai.com">Michael</a> and <a href="http://chrisjdavis.org">Chris</a>
 </p>

squelettes/2012/lang/local_fr.php

@@ -30,7 +30,11 @@ $GLOBALS[$GLOBALS['idx_lang']] = array(
 // Divers
 'sites_web' => 'Liens utiles',
 'suite' => 'Lire la suite',
-'contact' => 'Contact'
+'contact' => 'Contact',
+
+"aucun_article" => 'Aucun article',
+"1_article" => '1 article',
+"nb_articles" => '@nb@ articles',
 
 );
 

squelettes/2012/rubrique.html

@@ -17,10 +17,10 @@
 	</div>
 	<div class="primary">
 
-	[(#REM) Fil d'Ariane ]
+		[(#REM) Fil d'Ariane ]
 		<div id="hierarchie"><a href="#URL_SITE_SPIP/"><:accueil_site:></a><BOUCLE_ariane(HIERARCHIE){id_rubrique}> &gt; <a href="#URL_RUBRIQUE">[(#TITRE|couper{80})]</a></BOUCLE_ariane>[ &gt; (#TITRE|couper{80})]</div>
-		
-<div class="itemhead">
+
+		<div class="itemhead">
 			[(#LOGO_RUBRIQUE|right||image_reduire{100})]
 			<h1>#TITRE</h1>
 			[<div>(#TEXTE)</div>]
@@ -28,40 +28,34 @@
 
 
 
-<B_event_list>
-<h2>Les prochaines Dates </h2><ul style="list-style: none; margin: 0; padding: 0;">
-<BOUCLE_event_list(EVENEMENTS){id_rubrique}{statut=publie}{par date_fin}{!evenement_passe}>
-<li style="margin: 0; padding: 0;">
-[(#DATE_DEBUT|affdate_debut_fin{#DATE_FIN})]
-( [(#LIEU|ucfirst)] ) 
-</li>
-</BOUCLE_event_list>
-
-
-
-
+		<B_event_list>
+		<h2>Les prochaines dates </h2>
+		<ul class="liste-items events">
+			<BOUCLE_event_list(EVENEMENTS){id_evenement?}{id_rubrique}{statut=publie}{par date_fin}{!evenement_passe}{pagination 5}>
+			<li class="event">[<span class="date">(#DATE_DEBUT|Agenda_affdate_debut_fin{#DATE_FIN,#HORAIRE})</span>]<a href="[(#URL_ARTICLE|parametre_url{id_evenement,#ID_EVENEMENT})]">#TITRE</a>[
+			<br />(#LIEU)]</li>
+			</BOUCLE_event_list>
+		</ul>
+		[<p class="pagination">(#PAGINATION)</p>]
+		</B_event_list>
 
 
+		<div class="itemtext">
+			[(#INCLURE{fond=inc_articles,id_rubrique,ajax})]
 
 
-<div class="itemtext">
-			<B_articles>
-			<ul>
-				<BOUCLE_articles(ARTICLES) {id_rubrique} {!par date}>
-				<li><a href="#URL_ARTICLE">#TITRE</a></li>
-				</BOUCLE_articles>
-			</ul>
-			</B_articles>
 			<B_rubriques>
-			<ul>
+			<ul class="plan">
 				<BOUCLE_rubriques(RUBRIQUES) {id_parent} {par titre}>
 				<li>
 					<strong><a href="#URL_RUBRIQUE">[(#TITRE)]</a></strong>
-					<BOUCLE_sous_articles(BOUCLE_articles)> </BOUCLE_sous_articles>
+					<BOUCLE_cpt(ARTICLES){id_rubrique} /><small>([(#TOTAL_BOUCLE|singulier_ou_pluriel{1_article,nb_articles}|sinon{<:aucun_article:>})])</small><//B_cpt>
 					<B_sous_rubriques>
 					<ul>
 						<BOUCLE_sous_rubriques(RUBRIQUES) {id_parent} {par titre}>
-						<li><strong><a href="#URL_RUBRIQUE">[(#TITRE)]</a></strong></li>
+						<li><strong><a href="#URL_RUBRIQUE">[(#TITRE)]</a></strong>
+						<BOUCLE_cpt2(ARTICLES){branche} /><small>([(#TOTAL_BOUCLE|singulier_ou_pluriel{1_article,nb_articles}|sinon{<:aucun_article:>})])</small><//B_cpt2>
+						</li>
 						</BOUCLE_sous_rubriques>
 					</ul>
 					</B_sous_rubriques>
@@ -69,7 +63,9 @@
 				</BOUCLE_rubriques>
 			</ul>
 			</B_rubriques>
-			<B_sites><br />
+
+
+			<B_sites>
 			<h2>Les sites du coin :</h2>
 			<ul class="liste-items sites">
 				<BOUCLE_sites(SITES){branche}>