diff options
| -rwxr-xr-x | httpd/cgi-bin/check | 16 | ||||
| -rw-r--r-- | share/templates/en_US/error_loop.tmpl | 26 | ||||
| -rw-r--r-- | share/templates/en_US/invalid.tmpl | 30 | ||||
| -rw-r--r-- | share/templates/en_US/valid.tmpl | 3 |
4 files changed, 45 insertions, 30 deletions
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index b01a519..7d0beb4 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.418 2005-05-10 07:13:43 ot Exp $ +# $Id: check,v 1.419 2005-05-16 08:41:46 ot Exp $ # # Disable buffering on STDOUT! @@ -220,7 +220,7 @@ Directory not readable (permission denied): @_r # # Strings - $VERSION = q$Revision: 1.418 $; + $VERSION = q$Revision: 1.419 $; $VERSION =~ s/Revision: ([\d\.]+) /$1/; # @@ -855,6 +855,7 @@ if ($File->{Opt}->{Output} eq 'xml') { if ($File->{'Is Valid'}) { $T->param(VALID => TRUE); $T->param(valid_status => 'Valid'); + $T->param(file_errors => &report_errors($File)); &report_valid($File, $T); } else { $T->param(VALID => FALSE); @@ -1510,6 +1511,17 @@ sub report_errors ($) { if ($err->{type} eq 'I') { $err->{class} = 'msg_info'; + $err->{err_type_info} = 1; + } + elsif ($err->{type} eq 'E') + { + $err->{class} = 'msg_err'; + $err->{err_type_err} = 1; + } + elsif ($err->{type} eq 'W') + { + $err->{class} = 'msg_warn'; + $err->{err_type_warn} = 1; } # TODO other classes for "W", "E" etc? diff --git a/share/templates/en_US/error_loop.tmpl b/share/templates/en_US/error_loop.tmpl new file mode 100644 index 0000000..a6f6630 --- /dev/null +++ b/share/templates/en_US/error_loop.tmpl @@ -0,0 +1,26 @@ +<ol> +<TMPL_IF NAME="opt_show_source"> + <TMPL_LOOP NAME="file_errors"> + <li<TMPL_IF NAME="class"> class="<TMPL_VAR NAME="class">"</TMPL_IF>> +<span class="err_type"><TMPL_IF NAME="err_type_info">Info</TMPL_IF><TMPL_IF NAME="err_type_warn">Warning</TMPL_IF><TMPL_IF NAME="err_type_err">Error</TMPL_IF></span> + <em>Line <a href="#line-<TMPL_VAR NAME="line" ESCAPE="HTML">"><TMPL_VAR NAME="line" ESCAPE="HTML"></a>, + column <TMPL_VAR NAME="char" ESCAPE="HTML"></em>: + <span class="msg"><TMPL_VAR NAME="msg" ESCAPE="HTML"></span> +<TMPL_IF NAME="uri">(<a href="<TMPL_VAR NAME="uri" ESCAPE="HTML">">explain...</a>)</TMPL_IF>. +<pre><code class="input"><TMPL_VAR NAME="src"></code></pre> +<TMPL_IF NAME="expl"><TMPL_VAR NAME="expl"></TMPL_IF> + </li> + </TMPL_LOOP> +<TMPL_ELSE> + <TMPL_LOOP NAME="file_errors"> + <li<TMPL_IF NAME="class"> class="<TMPL_VAR NAME="class">"</TMPL_IF>> +<span class="err_type"><TMPL_IF NAME="err_type_info">Info</TMPL_IF><TMPL_IF NAME="err_type_warn">Warning</TMPL_IF><TMPL_IF NAME="err_type_err">Error</TMPL_IF></span> + <em>Line <TMPL_VAR NAME="line" ESCAPE="HTML"> column <TMPL_VAR NAME="char" ESCAPE="HTML"></em>: + <span class="msg"><TMPL_VAR NAME="msg" ESCAPE="HTML"></span><TMPL_IF NAME="uri">(<a href="<TMPL_VAR NAME="uri" ESCAPE="HTML">">explain...</a>)</TMPL_IF>.<pre><code class="input"><TMPL_VAR NAME="src"></code></pre><TMPL_IF NAME="expl"><TMPL_VAR NAME="expl"></TMPL_IF> </li> + </TMPL_LOOP> +</TMPL_IF> +</ol> + +<TMPL_IF NAME="opt_verbose"> + <script type="text/javascript" src="loadexplanation.js"></script> +</TMPL_IF> diff --git a/share/templates/en_US/invalid.tmpl b/share/templates/en_US/invalid.tmpl index 76be30d..aa6a591 100644 --- a/share/templates/en_US/invalid.tmpl +++ b/share/templates/en_US/invalid.tmpl @@ -12,33 +12,7 @@ an SGML parser. </p> </TMPL_IF> - <ol> -<TMPL_IF NAME="opt_show_source"> - <TMPL_LOOP NAME="file_errors"> - <li> - <em>Line <a href="#line-<TMPL_VAR NAME="line" ESCAPE="HTML">"><TMPL_VAR NAME="line" ESCAPE="HTML"></a>, - column <TMPL_VAR NAME="char" ESCAPE="HTML"></em>: - <span class="msg<TMPL_IF NAME="class"> <TMPL_VAR NAME="class"></TMPL_IF>"><TMPL_VAR NAME="msg" ESCAPE="HTML"></span> -<TMPL_IF NAME="uri">(<a href="<TMPL_VAR NAME="uri" ESCAPE="HTML">">explain...</a>)</TMPL_IF>. -<pre><code class="input"><TMPL_VAR NAME="src"></code></pre> -<TMPL_IF NAME="expl"><TMPL_VAR NAME="expl"></TMPL_IF> - </li> - </TMPL_LOOP> -<TMPL_ELSE> - <TMPL_LOOP NAME="file_errors"> - <li> - <em>Line <TMPL_VAR NAME="line" ESCAPE="HTML"> - column <TMPL_VAR NAME="char" ESCAPE="HTML"></em>: - <span class="msg<TMPL_IF NAME="class"> <TMPL_VAR NAME="class"></TMPL_IF>"><TMPL_VAR NAME="msg" ESCAPE="HTML"></span> -<TMPL_IF NAME="uri">(<a href="<TMPL_VAR NAME="uri" ESCAPE="HTML">">explain...</a>)</TMPL_IF>. -<pre><code class="input"><TMPL_VAR NAME="src"></code></pre> -<TMPL_IF NAME="expl"><TMPL_VAR NAME="expl"></TMPL_IF> - </li> - </TMPL_LOOP> -</TMPL_IF> - </ol> -<TMPL_IF NAME="opt_verbose"> - <script type="text/javascript" src="loadexplanation.js"></script> -</TMPL_IF> +<TMPL_INCLUDE NAME="error_loop.tmpl"> + </div> diff --git a/share/templates/en_US/valid.tmpl b/share/templates/en_US/valid.tmpl index 7cb2680..a93e487 100644 --- a/share/templates/en_US/valid.tmpl +++ b/share/templates/en_US/valid.tmpl @@ -8,6 +8,9 @@ <dt><a href="http://www.w3.org/2001/06tips/">Tip Of The Day</a>:</dt> <dd><a href="<TMPL_VAR NAME="tip_uri" ESCAPE="HTML">"><TMPL_VAR NAME="tip_slug"></a></dd> </dl> + +<TMPL_INCLUDE NAME="error_loop.tmpl"> + <p> <TMPL_IF NAME="is_upload"> The uploaded document "<TMPL_VAR NAME="file_uri" ESCAPE="HTML">" |