Demote charset warning. Tweak severity levels.

3 files changed, 39 insertions, 15 deletions

diff --git a/htdocs/base.css b/htdocs/base.css
index 5a27638..cec3f04 100644
--- a/htdocs/base.css
+++ b/htdocs/base.css
@@ -4,7 +4,7 @@
   Copyright © 2000 W3C (MIT, INRIA, Keio). All Rights Reserved.
   See http://www.w3.org/Consortium/Legal/ipr-notice.html#Copyright
 
-  $Id: base.css,v 1.12 2001-09-06 23:16:16 link Exp $
+  $Id: base.css,v 1.13 2001-09-14 00:14:15 link Exp $
 */
 
 @import url(non-netscape.css);
@@ -57,6 +57,7 @@ address {
   margin-top:  3em;
   border-top-style: solid;
   border-top-color: black;
+  clear: both;
 }
 
 p.navbar a {
diff --git a/htdocs/results.css b/htdocs/results.css
index 947b1ba..4536e50 100644
--- a/htdocs/results.css
+++ b/htdocs/results.css
@@ -1,7 +1,9 @@
 
 /* style sheet for the validator's results page */
 
-/* $Id: results.css,v 1.5 2001-07-24 10:18:30 link Exp $ */
+/* $Id: results.css,v 1.6 2001-09-14 00:14:15 link Exp $ */
+
+@import url(base.css);
 
 .markup {
   color: red;
@@ -31,13 +33,15 @@ h1.title img {
   vertical-align: middle;
 }
 
-
-.Warning {
+#Notice {
   width: 75ex;
-  background: yellow;
   border: solid;
-  border-color: black;
   margin: .2em;
   padding: .5em;
   text-align: justify;
 }
+
+.Info    {background: white;  border-color: gray;}
+.Warning {background: silver; border-color: gray;}
+.Error   {background: yellow; border-color: black;}
+.Fatal   {background: red;    border-color: black;}
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check
index b50653f..dd8131f 100755
--- a/httpd/cgi-bin/check
+++ b/httpd/cgi-bin/check
@@ -9,7 +9,7 @@
 # This source code is available under the license at:
 #     http://www.w3.org/Consortium/Legal/copyright-software
 #
-# $Id: check,v 1.177 2001-09-09 21:07:55 link Exp $
+# $Id: check,v 1.178 2001-09-14 00:14:15 link Exp $
 
 #
 # We need Perl 5.004.
@@ -40,6 +40,14 @@ use constant UNDEF => undef;
 use constant DEBUG => 0;
 
 #
+# Tentative Validation Severeties.
+use constant T_INFO  => 1; # 0001
+use constant T_WARN  => 2; # 0010
+use constant T_ERROR => 4; # 0100
+use constant T_FATAL => 8; # 1000
+
+
+#
 # Define global variables
 use vars qw($VERSION $DATE $MAINTAINER $NOTICE);               # Strings.
 use vars qw($frag $pub_ids $element_uri $file_type $doctypes $charsets);
@@ -80,9 +88,9 @@ my $element_ref = 'http://www.htmlhelp.com/reference/html40/';
 
 #
 # Strings
-$VERSION    =  q$Revision: 1.177 $;
+$VERSION    =  q$Revision: 1.178 $;
 $VERSION    =~ s/Revision: ([\d\.]+) /$1/;
-$DATE       =  q$Date: 2001-09-09 21:07:55 $;
+$DATE       =  q$Date: 2001-09-14 00:14:15 $;
 $MAINTAINER =  'gerald@w3.org';
 $NOTICE     =  ''; # "<p><strong>Note: This service will be ...</strong>";
 
@@ -278,7 +286,7 @@ if (defined $q->param('doctype')
   inserted instead. The document will not be Valid until you alter the source
   file to reflect this new DOCTYPE.
 .EOF.
-  $File->{Tentative} = TRUE; # Tag it as Invalid.
+  $File->{Tentative} |= T_ERROR; # Tag it as Invalid.
 }
 
 #
@@ -415,7 +423,7 @@ if ($File->{Use_Charset} ne $File->{Charset}) {
       character encoding (&#171;<code>$File->{Use_Charset}</code>&#187;)
       used instead.
 EOHD
-  $File->{Tentative} = TRUE;
+  $File->{Tentative} |= T_ERROR;
 }
 if ($File->{Use_Charset} eq 'unknown') {
   &add_warning(<<"EOHD");
@@ -426,7 +434,7 @@ if ($File->{Use_Charset} eq 'unknown') {
       <a href='http://www.w3.org/International/O-charset.html'>Further
       explanations</a>.
 EOHD
-  $File->{Tentative} = TRUE;
+  $File->{Tentative} |= T_WARN;
 }
 
 {  # block for character conversion and checking
@@ -648,8 +656,21 @@ EOHD
 }
 
 if (defined $File->{Tentative}) {
+  my $class = '';
+#     $class = $File->{Tentative} & T_FATAL ? 'Fatal'
+#            : $File->{Tentative} & T_ERROR ? 'Error'
+#            : $File->{Tentative} & T_WARN  ? 'Warning'
+#            : $File->{Tentative} & T_INFO  ? 'Info'
+#            : 'Info';
+
+     $class .= ($File->{Tentative} & T_INFO  ? ' Info'    :'');
+     $class .= ($File->{Tentative} & T_WARN  ? ' Warning' :'');
+     $class .= ($File->{Tentative} & T_ERROR ? ' Error'   :'');
+     $class .= ($File->{Tentative} & T_FATAL ? ' Fatal'   :'');
+
+
   print <<".EOF.";
-  <p class="Warning">
+  <p id="Notice" class="$class">
     Please note that you have chosen one or more options that alter the content
     of the document before validation, or have not provided enough information
     to accurately validate the document. Even if no errors are reported below,
@@ -756,8 +777,6 @@ EOF
 # Spit out some closing HTML at the end of output.
 sub output_closing {
   print <<"EOF";
-<hr>
-
 <address>
   <a href="${abs_svc_uri}check/referer"><img
      src="http://www.w3.org/Icons/valid-html401" height="31" width="88"