[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Patch debian-www with css



Hi!

After Denis' revision of the templates it was much easier to apply css to the debian website.

The css file itself will go to subdir/english and is not included in the patch attached to this message.

English language pages (I'll do two more today) built with patch attached will be found at http://www.witch.westfalen.de/debian/dwww/ .

Beside replacing the menu tables by css style I created a new macro or what ever it is called for a hidden hrline, which is to be seen only in non-css browsers and replacing the box border for them.

Another thing is the script creating the mail for Weekly News. I did not touch it, but made a centered H1 for lynx again. This is because Lynx does not center H1 any longer, if there are divs.

Thanks to those Developers looking into the pages (especially if they did not get worse for blind people)!

Feel free to apply the patch and include the debian.css file. I can send it by mail, if you do not want to fetch it from the above url.

I'll leave everything in place here. So if you want later changes, I can make them and send you a new patch. The css file should be handled carfully by those working on the server as changes may be harmful.

And her it goes!

greetings Jutta
Index: basic.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/basic.wml,v
retrieving revision 1.78
diff -u -r1.78 basic.wml
--- basic.wml	2 Dec 2004 21:01:42 -0000	1.78
+++ basic.wml	5 Dec 2004 12:47:03 -0000
@@ -26,16 +26,23 @@
   <meta name="Generator" content="WML $(WML_VERSION)" />
   <meta name="Modified"  content="$(WML_GEN_ISOTIME)" />
 {#style#}
+<link href="/debian.css" rel="stylesheet" type="text/css">
+<style type="text/css" media="all">
+</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: 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
--- common_tags.wml	7 Nov 2003 16:04:14 -0000	1.8
+++ common_tags.wml	5 Dec 2004 12:47:04 -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: consultant.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/consultant.wml,v
retrieving revision 1.54
diff -u -r1.54 consultant.wml
--- consultant.wml	2 Dec 2004 21:01:42 -0000	1.54
+++ consultant.wml	5 Dec 2004 12:47:04 -0000
@@ -16,7 +16,7 @@
 {#check_trans#}
 
 {#pre_footer#:
-<hrline/>
+<hrlinehidden/>
 
 <returnconsult/>
 
Index: header.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/header.wml,v
retrieving revision 1.10
diff -u -r1.10 header.wml
--- header.wml	2 Dec 2004 21:01:43 -0000	1.10
+++ header.wml	5 Dec 2004 12:47:06 -0000
@@ -22,5 +22,8 @@
   <meta name="Generator" content="WML $(WML_VERSION)" />
   <meta name="Modified"  content="$(WML_GEN_ISOTIME)" />
 {#style#}
+<link href="/debian/debian.css" rel="stylesheet" type="text/css">
+<style type="text/css" media="all">
+</style>
 </head>
-<body text="#000000" bgcolor="#FFFFFF" link="$(LINK:-#0000FF)" vlink="$(VLINK:-#800080)" alink="$(ALINK:-#FF0000)">
+<body>
Index: languages.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/languages.wml,v
retrieving revision 1.131
diff -u -r1.131 languages.wml
--- languages.wml	1 Dec 2004 23:55:41 -0000	1.131
+++ languages.wml	5 Dec 2004 12:47:07 -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 .= "&nbsp;($translit{$cur_lang})" if defined $translit{$cur_lang};
-        $str .= "</a>&nbsp;\n";
+        $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";
       } 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\">$_(&#31616;)</a>&nbsp;\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>&nbsp;\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\">$_(&#32321;)</a>&nbsp;\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\">$_(&#31616;)</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\">$_(&#32321;)</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 .= "&nbsp;($translit{$cur_lang})" if defined $translit{$cur_lang};
-           $str .= "</a>&nbsp;\n";
+           $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";
         } 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\">$_(&#31616;)</a>&nbsp;\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>&nbsp;\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\">$_(&#32321;)</a>&nbsp;\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\">$_(&#31616;)</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\">$_(&#32321;)</a>\n";
         }
      }
-     $str .= "\n<br />\n";
+     $str .= "\n</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: mainpage.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/mainpage.wml,v
retrieving revision 1.43
diff -u -r1.43 mainpage.wml
--- mainpage.wml	2 Dec 2004 21:01:43 -0000	1.43
+++ mainpage.wml	5 Dec 2004 12:47:08 -0000
@@ -25,133 +25,90 @@
     </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>&nbsp;</td>
-    <td valign="top" width="$(MENUWIDTH:-140)">
-    <!--UdmComment-->
-
-    <p><FONTS_SANS-SERIF><strong><a href="$(INTRO)/about"><about/></a></strong><br />
-      <small>
-      &nbsp;<a href="$(HOME)/social_contract"><socialcontract/></a><br />
-      &nbsp;<a href="$(HOME)/intro/free"><freesoftware/></a><br />
-      &nbsp;<a href="$(HOME)/partners/"><partners/></a><br />
-      &nbsp;<a href="$(HOME)/donations"><donations/></a><br />
-      &nbsp;<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>
-      &nbsp;<a href="$(HOME)/News/weekly/"><weeklynews/></a><br />
-      &nbsp;<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>
-      &nbsp;<a href="CD/vendors/"><cdvendors/></a><br />
-      &nbsp;<a href="$(DISTRIB)/cd"><cdisoimages/></a><br />
-      &nbsp;<a href="$(DISTRIB)/netinst"><netinst/></a><br />
-      &nbsp;<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>
-      &nbsp;<a href="$(HOME)/releases/"><releaseinfo/></a><br />
-      &nbsp;<a href="$(HOME)/releases/stable/installmanual"><installationmanual/></a><br />
-      &nbsp;<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>
-      &nbsp;<a href="$(HOME)/international/"><debinternational/></a><br />
-      &nbsp;<a href="$(HOME)/security/"><security/></a><br />
-      &nbsp;<a href="$(BUGS)/"><bugreports/></a><br />
-      &nbsp;<a href="MailingLists/"><mailinglists/></a><br />
-      &nbsp;<a href="http://lists.debian.org/";><mailarchives/></a><br />
-      &nbsp;<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 /><a href="$(HOME)/intro/free"><freesoftware/></a>
+      <li /><a href="$(HOME)/partners/"><partners/></a>
+      <li /><a href="$(HOME)/donations"><donations/></a>
+      <li /><a href="$(HOME)/contact"><contactus/></a>
+      </ul>
+    <p><strong><a href="$(HOME)/News/"><news/></a></strong></p>
+      <ul>
+      <li /><a href="$(HOME)/News/weekly/"><weeklynews/></a>
+      <li /><a href="$(HOME)/events/"><events/></a>
+      </ul>
+
+    <p><strong><a href="$(DISTRIB)/"><gettingdebian/></a></strong></p>
+      <ul>
+      <li /><a href="CD/vendors/"><cdvendors/></a>
+      <li /><a href="$(DISTRIB)/cd"><cdisoimages/></a>
+      <li /><a href="$(DISTRIB)/netinst"><netinst/></a>
+      <li /><a href="$(DISTRIB)/pre-installed"><pre-installed/></a>
+      </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 /><a href="$(HOME)/releases/stable/installmanual"><installationmanual/
+></a>
+      <li /><a href="$(DOC)/books"><debianbooks/></a>
+      </ul>
+    <p><strong><a href="$(HOME)/support"><support/></a></strong></p>
+      <ul>
+      <li /><a href="$(HOME)/international/"><debinternational/></a>
+      <li /><a href="$(HOME)/security/"><security/></a>
+      <li /><a href="$(BUGS)/"><bugreports/></a>
+      <li /><a href="MailingLists/"><mailinglists/></a>
+      <li /><a href="http://lists.debian.org/";><mailarchives/></a>
+      <li /><a href="$(HOME)/ports/"><portsarchitectures/></a>
+      </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="$(HOME)/sponsor.html"><img src="sponsor_img.jpg" border="0" vspace=
+"16" alt="<visitsponsor/>" width="102" height="60" /></a>
+    
     <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" />"
+        "<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>&nbsp;</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>
-  &nbsp;&nbsp;&nbsp;
-  </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: navbar.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/navbar.wml,v
retrieving revision 1.67
diff -u -r1.67 navbar.wml
--- navbar.wml	2 Nov 2004 00:09:49 -0000	1.67
+++ navbar.wml	5 Dec 2004 12:47:08 -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="Debian Logo" /></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: news.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/news.wml,v
retrieving revision 1.55
diff -u -r1.55 news.wml
--- news.wml	2 Dec 2004 21:01:43 -0000	1.55
+++ news.wml	5 Dec 2004 12:47:08 -0000
@@ -34,7 +34,7 @@
 
 {#pre_footer#:
 <ifeq "$(NOHOMELINK)" "" "
-<hrline/>
+<hrlinehidden/>
 <returnline/>
 "/>
 
Index: template.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/template.wml,v
retrieving revision 1.17
diff -u -r1.17 template.wml
--- template.wml	2 Dec 2004 21:01:43 -0000	1.17
+++ template.wml	5 Dec 2004 12:47:11 -0000
@@ -7,12 +7,12 @@
 {#check_trans#}
 
 <ifeq "$(NOHEADER)" "" "
-<h1>$(title)</h1>
+<h1 align="center">$(title)</h1>
 "/>
 
 {#pre_footer#:
 <ifeq "$(NOHOMELINK)" "" "
-<hrline/>
+<hrlinehidden/>
 <returnline/>
 "/>
 



--
http://www.witch.westfalen.de
http://witch.muensterland.org

Reply to: