diff options
| -rwxr-xr-x | httpd/cgi-bin/check | 14 | ||||
| -rw-r--r-- | share/templates/en_US/popup_doctype.tmpl | 22 |
2 files changed, 23 insertions, 13 deletions
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index 21b8df7..0aacb11 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.411 2005-03-25 04:44:33 ot Exp $ +# $Id: check,v 1.412 2005-03-31 07:43:42 ot Exp $ # # Disable buffering on STDOUT! @@ -220,7 +220,7 @@ Directory not readable (permission denied): @_r # # Strings - $VERSION = q$Revision: 1.411 $; + $VERSION = q$Revision: 1.412 $; $VERSION =~ s/Revision: ([\d\.]+) /$1/; # @@ -838,6 +838,9 @@ if ($File->{Opt}->{Output} eq 'xml') { } else { &prep_template($File, $T); + + + if (! $File->{Doctype} and ($File->{Version} eq 'unknown' or $File->{Version} eq 'SGML')) { $T->param(file_version => '(no Doctype found)'); } @@ -930,6 +933,13 @@ sub prep_template ($$) { $T->param(file_namespace => $File->{Namespace}); my @nss = map({uri => $_}, @{$File->{Namespaces}}); $T->param(file_namespaces => \@nss) if @nss; + + if ($File->{Opt}->{DOCTYPE}) { + my $over_doctype_param = "override $File->{Opt}->{DOCTYPE}"; + $T->param($over_doctype_param => TRUE); + + } + } # diff --git a/share/templates/en_US/popup_doctype.tmpl b/share/templates/en_US/popup_doctype.tmpl index 708810b..2a2912e 100644 --- a/share/templates/en_US/popup_doctype.tmpl +++ b/share/templates/en_US/popup_doctype.tmpl @@ -1,14 +1,14 @@ <select id="doctype" name="doctype"> <option value="Inline">(detect automatically)</option> - <option value="XHTML 1.1">XHTML 1.1</option> - <option value="XHTML Basic 1.0">XHTML Basic 1.0</option> - <option value="XHTML 1.0 Strict">XHTML 1.0 Strict</option> - <option value="XHTML 1.0 Transitional">XHTML 1.0 Transitional</option> - <option value="XHTML 1.0 Frameset">XHTML 1.0 Frameset</option> - <option value="ISO/IEC 15445:2000 ("ISO HTML")">ISO/IEC 15445:2000 ("ISO HTML")</option> - <option value="HTML 4.01 Strict">HTML 4.01 Strict</option> - <option value="HTML 4.01 Transitional">HTML 4.01 Transitional</option> - <option value="HTML 4.01 Frameset">HTML 4.01 Frameset</option> - <option value="HTML 3.2">HTML 3.2</option> - <option value="HTML 2.0">HTML 2.0</option> + <option value="XHTML 1.1" <TMPL_IF NAME="override XHTML 1.1">selected="selected"</TMPL_IF>>XHTML 1.1</option> + <option value="XHTML Basic 1.0" <TMPL_IF NAME="override XHTML Basic 1.0">selected="selected"</TMPL_IF>>XHTML Basic 1.0</option> + <option value="XHTML 1.0 Strict"<TMPL_IF NAME="override XHTML 1.0 Strict">selected="selected"</TMPL_IF>>XHTML 1.0 Strict</option> + <option value="XHTML 1.0 Transitional" <TMPL_IF NAME="override XHTML 1.0 Transitional">selected="selected"</TMPL_IF>>XHTML 1.0 Transitional</option> + <option value="XHTML 1.0 Frameset" <TMPL_IF NAME="override XHTML 1.0 Frameset">selected="selected"</TMPL_IF>>XHTML 1.0 Frameset</option> + <option value="ISO/IEC 15445:2000 ("ISO HTML")" <TMPL_IF NAME='override ISO/IEC 15445:2000 ("ISO HTML")'>selected="selected"</TMPL_IF>>ISO/IEC 15445:2000 ("ISO HTML")</option> + <option value="HTML 4.01 Strict" <TMPL_IF NAME="override HTML 4.01 Strict">selected="selected"</TMPL_IF>>HTML 4.01 Strict</option> + <option value="HTML 4.01 Transitional" <TMPL_IF NAME="override HTML 4.01 Transitional">selected="selected"</TMPL_IF>>HTML 4.01 Transitional</option> + <option value="HTML 4.01 Frameset" <TMPL_IF NAME="override HTML 4.01 Frameset">selected="selected"</TMPL_IF>>HTML 4.01 Frameset</option> + <option value="HTML 3.2" <TMPL_IF NAME="override HTML 3.2">selected="selected"</TMPL_IF>>HTML 3.2</option> + <option value="HTML 2.0" <TMPL_IF NAME="override HTML 2.0">selected="selected"</TMPL_IF>>HTML 2.0</option> </select> |