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

navbar.wml, basic.wml changes for nm.debian.org



Hi,

https://nm.debian.org uses the webwml templates. The problem is that
we are currently loading the Debian logos from www.debian.org, which
triggers a security warning in browsers. I can easily redefine PICS to
point to nm.d.o, but that fails for openlogo-nd-50.png and the css
files because I still want HOME to point to www, just not for those
external resources. I'd like to add 2 variables, CSS_HOME and
PICS_HOME so I can use copies of those files.

A patch is attached below; it does not change current behavior unless
the 2 variables are set. Could someone please review and maybe commit
it? (I do have webwml access but wanted to check back with -www
first.)

If you want to see the patch in action, go to
https://nm.debian.org/~myon/nm/.

Please Cc: me on replies, thanks.

Index: english/template/debian/basic.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/basic.wml,v
retrieving revision 1.86
diff -u -p -r1.86 basic.wml
--- english/template/debian/basic.wml	14 Mar 2006 09:43:34 -0000	1.86
+++ english/template/debian/basic.wml	15 Dec 2006 09:35:05 -0000
@@ -28,8 +28,8 @@
   <meta name="Modified"  content="$(WML_GEN_ISOTIME)" />
 {#rss#}
 {#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#:<link href="$(CSS_HOME:-$(HOME))/debian.css" rel="stylesheet" type="text/css" />
+  <link href="$(CSS_HOME:-$(HOME))/debian-$(CUR_ISO_LANG).css" rel="stylesheet" type="text/css" media="all"/>
 :#style#}
 </head>
 <body>
Index: english/template/debian/navbar.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/navbar.wml,v
retrieving revision 1.75
diff -u -p -r1.75 navbar.wml
--- english/template/debian/navbar.wml	31 Oct 2005 00:02:50 -0000	1.75
+++ english/template/debian/navbar.wml	15 Dec 2006 09:35:05 -0000
@@ -4,7 +4,7 @@
 <div id="header">
    <div id="upperheader">
    <div id="logo">
-  <a href="$(HOME)/"><img src="$(HOME)/logos/openlogo-nd-50.png" width="50" height="61" alt="" /></a>
+  <a href="$(HOME)/"><img src="$(PICS_HOME:-$(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 id="serverselect">

Christoph
-- 
cb@df7cb.de | http://www.df7cb.de/

Attachment: signature.asc
Description: Digital signature


Reply to: