Re: Patch debian-www with css
On Thu, Dec 09, 2004 at 02:51:17AM +0100, Frank Lichtenheld wrote:
> On Tue, Dec 07, 2004 at 10:41:59PM +0100, Denis Barbier wrote:
> > And a new new version: I removed the <style> tag, it seems quite
> > useless, and added a missing <p> in languages.wml.
>
> I applied the patch at my working copy and my general test pages
> are now build with it. See http://higgs.djpig.de/debian-www/
Attached is an updated patch which contains fixes for some of the
issues I found while testing, mostly footer stuff.
I also commented out the part that made <dt> contents bold. We don't
currently do that and should only change that if really wanted. It
changes the appearance of e.g. security/index.
Still wondering what causes the problems on the frontpage, though.
Gruesse,
--
Frank Lichtenheld <djpig@debian.org>
www: http://www.djpig.de/
Index: debian.css
===================================================================
RCS file: /cvs/webwml/webwml/english/debian.css,v
retrieving revision 1.4
diff -u -r1.4 debian.css
--- debian.css 9 Dec 2004 12:49:38 -0000 1.4
+++ debian.css 9 Dec 2004 13:37:45 -0000
@@ -229,9 +229,10 @@
display: none;
}
+/* delayed until the content is prepared
dl dt {
font-weight: bold;
-}
+}*/
#footer ul {
display: inline;
@@ -244,6 +245,10 @@
#footer ul li a {
white-space: nowrap;
+}
+
+#footer p {
+ margin: 0px;
}
/* classes for package pages */
Index: template/debian/basic.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/basic.wml,v
retrieving revision 1.78
diff -u -r1.78 basic.wml
--- template/debian/basic.wml 2 Dec 2004 21:01:42 -0000 1.78
+++ template/debian/basic.wml 9 Dec 2004 13:37:46 -0000
@@ -26,16 +26,21 @@
<meta name="Generator" content="WML $(WML_VERSION)" />
<meta name="Modified" content="$(WML_GEN_ISOTIME)" />
{#style#}
+{#style#:<link href="$(HOME)/debian.css" rel="stylesheet" type="text/css" />:#style#}
</head>
-<body text="#000000" bgcolor="#FFFFFF" link="$(LINK:-#0000FF)" vlink="$(VLINK:-#800080)" alink="$(ALINK:-#FF0000)">
+<body>
$(NONAVBAR:+# )#use wml::debian::navbar
-
+<div id="outer">
+<div id="inner">
{#body#}
-
+</div> <!-- end inner -->
+<div id="footer">
{#pre_footer#}
#use wml::debian::footer NOCOMMENTS="$(NOCOMMENTS)" NOCOPYRIGHT="$(NOCOPYRIGHT)"
{#post_footer#}
+</div> <!-- end footer -->
+</div> <!-- end outer -->
</body>
:}
</html>
Index: template/debian/common_tags.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/common_tags.wml,v
retrieving revision 1.8
diff -u -r1.8 common_tags.wml
--- template/debian/common_tags.wml 7 Nov 2003 16:04:14 -0000 1.8
+++ template/debian/common_tags.wml 9 Dec 2004 13:37:46 -0000
@@ -1,4 +1,5 @@
<define-tag hrline><hr noshade width="100%" size="1" /></define-tag>
+<define-tag hrlinehidden><hr class ="hidecss" /></define-tag>
<define-tag url><a href="%0">%0</a></define-tag>
<define-tag newsurl><url %0 /></define-tag>
Index: template/debian/consultant.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/consultant.wml,v
retrieving revision 1.54
diff -u -r1.54 consultant.wml
--- template/debian/consultant.wml 2 Dec 2004 21:01:42 -0000 1.54
+++ template/debian/consultant.wml 9 Dec 2004 13:37:46 -0000
@@ -16,7 +16,7 @@
{#check_trans#}
{#pre_footer#:
-<hrline/>
+<hrlinehidden/>
<returnconsult/>
Index: template/debian/header.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/header.wml,v
retrieving revision 1.10
diff -u -r1.10 header.wml
--- template/debian/header.wml 2 Dec 2004 21:01:43 -0000 1.10
+++ template/debian/header.wml 9 Dec 2004 13:37:46 -0000
@@ -21,6 +21,7 @@
</when>
<meta name="Generator" content="WML $(WML_VERSION)" />
<meta name="Modified" content="$(WML_GEN_ISOTIME)" />
-{#style#}
+{#style#:<link href="$(HOME)/debian.css" rel="stylesheet" type="text/css" />:#style#}
</head>
-<body text="#000000" bgcolor="#FFFFFF" link="$(LINK:-#0000FF)" vlink="$(VLINK:-#800080)" alink="$(ALINK:-#FF0000)">
+<body>
+<p style="color:red">These pages are generated to test new content for the <a href="http://www.debian.org/";>official Debian website</a>. Please don't rely on any information presented here.</p>
Index: template/debian/languages.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/languages.wml,v
retrieving revision 1.131
diff -u -r1.131 languages.wml
--- template/debian/languages.wml 1 Dec 2004 23:55:41 -0000 1.131
+++ template/debian/languages.wml 9 Dec 2004 13:37:46 -0000
@@ -158,10 +158,10 @@
# printf STDERR join(', ', @used_langs);
if ($rel_dir eq "" && $file eq "sitemap") { # special case for the site map
- $str .= "\n";
$str .= "<!--UdmComment-->\n";
- $str .= q{<gettext>This page is also available in the following languages:</gettext>}."\n";
- $str .= "<br />\n";
+ $str .= "<p>\n";
+ $str .= q{<gettext>This page is also available in the following languages:</gettext>}."</p>\n";
+ $str .= "<p class=\"navpara\">\n";
foreach (keys %langs) {
if ($_ ne lc($cur_lang) or $cur_lang eq "Chinese") {
$sorted_langs{$selflang{$_}} = $_;
@@ -171,21 +171,23 @@
$cur_lang = $sorted_langs{$_};
$tooltip = $trans{$CUR_ISO_LANG}{$cur_lang};
if ($cur_lang ne "chinese") {
- $str .= "<a href=\"$file.$langs{$cur_lang}.html\" title=\"$tooltip\" hreflang=\"$langs{$cur_lang}\" lang=\"$langs{$cur_lang}\" rel=\"alternate\">$_";
+ $str .= " <a href=\"$file.$langs{$cur_lang}.html\" title=\"$tooltip\" hreflang=\"$langs{$cur_lang}\" lang=\"$langs{$cur_lang}\" rel=\"alternate\">$_";
$str .= " ($translit{$cur_lang})" if defined $translit{$cur_lang};
- $str .= "</a> \n";
+ $str .= "</a>\n";
} else {
- $str .= "<a href=\"$file.$langs{$cur_lang}-cn.html\" title=\"$tooltip (<CNc/>)\" hreflang=\"$langs{$cur_lang}-CN\" lang=\"$langs{$cur_lang}-CN\" rel=\"alternate\" style=\"white-space: nowrap\">$_(简)</a> \n";
- $str .= "<a href=\"$file.$langs{$cur_lang}-hk.html\" title=\"$tooltip (<HKc/>)\" hreflang=\"$langs{$cur_lang}-HK\" lang=\"$langs{$cur_lang}-HK\" rel=\"alternate\" style=\"white-space: nowrap\">$_(HK)</a> \n";
- $str .= "<a href=\"$file.$langs{$cur_lang}-tw.html\" title=\"$tooltip (<TWc/>)\" hreflang=\"$langs{$cur_lang}-TW\" lang=\"$langs{$cur_lang}-TW\" rel=\"alternate\" style=\"white-space: nowrap\">$_(繁)</a> \n";
+ $str .= " <a href=\"$file.$langs{$cur_lang}-cn.html\" title=\"$tooltip (<CNc/>)\" hreflang=\"$langs{$cur_lang}-CN\" lang=\"$langs{$cur_lang}-CN\" rel=\"alternate\">$_(简)</a>\n";
+ $str .= " <a href=\"$file.$langs{$cur_lang}-hk.html\" title=\"$tooltip (<HKc/>)\" hreflang=\"$langs{$cur_lang}-HK\" lang=\"$langs{$cur_lang}-HK\" rel=\"alternate\">$_(HK)</a>\n";
+ $str .= " <a href=\"$file.$langs{$cur_lang}-tw.html\" title=\"$tooltip (<TWc/>)\" hreflang=\"$langs{$cur_lang}-TW\" lang=\"$langs{$cur_lang}-TW\" rel=\"alternate\">$_(繁)</a>\n";
}
}
+ $str .= "</p>\n";
$str .= "<!--/UdmComment-->\n";
}
elsif (@used_langs) {
$str .= "<!--UdmComment-->\n";
+ $str .= "<p>\n";
$str .= q{<gettext>This page is also available in the following languages:</gettext>}."\n";
- $str .= "<br />\n";
+ $str .= "</p><p class=\"navpara\">\n";
# Language sorting. Create a hash going from the language's own name
# for itself to the language's ISO keys. Then work with the sorted
# keys.
@@ -198,18 +200,18 @@
$cur_lang = $sorted_langs{$_};
$tooltip = $trans{$CUR_ISO_LANG}{$cur_lang};
if ($cur_lang ne "chinese") {
- $str .= "<a href=\"$file.$langs{$cur_lang}.html\" title=\"$tooltip\" hreflang=\"$langs{$cur_lang}\" lang=\"$langs{$cur_lang}\" rel=\"alternate\">$_";
+ $str .= " <a href=\"$file.$langs{$cur_lang}.html\" title=\"$tooltip\" hreflang=\"$langs{$cur_lang}\" lang=\"$langs{$cur_lang}\" rel=\"alternate\">$_";
$str .= " ($translit{$cur_lang})" if defined $translit{$cur_lang};
- $str .= "</a> \n";
+ $str .= "</a>\n";
} else {
- $str .= "<a href=\"$file.$langs{$cur_lang}-cn.html\" title=\"$tooltip (<CNc/>)\" hreflang=\"$langs{$cur_lang}-CN\" lang=\"$langs{$cur_lang}-CN\" rel=\"alternate\" style=\"white-space: nowrap\">$_(简)</a> \n";
- $str .= "<a href=\"$file.$langs{$cur_lang}-hk.html\" title=\"$tooltip (<HKc/>)\" hreflang=\"$langs{$cur_lang}-HK\" lang=\"$langs{$cur_lang}-HK\" rel=\"alternate\" style=\"white-space: nowrap\">$_(HK)</a> \n";
- $str .= "<a href=\"$file.$langs{$cur_lang}-tw.html\" title=\"$tooltip (<TWc/>)\" hreflang=\"$langs{$cur_lang}-TW\" lang=\"$langs{$cur_lang}-TW\" rel=\"alternate\" style=\"white-space: nowrap\">$_(繁)</a> \n";
+ $str .= " <a href=\"$file.$langs{$cur_lang}-cn.html\" title=\"$tooltip (<CNc/>)\" hreflang=\"$langs{$cur_lang}-CN\" lang=\"$langs{$cur_lang}-CN\" rel=\"alternate\">$_(简)</a>\n";
+ $str .= " <a href=\"$file.$langs{$cur_lang}-hk.html\" title=\"$tooltip (<HKc/>)\" hreflang=\"$langs{$cur_lang}-HK\" lang=\"$langs{$cur_lang}-HK\" rel=\"alternate\">$_(HK)</a>\n";
+ $str .= " <a href=\"$file.$langs{$cur_lang}-tw.html\" title=\"$tooltip (<TWc/>)\" hreflang=\"$langs{$cur_lang}-TW\" lang=\"$langs{$cur_lang}-TW\" rel=\"alternate\">$_(繁)</a>\n";
}
}
- $str .= "\n<br />\n";
+ $str .= "\n</p><p>\n";
$str .= q{<gettext>How to set <a href=m4_HOME/intro/cn>the default document language</a></gettext>};
- $str .= "\n<!--/UdmComment-->\n";
+ $str .= "\n</p>\n<!--/UdmComment-->\n";
}
return $str;
Index: template/debian/mainpage.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/mainpage.wml,v
retrieving revision 1.43
diff -u -r1.43 mainpage.wml
--- template/debian/mainpage.wml 2 Dec 2004 21:01:43 -0000 1.43
+++ template/debian/mainpage.wml 9 Dec 2004 13:37:46 -0000
@@ -25,133 +25,86 @@
</font>
</define-tag>
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tr>
- <td valign="top">
- <table bgcolor="#BBDDFF" border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <td colspan="3" valign="top" width="100%">
- <img src="$(PICS)/blue-upperleft.png" align="left" border="0" hspace="0" vspace="0" />
- <img src="$(PICS)/blue-upperright.png" align="right" border="0" hspace="0" vspace="0" />
- </td>
- </tr>
- <tr>
- <td> </td>
- <td valign="top" width="$(MENUWIDTH:-140)">
- <!--UdmComment-->
-
- <p><FONTS_SANS-SERIF><strong><a href="$(INTRO)/about"><about/></a></strong><br />
- <small>
- <a href="$(HOME)/social_contract"><socialcontract/></a><br />
- <a href="$(HOME)/intro/free"><freesoftware/></a><br />
- <a href="$(HOME)/partners/"><partners/></a><br />
- <a href="$(HOME)/donations"><donations/></a><br />
- <a href="$(HOME)/contact"><contactus/></a><br />
- </small>
- </FONTS_SANS-SERIF></p>
-
- <p><FONTS_SANS-SERIF><strong><a href="$(HOME)/News/"><news/></a></strong><br />
- <small>
- <a href="$(HOME)/News/weekly/"><weeklynews/></a><br />
- <a href="$(HOME)/events/"><events/></a><br />
- </small>
- </FONTS_SANS-SERIF></p>
-
- <p><FONTS_SANS-SERIF><strong><a href="$(DISTRIB)/"><gettingdebian/></a></strong><br />
- <small>
- <a href="CD/vendors/"><cdvendors/></a><br />
- <a href="$(DISTRIB)/cd"><cdisoimages/></a><br />
- <a href="$(DISTRIB)/netinst"><netinst/></a><br />
- <a href="$(DISTRIB)/pre-installed"><pre-installed/></a><br />
- </small>
- </FONTS_SANS-SERIF></p>
-
- <p><FONTS_SANS-SERIF><strong><a href="$(DISTRIB)/packages"><debianpackages/></a></strong></FONTS_SANS-SERIF></p>
-
- <p><FONTS_SANS-SERIF><strong><a href="$(DOC)/"><documentation/></a></strong><br />
- <small>
- <a href="$(HOME)/releases/"><releaseinfo/></a><br />
- <a href="$(HOME)/releases/stable/installmanual"><installationmanual/></a><br />
- <a href="$(DOC)/books"><debianbooks/></a><br />
- </small>
- </FONTS_SANS-SERIF></p>
-
- <p><FONTS_SANS-SERIF><strong><a href="$(HOME)/support"><support/></a></strong><br />
- <small>
- <a href="$(HOME)/international/"><debinternational/></a><br />
- <a href="$(HOME)/security/"><security/></a><br />
- <a href="$(BUGS)/"><bugreports/></a><br />
- <a href="MailingLists/"><mailinglists/></a><br />
- <a href="http://lists.debian.org/";><mailarchives/></a><br />
- <a href="$(HOME)/ports/"><portsarchitectures/></a><br />
- </small>
- </FONTS_SANS-SERIF></p>
-
- <p><FONTS_SANS-SERIF><strong><a href="$(MISC)/"><misc/></a></strong></FONTS_SANS-SERIF></p>
+<div id="leftcol">
+<!--UdmComment-->
+
+ <p><strong><a href="$(INTRO)/about"><about/></a></strong></p>
+ <ul>
+ <li><a href="$(HOME)/social_contract"><socialcontract/></a></li>
+ <li><a href="$(HOME)/intro/free"><freesoftware/></a></li>
+ <li><a href="$(HOME)/partners/"><partners/></a></li>
+ <li><a href="$(HOME)/donations"><donations/></a></li>
+ <li><a href="$(HOME)/contact"><contactus/></a></li>
+ </ul>
+ <p><strong><a href="$(HOME)/News/"><news/></a></strong></p>
+ <ul>
+ <li><a href="$(HOME)/News/weekly/"><weeklynews/></a></li>
+ <li><a href="$(HOME)/events/"><events/></a></li>
+ </ul>
+
+ <p><strong><a href="$(DISTRIB)/"><gettingdebian/></a></strong></p>
+ <ul>
+ <li><a href="CD/vendors/"><cdvendors/></a></li>
+ <li><a href="$(DISTRIB)/cd"><cdisoimages/></a></li>
+ <li><a href="$(DISTRIB)/netinst"><netinst/></a></li>
+ <li><a href="$(DISTRIB)/pre-installed"><pre-installed/></a></li>
+ </ul>
+ <p><strong><a href="$(DISTRIB)/packages"><debianpackages/></a></strong></p>
+
+ <p><strong><a href="$(DOC)/"><documentation/></a></strong></p>
+ <ul>
+ <li><a href="$(HOME)/releases/"><releaseinfo/></a></li>
+ <li><a href="$(HOME)/releases/stable/installmanual"><installationmanual/></a></li>
+ <li><a href="$(DOC)/books"><debianbooks/></a></li>
+ </ul>
+ <p><strong><a href="$(HOME)/support"><support/></a></strong></p>
+ <ul>
+ <li><a href="$(HOME)/international/"><debinternational/></a></li>
+ <li><a href="$(HOME)/security/"><security/></a></li>
+ <li><a href="$(BUGS)/"><bugreports/></a></li>
+ <li><a href="MailingLists/"><mailinglists/></a></li>
+ <li><a href="http://lists.debian.org/";><mailarchives/></a></li>
+ <li><a href="$(HOME)/ports/"><portsarchitectures/></a></li>
+ </ul>
+ <p><strong><a href="$(MISC)/"><misc/></a></strong></p>
- <p><FONTS_SANS-SERIF><strong><a href="$(HOME)/devel/join/"><helpdebian/></a></strong></FONTS_SANS-SERIF></p>
+ <p><strong><a href="$(HOME)/devel/join/"><helpdebian/></a></strong></p>
- <p><FONTS_SANS-SERIF><strong><a href="$(HOME)/devel/"><develcorner/></a></strong></FONTS_SANS-SERIF></p>
+ <p><strong><a href="$(HOME)/devel/"><develcorner/></a></strong></p>
- <p><FONTS_SANS-SERIF><strong><a href="$(HOME)/sitemap"><sitemap_short/></a></strong></FONTS_SANS-SERIF></p>
+ <p><strong><a href="$(HOME)/sitemap"><sitemap_short/></a></strong></p>
- <p><FONTS_SANS-SERIF><strong><a href="$(SEARCH)"><search/></a></strong></FONTS_SANS-SERIF></p>
+ <p><strong><a href="$(SEARCH)"><search/></a></strong></p>
<form method="get" action="http://search.debian.org/";>
<small><input type="text" name="q" size="12" /></small>
</form>
<p align="center">
<a href="$(HOME)/sponsor.html"><img src="sponsor_img.jpg" border="0" vspace="16" alt="<visitsponsor/>" width="102" height="60" /></a>
- <br />
+
<a href="http://validator.w3.org/check/referer";><ifeq "$(DOCTYPE)" xhtml
"<img src="http://www.w3.org/Icons/valid-xhtml10"; border="0" alt="Valid XHTML 1.0!" width="88" height="31" />"
"<img src="http://www.w3.org/Icons/valid-html401"; border="0" alt="Valid HTML 4.01!" width="88" height="31" />"
/></a>
</p>
- <!--/UdmComment-->
-
- </td>
- <td> </td>
- </tr>
- <tr>
- <td colspan="3" valign="bottom" width="100%">
- <img src="$(PICS)/blue-lowerleft.png" align="left" border="0" hspace="0" vspace="0" />
- <img src="$(PICS)/blue-lowerright.png" align="right" border="0" hspace="0" vspace="0" />
- </td>
- </tr>
- </table>
-
- </td>
-
- <td valign="top">
- <br />
+<!--/UdmComment-->
+</div> <!-- end leftcol -->
+<div id="maincol">
{#check_trans#}
{#mainbody#}
- </td>
-</tr>
-</table>
+</div> <!-- end maincol -->
{#pre_footer#:
-<hrline/>
-
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tr>
- <td width="65%">
+ <hrlinehidden/>
<:= languages() :>
# this <br> is to aid Lynx
- <br />
- </td>
- <td width="35%">
<!--UdmComment-->
+ <hrline/>
:#pre_footer#}
{#post_footer#:
<!--/UdmComment-->
- </td>
-</tr>
-</table>
:#post_footer#}
-
{#mainbody#:
Index: template/debian/navbar.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/navbar.wml,v
retrieving revision 1.67
diff -u -r1.67 navbar.wml
--- template/debian/navbar.wml 2 Nov 2004 00:09:49 -0000 1.67
+++ template/debian/navbar.wml 9 Dec 2004 13:37:46 -0000
@@ -1,52 +1,34 @@
#use wml::debian::common_translation
#use wml::debian::mirrors small="yes" usefonts="yes" fontcolor="#990000"
-<table width="100%" align="center" border="0" cellpadding="3" cellspacing="0">
-<tr>
- <td align="left" valign="middle">
- <a href="$(HOME)/"><img src="$(HOME)/logos/openlogo-nd-50.png" border="0" hspace="0" vspace="0" alt="" /></a>
- <a href="$(HOME)/" rel="start"><img src="$(PICS)/debian.png" border="0" hspace="0" vspace="0" alt="<debianproject/>" /></a>
- </td>
+<div id="header">
+ <div id="upperheader">
+ <div id="logo">
+ <a href="$(HOME)/"><img src="$(HOME)/logos/openlogo-nd-50.png" alt="" /></a>
+ <a href="$(HOME)/" rel="start"><img src="$(PICS)/debian.png" alt="<debianproject/>" /></a>
+ </div> <!-- end logo -->
+<div id="serverselect">
<when <not "$(NOMIRRORS)"/>>
- <td align="right" valign="middle">
- <table><tr><td align="center">
<mirrors-serverlist/>
- </td></tr></table>
- </td>
</when>
-</tr>
-</table>
+</div> <!-- end serverselect -->
+</div> <!-- end upperheader -->
<!--UdmComment-->
-<table bgcolor="#DF0451" border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr>
-<td valign="top">
-<img src="$(PICS)/red-upperleft.png" align="left" border="0" hspace="0" vspace="0" alt="" />
-</td>
-<td rowspan="2" align="center">
-<a href="$(INTRO)/about"><img src="$(PICS)/about.$(CUR_ISO_LANG).gif" align="middle" border="0" hspace="4" vspace="7" alt="<aboutdebian/>" /></a>
-<a href="$(HOME)/News/"><img src="$(PICS)/news.$(CUR_ISO_LANG).gif" align="middle" border="0" hspace="4" vspace="7" alt="<news/>" /></a>
+<div id="navbar">
+<p class="navpara">
+<a href="$(INTRO)/about"><img src="$(PICS)/about.$(CUR_ISO_LANG).gif" alt="<aboutdebian/>" /></a>
+<a href="$(HOME)/News/"><img src="$(PICS)/news.$(CUR_ISO_LANG).gif" alt="<news/>" /></a>
<a href="$(DISTRIB)/"><img src="$(PICS)/getting.\
<if <file-exists "$(PICS)/getting.$(CUR_ISO_LANG).gif" /> "$(CUR_ISO_LANG)" "en" />\
-.gif" align="middle" border="0" hspace="4" vspace="7" alt="<gettingdebian/>" /></a>
-<a href="$(HOME)/support"><img src="$(PICS)/support.$(CUR_ISO_LANG).gif" align="middle" border="0" hspace="4" vspace="7" alt="<support/>" /></a>
-<a href="$(HOME)/devel/"><img src="$(PICS)/devel.$(CUR_ISO_LANG).gif" align="middle" border="0" hspace="4" vspace="7" alt="<develcorner/>" /></a>
+.gif" alt="<gettingdebian/>" /></a>
+<a href="$(HOME)/support"><img src="$(PICS)/support.$(CUR_ISO_LANG).gif" alt="<support/>" /></a>
+<a href="$(HOME)/devel/"><img src="$(PICS)/devel.$(CUR_ISO_LANG).gif" alt="<develcorner/>" /></a>
<a href="$(HOME)/sitemap" rel="contents"><img src="$(PICS)/sitemap.\
<if <file-exists "$(PICS)/sitemap.$(CUR_ISO_LANG).gif" /> "$(CUR_ISO_LANG)" "en" />\
-.gif" align="middle" border="0" hspace="4" vspace="7" alt="<sitemap_short/>" /></a>
-<a href="$(SEARCH)"><img src="$(PICS)/search.$(CUR_ISO_LANG).gif" align="middle" border="0" hspace="4" vspace="7" alt="<search/>" /></a>
-</td>
-<td valign="top">
-<img src="$(PICS)/red-upperright.png" align="right" border="0" hspace="0" vspace="0" alt="" />
-</td>
-</tr>
-<tr>
-<td valign="bottom">
-<img src="$(PICS)/red-lowerleft.png" align="left" border="0" hspace="0" vspace="0" alt="" />
-</td>
-<td valign="bottom">
-<img src="$(PICS)/red-lowerright.png" align="right" border="0" hspace="0" vspace="0" alt="" />
-</td>
-</tr>
-</table>
+.gif" alt="<sitemap_short/>" /></a>
+<a href="$(SEARCH)"><img src="$(PICS)/search.$(CUR_ISO_LANG).gif" alt="<search/>" /></a>
+</p>
+</div> <!-- end navbar -->
+</div> <!-- end header -->
<!--/UdmComment-->
Index: template/debian/news.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/news.wml,v
retrieving revision 1.55
diff -u -r1.55 news.wml
--- template/debian/news.wml 2 Dec 2004 21:01:43 -0000 1.55
+++ template/debian/news.wml 9 Dec 2004 13:37:46 -0000
@@ -4,7 +4,7 @@
#use wml::debian::ctime
<define-tag othernews whitespace=delete>
- <gettext>Back to other <a href="./">Debian news</a>.</gettext>
+ <gettext>Back to: other <a href="./">Debian news</a> || <a href="m4_HOME/">Debian Project homepage</a>.</gettext>
</define-tag>
<define-tag newsurldead whitespace=delete>
@@ -29,21 +29,15 @@
{#mainbody#}
-<hrline/>
-<othernews/>
-
{#pre_footer#:
-<ifeq "$(NOHOMELINK)" "" "
+<hrlinehidden/>
+<othernews/>
<hrline/>
-<returnline/>
-"/>
<ifeq "$(NOLANGUAGES)" "" "
-<hrline/>
<:= languages() :>
-"/>
-
<hrline/>
+"/>
:#pre_footer#}
{#mainbody#:
Index: template/debian/security.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/security.wml,v
retrieving revision 1.122
diff -u -r1.122 security.wml
--- template/debian/security.wml 2 Dec 2004 21:01:43 -0000 1.122
+++ template/debian/security.wml 9 Dec 2004 13:37:46 -0000
@@ -89,7 +89,7 @@
</dl>
{#pre_footer#:
-<hrline/>
+<hrlinehidden/>
<:= languages() :>
Index: template/debian/template.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/template.wml,v
retrieving revision 1.17
diff -u -r1.17 template.wml
--- template/debian/template.wml 2 Dec 2004 21:01:43 -0000 1.17
+++ template/debian/template.wml 9 Dec 2004 13:37:46 -0000
@@ -7,20 +7,19 @@
{#check_trans#}
<ifeq "$(NOHEADER)" "" "
-<h1>$(title)</h1>
+<h1 align="center">$(title)</h1>
"/>
{#pre_footer#:
+<hrlinehidden/>
+
<ifeq "$(NOHOMELINK)" "" "
-<hrline/>
<returnline/>
+<hrline/>
"/>
<ifeq "$(NOLANGUAGES)" "" "
-<hrline/>
<:= languages() :>
-"/>
-
<hrline/>
+"/>
:#pre_footer#}
-
Index: template/debian/votebar.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/votebar.wml,v
retrieving revision 1.99
diff -u -r1.99 votebar.wml
--- template/debian/votebar.wml 2 Dec 2004 21:01:43 -0000 1.99
+++ template/debian/votebar.wml 9 Dec 2004 13:37:46 -0000
@@ -193,15 +193,9 @@
{#pre_footer#:
<!--UdmComment-->
-<div align="center">
-<hrline/>
+<hrlinehidden/>
<:= languages() :>
<hrline/>
:#pre_footer#}
-
-{#post_footer#:
-</div>
-<!--/UdmComment-->
-:#post_footer#}
{#mainbody#:
Reply to: