custom errordocs revision

André Malo 20 Nov 2002 04:59:17 -0000

While playing around with not-yet-committed mod_negotiation patches (hint 
hint *g*) I revised the error docs. The original diff is about 100K, so I 
shortened it a bit and left only one .var file in. the other go similiar.


However, major changes:

* XHTML 1._0_. delivering xhtml 1.1 as text/html is bogus.
  (see <http://www.w3.org/TR/xhtml-media-types/#summary>)
* replaced the also bogus <dl> stuff by normal <p>s
  and added some CSS instead.
  (embedding CSS compatible to xml *and* html causes the very
  ugly hack, you can see in top.html, because in HTML <style> contains 
  CDATA and in XHTML PCDATA, see also
  <http://lists.w3.org/Archives/Public/www-html/2002Apr/0053.html>)
* fixed some encoding issues.
* removed the weird empty lines at the beginning of every document
* (added CONTENT_LANGUAGE parameter for pt-br)

any objections or comments?

nd
-- 
s  s^saaaaaoaaaoaaaaooooaaoaaaomaaaa  a  alataa  aaoat  a  a
a maoaa a laoata  a  oia a o  a m a  o  alaoooat aaool aaoaa
matooololaaatoto  aaa o a  o ms;s;\s;s;g;y;s;:;s;y#mailto: #
 \51/\134\137| http://www.perlig.de #;print;# > [EMAIL PROTECTED]

Index: HTTP_BAD_GATEWAY.html.var
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/error/HTTP_BAD_GATEWAY.html.var,v
retrieving revision 1.9
diff -u -r1.9 HTTP_BAD_GATEWAY.html.var
--- HTTP_BAD_GATEWAY.html.var   8 Oct 2002 19:20:01 -0000       1.9
+++ HTTP_BAD_GATEWAY.html.var   20 Nov 2002 04:25:54 -0000
@@ -1,9 +1,9 @@
 Content-language: de
 Content-type: text/html; charset=ISO-8859-1
 Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Fehlerhaftes Gateway!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Fehlerhaftes Gateway!"
+--><!--#include virtual="include/top.html"-->
 
     Der Proxy-Server erhielt eine fehlerhafte Antwort
     eines &uuml;bergeordneten Servers oder Proxies. 
@@ -19,8 +19,8 @@
 Content-language: en
 Content-type: text/html; charset=ISO-8859-1
 Body:----------en--
-<!--#set var="TITLE" value="Bad Gateway!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Bad Gateway!"
+--><!--#include virtual="include/top.html" -->
 
     The proxy server received an invalid
     response from an upstream server.
@@ -36,9 +36,9 @@
 Content-language: es
 Content-type: text/html; charset=ISO-8859-1
 Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="Bad Gateway!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="Bad Gateway!"
+--><!--#include virtual="include/top.html" -->
 
        El servidor fuente recibio informaci&oacute;n 
        inv&aacute;lida por parte del servidor destino.
@@ -54,9 +54,9 @@
 Content-language: fr
 Content-type: text/html; charset=ISO-8859-1
 Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="Gateway incorrecte!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="Gateway incorrecte!"
+--><!--#include virtual="include/top.html" -->
 
     Le serveur proxy a re&ccedil;u une r&eacute;ponse
     incorrecte de la part d'un serveur sup&eacute;rieur. 
@@ -72,9 +72,9 @@
 Content-language: nl
 Content-type: text/html; charset=ISO-8859-1
 Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Verkeerde Gateway!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Verkeerde Gateway!"
+--><!--#include virtual="include/top.html" -->
 
     De proxy server heeft een ongeldig
     antwoord ontvangen van een gecontacteerde server.
@@ -90,9 +90,9 @@
 Content-language: sv
 Content-type: text/html; charset=ISO-8859-1
 Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Felaktig Gateway!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Felaktig Gateway!"
+--><!--#include virtual="include/top.html" -->
 
     Proxyservern mottog ett felaktigt svar fr&aring;n
     en tidigare server.
@@ -108,9 +108,9 @@
 Content-language: it
 Content-type: text/html; charset=ISO-8859-1
 Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="Gateway errato!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="Gateway errato!"
+--><!--#include virtual="include/top.html" -->
 
     Il server proxy ha ricevuto una risposta
     non valida dal server precedente.
@@ -126,8 +126,9 @@
 Content-language: pt-br
 Content-type: text/html; charset=ISO-8859-1
 Body:-------pt-br--
-<!--#set var="TITLE" value="Gateway inv&aacute;lido!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="Gateway inv&aacute;lido!"
+--><!--#include virtual="include/top.html" -->
 
     O servidor proxy recebeu uma resposta
     inv&aacute;lida do servidor destino.
@@ -139,3 +140,4 @@
 
 <!--#include virtual="include/bottom.html" -->
 -------pt-br--
+
Index: contact.html.var
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/error/contact.html.var,v
retrieving revision 1.12
diff -u -r1.12 contact.html.var
--- contact.html.var    8 Oct 2002 19:20:01 -0000       1.12
+++ contact.html.var    20 Nov 2002 04:26:03 -0000
@@ -3,7 +3,7 @@
 Body:----------de--
 Sofern Sie dies f&uuml;r eine Fehlfunktion des Servers halten,
 informieren Sie bitte den 
-<a href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" -->">Webmaster</a>
+<a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" -->">Webmaster</a>
 hier&uuml;ber.
 ----------de--
 
@@ -11,14 +11,14 @@
 Content-type: text/html; charset=ISO-8859-1
 Body:----------en--
 If you think this is a server error, please contact
-the <a href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" 
-->">webmaster</a>.
+the <a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" 
-->">webmaster</a>.
 ----------en--
 
 Content-language: es
 Content-type: text/html; charset=ISO-8859-1
 Body:----------es--
 Favor de contactar al 
-<a href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" -->">webmaster</a>
+<a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" -->">webmaster</a>
 en caso de que usted crea que existe un error en el servidor.
 ----------es--
 
@@ -26,28 +26,28 @@
 Content-type: text/html; charset=ISO-8859-1
 Body:----------fr--
 Si vous pensez qu'il s'agit d'une erreur du serveur, veuillez contacter le 
-<a href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" -->">gestionnaire 
du site</a>.
+<a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" -->">gestionnaire 
du site</a>.
 ----------fr--
 
 Content-language: nl
 Content-type: text/html; charset=ISO-8859-1
 Body:----------nl--
 Indien u van oordeel bent dat deze server in fout is, gelieve
-de <a href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" 
-->">webmaster</a> te contacteren.
+de <a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" 
-->">webmaster</a> te contacteren.
 ----------nl--
 
 Content-language: sv
 Content-type: text/html; charset=ISO-8859-1
 Body:----------sv--
 Om du tror att detta beror p&aring; ett serverfel, v&auml;nligen kontakta 
-<a href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" 
-->">webbansvarig</a>.
+<a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" 
-->">webbansvarig</a>.
 ----------sv--
 
 Content-language: it
 Content-type: text/html; charset=ISO-8859-1
 Body:----------it--
 Se pensi che questo sia un errore del server, per favore contatta il 
-<a href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" 
-->">webmaster</a>.
+<a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" -->">webmaster</a>.
 ----------it--
 
 Content-language: pt-br
@@ -55,5 +55,6 @@
 Body:-------pt-br--
 Se voc&ecirc; acredita ter encontrado um problema no servidor,
 por favor entre em contato com o 
-<a href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" 
-->">webmaster</a>.
+<a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" -->">webmaster</a>.
 -------pt-br--
+
Index: include/bottom.html
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/error/include/bottom.html,v
retrieving revision 1.11
diff -u -r1.11 bottom.html
--- include/bottom.html 11 Jul 2002 19:07:03 -0000      1.11
+++ include/bottom.html 20 Nov 2002 04:26:03 -0000
@@ -1,19 +1,14 @@
-</dd></dl><dl><dd>
+</p>
+<p>
 <!--#include virtual="../contact.html.var" -->
-</dd></dl>
+</p>
 
 <h2>Error <!--#echo encoding="none" var="REDIRECT_STATUS" --></h2>
-<dl>
-<dd>
 <address>
-  <a href="/"><!--#echo encoding="none" var="SERVER_NAME" --></a>
-  <br />
+  <a href="/"><!--#echo var="SERVER_NAME" --></a><br />
   <!--#config timefmt="%c" -->
-  <small><!--#echo encoding="none" var="DATE_LOCAL" --></small>
-  <br />
-  <small><!--#echo encoding="none" var="SERVER_SOFTWARE" --></small>
+  <span><!--#echo var="DATE_LOCAL" --><br />
+  <!--#echo var="SERVER_SOFTWARE" --></span>
 </address>
-</dd>
-</dl>
 </body>
 </html>
Index: include/spacer.html
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/error/include/spacer.html,v
retrieving revision 1.2
diff -u -r1.2 spacer.html
--- include/spacer.html 11 Jul 2002 19:07:03 -0000      1.2
+++ include/spacer.html 20 Nov 2002 04:26:03 -0000
@@ -1 +1,2 @@
-</dd></dl><dl><dd>
+</p>
+<p>
Index: include/top.html
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/error/include/top.html,v
retrieving revision 1.8
diff -u -r1.8 top.html
--- include/top.html    24 Aug 2002 22:25:16 -0000      1.8
+++ include/top.html    20 Nov 2002 04:26:03 -0000
@@ -1,25 +1,24 @@
-<!--#if expr="! $CONTENT_LANGUAGE" -->
-<!--#set var="CONTENT_LANGUAGE" value="en" -->
-<!--#endif -->
-<!--#if expr="! $CHARACTER_ENCODING" -->
-<!--#set var="CHARACTER_ENCODING" value="ISO-8859-1" -->
-<!--#endif -->
-<?xml version="1.0" encoding="<!--#echo encoding="none" 
var="CHARACTER_ENCODING" -->"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="<!--#echo encoding="none" 
var="CONTENT_LANGUAGE" -->">
+<!--#if expr="! $CONTENT_LANGUAGE"
+--><!--#set var="CONTENT_LANGUAGE" value="en"
+--><!--#endif
+--><!--#if expr="! $CHARACTER_ENCODING"
+--><!--#set var="CHARACTER_ENCODING" value="ISO-8859-1"
+--><!--#endif
+--><?xml version="1.0" encoding="<!--#echo var="CHARACTER_ENCODING" -->"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; lang="<!--#echo 
var="CONTENT_LANGUAGE" -->" xml:lang="<!--#echo var="CONTENT_LANGUAGE" -->">
 <head>
 <title><!--#echo var="TITLE" --></title>
-<link rev="made" href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" 
-->" />
-<style type="text/css">
-<!--
-body { color: #000000; background-color: #FFFFFF; }
-a:link { color: #0000CC; }
--->
-</style>
+<link rev="made" href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" -->" 
/>
+<style type="text/css"><!--/*--><![CDATA[/*><!--*/ 
+    body { color: #000000; background-color: #FFFFFF; }
+    a:link { color: #0000CC; }
+    p, address {margin-left: 3em;}
+    span {font-size: smaller;}
+/*]]>*/--></style>
 </head>
 
 <body>
 <h1><!--#echo encoding="none" var="TITLE" --></h1>
-<dl>
-<dd>
+<p>
\ No newline at end of file

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

custom errordocs revision

Reply via email to