On Thu, Dec 02, 2004 at 01:28:13AM +0100, Frank Lichtenheld wrote:
On Thu, Dec 02, 2004 at 12:58:18AM +0100, Denis Barbier wrote:
They will help future patches written by Jutta Wrage, and I am going to
commit them in a day or two if there is no objection.
You may need to check your patch against the modifcations I did
today to footer.wml inventing a pre_footer diversion, too.
You are right, here are updated patches.
Denis
Index: english/template/debian/basic.wml
===
RCS file: /cvs/webwml/webwml/english/template/debian/basic.wml,v
retrieving revision 1.76
diff -u -r1.76 basic.wml
--- english/template/debian/basic.wml 15 Jan 2002 22:43:06 - 1.76
+++ english/template/debian/basic.wml 1 Dec 2004 23:24:17 -
@@ -4,9 +4,9 @@
#use wml::debian::common_translation
#use wml::debian::common_tags
-#use wml::debian::header
+#use wml::debian::header LINK=$(LINK:-FF) VLINK=$(VLINK:-800080)
ALINK=$(ALINK:-FF)
-#use wml::debian::navbar
+$(NONAVBAR:+# )#use wml::debian::navbar
{#body#}
Index: english/template/debian/cdimage.wml
===
RCS file: /cvs/webwml/webwml/english/template/debian/cdimage.wml,v
retrieving revision 1.58
diff -u -r1.58 cdimage.wml
--- english/template/debian/cdimage.wml 3 Nov 2004 13:27:58 - 1.58
+++ english/template/debian/cdimage.wml 1 Dec 2004 23:24:17 -
@@ -76,7 +76,7 @@
# for now, use the English pictures
define-tag cdpiclangen/define-tag
-#use wml::debian::header LINK=#8c4939 VLINK=#45241c ALINK=#ff2600
+#use wml::debian::basic LINK=#8c4939 VLINK=#45241c ALINK=#ff2600
NONAVBAR=true NOCOMMENTS=true
table width=100% bgcolor=#ff border=0 cellspacing=0
cellpadding=0
tr
@@ -123,7 +123,7 @@
{#check_trans#}
-{#body#}
+{#mainbody#}
hrline/
@@ -155,6 +155,4 @@
/table
:#post_footer#}
-#use wml::debian::footer NOCOMMENTS=true
-
-{#body#:
+{#mainbody#:
Index: english/template/debian/header.wml
===
RCS file: /cvs/webwml/webwml/english/template/debian/header.wml,v
retrieving revision 1.8
diff -u -r1.8 header.wml
--- english/template/debian/header.wml 1 Jun 2004 21:15:08 - 1.8
+++ english/template/debian/header.wml 1 Dec 2004 23:24:17 -
@@ -23,4 +23,4 @@
meta name=Modified content=$(WML_GEN_ISOTIME) /
{#style#}
/head
-body text=#00 bgcolor=#FF link=$(LINK:-#FF)
vlink=$(VLINK:-#800080) alink=$(ALINK:-#FF)
+body text=#00 bgcolor=#FF link=$(LINK) vlink=$(VLINK)
alink=$(ALINK)
--- english/template/debian/basic.wml 2004-12-01 23:38:49.0 +0100
+++ english/template/debian/basic.wml 2004-12-01 23:50:34.0 +0100
@@ -4,12 +4,40 @@
#use wml::debian::common_translation
#use wml::debian::common_tags
-#use wml::debian::header LINK=$(LINK:-FF) VLINK=$(VLINK:-800080)
ALINK=$(ALINK:-FF)
+ifeq $(DOCTYPE) xhtml
+ !DOCTYPE html PUBLIC \-//W3C//DTD XHTML 1.0 Transitional//EN\
\http://ww w.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\
+ !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.01 Transitional//EN\
+/
+# not using [AR: dir=RTL:] because apparently the whole page was flipped
+# and this wasn't desirable for them
+html lang=$(CUR_ISO_LANG)[FA: dir=RTL:]
+{:
+head
+ meta http-equiv=Content-Type content=text/html; charset=$(CHARSET) /
+ title$(BARETITLE:*Debian -- )$(title)/title
+ link rev=made href=mailto:[EMAIL PROTECTED] /
+when $(MAINPAGE)
+ link rel=shortcut icon href=favicon.ico /
+ meta name=Keywords content=keywords/ /
+/when
+when $(SUMMARY)
+ meta name=Description content=$(SUMMARY) /
+/when
+ meta name=Generator content=WML $(WML_VERSION) /
+ meta name=Modified content=$(WML_GEN_ISOTIME) /
+{#style#}
+/head
+body text=#00 bgcolor=#FF link=$(LINK:-#FF)
vlink=$(VLINK:-#800080) alink=$(ALINK:-#FF)
$(NONAVBAR:+# )#use wml::debian::navbar
{#body#}
+{#pre_footer#}
#use wml::debian::footer NOCOMMENTS=$(NOCOMMENTS)
NOCOPYRIGHT=$(NOCOPYRIGHT)
+{#post_footer#}
+/body
+:}
+/html
{#body#:
--- english/template/debian/consultant.wml 2004-12-01 23:19:13.0
+0100
+++ english/template/debian/consultant.wml 2004-12-01 23:15:22.0
+0100
@@ -15,8 +15,7 @@
{#check_trans#}
-{#mainbody#}
-
+{#pre_footer#:
hrline/
returnconsult/
@@ -27,6 +26,4 @@
/
hrline/
-
-
-{#mainbody#:
+:#pre_footer#}
--- english/template/debian/ddp.wml 2004-12-01 23:19:13.0 +0100
+++ english/template/debian/ddp.wml 2004-12-01 23:15:22.0 +0100
@@ -12,8 +12,7 @@
h1$(title)/h1
/
-{#mainbody#}
-
+{#pre_footer#:
hrline/
ddpcommentsto/
@@ -28,5 +27,5 @@
/
hrline/
+:#pre_footer#}
-{#mainbody#:
--- english/template/debian/event.wml 2004-12-01 23:19:13.0 +0100
+++ english/template/debian/event.wml 2004-12-01 23:15:22.0 +0100
@@ -68,10 +68,12 @@
: } :
+{#pre_footer#:
hrline/
:=
