Commit f74087bd authored by Denis Barbier's avatar Denis Barbier

On the road to HTML 4 strict compliance. Apply Jutta's patch sent

to bug #325190.

CVS version numbers

english/debian.css: 1.29 -> 1.30 
english/sitemap.wml: 1.35 -> 1.36 
english/template/debian/cdimage.wml: 1.66 -> 1.67 
english/template/debian/common_tags.wml: 1.9 -> 1.10 
english/template/debian/mainpage.wml: 1.48 -> 1.49 
english/template/debian/mirrors.wml: 1.38 -> 1.39 
english/template/debian/navbar.wml: 1.73 -> 1.74 
english/template/debian/security.wml: 1.124 -> 1.125 
english/template/debian/template.wml: 1.19 -> 1.20 
english/template/debian/votebar.wml: 1.109 -> 1.110 
english/template/debian/weeklynews/index.wml: 1.26 -> 1.27
parent 123ab2d6
......@@ -43,6 +43,8 @@ html, body {
img { border: 0; }
h1 { text-align: center; }
acronym {
border-bottom: 1px dotted black;
}
......@@ -84,7 +86,14 @@ acronym {
right: 0;
}
#serverselect p small {
#serverselect:lang(de) {
width: 15em;
}
#serverselect:lang(en) {
width: 13em;
}
#serverselect p {
color: #990000;
font-size: 0.8em;
font-weight: normal;
......@@ -158,7 +167,7 @@ acronym {
font-size: 0.9em;
}
#navbar .hidecss {
#navbar .hidecss, .hidecss {
display: none;
}
......@@ -269,14 +278,11 @@ acronym {
#outer>#inner { border-bottom: 1px solid #BFC3DC; }
.bordertop { border-top: 1px solid #BFC3DC; }
.hidecss {
display: none;
}
/*dl dt {
font-weight: bold;
}*/
#footer ul {
display: inline;
list-style-type: none;
......@@ -380,6 +386,11 @@ div.righthalf {
#pdeps ul {
list-style-type: none;
padding-left: 2em;
}
#pdeps li {
text-indent: -2em;
}
#pdeps ul.uldep, #pdeps ul.uladep {
......@@ -397,6 +408,9 @@ div.righthalf {
list-style-image: url(http://packages.debian.org/Pics/sug.gif);
}
#pdeps ul.uldep li, #pdeps ul.ulrec li, #pdeps ul.ulsug li, #pdeps ul.uladep li, #pdeps ul.ulidep li {
padding-left: 2em;
}
#pdeps dl {
margin: 0;
}
......@@ -415,7 +429,6 @@ div.righthalf {
margin: 0 0 1em 1em;
border-style: ridge;
border-collapse: collapse;
/* background-color: #BBDDFF; */
}
#pdownload th {
......@@ -451,6 +464,9 @@ div.righthalf {
text-align: center;
}
.warning {
color: red;
}
.center {
text-align: center;
}
......@@ -459,10 +475,10 @@ div.righthalf {
vertical-align: top;
}
:link { color: #0000FF; }
:visited { color: #800080; }
:link:active, :visited:active { color: #FF0000; }
:link:hover, :visited:hover { color: #F000FF; }
a:link:visited { color: #800080; }
a:link { color: #0000FF; }
a:link:active { color: #FF0000; }
a:link:hover { color: #F000FF; }
.navpara a {
white-space: nowrap;
......@@ -479,7 +495,7 @@ div.righthalf {
text-align: right;
}
#leftcol, #navbar, #navbar a {
#leftcol, #navbar, #navbar a {
-moz-border-radius: 15px;
/* this goes to the end as the css validator does not like it
will be replaced by border-radius with css3 */
......
......@@ -318,5 +318,5 @@ sub title_of {
</div>
</div>
<p align="center"><font size="+2"><strong><linkto "$(SEARCH)"></strong></font></p>
<p><strong><linkto "$(SEARCH)"></strong></p>
</div>
......@@ -81,11 +81,11 @@
<table width="100%" bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="left" valign="middle">
<a href="$(HOME)/CD/"><img src="$(HOME)/CD/pictures/cdimage.<cdpiclang/>.png" alt="<debiancd/>" width="380" height="82" border="0"></a>
<a href="$(HOME)/CD/"><img src="$(HOME)/CD/pictures/cdimage.<cdpiclang/>.png" alt="<debiancd/>" width="380" height="82"></a>
</td>
<td align="right" valign="middle">
<a href="$(HOME)/"><img src="$(HOME)/logos/openlogo-nd-50.png" border="0" hspace="0" vspace="0" alt="" /></a>
<a href="$(HOME)/"><img src="$(PICS)/debian.png" border="0" hspace="0" vspace="0" alt="<debianproject/>" /></a>
<a href="$(HOME)/"><img src="$(HOME)/logos/openlogo-nd-50.png" hspace="0" vspace="0" alt="" /></a>
<a href="$(HOME)/"><img src="$(PICS)/debian.png" hspace="0" vspace="0" alt="<debianproject/>" /></a>
</td>
</tr>
</table>
......@@ -93,26 +93,26 @@
<table width="100%" bgcolor="#e09e86" border="0" cellpadding="0" cellspacing="0">
<tr>
<td align="left" valign="top">
<img src="$(HOME)/CD/pictures/menubar-tl.png" width="16" height="16" alt="" align="left" border="0" hspace="0" vspace="0">
<img src="$(HOME)/CD/pictures/menubar-tl.png" width="16" height="16" alt="" align="left" hspace="0" vspace="0">
</td>
<td rowspan="2" align="center" valign="middle">
<a href="$(HOME)/CD/faq/"><img src="$(HOME)/CD/pictures/menu-faq.<cdpiclang/>.png" width="40" height="27" alt="<dc_faq/> <sep/>" border="0" align="middle" hspace="6" vspace="1"></a>
<a href="$(HOME)/CD/netinst/"><img src="$(HOME)/CD/pictures/menu-netinst.<cdpiclang/>.png" width="125" height="27" alt="<dc_net/> <sep/>" border="0" align="middle" hspace="6" vspace="1"></a>
<a href="$(HOME)/CD/vendors/"><img src="$(HOME)/CD/pictures/menu-buy.<cdpiclang/>.png" width="41" height="27" alt="<dc_buy/> <sep/>" border="0" align="middle" hspace="6" vspace="1"></a>
<a href="$(HOME)/CD/jigdo-cd/"><img src="$(HOME)/CD/pictures/menu-jigdo.<cdpiclang/>.png" width="60" height="27" alt="<dc_jigdo/> <sep/>" border="0" align="middle" hspace="6" vspace="1"></a>
<a href="$(HOME)/CD/http-ftp/"><img src="$(HOME)/CD/pictures/menu-http-ftp.<cdpiclang/>.png" width="93" height="27" alt="<dc_httpftp/> <sep/>" border="0" align="middle" hspace="6" vspace="1"></a>
<a href="$(HOME)/CD/misc"><img src="$(HOME)/CD/pictures/menu-misc.<cdpiclang/>.png" width="50" height="27" alt="<dc_misc/>" border="0" align="middle" hspace="6" vspace="1"></a>
<a href="$(HOME)/CD/faq/"><img src="$(HOME)/CD/pictures/menu-faq.<cdpiclang/>.png" width="40" height="27" alt="<dc_faq/> <sep/>" align="middle" hspace="6" vspace="1"></a>
<a href="$(HOME)/CD/netinst/"><img src="$(HOME)/CD/pictures/menu-netinst.<cdpiclang/>.png" width="125" height="27" alt="<dc_net/> <sep/>" align="middle" hspace="6" vspace="1"></a>
<a href="$(HOME)/CD/vendors/"><img src="$(HOME)/CD/pictures/menu-buy.<cdpiclang/>.png" width="41" height="27" alt="<dc_buy/> <sep/>" align="middle" hspace="6" vspace="1"></a>
<a href="$(HOME)/CD/jigdo-cd/"><img src="$(HOME)/CD/pictures/menu-jigdo.<cdpiclang/>.png" width="60" height="27" alt="<dc_jigdo/> <sep/>" align="middle" hspace="6" vspace="1"></a>
<a href="$(HOME)/CD/http-ftp/"><img src="$(HOME)/CD/pictures/menu-http-ftp.<cdpiclang/>.png" width="93" height="27" alt="<dc_httpftp/> <sep/>" align="middle" hspace="6" vspace="1"></a>
<a href="$(HOME)/CD/misc"><img src="$(HOME)/CD/pictures/menu-misc.<cdpiclang/>.png" width="50" height="27" alt="<dc_misc/>" align="middle" hspace="6" vspace="1"></a>
</td>
<td align="right" valign="top">
<img src="$(HOME)/CD/pictures/menubar-tr.png" width="16" height="16" alt="" align="right" border="0" hspace="0" vspace="0">
<img src="$(HOME)/CD/pictures/menubar-tr.png" width="16" height="16" alt="" align="right" hspace="0" vspace="0">
</td>
</tr>
<tr>
<td align="left" valign="bottom">
<img src="$(HOME)/CD/pictures/menubar-bl.png" width="16" height="16" alt="" align="left" border="0" hspace="0" vspace="0">
<img src="$(HOME)/CD/pictures/menubar-bl.png" width="16" height="16" alt="" align="left" hspace="0" vspace="0">
</td>
<td align="right" valign="bottom">
<img src="$(HOME)/CD/pictures/menubar-br.png" width="16" height="16" alt="" align="right" border="0" hspace="0" vspace="0">
<img src="$(HOME)/CD/pictures/menubar-br.png" width="16" height="16" alt="" align="right" hspace="0" vspace="0">
</td>
</tr>
</table>
......
<define-tag hrline><hr noshade width="100%" size="1" /></define-tag>
<define-tag hrline><hr /></define-tag>
<define-tag hrlinehidden><hr class ="hidecss" /></define-tag>
<define-tag url><a href="%0">%0</a></define-tag>
......
......@@ -85,16 +85,18 @@
<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>
<p>
<input type="text" name="q" size="12" />
</p>
</form>
<p>
<a href="$(HOME)/sponsor.html"><img src="sponsor_img.jpg" border="0" vspace="16" alt="<visitsponsor/>" width="102" height="60" /></a>
<a href="$(HOME)/sponsor.html"><img src="sponsor_img.jpg" alt="<visitsponsor/>" width="102" height="60" /></a>
</p>
<p>
<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" alt="Valid XHTML 1.0!" width="88" height="31" />"
"<img src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" width="88" height="31" />"
/></a>
</p>
<p>
......
......@@ -11,7 +11,7 @@
<define-tag mirrors-serverlist>
<!--UdmComment-->
<form method="get" action="http://cgi.debian.org/cgi-bin/redirect.pl">
<p>
<perl>
my $rootdir = &canonpath('$(WML_SRC_DIRNAME)/$(HOME)');
my $curdir = &relpath($rootdir, '$(WML_SRC_DIRNAME)');
......@@ -21,12 +21,10 @@
</perl>
# See wml_p1_ipp(1) for details on these constructs
$(usefonts:+<font$(fontface:+ face="$(fontface)")$(fontcolor:+ color="$(fontcolor)")>)
$(small:+<small>)<selectserver/>:$(small:+</small>)
$(usefonts:+</font>)
<selectserver/>
<br />
# note: the values for site don't have an ending slash on purpose, that's page
<select name="site"$(small:+ style="font-size:90%;")>
<select name="site">
<perl>
my %mirrors = (
"<ATc/>" => "at",
......@@ -55,8 +53,8 @@ foreach my $m (sort langcmp keys %mirrors) {
}
</perl>\
</select>
<input type="submit" value=" <go/> "$(small:+ style="font-size:90%;") />
<br />
<input type="submit" value=" <go/> "/>
</p>
</form>
<!--/UdmComment-->
</define-tag>
#use wml::debian::common_translation
#use wml::debian::mirrors small="yes" usefonts="yes" fontcolor="#990000"
#use wml::debian::mirrors
<div id="header">
<div id="upperheader">
......
......@@ -43,7 +43,7 @@
<h2><pagetitle/> -- <description/></h2>
<dl compact>
<dl>
<dt><gettext domain="security">Date Reported</gettext>:</dt>
<dd><:= newsdate('<report_date/>') :></dd>
<ifneq "<packages/>" "" "
......@@ -70,9 +70,8 @@ if ($#pkg_links > 1) {
</dd>
"/>
<dt><gettext domain="security">Vulnerable</gettext>:</dt>
<dd>
<ifeq "<isvulnerable/>" "yes" "<font color="#FF0000"><yes/></font>" />
<ifeq "<isvulnerable/>" "no" "<font color="#00FF00"><no/></font>" />
<ifeq "<isvulnerable/>" "yes" "<dd class="warning"><yes/>" />
<ifeq "<isvulnerable/>" "no" "<dd><no/>" />
</dd>
<dt><gettext domain="security">Security database references</gettext>:</dt>
<dd><:= security_references("<secrefs/>") :></dd>
......
......@@ -7,7 +7,7 @@
{#check_trans#}
<ifeq "$(NOHEADER)" "" "
<h1 align="center">$(title)</h1>
<h1>$(title)</h1>
"/>
{#pre_footer#:
......
......@@ -144,8 +144,8 @@ return $str;
<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" />
<img src="$(PICS)/blue-upperleft.png" align="left" hspace="0" vspace="0" />
<img src="$(PICS)/blue-upperright.png" align="right" hspace="0" vspace="0" />
</td>
</tr>
<tr>
......@@ -172,8 +172,8 @@ return $str;
</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" />
<img src="$(PICS)/blue-lowerleft.png" align="left" hspace="0" vspace="0" />
<img src="$(PICS)/blue-lowerright.png" align="right" hspace="0" vspace="0" />
</td>
</tr>
</table>
......
......@@ -26,7 +26,7 @@ sub get_weeklynews_list {
my $str="";
open(CURRENT, "CURRENT-ISSUE-IS") or open(CURRENT, "$eng_dir/CURRENT-ISSUE-IS") or return '';
my $currentissue=<CURRENT>;
my $currentissue=<CURRENT>;# </CURRENT>
chomp $currentissue;
my ($currentyear)=$currentissue=~m:^(\d+)/:;
$currentissue=~s:^\d+/::;
......@@ -54,7 +54,7 @@ sub get_weeklynews_list {
$summary=$1;
}
if ($title) {
$str.="<a href=\"". ($noyear ? "$dirprefix" : "$year/" )."$base\">$title</a> $summary<br>\n";
$str.="<a href=\"". ($noyear ? "$dirprefix" : "$year/" )."$base\">$title</a> $summary<br />\n";
}
close $fh;
$count++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment