Introduce a new entity, cgibase, which points at where our CGI scripts

can be found, i.e., http://www.FreeBSD.org/cgi at the moment.

This allows for easier pre-commit testing of CGI scripts, and avoids
SNAFUs with an incorrect URL being committed, as has happened a couple
of times recently.

en/ should be fully converted with this commit; other languages need to
be updated, but are in mid merge molasses at present so I have not
touched them.
This commit is contained in:
Ceri Davies 2005-10-06 19:27:37 +00:00
parent 6756c7c59f
commit 3cb4b2fa46
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=25915
8 changed files with 20 additions and 18 deletions

View file

@ -1,4 +1,4 @@
<!-- $FreeBSD: www/en/index.xsl,v 1.128 2005/10/04 05:57:25 murray Exp $ --> <!-- $FreeBSD: www/en/index.xsl,v 1.129 2005/10/05 21:46:34 delphij Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@ -6,7 +6,7 @@
<xsl:import href="news/includes.xsl"/> <xsl:import href="news/includes.xsl"/>
<xsl:variable name="base" select="'.'"/> <xsl:variable name="base" select="'.'"/>
<xsl:variable name="date" select="'$FreeBSD: www/en/index.xsl,v 1.128 2005/10/04 05:57:25 murray Exp $'"/> <xsl:variable name="date" select="'$FreeBSD: www/en/index.xsl,v 1.129 2005/10/05 21:46:34 delphij Exp $'"/>
<xsl:variable name="title" select="'The FreeBSD Project'"/> <xsl:variable name="title" select="'The FreeBSD Project'"/>
<!-- these params should be externally bound. The values <!-- these params should be externally bound. The values
@ -130,7 +130,7 @@
</div> <!-- languagenav --> </div> <!-- languagenav -->
<div id="mirror"> <div id="mirror">
<form action="{$base}/cgi/mirror.cgi" method="get"> <form action="{$cgibase}/mirror.cgi" method="get">
<div> <div>
<h2 class="blockhide"><label for="mirrorsel">Mirror</label></h2> <h2 class="blockhide"><label for="mirrorsel">Mirror</label></h2>
<select id="mirrorsel" name="goto"> <select id="mirrorsel" name="goto">

View file

@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
<!ENTITY base CDATA ".."> <!ENTITY base CDATA "..">
<!ENTITY date "$FreeBSD: www/en/projects/newbies.sgml,v 1.46 2005/09/24 15:05:22 blackend Exp $"> <!ENTITY date "$FreeBSD: www/en/projects/newbies.sgml,v 1.47 2005/10/04 19:43:49 hrs Exp $">
<!ENTITY title 'Resources for Newbies'> <!ENTITY title 'Resources for Newbies'>
<!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes; <!ENTITY % navincludes SYSTEM "../includes.navdocs.sgml"> %navincludes;
<!ENTITY % includes SYSTEM "../includes.sgml"> %includes; <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
@ -110,7 +110,7 @@
href="news:comp.unix.bsd.freebsd.announce">comp.unix.bsd.freebsd.announce</a> href="news:comp.unix.bsd.freebsd.announce">comp.unix.bsd.freebsd.announce</a>
as well.</p></li> as well.</p></li>
<li><p><a href="&base;/cgi/man.cgi">Man pages</a> are good <li><p><a href="&cgibase;/man.cgi">Man pages</a> are good
for reference but not always for reference but not always
the best introduction for a novice. The more you work with man pages the best introduction for a novice. The more you work with man pages
the more familiar they become. Some are very good for newbies, so the more familiar they become. Some are very good for newbies, so

View file

@ -1,5 +1,5 @@
<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [ <!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
<!ENTITY date "$FreeBSD: www/en/support.sgml,v 1.350 2005/04/27 18:10:16 remko Exp $"> <!ENTITY date "$FreeBSD: www/en/support.sgml,v 1.352 2005/10/04 22:27:39 simon Exp $">
<!ENTITY title "FreeBSD Support"> <!ENTITY title "FreeBSD Support">
<!ENTITY % navincludes SYSTEM "includes.navsupport.sgml"> %navincludes; <!ENTITY % navincludes SYSTEM "includes.navsupport.sgml"> %navincludes;
<!ENTITY % includes SYSTEM "includes.sgml"> %includes; <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
@ -22,8 +22,8 @@
our <a href="&base;/support/bugreports.html">problem reporting guidelines</a> our <a href="&base;/support/bugreports.html">problem reporting guidelines</a>
and then report the problem using our <a href="&base;/send-pr.html">problem report form</a>.</p> and then report the problem using our <a href="&base;/send-pr.html">problem report form</a>.</p>
<p>You can also <a href="&base;/cgi/query-pr-summary.cgi">view the open problem reports</a> and <p>You can also <a href="&cgibase;/query-pr-summary.cgi">view the open problem reports</a> and
<a href="&base;/cgi/query-pr-summary.cgi?query">search problem reports</a> on this website.</p> <a href="&cgibase;/query-pr-summary.cgi?query">search problem reports</a> on this website.</p>
&footer; &footer;
</body> </body>

View file

@ -1,4 +1,4 @@
<!-- $FreeBSD: www/share/sgml/includes.header.sgml,v 1.5 2005/02/12 13:06:38 ceri Exp $ --> <!-- $FreeBSD: www/share/sgml/includes.header.sgml,v 1.6 2005/10/04 06:13:33 murray Exp $ -->
<!-- Images --> <!-- Images -->
<!ENTITY i.daemon '<img src="&base;/gifs/daemon.gif" alt="" align="left" width="80" height="76">'> <!ENTITY i.daemon '<img src="&base;/gifs/daemon.gif" alt="" align="left" width="80" height="76">'>
@ -57,7 +57,7 @@
</ul> </ul>
</div> <!-- searchnav --> </div> <!-- searchnav -->
<div id="search"> <div id="search">
<form action="&base;/cgi/search.cgi" method="get"> <form action="&cgibase;/search.cgi" method="get">
<div> <div>
<h2 class="blockhide"><label for="words">Search</label></h2> <h2 class="blockhide"><label for="words">Search</label></h2>
<input type="hidden" name="max" value="25"> <input type="hidden" name="source" value="www"><input id="words" name="words" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value=&#39;&#39;;" value="Search"> <input id="submit" name="submit" type="submit" value="Search"> <input type="hidden" name="max" value="25"> <input type="hidden" name="source" value="www"><input id="words" name="words" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value=&#39;&#39;;" value="Search"> <input id="submit" name="submit" type="submit" value="Search">

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1" ?> <?xml version="1.0" encoding="ISO-8859-1" ?>
<!-- $FreeBSD: www/share/sgml/includes.header.xsl,v 1.4 2005/02/12 13:06:38 ceri Exp $ --> <!-- $FreeBSD: www/share/sgml/includes.header.xsl,v 1.5 2005/10/04 06:13:33 murray Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@ -70,7 +70,7 @@
</ul> </ul>
</div> <!-- searchnav --> </div> <!-- searchnav -->
<div id="search"> <div id="search">
<form action="{$base}/cgi/search.cgi" method="get"> <form action="{$cgibase}/search.cgi" method="get">
<div> <div>
<h2 class="blockhide"><label for="words">Search</label></h2> <h2 class="blockhide"><label for="words">Search</label></h2>
<input type="hidden" name="max" value="25" /> <input type="hidden" name="source" value="www" /><input id="words" name="words" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value='';" value="Search" />&#160;<input id="submit" name="submit" type="submit" value="Search" /> <input type="hidden" name="max" value="25" /> <input type="hidden" name="source" value="www" /><input id="words" name="words" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value='';" value="Search" />&#160;<input id="submit" name="submit" type="submit" value="Search" />
@ -176,7 +176,7 @@
<li><a href="{$base}/doc/en_US.ISO8859-1/books/handbook/">Handbook</a></li> <li><a href="{$base}/doc/en_US.ISO8859-1/books/handbook/">Handbook</a></li>
<li><a href="{$base}/docs/man.html">Manual Pages</a> <li><a href="{$base}/docs/man.html">Manual Pages</a>
<ul> <ul>
<li><a href="{$base}/cgi/man.cgi">Man Online</a></li> <li><a href="{$cgibase}/man.cgi">Man Online</a></li>
</ul> </ul>
</li> </li>
<li><a href="{$base}/docs/books.html">Books and Articles Online</a></li> <li><a href="{$base}/docs/books.html">Books and Articles Online</a></li>

View file

@ -1,4 +1,4 @@
<!-- $FreeBSD: www/share/sgml/includes.navdocs.sgml,v 1.2 2005/10/06 15:27:30 simon Exp $ --> <!-- $FreeBSD: www/share/sgml/includes.navdocs.sgml,v 1.3 2005/10/06 15:30:24 simon Exp $ -->
<!ENTITY nav '<div id="sidenav"> <!ENTITY nav '<div id="sidenav">
<h2 class="blockhide">Section Navigation</h2> <h2 class="blockhide">Section Navigation</h2>
@ -8,7 +8,7 @@
<li><a href="&base;/doc/en_US.ISO8859-1/books/handbook/">Handbook</a></li> <li><a href="&base;/doc/en_US.ISO8859-1/books/handbook/">Handbook</a></li>
<li><a href="&base;/docs/man.html">Manual Pages</a> <li><a href="&base;/docs/man.html">Manual Pages</a>
<ul> <ul>
<li><a href="http://www.FreeBSD.org/cgi/man.cgi">Man Online</a></li> <li><a href="&cgibase;/man.cgi">Man Online</a></li>
</ul> </ul>
</li> </li>
<li><a href="&base;/docs/books.html">Books and Articles Online</a></li> <li><a href="&base;/docs/books.html">Books and Articles Online</a></li>

View file

@ -1,4 +1,4 @@
<!-- $FreeBSD$ --> <!-- $FreeBSD: www/share/sgml/includes.sgml,v 1.1 2003/10/11 18:51:26 hrs Exp $ -->
<!-- <!--
Base is the absolute URL for the given page, minus the actual page Base is the absolute URL for the given page, minus the actual page
@ -17,6 +17,7 @@
--> -->
<!ENTITY base CDATA "."> <!ENTITY base CDATA ".">
<!ENTITY cgibase CDATA "http://www.FreeBSD.org/cgi">
<!ENTITY enbase CDATA "."> <!ENTITY enbase CDATA ".">
<!ENTITY % includes.release SYSTEM "includes.release.sgml"> <!ENTITY % includes.release SYSTEM "includes.release.sgml">

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1" ?> <?xml version="1.0" encoding="ISO-8859-1" ?>
<!-- $FreeBSD: www/share/sgml/includes.xsl,v 1.1 2003/11/24 18:26:34 hrs Exp $ --> <!-- $FreeBSD: www/share/sgml/includes.xsl,v 1.2 2004/01/12 21:27:00 hrs Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@ -10,6 +10,7 @@
<xsl:import href="./transtable-common.xsl" /> <xsl:import href="./transtable-common.xsl" />
<xsl:variable name="base" select="'.'" /> <xsl:variable name="base" select="'.'" />
<xsl:variable name="cgibase" select="'http://www.FreeBSD.org/cgi'" />
<xsl:variable name="enbase" select="concat ($base, '/..')" /> <xsl:variable name="enbase" select="concat ($base, '/..')" />
</xsl:stylesheet> </xsl:stylesheet>