Logical changes in header/footer

To: debian-www@lists.debian.org
Subject: Logical changes in header/footer
From: barbier@linuxfr.org (Denis Barbier)
Date: Mon, 7 Jan 2002 01:56:21 +0100
Message-id: <[🔎] 20020107015621.A15284@zobe.linuxfr.org>

Hi,

the current use of wml::debian::header and wml::debian::footer does not
seem logical to me, mostly because wml::debian::footer is embedded
within many templates and does not contain </body></html>.
Basically this patch
  * appends <body> into header.wml
  * appends </body>:}</html> into footer.wml
  * remove #use wml::debian::footer when unnecessary
Comments?

Denis

Index: searchtmpl/search.data
===================================================================
RCS file: /cvs/webwml/webwml/english/searchtmpl/search.data,v
retrieving revision 1.13
diff -u -r1.13 search.data
--- searchtmpl/search.data	2001/07/14 12:04:27	1.13
+++ searchtmpl/search.data	2002/01/07 00:30:57
@@ -1,3 +1,13 @@
+$(HOME=http://www.debian.org)
+$(BUGS=http://www.debian.org/Bugs)
+$(DEVEL=http://www.debian.org/devel)
+$(DISTRIB=http://www.debian.org/distrib)
+$(DOC=http://www.debian.org/doc)
+$(INTRO=http://www.debian.org/intro)
+$(MISC=http://www.debian.org/misc)
+$(PICS=http://www.debian.org/Pics)
+$(STYLE=http://www.debian.org/style)
+$(CHINESE=http://www.debian.org/intl/zh)
 #include "../../english/searchtmpl/search.def"
 <!--variables
 #DBAddr  pgsql://udm:udm@localhost/udmsearch/
@@ -12,11 +22,11 @@
 -->
 
 <!--top-->
-#use wml::debian::common_translation HOME="http://www.debian.org";
+#use wml::debian::common_translation
 $(title=<search>)
 #use wml::debian::languages
 #use wml::debian::language_names
-#use wml::debian::basic SUMMARY="$(SUMMARY)" PICS="http://www.debian.org/Pics"; HOME="http://www.debian.org"; INTRO="http://www.debian.org/intro"; DISTRIB="http://www.debian.org/distrib"; NOLANGUAGES=true NOMIRRORS=true
+#use wml::debian::basic SUMMARY="$(SUMMARY)" NOLANGUAGES=true NOMIRRORS=true
 
 <: if ("$(NOHEADER)" eq "") {
 	print "<H1>$(title)</H1>\n";
@@ -188,6 +198,7 @@
 <P><returnline>">
 # <ifeq "$(NOLANGUAGES)" "" "<:= languages() :>">
 <hr>
-#use wml::debian::footer HOME="http://www.debian.org";
+{#post_footer#:
 <!--/bottom-->
+:#post_footer#}
 {#searchbody#:
Index: template/debian/basic.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/basic.wml,v
retrieving revision 1.75
diff -u -r1.75 basic.wml
--- template/debian/basic.wml	2001/12/31 21:01:59	1.75
+++ template/debian/basic.wml	2002/01/07 00:30:58
@@ -1,19 +1,9 @@
-#use wml::std::tags
-#use wml::std::box
-
-#use wml::debian::common_translation
-#use wml::debian::common_tags
-
 #use wml::debian::header
 
-<body text="#000000" bgcolor="#FFFFFF" link="#0000FF" vlink="#800080" alink="#FF0000">
-
 #use wml::debian::navbar
 
 {#body#}
 
-</body>
-:}
-</html>
+#use wml::debian::footer NOCOMMENTS="$(NOCOMMENTS)" NOCOPYRIGHT="$(NOCOPYRIGHT)"
 
 {#body#:
Index: template/debian/cdimage.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/cdimage.wml,v
retrieving revision 1.16
diff -u -r1.16 cdimage.wml
--- template/debian/cdimage.wml	2002/01/04 20:22:28	1.16
+++ template/debian/cdimage.wml	2002/01/07 00:30:58
@@ -62,10 +62,8 @@
 
 # don't translate anything below this point
 
-#use wml::debian::header
+#use wml::debian::header link="#8c4939" vlink="#45241c" alink="#ff2600"
 
-<body bgcolor="#ffffff" text="#000000" link="#8c4939" vlink="#45241c" alink="#ff2600">
-
 <table width="100%" bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="0">
   <tr>
     <td align="left" valign="middle">
@@ -131,7 +129,7 @@
     <hrline/>
     <small><debian-cd-team/> &lt;<a href="mailto:debian-cd@lists.debian.org";>debian-cd@lists.debian.org</a>&gt;</small>
     <br>
-#use wml::debian::footer NOCOMMENTS=true
+{#post_footer#:
   </td>
   <td width="50%" align="right" valign="middle">
     <small><tt><b><a href="$(HOME)/CD/">debian_on_cd</a>:
@@ -147,9 +145,8 @@
   </td>
 </tr>
 </table>
+:#post_footer#}
 
-</body>
-:}
-</html>
+#use wml::debian::footer NOCOMMENTS=true
 
 {#body#:
Index: template/debian/consultant.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/consultant.wml,v
retrieving revision 1.47
diff -u -r1.47 consultant.wml
--- template/debian/consultant.wml	2001/12/19 18:21:13	1.47
+++ template/debian/consultant.wml	2002/01/07 00:30:58
@@ -59,7 +59,7 @@
 # DO NOT translate anything below this line. If you feel something needs to
 # be modified, first write to debian-www list.
 
-#use wml::debian::basic SUMMARY="$(SUMMARY)" title="<consultanttitle/>"
+#use wml::debian::basic SUMMARY="$(SUMMARY)" title="<consultanttitle/>" NOCOMMENTS="yes" NOCOPYRIGHT="yes"
 #use wml::debian::languages
 
 {#check_trans#}
@@ -76,6 +76,5 @@
 
 <hrline/>
 
-#use wml::debian::footer NOCOMMENTS="yes" NOCOPYRIGHT="yes"
 
 {#mainbody#:
Index: template/debian/ddp.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/ddp.wml,v
retrieving revision 1.35
diff -u -r1.35 ddp.wml
--- template/debian/ddp.wml	2001/12/19 18:21:13	1.35
+++ template/debian/ddp.wml	2002/01/07 00:30:58
@@ -53,6 +53,4 @@
 
 <hrline/>
 
-#use wml::debian::footer
-
 {#mainbody#:
Index: template/debian/event.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/event.wml,v
retrieving revision 1.59
diff -u -r1.59 event.wml
--- template/debian/event.wml	2001/12/19 18:21:13	1.59
+++ template/debian/event.wml	2002/01/07 00:30:58
@@ -68,6 +68,4 @@
 
 <hrline/>
 
-#use wml::debian::footer
-
 {#mainbody#:
Index: template/debian/footer.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/footer.wml,v
retrieving revision 1.93
diff -u -r1.93 footer.wml
--- template/debian/footer.wml	2002/01/02 01:35:29	1.93
+++ template/debian/footer.wml	2002/01/07 00:30:59
@@ -186,3 +186,8 @@
   <copyright/> &copy; <copyrightyears/> <a href="http://www.spi-inc.org/";>SPI</a>; <seelicense/>
 </when>
 </small>
+
+{#post_footer#}
+</body>
+:}
+</html>
Index: template/debian/header.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/header.wml,v
retrieving revision 1.2
diff -u -r1.2 header.wml
--- template/debian/header.wml	2001/12/31 21:01:59	1.2
+++ template/debian/header.wml	2002/01/07 00:30:59
@@ -1,4 +1,5 @@
 #use wml::std::info
+#use wml::debian::common_translation
 
 <ifeq "$(DOCTYPE)" xhtml
    "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://ww w.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">"
@@ -17,3 +18,4 @@
 <info style=meta />
 {#style#}
 </head>
+<body text="#000000" bgcolor="#FFFFFF" link="$(link:-#0000FF)" vlink="$(vlink:-#800080)" alink="$(alink:-#FF0000)">
Index: template/debian/mainpage.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/mainpage.wml,v
retrieving revision 1.22
diff -u -r1.22 mainpage.wml
--- template/debian/mainpage.wml	2002/01/02 21:35:39	1.22
+++ template/debian/mainpage.wml	2002/01/07 00:30:59
@@ -141,10 +141,11 @@
   </td>
   <td width="35%">
 <!--UdmComment-->
-#use wml::debian::footer
+{#post_footer#:
 <!--/UdmComment-->
   </td>
 </tr>
 </table>
+:#post_footer#}
 
 {#mainbody#:
Index: template/debian/news.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/news.wml,v
retrieving revision 1.36
diff -u -r1.36 news.wml
--- template/debian/news.wml	2001/12/31 20:54:20	1.36
+++ template/debian/news.wml	2002/01/07 00:30:59
@@ -66,6 +66,4 @@
 
 <hrline/>
 
-#use wml::debian::footer
-
 {#mainbody#:
Index: template/debian/past_event.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/past_event.wml,v
retrieving revision 1.16
diff -u -r1.16 past_event.wml
--- template/debian/past_event.wml	2001/12/19 18:21:13	1.16
+++ template/debian/past_event.wml	2002/01/07 00:30:59
@@ -74,6 +74,4 @@
 
 <hrline/>
 
-#use wml::debian::footer
-
 {#mainbody#:
Index: template/debian/security.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/security.wml,v
retrieving revision 1.95
diff -u -r1.95 security.wml
--- template/debian/security.wml	2002/01/06 21:05:57	1.95
+++ template/debian/security.wml	2002/01/07 00:30:59
@@ -40,6 +40,4 @@
 
 <hrline/>
 
-#use wml::debian::footer
-
 {#securitybody#:
Index: template/debian/template.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/template.wml,v
retrieving revision 1.14
diff -u -r1.14 template.wml
--- template/debian/template.wml	2001/12/19 18:21:13	1.14
+++ template/debian/template.wml	2002/01/07 00:30:59
@@ -23,6 +23,4 @@
 
 <hrline/>
 
-#use wml::debian::footer
-
 {#mainbody#:
Index: template/debian/votebar.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/votebar.wml,v
retrieving revision 1.82
diff -u -r1.82 votebar.wml
--- template/debian/votebar.wml	2002/01/04 20:31:42	1.82
+++ template/debian/votebar.wml	2002/01/07 00:31:00
@@ -508,8 +508,10 @@
 <div align="center">
 <:= languages() :>
 <hrline/>
-#use wml::debian::footer
+
+{#post_footer#:
 </div>
 <!--/UdmComment-->
+:#post_footer#}
 
 {#mainbody#:

Reply to:

Follow-Ups:
- Re: Logical changes in header/footer
  - From: Josip Rodin <joy@cibalia.gkvk.hr>
- Re: Logical changes in header/footer
  - From: Josip Rodin <joy@cibalia.gkvk.hr>

Prev by Date: Re: Images on /CD/
Next by Date: Re: Debian WWW people page
Previous by thread: Re: Debian WWW CVS commit by barbier: webwml/english/template/debian languages.wml
Next by thread: Re: Logical changes in header/footer
Index(es):
- Date
- Thread