From 12e49184d5d63c00a73f2a05436b7da633ec1c13 Mon Sep 17 00:00:00 2001
From: tetue <tetue@rezo.net>
Date: Fri, 24 Aug 2007 07:38:14 +0000
Subject: [PATCH] Cache homogene : identique sur la plupart des skel pour que
 sa modification soit plus simple, et exprime sur une base horaire (3600) pour
 que ce soit plus comprehensible.

---
 dist/agenda.html         | 2 +-
 dist/article.html        | 2 +-
 dist/auteur.html         | 2 +-
 dist/breve.html          | 2 +-
 dist/forum.html          | 2 +-
 dist/ical.html           | 2 +-
 dist/inc-entete.html     | 2 +-
 dist/inc-forum.html      | 2 +-
 dist/inc-head.html       | 2 +-
 dist/login.html          | 2 +-
 dist/mot.html            | 2 +-
 dist/plan.html           | 2 +-
 dist/rubrique.html       | 2 +-
 dist/site.html           | 2 +-
 dist/sommaire.html       | 2 +-
 dist/sommaire_texte.html | 2 +-
 dist/style_prive.html    | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/dist/agenda.html b/dist/agenda.html
index 368fd2d823..19912cf03f 100644
--- a/dist/agenda.html
+++ b/dist/agenda.html
@@ -1,4 +1,4 @@
-#CACHE{7200}
+#CACHE{3600*24}
 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="#LANG" lang="#LANG" dir="#LANG_DIR">
 <head>
diff --git a/dist/article.html b/dist/article.html
index 6ce4fdf894..8f35e551db 100644
--- a/dist/article.html
+++ b/dist/article.html
@@ -1,4 +1,4 @@
-#CACHE{86400}
+#CACHE{3600*24}
 <BOUCLE_article_principal(ARTICLES) {id_article}>
 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="#LANG" lang="#LANG" dir="#LANG_DIR">
diff --git a/dist/auteur.html b/dist/auteur.html
index 6b20000f6f..05478112bd 100644
--- a/dist/auteur.html
+++ b/dist/auteur.html
@@ -1,4 +1,4 @@
-#CACHE{86400}
+#CACHE{3600*24}
 <BOUCLE_auteur_principal(AUTEURS) {id_auteur}>
 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="#LANG" lang="#LANG" dir="#LANG_DIR">
diff --git a/dist/breve.html b/dist/breve.html
index bd3c838ecb..9a93d4d187 100644
--- a/dist/breve.html
+++ b/dist/breve.html
@@ -1,4 +1,4 @@
-#CACHE{43200}
+#CACHE{3600*24}
 <BOUCLE_breve_principal(BREVES) {id_breve}>
 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="#LANG" lang="#LANG" dir="#LANG_DIR">
diff --git a/dist/forum.html b/dist/forum.html
index 3e8d043b09..036f197a54 100644
--- a/dist/forum.html
+++ b/dist/forum.html
@@ -1,4 +1,4 @@
-#CACHE{3600}
+#CACHE{3600*24}
 #HTTP_HEADER{"Cache-Control: max-age=3600, must-revalidate"}
 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="#LANG" lang="#LANG" dir="#LANG_DIR">
diff --git a/dist/ical.html b/dist/ical.html
index c460c68aa8..39e2c93e5b 100644
--- a/dist/ical.html
+++ b/dist/ical.html
@@ -1,5 +1,5 @@
 #HTTP_HEADER{Content-type: text/calendar}
-#CACHE{3600}
+#CACHE{3600*24}
 BEGIN:VCALENDAR
 CALSCALE:GREGORIAN
 PRODID: SPIP http://www.spip.net
diff --git a/dist/inc-entete.html b/dist/inc-entete.html
index 97a938f5bb..9ea96cd2a2 100644
--- a/dist/inc-entete.html
+++ b/dist/inc-entete.html
@@ -19,6 +19,6 @@
 
 #FORMULAIRE_RECHERCHE
 
-<div style="clear: both"></div>
+<br class="nettoyeur" />
 
 </div>
\ No newline at end of file
diff --git a/dist/inc-forum.html b/dist/inc-forum.html
index 363e999b22..2cc9f3092e 100644
--- a/dist/inc-forum.html
+++ b/dist/inc-forum.html
@@ -53,4 +53,4 @@
 	</BOUCLE_forums>
 
 </ul>
-</B_forums>
+</B_forums>
\ No newline at end of file
diff --git a/dist/inc-head.html b/dist/inc-head.html
index 7ac88c8686..fc2a276f08 100644
--- a/dist/inc-head.html
+++ b/dist/inc-head.html
@@ -1,4 +1,4 @@
-#CACHE{86400}
+#CACHE{3600*24}
 [(#REM)
 	Head standard de toutes les pages ; les elements specifiques
 	(title, description) figurent dans le squelette article.html
diff --git a/dist/login.html b/dist/login.html
index 48dbaf1b70..8d21eca51a 100644
--- a/dist/login.html
+++ b/dist/login.html
@@ -2,7 +2,7 @@
 	Le fichier est en cache dans SPIP, mais les navigateurs ne doivent pas
 	conserver cette page en memoire
 ]
-#CACHE{24 * 3600}
+#CACHE{3600*24}
 #HTTP_HEADER{Content-Type: text/html; charset=#CHARSET}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="#LANG" lang="#LANG" dir="#LANG_DIR">
diff --git a/dist/mot.html b/dist/mot.html
index b1517a49a1..6b9ffb520d 100644
--- a/dist/mot.html
+++ b/dist/mot.html
@@ -1,4 +1,4 @@
-#CACHE{86400}
+#CACHE{3600*24}
 <BOUCLE_mot_principal(MOTS) {id_mot} {doublons}>
 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="#LANG" lang="#LANG" dir="#LANG_DIR">
diff --git a/dist/plan.html b/dist/plan.html
index 916a1ecebb..0a837f10bb 100644
--- a/dist/plan.html
+++ b/dist/plan.html
@@ -1,4 +1,4 @@
-#CACHE{7200}
+#CACHE{3600*24}
 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="#LANG" lang="#LANG" dir="#LANG_DIR">
 <head>
diff --git a/dist/rubrique.html b/dist/rubrique.html
index 84acdfe575..febd861d99 100644
--- a/dist/rubrique.html
+++ b/dist/rubrique.html
@@ -1,4 +1,4 @@
-#CACHE{7200}
+#CACHE{3600*24}
 <BOUCLE_rubrique_principal(RUBRIQUES) {id_rubrique}>
 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="#LANG" lang="#LANG" dir="#LANG_DIR">
diff --git a/dist/site.html b/dist/site.html
index 610056b797..59ba98e654 100644
--- a/dist/site.html
+++ b/dist/site.html
@@ -1,4 +1,4 @@
-#CACHE{7200}
+#CACHE{3600*24}
 <BOUCLE_site(SITES){id_syndic}>
 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
 [(#REM) Les sites n'ont pas de "lang" a proprement parler ; on se base donc sur la langue de la rubrique qui les contient. Les articles syndiques, eux, ont une "lang". ]
diff --git a/dist/sommaire.html b/dist/sommaire.html
index a4af5b93e9..bad939780a 100644
--- a/dist/sommaire.html
+++ b/dist/sommaire.html
@@ -1,4 +1,4 @@
-#CACHE{7200}
+#CACHE{3600*24}
 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="#LANG" lang="#LANG" dir="#LANG_DIR">
 <head>
diff --git a/dist/sommaire_texte.html b/dist/sommaire_texte.html
index 98973f8594..be1bc632a3 100644
--- a/dist/sommaire_texte.html
+++ b/dist/sommaire_texte.html
@@ -1,4 +1,4 @@
-#CACHE{7200}
+#CACHE{3600*24}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="#LANG" lang="#LANG" dir="#LANG_DIR">
 <!--
diff --git a/dist/style_prive.html b/dist/style_prive.html
index 07ed440d6a..d9a11eefa3 100644
--- a/dist/style_prive.html
+++ b/dist/style_prive.html
@@ -707,7 +707,7 @@ ul.instituer li.refuse.selected a,ul.instituer li.refuse a:hover { background: #
 .no_onglets .tabs-container {background:#fff; border:none;padding-top:0;}
 .no_onglets .tabs-nav {display:none;}
 .no_onglets .fiche_objet { background:#fff;border:1px solid black; padding:5px;margin-bottom:1em;}
-.no_onglets #voir.tabs-container { background: #FFF; padding:0; border: none; }
+.no_onglets #voir.tabs-container { background: #FFF; padding:0; border: 0; }
 
 .no_onglets #contenu #wysiwyg span.label{ display:none; }
 .no_onglets #contenu #wysiwyg .contenu_lien_titre {margin:1em 0;}
-- 
GitLab