From ccb2880d56ea9c120b00bd7e1026e079ea303b21 Mon Sep 17 00:00:00 2001
From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 31 Jan 2010 13:08:45 +0100
Subject: [PATCH] don't link outside db.d.o when using https

---
 debian/rules                 |   4 +
 html/.wmlrc                  |   2 +
 html/Pics/debian.png         | Bin 0 -> 3895 bytes
 html/Pics/openlogo-nd-50.png | Bin 0 -> 719 bytes
 html/debian-en.css           |  35 ++
 html/debian.css              | 740 +++++++++++++++++++++++++++++++++++
 html/template/header.wml     |   4 +-
 html/template/navbar.wml     |   4 +-
 8 files changed, 785 insertions(+), 4 deletions(-)
 create mode 100644 html/Pics/debian.png
 create mode 100644 html/Pics/openlogo-nd-50.png
 create mode 100644 html/debian-en.css
 create mode 100644 html/debian.css

diff --git a/debian/rules b/debian/rules
index 56dae6a..06bcaba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ clean:
 
 instdirs = \
 	var/www/userdir-ldap \
+	var/www/userdir-ldap/Pics \
 	var/cache/userdir-ldap/web-cookies \
 	var/cache/userdir-ldap/hosts \
 	usr/share/doc/$(package) \
@@ -30,9 +31,12 @@ binary-indep: build
 	dh_installdirs $(instdirs)
 	dh_installdocs
 
+	wget -O html/debian.css http://www.debian.org/debian.css
+	wget -O html/debian-en.css http://www.debian.org/debian-en.css
 	install -m 755 *.cgi $(i)/var/www/userdir-ldap/
 	install -m 644 Util.pm $(i)/var/www/userdir-ldap/
 	install -m 644 html/index.html $(i)/var/www/
+	install -m 644 html/Pics/*.png $(i)/var/www/userdir-ldap/Pics/
 	install -m 644 html/doc-direct.html $(i)/var/www/userdir-ldap/
 	install -m 644 html/doc-general.html $(i)/var/www/userdir-ldap/
 	install -m 644 html/doc-hosts.html $(i)/var/www/userdir-ldap/
diff --git a/html/.wmlrc b/html/.wmlrc
index e2fa3b6..3482e63 100644
--- a/html/.wmlrc
+++ b/html/.wmlrc
@@ -7,6 +7,8 @@
 -D INTRO="http://www.debian.org/intro"
 -D DISTRIB="http://www.debian.org/distrib"
 -D HOME="http://www.debian.org"
+-D DBHOME=""
+-D DBPICS="/Pics"
 -D PICS="http://www.debian.org/Pics"
 -D STYLE="style"
 -D CHARSET=utf-8
diff --git a/html/Pics/debian.png b/html/Pics/debian.png
new file mode 100644
index 0000000000000000000000000000000000000000..41498fab73af15794002cbab71f25ea739a9b462
GIT binary patch
literal 3895
zcmV-756JL|P)<h;3K|Lk000e1NJLTq006T9002D*0ssI2Y0S?I00009a7bBm0000;
z0000;07l7cJ^%m?=}AOERCwC$oe6YJ#~;U^N+q%8)EbSZA@(&1Vl7pN3Wvx+OKF7?
zBB@=(+Df%F_|w*@Qb$OT#1^5}){+IKjxAz|gh(urNDvZFi2s-Scl&bh%-nhJ-S=Mp
z>HD2D=Xsesb7$r=zh$;+URuQ}B+*!#Kwl}!dXT^8Zz~yAkzkRR=JwSk+ky9&@3fL(
zpgeo_%z_om$jDG1i@U&LBCrsC?yrcolA(vZc<~}BDJd{8uxr<@=C2P*-?wj{kB^VN
zy?t?UvFWfV^Khs}Mov!7;lqdL&!69_RV&SF88&Q~*{bp6$&>i__<(?b=FOW6rB|(5
zRYfvh8xbiMuYT-&%Bop0ij0JW1ayDDe*K)BoZf!>ZB0q>_xCs5d*8l&J2EnI-n@Cf
zzP_HGp4F;Vla$`3O&b+mPBIo{8V;k#$j{G52WTj=WXTfKy|-4YojrTDhAwK6QCy%+
zbEjh={Mh?E+#F{mqlE0(vBM%{2rk7(AAMwMG9Yj!*kq(O_kWg=Z6%}RkSZ>QMJM)6
zR8*9y-##oXj7A2mjEV)pUQn@U=3kVNW3?s(>E69Nv2P9?I%Mj%&&|!Xv9TeRK5En`
zb;}~ck=ks0QDzy$LLD-O3>ji6G9d4~^NxAQ_#Yg0KK}+R)FETalqnV@qeF)dW+USj
z9RG<C;CN+3$}SeBCF9hoQ)Z}ux3{-B$q?X3Ydfjzxt!)BBQGz{3>EPA_a~O_=jZp*
zDpoS&^7GF>TYJ|^hLsE}88TVEe7ThjOOjDsT%3`S@%J0SXK}qs6*46GLozcnd6vX}
z`|UTq$UvTtA3v5<!C=YH&tJN9>AidR^s4E@hYxjY`r^e46&L>wA3nTw>sI2Q9zA*_
z7Mhlp#x9gahE}VMiHZ5_v(Ll@OkJ_DvGMfuoH}(XZHk(QjNIJZRjXEcd3g~hQt{=W
zL4!7I*udE8!AVA8VIkTJ1-<pwTe`{I+}zN$_wV25Z+dj(ojZ4;qoYTU9&K-LZ)azR
zo@S(f{`~pr)2Ej#Su%9!P{uM-&6+iRe0-KITXyc;IekGvPsPQ>Em*LiNs}hX3S(9G
zuNN*{2nq^va&jWBA>hTbva)!|Ku?5(gg7`jXp9gx84n&jm^pK%e2tVSE-o%xwrnw&
zjI(FYy1TnG^0&3MMS650u?Rd4e9?j<MvUm$vuC|}^>m+gb#<iyk&uuuZrnI@xxP);
zr%#^~Cr&V0@8rpo!NI|Jp8*2~VBAV3f<-c*9g$2j801o`R;|5z_bQVCz+1L#sWDm@
zWI&tMuU}u^3^69;ou^0!%A(DaO2pgSoA}P?2F4)i)~%Z)eNj=-_U+rneJX}Yg$fmD
zMnO=44D}<B0W82VXL04rm*2H(7mJJo2M$!MSkZVa-h1yoXkB8h_V3>hC2Ux>-+lL;
zUSy=Cq;O&($dDmJi0`~{<3|3ayB~l2QKOQeb~HH9j0`f+_|PbNl~uiZ^;@@Yk;zC(
zN~%<;k}6e#N+8zf{Q2_?@}Q`J6ov~e0n}z<Vj?FQu-0rNBA0UI%E8hTJx%%6Bta%m
zo-8+%oK{j%fOU3uHqGMG>=ej|jEpp(IA~=88K@6i!^6bD-(0k45yk|5j~zP}y{H!%
z1qB7~zyCh5zfl>{TZT%Hii(2$Cgu#Y3U$px#`^W^4QL&Blou~vl)pTDRZcP>vu4d=
zt8UjfqUZ!nn>LN6HfX+oU|?Xwh7Bc-RD%W$6zdKLR<zgukTHGwblL+b2C<Ob#-oSA
z!^3OWuFXlt+_`h*DPh8Q?j-D%ga1#Ai6F7Du{>l**n%qJX&u@=MZ{?QWF#jiOOip0
z3>-KRan|+g*AYGHMv@T`5e&x;V~IvaKtKR(SPCDY=SGek2@e`R2ht;kf(@dzsvwz}
znI*`;cm-C(q|KT&Lnkr(<PSgmkcSL}M#Ru`@#4j_oMGLFI$YNqppo(M#~+KI5wJnK
zqIIB?5GQZmy!qXC-(|E8dQoUfT^TcG3_lq#^I``$Iy!#+_17qu9jUc%-=3I1l*)}8
zH;7LmTw>G$O-J-$!3X-3_SC_H2TPCvl|>7(@7}%34yHNDm@{V%aX>tM`jnCRph1I(
zJ@@3v6E+#TWXr37o?ypc@WdsLEM2;kp9~1T$6sM{Q5Mgf1VTc1Ih-%ULk45WAx5P=
zg<<m#84O?MmtTHStP&3yuscLe4im=CeC^t`#1}h${5TI8FjcexclGL3Ml32fDEg8C
z`>XGM$1YvE5R2HfX%jI$!;ylblB+%4nK9ZPO_8TpWc=~RAG8S&WT6Tf@$vD*A`%i3
z*qNuNrxQn#I9<Ue18SU+`8VHuLwnHE)6+;Y43LQvC+bDUp+krCa+P$27PXZiBPb|{
z=Hl|y$IHu0kqn}H3q#1BR~CdgAu(aX1Vu7nq1hf1oIyk)#Aj>Ns392@W+3B-AAV4a
zjD7p|vCE>xH6_UC+_|$}=FI?|LEMw);^M-SKhc+lpRY(p_wL;lGymX&4``1|RujxX
z#<p$SR3XF0#)ds4xX6G9P`PqtV$99Cgs4ac1|PAAPMtdO<WHR96}3Hs4BdGfnuLai
zDthT=BZFqv^(6xyx?)*=etrsM04`#R+O=zQ)<=<yl#~==5np`qg~4PvJ3A|q0UuB?
zbH*IAWRWR0HkOzyBqXG?k%4ebu`Js3)jwpw$>(&z3?>6^Cb5WsfB=({p%`z!e0`Y$
z?eU0+2uZ9#Ocov<&foV4w$Ge76BZV>X3d(fN(#cj88c?6LI!$71u|&Iyao>*tQHwR
z{qz&Dh!!ncjN=gE#sVHPICnYFBKCy~7pg@D_(PP`s#Po4XagqfEknl2l`DxU#*ZIw
zYBG!wMKbu$wVITS)YMcs%SKkV%#uOds#!|NXxFYCF^5Hq78yeZG#1?3Dpjf&U)eHC
zhOe)$`N<H&T1DyIyEl&qsuvl+V*dR3YE`z(k}-DdSo4#?e@4v|WUyyuTefT&6ciL4
z9sSo|f2HdPZKk+%kuh}WP*eLEwzjs;h6)0fQcFf&US9R;)rpClHf<Ug7pJ?w#1v7h
zX~|GAYNe6EIn%`!(~+UO^-V7_rcRwoOzGj_!Cs61{~)7v>(>7gGV0W+BY(VN#fp+O
z9ey&13q1}F4mmkF=9%eIhm3XW*3tHTs6_^Cp0SjWL5y0RoSfvV>O5o|J$jUwEI2q=
z@lB$lqDm1Nv^mgn<;ta`r0}#X@y;EdIZ!)0JByP6^-f%F?ccw@B<1eiyLre62?-%4
zyMFz;+16UsAtN<4mF7ZA4j|BkxKCP_jLghTV*cgJmzUUb^OJGu(k0^Kp`oFi`!ghD
zj2=CjxE~-tKi}ZqvJ4qot(G=r%ii|FCIim7xQ*}m^XIgEm%so1yJg9Uh=?FQE<Ym1
zNk-SMUFB&SHf+fAGJX5@Ek$JDKiX-hcJ12nED_O;sOX;eB5vo@sBxRDkz@$FH6>ED
zYSn^*0yC3=@k3l8vLqQq1t@5HMe8WvK2Id$`|rOuV7sCj$Y5^^GJp)?ff@`RIcgG#
zi;F8=bD%Gow`xjGRm)}d>eW1CoH})imW*c;vWdtzd-g2xAdvj{uaP<fa{2OQ_RBD4
ziY-RQwQJXC?}Uhs?IhAnBP1;?O-xo)RMetH3u3amb?fSNNr8%F5RZ^x&=XJO(#V)M
zZypaB?3-RrpFYi4ptl$q5Km7}+H3Xc(}#9_MSOfb?X;&xcIzW_11)90e*I_@#-=0V
z#*G`qcohT?({t|j`|`^#iOCu_ZcIA@4nxB}{9;Km*jp$D4<0N(PIKYHg<7?0F`kkH
zy^kI}BJKti<daW6;n_znis+pfMh4tH-9v1;u3}+fp)q98l0g8Cd^1r-Mh0=J(9~q~
z@86$`3^X+R__l+C!>n1e_V3@Hn3#y)!NI|b$Gzn@(l1-KjFBGB;GR8uXah@>d-v|a
z`vFM?lL0J-4<AmP++#%1G-V(mgW*v@1`HU0A_`v%hSr=pb9CqCiEjm2v0?@Bm1rv)
zJY;a4Dqv5*DGE(<%$PAl@-{FTJ$m$D=hn7u+l31k9zA*#DnvLLjNkZ-c7#0w5W*b_
z;=XX&Enze=($mvnABm6n`1mlIlK;fBv$L}S%?Q&*n~$a)ho_xhRGAD=Y`{G@HEPtL
z4JP6(CAV+i=D(fD#>S>Wg9b#`Y}>YNLWZ<kA6;Br)~s0r^#*mFot=ID{Q1bp$YH~V
z(T*O$xX|nfn~Yw)dP!1#`|Y;|kO4KEo11HKGCu$Ob14~uCe-(4mC(>o+NgDPbtUf6
zMXc!P=xF55o#f<XAveZRB7SMoqzUZ;6Hz*L?8vz;sMTsEcX=s_o0}Wld>R=vWk#DN
za(8z(Y$8W+_y}Y`4jw$ne;X5e1+73MLqor+D=RC@!^6XvzJ%^!td!~{pMLtOqVvm`
zpoCj3kKGay5*SgN+#CzD9W*ikF7d6P0*UE)P9o7RsS?ks5N>b-9PH~Q1Zm&C{mq*<
zUo!8PVH^g3`t&LMFN6D4AmhxLGsZB1F8TG>UwIB6pg2Z8Cr_S~KeBb}R>rkbqO@t#
zCMhXNT==EAAmT{Sm2Ta-(KgGm_k!HHbB6{l^nx&5OTP6HW8Kfsk7knbFlZ2Ou%InU
zX*mA(i!kj7nDxC%5IhMdE8)`a*s){8h!OglCun=vLEXD=*uscKHS`0Fu$#1v>B8y^
z#)j@JA0k9rU@vzy&_@jIe&omzMs;FhVi?sCu0YbT_b!Bohr_}2^74Y|f(63ou&^-6
z*{>^CuB?15>({S8{zmrh-HUIKm}f*H4eSdB*`!I6yuH2MNrHH9%$PB&R;_|FB)=C5
z-#{U6+_({Kjh94#BRtipQ6r%bgn#<_`XU5NNl8(RjU^Ht9gU*J+Cf)g*a@G}j_cN~
zqdka%z{l*_v+-8Fd-sOBiVqld+qZ8guB4#Bg~m)wOho3#jvW*JiQrsfvr<!2@jcr4
zcu9eyjqlmliQ=zo*RB=PU%Pe<Jt%xeNQh_u{PRzw`7bgU#0za(azOw9002ovPDHLk
FV1lgZYp?(S

literal 0
HcmV?d00001

diff --git a/html/Pics/openlogo-nd-50.png b/html/Pics/openlogo-nd-50.png
new file mode 100644
index 0000000000000000000000000000000000000000..364a3e87b138ca8d984c7df9aca57c79764e7aba
GIT binary patch
literal 719
zcmV;=0x<oFP)<h;3K|Lk000e1NJLTq001%o002D*0{{R3*tg170000pP)t-s|NsBT
z05;1IL*sv%`|tAVpR@75&DB6?_}}K-V1o3|+3l~u&LB_HFkIkpj^>Z2*-&-B_^g)z
z0004EOGiWihy@);00009a7bBm000XT000XT0n*)m`~Uy|2XskIMF-LW0u~1xN1)^N
z0006aNkl<ZNXL~{+ZKZ`2qVz@&Hn$_?m_Let#0LMN0$=<1SA?m=_rM~7)AeuD+~bO
zY%Tlv8)hoH@a~;q004kxHcyC+@f3Lq3JGr^BSK$ZS6iYn#ze6fQR*3C!>!_tJgX;!
z@A+l=Cbo=ceF!|!b3WVVrEHjQ-TWa!KlS>=q}IV#id*KIh)B$?kHhO=lnad}!@m)v
z7yx+xoBM;~D79DYn)b;E1!GJ{!y<~vD4r=-!u{xb0NH6G(KC|3U>{8|lJsprln})X
zfYpF#W1!>dJ^*a=A-)@Im9Cy@sR3XWcDmH1Wf5mJ0{}-vbrc`RVJ0G?d_ept-ebNY
zEC73S=q_HN_B-JV*$znG=HBMzu0;m*G8a$kEL7d|yFupa9RtPe2@a6^11Dcs>A3r#
zbYi<qi!{f0r}rP7+5p^~kV9LgF1kIjzCdXz20-1*ErS+HCylb%U${$Dk)}m9CHISQ
zUonA9^QXR#QjFZErU6)Wae?WsQi+UwnKPXL*4O&<`irn;@M$vV0i<x>t$8>cTrz+v
zn|KC*a?@5v9}|Uaxt%ob&*k=Tp;FaaL}VNH)xP;A!yCP|RpOJ`Cb_+Z{;u@DBLQHy
z1QB3xz>iRAvdjKavnHl(sD*GmKQX^jTWig6Z^ByD^6XRO4~$vIa8>I(c@g6Qq{X^z
z0IXY^&|m>hi?gE>@Ni&WKo;;}5#%<@$;!jW`v-HH4r*Vp<n90f002ovPDHLkV1hv!
BP3`~y

literal 0
HcmV?d00001

diff --git a/html/debian-en.css b/html/debian-en.css
new file mode 100644
index 0000000..3c5b1b8
--- /dev/null
+++ b/html/debian-en.css
@@ -0,0 +1,35 @@
+/* Debian language css file for english - en */
+/* please do not touch for now! - Jutta Wrage 2005 */
+
+html[lang|=en] #serverselect {
+	width: 13em;
+}
+html[lang|=en] #maincol {
+	margin-left: 10em;
+}
+html[lang|=en] #leftcol ul.cdmenu {
+	width: 10em;
+}
+	
+q { font-style: italic; }
+/* quotes */
+html[lang|=en] q:before { content: "\201C"; }
+html[lang|=en] q:after { content: "\201D"; } 
+html[lang|=en] q q:before { content: "\2018"; }
+html[lang|=en] q q:after { content: "\2019"; }
+
+/* html[lang|=en] blockquote p:first-child:before { content: "\201C"; }
+html[lang|=en] blockquote p.notlast:after { content: ""; }
+html[lang|=en] blockquote p:after { content: "\201D"; }
+
+html[lang|=en] blockquote.question p:before { content: ""; }
+html[lang|=en] blockquote.question p:after, blockquote.documentquote p:after{ content: ""; }
+html[lang|=en] blockquote { font-style: italic; }
+*/
+
+/*
+html[lang=en] .en2 q:before { content: "\2018"; }
+html[lang=en] .en2 q:after { content: "\2019"; }
+html[lang=en] .en2 q q:before { content: "\201C"; }
+html[lang=en] .en2 q q:after { content: "\201D"; } 
+*/
diff --git a/html/debian.css b/html/debian.css
new file mode 100644
index 0000000..3902e14
--- /dev/null
+++ b/html/debian.css
@@ -0,0 +1,740 @@
+/* css file for debian web site - Jutta Wrage 2004 */
+/* please see README_CSS.txt for more information */
+
+html, body {
+	color: #000000;
+	background-color: #FFFFFF;
+	margin: 0 4px 0 4px;
+	padding: 0;
+}
+
+img { border: 0; }
+
+h1 { text-align: center; }
+
+acronym {
+	border-bottom: 1px dotted #000000;
+}
+
+hr.hidecss {
+	border: 0;
+}
+
+hr {
+	border-bottom: 0;
+	border-top: 1px solid #BFC3DC;
+}
+
+samp {
+	display: block;
+	margin-left: 2em;
+}
+div.sampleblock {
+	width: 80%;
+	margin: auto;
+	font-family:courier, serif;
+	font-size: 90%;
+}
+.centerblock {
+        width: 90%;
+	margin-left: auto;
+	margin-right: auto;
+}		
+div.quoteblock {
+	width: 75%;
+	margin: auto;
+	font-size: 90%;
+	text-align: justify;
+}
+
+.quoteblock div.preimg {
+	float: left;
+	margin-top: 0.2em;
+}
+.quoteblock cite {
+	display: block;
+	text-align: right;
+}
+blockquote.question {
+	font-style: italic;
+}
+blockquote.question p span {
+	font-style: normal;
+	width: 10%;
+}
+#pagewidth {
+	width: 100%;
+	text-align: left;
+}
+
+/* now the header*/
+#header {
+	margin-left: -3px;
+	width: 100%;
+	height: auto;
+}
+
+/* upper nested header box*/
+#upperheader {
+	width: 100%;
+	margin-top: 11px;
+	height: auto;
+	background: #FFFFFF;
+}
+
+#logo {
+	float: left;
+	margin-left: 6px;
+	background: #FFFFFF;
+}
+
+#serverselect {
+	float: right;
+	display: block;
+	padding-top: 1px;
+	margin-right: 6px;
+	margin-left: auto;
+	text-align: right;
+	top: 0;
+	right: 0;
+}
+
+#serverselect p {
+	color: #990000;
+	font-size: 0.8em;
+	font-weight: normal;
+}
+
+#serverselect p select {
+	font-size: 88%;
+}
+
+#serverselect p input {
+	font-size: 88%;
+}
+.centerlogo {
+	margin-left: 260px;
+	margin-right: auto;
+	width: 125px;
+	text-align: center;
+	vertical-align: bottom;
+}
+#cdlogo {
+}
+
+#hpacketsearch {
+	display: block;
+	padding-top: 1px;
+	padding-left: 5px;
+	margin-right: 0.2em;
+	margin-left: auto;
+	text-align: left;
+	width: 25em;
+	top: 0em;
+	right: 0em;
+}
+
+#hpacketsearch p small {
+	color: #990000;
+	font-size: 0.8em;
+	font-weight: normal;
+}
+
+#hpacketsearch p select {
+	font-size: 88%;
+}
+
+#hpacketsearch p input {
+	font-size: 88%;
+}
+
+#navbar {
+	/* margin-top: 1em; */
+	clear: both;
+	padding-left: 0px;
+	/* margin-top: 5px; */
+	padding-top: 6px;
+	padding-bottom: 4px;
+	width: 100%;
+	height: auto;
+	text-align: center;
+	background: #BF1238;
+}
+#navbar ul {
+	display: inline;
+	list-style-type: none; 
+	padding-left: 0px;
+	line-height: 1.5em;
+}
+#navbar ul li {
+	display: inline;
+	margin: 0;
+	white-space: nowrap;
+}
+#navbar a {
+	color: #FFFFFF;
+	text-decoration: none;
+	padding: 0.2em 0.4em 0.2em 0.4em;
+	background-color: #000084;
+	border: 1px solid #000084;
+	font-family: Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	font-size: 0.9em;
+}
+#navbar a:hover {
+	background: #0000CC;
+}
+#navbar .hidecss, .hidecss {
+	display: none;
+}
+
+/* the rest of page out of two nested boxes around */
+
+#outer {
+	background-color: #FFFFFF;
+	width: auto;
+	/* border:solid white 2px; */
+}
+
+#inner {
+	margin: -2px;
+	margin-top: 0;
+	width: 100%;
+	background: #FFFFFF;
+	/* overflow: auto; */
+}
+
+#leftcol {
+	float: left;
+	margin: 0em 0.4em 0 0;
+	padding-left: 0;
+	padding-bottom: 1em;
+	width: auto;
+	background: #BBDDFF;
+	font-size: 0.9em;
+	font-family: Arial, Helvetica, sans-serif;
+	border: 1px solid #BBDDFF;
+	/* overflow: auto; */
+}
+#leftcol a:link, #leftcol a:visited {
+	display: block;
+}
+#leftcol a:hover {
+	background-color: #DDEEFF;
+	/* background-color: #FFFFFF; */
+}
+#leftcol ul {
+	margin: 2px;
+	padding: 0;
+	list-style-type: none;
+	font-weight: bold;
+}
+#leftcol ul.votemenu {
+	width: 11em;
+}
+#leftcol ul.cdmenu {
+	width: 12em;
+}
+#leftcol ul.votemenu ul li, #leftcol ul.cdmenu ul li {
+	padding-bottom: 0.4em;
+}
+#leftcol li ul {
+	display: inline;
+}
+#leftcol ul li {
+	padding: 0.2em 0;
+}
+#leftcol ul ul {
+	font-size: 0.9em;
+	margin: 0;
+}
+#leftcol ul li a {
+	line-height: 1.2em;
+	padding-right: 0.5em;
+	/* padding: 0.2em 0 0.3em 0em; */
+}
+#leftcol ul ul li a {
+	font-weight: normal;
+	padding: 0.1em 0.5em;
+	line-height: 1.1em;
+}
+#leftcol ul ul li {
+	padding-top: 0;
+}
+#leftcol p {
+	margin-left: 2px;
+	margin-right: 2px;
+}
+#leftcol p a {
+	display: block;
+	margin: 0;
+}
+#leftcol p img {
+	margin-left: 1em;
+}
+#leftcol .menuselected {
+	color: #BF1238;
+}
+#leftcol ul ul .menuselected {
+	text-indent: 0.5em;
+}
+#maincol {
+	background: #FFFFFF;
+	margin-left: 12em;
+	margin-right: 0.5em;
+	margin-bottom: 1em;
+}
+
+#lefthalfcol {
+	float: left;
+	margin-left: 0em;
+	width: 49%;
+}
+
+#lefthalfcol h4, #lefthalfcol h3 , #righthalfcol h4, #righthalfcol h3 {
+	margin: 0em;
+}
+	
+#lefthalfcol dl {
+	margin-top: 0em;
+}
+
+#righthalfcol {
+	margin-left: 50%;
+	width: 49%;
+}
+
+#righthalfcol dl {
+	margin-right: 0.2em;
+}
+
+#footer {
+	clear: both;
+	width: 100%;
+	padding-top: 3px;
+	bottom: 0;
+	text-align: center;
+	margin: 0px;
+}
+
+#fineprint {
+	margin-top: 0.2em;
+	padding-top: 3px;
+	text-align: center;
+	font-size: 0.85em;
+}
+
+#outer>#inner { border-bottom: 1px solid #BFC3DC; }
+.bordertop { border-top: 1px solid #BFC3DC; }
+
+dl.gloss dt {
+	font-weight: bold;
+}
+
+#footer ul {
+	display: inline;
+	list-style-type: none;
+}
+
+#footer ul li {
+	display: inline;
+}
+
+#footer ul li a, table.y2k td {
+	white-space: nowrap;
+}
+
+#footer p {
+	margin: 0px;
+}
+
+#main {
+	background: #bbddff;
+	padding: 1em 0; /* have some padding to get rid of collapsed margins */
+}
+
+/* classes for cards */
+
+.cardleft {
+	margin: 0 0 1em;
+	float: left;
+	width: 49%;
+}
+.cardright {
+	margin-left: 50%
+	/*margin: 0 1% 2em 50%; */
+}
+.card {
+	clear: left;
+	margin: 0 0 1em;
+}
+
+.cardleft h2, .cardright h2, .card h2 {
+	font-size: 120%;
+	background: #000000;
+	color: #FFD400;
+	display: inline;
+	padding: 0.2em 0.4em;
+	margin: 0 10px;
+	font-family: Arial, Helvetica, sans-serif;
+	letter-spacing: 0.2em;
+}
+
+.cardleft dl dd, .cardright dl dd , .card dl dd {
+	padding-bottom: 0.5em;
+}
+
+.cardleft div, .cardright div, .card div {
+	border: 2px solid #000000;
+	background: #FFFFFF;
+	padding: 0.5em;
+	margin: 2px 10px;
+	/* the next two lines xpand the div to heigth of left inner div */
+	overflow: auto;
+}
+
+div.lefthalf {
+	float: left;
+	width: 49%;
+	border: 0;
+	margin: 0; 
+	padding: 0;
+}
+
+div.righthalf {
+	border: 0;
+	margin: 0;
+	padding: 0;
+}
+/* classes and div names for package pages */
+
+#pdesc, #pdeps, #pdownload, #pmoreinfo {
+	margin-left: 1em;
+	margin-right: 1em;
+}
+
+#pdesc p {
+	text-align: justify;
+}
+
+.pdescshort {
+	text-align: left;
+	font-size: large;
+	font-weight: bold;
+}
+
+#pdeps table tr td {
+	font-size: 0.9em;
+}
+
+#pdeps ul {
+	list-style-type: none;
+	padding-left: 2em;
+}
+
+#pdeps li {
+	text-indent: -2em;
+}
+
+#pdeps ul.uldep, #pdeps ul.uladep {
+	list-style-type: disc;
+	list-style-image: url(http://packages.debian.org/Pics/dep.gif);
+}
+
+#pdeps ul.ulrec, #pdeps ul.ulidep {
+	list-style-type: disc;
+	list-style-image: url(http://packages.debian.org/Pics/rec.gif);
+}
+
+#pdeps ul.ulsug {
+	list-style-type: disc;
+	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;
+}
+
+#pdownload p, #pdownload form, #pdownload submit {
+	display: inline;
+}
+
+#pdownload td {
+	font-size: 0.85em;
+	text-align: center;
+}
+
+#pmoreinfo p {
+	font-size: 0.85em;
+}
+
+/* colors for packages, warnings and news in ports */
+.pred, .warning, dt.new, .no {
+	color: red; /* FF0000 */
+}
+
+.psmallcenter, .psmalltrademark {
+	clear: both;
+	font-size: 0.85em;
+	text-align: center;
+}
+
+.psmalltrademark {
+	color: green;
+}
+#pdownload table, table.ridgetable, table.reltable {
+	border-width: 4px;
+	border-color: gray;
+	margin: 0 1em 1em 1em;
+	border-style: ridge;
+	border-collapse: collapse;
+}
+table.vote {
+	margin: 0 auto;
+	border-width: 3px;
+	border-color: gray;
+	border-style: ridge;
+	border-collapse: collapse;
+}
+#pdownload th, #pdownload td, table.ridgetable th, table.ridgetable td,
+	table.reltable td, table.reltable th {
+	border: 2px gray;
+	border-style: ridge;
+	padding: 0.1em;
+}
+table.reltable th {
+	background-color: #44CCCC;
+}
+table.vote th {
+	border: 1px solid gray;
+	background-color: #DDDDDD;
+}
+table.vote td {
+	border: 1px solid gray;
+	padding: 4px;
+}
+table.reltable tr.odd {
+	background-color: #FFFFFF;
+}
+table.reltable tr.even {
+	background-color: #DDDDDD;
+}
+table.stattrans {
+	margin: 0 auto;
+	width: 95%;
+	border: 1px solid black;
+	background-color: #cdc9c9;
+}
+table.stattrans th {
+	text-align: center;
+	padding: 2px;
+}
+table.stattrans td {
+	text-align: right;
+	padding: 2px;
+}
+table.stattrans tbody th {
+	text-align: left;
+	font-weight: normal;
+}
+table.volatile {
+	border-collapse: collapse;
+}
+.volatile th, .volatile td {
+	text-align: left;
+	border: 1px solid black;
+	padding: 0.2em;
+}
+.volatile thead {
+	background-color: silver;
+	color: #000000;
+}
+table.volatile tr.country {
+	color: #ffffff;
+	background-color: #df0451;
+}
+
+/* partners */
+.partnertype {
+	background-color: #BF1238;
+	padding: 0.2em 0 0.2em 1em;
+	color: #FFFFFF;
+	-moz-border-radius-bottomleft:15px;
+	-moz-border-radius-bottomright:15px;
+	-moz-border-radius-topleft:15px;
+	-moz-border-radius-topright:15px;
+	border-radius:15px;
+}
+div.partnerlogo {
+	display: table-cell;
+	vertical-align: middle;
+	text-align: center;
+	width: 300px;
+}
+div.partnerlogo2 {
+	display: table-cell;
+	vertical-align: middle;
+	text-align: center;
+	width: 300px;
+	border-top: 1px solid #BFC3DC;
+	padding: 0.2em 0 0.2em 1em;
+}
+div.partnerdesc {
+	display: table-cell;
+	font-size: 85%;
+}
+div.partnerdesc2 {
+	display: table-cell;
+	font-size: 85%;
+	border-top: 1px solid #BFC3DC;
+	padding: 0.2em 0 0.2em 1em;
+}
+div.partnerdefinedcellwidth1 {
+	display: table-cell;
+	padding: 0.2em 0 0.2em 1em;
+	font-size: 85%;
+	width: 200px;
+	border-top: 1px solid #BFC3DC;
+}
+div.partnertablerow {
+	display: table-row;
+}
+div.partnerdisplaytable {
+	display: table;
+	width: 98%;
+	margin: 10px 1% 10px 1%;
+}
+div.partnerdisplayblock {
+	display: block;
+}
+div.cdflash {
+	background-color: #E09E86;
+	width: 80%;
+	margin: auto;
+	text-align: center;
+}
+.cdrsync {
+	color: #6B1300;
+}
+/* debian installer */
+
+.dierror {
+	background-color: #FF6060;
+}
+.dibad {
+	background-color: #F7FF60;
+}
+.digood {
+	background-color: #7AFF71;
+}
+
+/* useful classes */
+
+th.eventheader {
+	background-color: #BBDDFF;
+}
+.center {
+	text-align: center;
+}
+.right {
+	text-align: right;
+}
+ul.circlelist {
+	list-style-type: circle;
+}
+.centerdiv table {
+	margin-left: auto;
+	margin-right: auto;
+}
+ul.discless {
+	list-style-type: none;
+}
+.top, img.ico {
+	vertical-align: top;
+}
+img.ico {
+	float: left;
+	margin: 0 0.2em 0 0;
+}
+img.rightico {
+	float: right;
+	vertical-align: top;
+	margin: 0 0 0 0.2em;
+}
+img.cve {
+	vertical-align: -25px;
+}
+.y2kok, .yes {
+	color: #00BB00;
+}
+.y2kok2 {
+	color: #00BBBB;
+}
+.bluehead {
+	color: #0000FF !important;
+}
+span.halfsize {
+	font-size: 80%;
+}
+span.ddpbooktitle, span.merchtitle {
+	font-size: larger;
+}
+a:link { color: #0000FF; }
+a:visited { color: #800080; }
+a:hover { color: #F000FF; }
+a:active { color: #FF0000; }
+
+.navpara a, col.y2k {
+	white-space: nowrap;
+	/* this is to keep from breaking at whitespace in anchors */
+}
+
+
+.underline { text-decoration: underline; }
+.clr { clear:both; }
+/*.content{padding:5px;} */ /*padding for content */
+/* #header .content{padding-bottom:0;} */ /*padding bottom 0 to remove space in IE5 Mac*/
+
+/* for l10n-arabic */
+.bidi {
+	direction: rtl;
+	text-align: right;
+}
+
+#leftcol, #navbar, #navbar a {
+	-moz-border-radius: 15px;
+	-webkit-border-radius: 15px;
+	/* these go to the end as the css validator does not like them
+	will be replaced by border-radius with css3 */
+	border-radius: 15px;
+}
+
+/* /CD/vendors/ */
+table.vendors {
+	width: 100%;
+	border-collapse: collapse;
+	border: 1px solid #AAAAAA;
+}
+
+table.vendors th {
+	background: #BBDDFF;
+	font-size: 0.9em;
+	font-family: Arial, Helvetica, sans-serif;
+	color: #3e4955;
+	padding: 0.2em;
+	border: 1px solid #AAAAAA;
+	border-bottom: none;
+	text-align: left;
+}
+
+table.vendors tr.b td {
+	background-color: #EEEEEE;
+}
+
+table.vendors td {
+	padding: 0.2em;
+	vertical-align: top;
+}
diff --git a/html/template/header.wml b/html/template/header.wml
index d86727d..adb07a4 100644
--- a/html/template/header.wml
+++ b/html/template/header.wml
@@ -23,9 +23,9 @@
   <meta name="Modified"  content="$(WML_GEN_ISOTIME)" />
 {#style#}
 {#style#:
-<link href="$(HOME)/debian.css" rel="stylesheet" type="text/css" />
+<link href="$(DBHOME)/debian.css" rel="stylesheet" type="text/css" />
 
-<link href="$(HOME)/debian-$(CUR_ISO_LANG).css" rel="stylesheet" type="text/css" media="all"/>
+<link href="$(DBHOME)/debian-$(CUR_ISO_LANG).css" rel="stylesheet" type="text/css" media="all"/>
 :#style#}
 </head>
 <body>
diff --git a/html/template/navbar.wml b/html/template/navbar.wml
index 54a3987..e975695 100644
--- a/html/template/navbar.wml
+++ b/html/template/navbar.wml
@@ -3,8 +3,8 @@
 <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>
+  <a href="$(HOME)/"><img src="$(DBPICS)/openlogo-nd-50.png" width="50" height="61" alt="" /></a>
+  <a href="$(HOME)/" rel="start"><img src="$(DBPICS)/debian.png" width="179" height="61" alt="<debianproject/>" /></a>
   </div> <!-- end logo -->
 </div> <!-- end upperheader -->
 
-- 
2.20.1