On Mon, Jan 25, 2010 at 12:50:32AM +0100, Martin Zobel-Helas wrote: > On Mon Jan 25, 2010 at 00:47:36 +0100, Simon Paillard wrote: > > > - more in http://people.debian.org/~spaillard/missing-from-wolkenstein > > > > List updated. [..] > > * 274 files in Pics/* are old menu pics no longer generated by makefile, > > but still in the www tree, and still linked from (as apache > > klecker logs in 2010 says): > > - http://search.debian.org/ > > - http://lists.debian.org/ > > - http://db.debian.org/ > > => Either keep english Pics, or patch the three websites above > > i would go for the later.
Attached the patch for db.d.o against the git tree. http://teubr.eu.org/~spaillar/debian/userdir-ldap-cgi/.git/ Note it links directly www.debian.org CSS, IMO it's saner. (Or update the makefile to download the CSS at build ?) You can view the test build at (nothing special): http://teubr.eu.org/~spaillar/debian/userdir-ldap-cgi/html/ -- Simon Paillard
>From 2472f1ac1ed46b15d0693fdc049643e0a88fa8d7 Mon Sep 17 00:00:00 2001 From: Simon Paillard <simon.paill...@resel.enst-bretagne.fr> Date: Mon, 25 Jan 2010 21:54:23 +0100 Subject: [PATCH] Move ud-ldap-cgi wml templates away from gif navbar to CSS navbar See http://lists.debian.org/debian-www/2010/01/msg00120.html --- html/.wmlrc | 2 + html/template/common_translation.wml | 3 ++ html/template/header.wml | 11 ++++-- html/template/navbar.wml | 59 +++++++++++---------------------- 4 files changed, 33 insertions(+), 42 deletions(-) diff --git a/html/.wmlrc b/html/.wmlrc index 2320f93..e2fa3b6 100644 --- a/html/.wmlrc +++ b/html/.wmlrc @@ -8,3 +8,5 @@ -D DISTRIB="http://www.debian.org/distrib" -D HOME="http://www.debian.org" -D PICS="http://www.debian.org/Pics" +-D STYLE="style" +-D CHARSET=utf-8 diff --git a/html/template/common_translation.wml b/html/template/common_translation.wml index fc4bfcf..3850f9a 100644 --- a/html/template/common_translation.wml +++ b/html/template/common_translation.wml @@ -21,6 +21,9 @@ <define-tag home whitespace=delete> <gettext>Home</gettext> </define-tag> +<define-tag skipquicknav whitespace=delete> + <gettext>Skip Quicknav</gettext> +</define-tag> <define-tag about whitespace=delete> <gettext>About</gettext> </define-tag> diff --git a/html/template/header.wml b/html/template/header.wml index a31a0af..d86727d 100644 --- a/html/template/header.wml +++ b/html/template/header.wml @@ -2,11 +2,11 @@ <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\">" + "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">" /> # 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":]> +<html lang="$(CUR_ISO_LANG)"[FA: dir="RTL":][HE: dir="RTL":]> {: <head> <meta http-equiv="Content-Type" content="text/html; charset=$(CHARSET)" /> @@ -22,5 +22,10 @@ <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" /> + +<link href="$(HOME)/debian-$(CUR_ISO_LANG).css" rel="stylesheet" type="text/css" media="all"/> +:#style#} </head> -<body text="#000000" bgcolor="#FFFFFF" link="$(LINK:-#0000FF)" vlink="$(VLINK:-#800080)" alink="$(ALINK:-#FF0000)"> +<body> diff --git a/html/template/navbar.wml b/html/template/navbar.wml index 5ce1e56..54a3987 100644 --- a/html/template/navbar.wml +++ b/html/template/navbar.wml @@ -1,44 +1,25 @@ #use wml::common_translation -<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> -</tr> -</table> +<div id="header"> + <div id="upperheader"> + <div id="logo"> + <a href="$(HOME)/"><img src="$(LOGOS:-$(HOME)/logos)/openlogo-nd-50.png" width="50" height="61" alt="" /></a> + <a href="$(HOME)/" rel="start"><img src="$(PICS)/debian.png" width="179" height="61" alt="<debianproject/>" /></a> + </div> <!-- end logo --> +</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> -<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> -<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> +<div id="navbar"> +<p class="hidecss"><a href="#inner"><skipquicknav/></a></p> +<ul> + <li><a href="$(INTRO)/about"><aboutdebian/></a></li> + <li><a href="$(HOME)/News/"><news/></a></li> + <li><a href="$(DISTRIB)/"><gettingdebian/></a></li> + <li><a href="$(HOME)/support"><support/></a></li> + <li><a href="$(HOME)/devel/"><develcorner/></a></li> + <li><a href="$(HOME)/sitemap"><sitemap_short/></a></li> + <li><a href="$(SEARCH)"><search/></a></li> +</ul> +</div> <!-- end navbar --> +</div> <!-- end header --> <!--/UdmComment--> -- 1.5.6.5