- From: Julien Grand-Mourcel via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 24 Jul 2007 10:32:59 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/css
In directory hutz:/tmp/cvs-serv4222/org/w3c/css/css
Modified Files:
soap12.properties xhtml.properties ucn.properties
StyleSheetGeneratorHTML.java
Log Message:
replacing tabs by 4 spaces
correcting typo bug ("e; => ")
removing html tags in StyleSheetGeneratorHTML
adding the corresponding tags in xhtml.properties
Removing the link to Validated CSS when no CSS is found
Removing a part of the congrats message when using file upload or direct input
Index: xhtml.properties
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/xhtml.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xhtml.properties 13 Jul 2007 13:32:19 -0000 1.1
+++ xhtml.properties 24 Jul 2007 10:32:56 -0000 1.2
@@ -1,70 +1,74 @@
<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN'
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html lang='en' xml:lang='en' xmlns='http://www.w3.org/1999/xhtml'>
- <head>
- <meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
- <title>$W3C_validator_results $file_title</title>
- <link href="http://jigsaw.w3.org/css-validator/" rel="validator" />
- <link type="text/css" rel='stylesheet' href='style/base.css' />
- <link type="text/css" rel='stylesheet' href='style/results.css' />
- </head>
- <body>
+ <head>
+ <meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
+ <title>$W3C_validator_results $file_title</title>
+ <link href="http://jigsaw.w3.org/css-validator/" rel="validator" />
+ <link type="text/css" rel='stylesheet' href='style/base.css' />
+ <link type="text/css" rel='stylesheet' href='style/results.css' />
+ </head>
+ <body>
#if ( $link )
- <ul id="lang_choice">
- #foreach ( $language in $languages )
- #set ( $name = $language.get("name") )
- #if ( $language.get("real") )
- #set ( $real = $language.get("real") )
- #else
- #set ( $real = $language.get("name") )
- #end
- <li><a href="$link&lang=$name"
- lang="$name"
- xml:lang="$name"
- hreflang="$name"
- rel="alternate">$real</a>
- </li>
- #end
-
- </ul>
+ <ul id="lang_choice">
+ #foreach ( $language in $languages )
+ #set ( $name = $language.get("name") )
+ #if ( $language.get("real") )
+ #set ( $real = $language.get("real") )
+ #else
+ #set ( $real = $language.get("name") )
+ #end
+
+ <li><a href="$link&lang=$name"
+ lang="$name"
+ xml:lang="$name"
+ hreflang="$name"
+ rel="alternate">$real</a>
+ </li>
+ #end
+
+ </ul>
#end
- <div id="banner">
- <h1 id="title">
- <a href="http://www.w3.org/">
- <img height="48" alt="W3C" id="logo" src="http://www.w3.org/Icons/WWW/w3c_home_nb" />
- </a>
- <a href="./">
- <img src="images/css_validation_service.png" alt="$CSS_validation_service" />
- </a>
- </h1>
- </div>
- <p id="tagline"></p>
- <ul class="navbar" id="jumpbar">
- <li><strong>$jump_to:</strong></li>
+ <div id="banner">
+ <h1 id="title">
+ <a href="http://www.w3.org/">
+ <img height="48" alt="W3C" id="logo" src="http://www.w3.org/Icons/WWW/w3c_home_nb" />
+ </a>
+ <a href="./">
+ <img src="images/css_validation_service.png" alt="$CSS_validation_service" />
+ </a>
+ </h1>
+ </div>
+ <p id="tagline"></p>
+ <ul class="navbar" id="jumpbar">
+ <li><strong>$jump_to:</strong></li>
#if ($errors_count > 0)
- <li><a href="#errors">$errors ($errors_count)</a></li>
+ <li><a href="#errors">$errors ($errors_count)</a></li>
#end
#if ($warnings_count > 0)
- <li><a href="#warnings">$warnings ($warnings_count)</a></li>
+ <li><a href="#warnings">$warnings ($warnings_count)</a></li>
#end
- <li><a href="#css">$validated_CSS</a></li>
- </ul>
- <h2>$W3C_validator_results <a href="$file_title">$file_title</a></h2>
+#if ($rules_count > 0 && $rules_list && $rules_list != "")
+ <li><a href="#css">$validated_CSS</a></li>
+#end
+ </ul>
+ <h2>$W3C_validator_results <a href="$file_title">$file_title</a></h2>
#if ( !$no_errors_report )
- #if ($errors_count == 0)
- <!-- NO ERRORS -->
- <div id='congrats'>
- <h3>$congrats</h3>
- <p>
- <a style="float: right" href="http://jigsaw.w3.org/css-validator/">
- <img src="http://jigsaw.w3.org/css-validator/images/vcss" alt="$valid_CSS" />
- </a>
- $doc_validates
- </p>
- <p>
- $no_errors_interoperable_msg
- </p>
- <pre class='example'>
+ #if ($errors_count == 0)
+ <!-- NO ERRORS -->
+ <div id='congrats'>
+ <h3>$congrats</h3>
+ <p>
+ <a style="float: right" href="http://jigsaw.w3.org/css-validator/">
+ <img src="http://jigsaw.w3.org/css-validator/images/vcss" alt="$valid_CSS" />
+ </a>
+ $doc_validates
+ </p>
+ #if ( !$file_title.startsWith("file://localhost") )
+ <p>
+ $no_errors_interoperable_msg
+ </p>
+ <pre class='example'>
<p>
<a href="http://jigsaw.w3.org/css-validator/">
<img style="border:0;width:88px;height:31px"
@@ -72,163 +76,190 @@
alt="$valid_CSS" />
</a>
</p>
- </pre>
- <p>($no_errors_close_tags_msg)</p>
- <p>
- $no_errors_dl_local_msg
- </p>
- <p>
- $no_errors_create_link_msg
- </p>
- <pre>
+ </pre>
+ <p>($no_errors_close_tags_msg)</p>
+ <p>
+ $no_errors_dl_local_msg
+ </p>
+ <p>
+ $no_errors_create_link_msg
+ </p>
+ <pre>
http://jigsaw.w3.org/css-validator/validator?uri=$file_title
or http://jigsaw.w3.org/css-validator/check/referer ($no_errors_forHTML_only_msg)
- </pre>
- <p>($no_errors_bookmark_msg)</p>
- </div>
- <p class="backtop"><a href="#banner">↑ $top</a></p>
- #else
- <!-- DEALING WITH ERRORS -->
- #if ( $hook_html_validator )
- $hook_html_validator
- #end
- #set ( $sf = "" )
- #set ( $open = false )
-
- <div id="errors">
- <h3>$errors_sorry_msg ($errors_count)</h3>
- #if ( $request )
- <h4>$request</h4>
- #end
- <div class='error-section-all'>
- #foreach ( $error_content in $errors_content )
- #set ( $err = $error_content.get("Error") )
- #set ( $error_msg = $error_content.get("ErrorMsg") )
- #set ( $context_name = $error_content.get("CtxName") )
- #set ( $context_msg = $error_content.get("CtxMsg") )
- #set ( $class_name = $error_content.get("ClassName") )
- #if ( $sf != $err.SourceFile )
- #if ( $open )
-
- </table>
- <!--end of individual error section-->
- </div>
- #end
- #set ( $sf = $err.SourceFile )
-
- <div class='error-section'>
- <h4>URI : <a href="$sf">$sf</a></h4>
- <table>
- #set ( $open = true )
- #end
-
- <tr class='error'>
- <td class='linenumber' title='Line $err.Line'>$err.Line</td>
- <td class='$context_name'>#if ( $context_msg ) $context_msg #end</td>
- <td class='$class_name'>$error_msg</td>
- </tr>
- #end
- #if ( $open )
-
- </table>
- </div>
- #end
-
- </div>
- </div>
- <p class="backtop"><a href="#banner">↑ $top</a></p>
- #end
+ </pre>
+ <p>($no_errors_bookmark_msg)</p>
+ #end
+ </div>
+ <p class="backtop"><a href="#banner">↑ $top</a></p>
+ #else
+ <!-- DEALING WITH ERRORS -->
+ #if ( $hook_html_validator )
+ $hook_html_validator
+ #end
+ #set ( $sf = "" )
+ #set ( $open = false )
+
+ <div id="errors">
+ <h3>$errors_sorry_msg ($errors_count)</h3>
+ #if ( $request )
+ <h4>$request</h4>
+ #end
+ <div class='error-section-all'>
+ #foreach ( $error_content in $errors_content )
+ #set ( $err = $error_content.get("Error") )
+ #set ( $error_msg = $error_content.get("ErrorMsg") )
+ #set ( $context_name = $error_content.get("CtxName") )
+ #set ( $context_msg = $error_content.get("CtxMsg") )
+ #set ( $class_name = $error_content.get("ClassName") )
+ #if ( $error_content.get("link_value_parse_error") )
+ #set ( $before_link = $error_content.get("link_before_parse_error") )
+ #set ( $link_value = $error_content.get("link_value_parse_error") )
+ #else
+ #set ( $link_value = false )
+ #end
+ #if ( !$link_value && $error_content.get("span_value_parse_error") )
+ #set ( $span_value = $error_content.get("span_value_parse_error") )
+ #else
+ #set ( $span_value = false )
+ #end
+ #if ( $sf != $err.SourceFile )
+ #if ( $open )
+
+ </table>
+ <!--end of individual error section-->
+ </div>
+ #end
+ #set ( $sf = $err.SourceFile )
+
+ <div class='error-section'>
+ <h4>URI : <a href="$sf">$sf</a></h4>
+ <table>
+ #set ( $open = true )
+ #end
+
+ <tr class='error'>
+ <td class='linenumber' title='Line $err.Line'>$err.Line</td>
+ <td class='$context_name'>#if ( $context_msg ) $context_msg #end</td>
+ <td class='$class_name'>
+ #if ( $link_value )
+ #set ( $link_name = $error_content.get("link_name_parse_error") )
+
+ $before_link : <a href="$link_value">$link_name</a>
+ #end
+
+ $error_msg
+ #if ( $span_value )
+ #set ( $span_class = $error_content.get("span_class_parse_error") )
+
+ <span class="$span_class">
+ $span_value
+ </span>
+ #end
+
+ </td>
+ </tr>
+ #end
+ #if ( $open )
+
+ </table>
+ </div>
+ #end
+
+ </div>
+ </div>
+ <p class="backtop"><a href="#banner">↑ $top</a></p>
+ #end
#end
#if ($warnings_count > 0)
- <!-- DEALING WITH WARNINGS -->
- <div id="warnings">
- <h3>$warnings ($warnings_count)</h3>
- <div class='warning-section-all'>
- #set ( $sf = "" )
- #set ( $open = false )
- #foreach ( $warning in $warnings_list )
- #if ( $sf != $warning.SourceFile )
- #if ( $open )
-
- </table>
- <!--end of individual warning section-->
- </div>
- #end
- #set ( $sf = $warning.SourceFile )
-
- <div class='warning-section'>
- <h4>URI : <a href="$sf">$sf</a></h4>
- <table>
- #set ( $open = true )
- #end
- #if ( $warning.Level <= $warning_level )
-
- <tr class='warning'>
- <td class='linenumber' title='Line $warning.Line'>$warning.Line</td>
- <td class='codeContext'>#if ( $warning.Context ) $warning.Context #end</td>
- <td class='level$warning.Level' title='warning level $warning.Level'>$warning.WarningMessage</td>
- </tr>
- #end
- #end
- #if ( $open )
-
- </table>
- </div>
- #end
-
- </div>
- </div>
- <p class="backtop"><a href="#banner">↑ $top</a></p>
-#end
+ <!-- DEALING WITH WARNINGS -->
+ <div id="warnings">
+ <h3>$warnings ($warnings_count)</h3>
+ <div class='warning-section-all'>
+ #set ( $sf = "" )
+ #set ( $open = false )
+ #foreach ( $warning in $warnings_list )
+ #if ( $sf != $warning.SourceFile )
+ #if ( $open )
- <div id="css">
+ </table>
+ <!--end of individual warning section-->
+ </div>
+ #end
+ #set ( $sf = $warning.SourceFile )
+
+ <div class='warning-section'>
+ <h4>URI : <a href="$sf">$sf</a></h4>
+ <table>
+ #set ( $open = true )
+ #end
+ #if ( $warning.Level <= $warning_level )
+
+ <tr class='warning'>
+ <td class='linenumber' title='Line $warning.Line'>$warning.Line</td>
+ <td class='codeContext'>#if ( $warning.Context ) $warning.Context #end</td>
+ <td class='level$warning.Level' title='warning level $warning.Level'>$warning.WarningMessage</td>
+ </tr>
+ #end
+ #end
+ #if ( $open )
+
+ </table>
+ </div>
+ #end
+
+ </div>
+ </div>
+ <p class="backtop"><a href="#banner">↑ $top</a></p>
+#end
#if ($rules_count > 0 && $rules_list && $rules_list != "")
- <h3>$valid_CSS_info</h3>
- <div class='vAtRule'>
- #if ($style_charset)
-
- <div class='vCharset'>@charset "$charset";</div>
- #end
+ <div id="css">
+ <h3>$valid_CSS_info</h3>
+ <div class='vAtRule'>
+ #if ($style_charset)
- $rules_list
- </div>
+ <div class='vCharset'>@charset "$charset";</div>
+ #end
+
+ $rules_list
+ </div>
+ </div>
+ <p class="backtop"><a href="#banner">↑ $top</a></p>
#else
- <h2>$CSS_not_found</h2>
+ <div id="css"><h2>$CSS_not_found</h2></div>
#end
- </div>
- <p class="backtop"><a href="#banner">↑ $top</a></p>
- <ul class="navbar" id="menu">
- <li><strong><a href="./" title="$home_title">$home</a></strong> <span class="hideme">|</span></li>
- <li><a href="about.html" title="$about_title">$about</a> <span class="hideme">|</span></li>
- <li><a href="documentation.html" title="$doc_title">$doc</a> <span class="hideme">|</span></li>
- <li><a href="DOWNLOAD.html" title="$dl_title">$dl</a> <span class="hideme">|</span></li>
- <li><a href="Email.html" title="$feedback_title">$feedback</a> <span class="hideme">|</span></li>
- <li><a href="thanks.html" title="$credits_title">$credits</a></li>
- </ul>
- <p id="activity_logos">
- <a href="http://www.w3.org/QA/" title="$W3C_quality_msg"><img src="http://www.w3.org/QA/2002/12/qa-small.png" alt="QA" /></a><a href="http://www.w3.org/Style/CSS/learning" title="$learn_more_msg"><img src="images/woolly-icon" alt="CSS" /></a>
- </p>
- <p id="support_logo">
- $support<br />
- <a href="http://www.w3.org/Consortium/supporters">
- <img src="http://www.w3.org/Consortium/supporter-logos/csupporter.png" alt="$supporter" />
- </a>
- </p>
- <p class="copyright">
- <a rel="Copyright" href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
- © 1994-2007
- <a href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a>®
- (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>,
- <a href="http://www.ercim.org/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>,
- <a href="http://www.keio.ac.jp/">Keio</a>),
- All Rights Reserved.
- W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>,
- <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a>,
- <a rel="Copyright" href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a>
- and <a rel="Copyright" href="http://www.w3.org/Consortium/Legal/copyright-software">software licensing</a>
- rules apply. Your interactions with this site are in accordance
- with our <a href="http://www.w3.org/Consortium/Legal/privacy-statement#Public">public</a> and
- <a href="http://www.w3.org/Consortium/Legal/privacy-statement#Members">Member</a> privacy statements.
- </p>
- </body>
+ <ul class="navbar" id="menu">
+ <li><strong><a href="./" title="$home_title">$home</a></strong> <span class="hideme">|</span></li>
+ <li><a href="about.html" title="$about_title">$about</a> <span class="hideme">|</span></li>
+ <li><a href="documentation.html" title="$doc_title">$doc</a> <span class="hideme">|</span></li>
+ <li><a href="DOWNLOAD.html" title="$dl_title">$dl</a> <span class="hideme">|</span></li>
+ <li><a href="Email.html" title="$feedback_title">$feedback</a> <span class="hideme">|</span></li>
+ <li><a href="thanks.html" title="$credits_title">$credits</a></li>
+ </ul>
+ <p id="activity_logos">
+ <a href="http://www.w3.org/QA/" title="$W3C_quality_msg"><img src="http://www.w3.org/QA/2002/12/qa-small.png" alt="QA" /></a><a href="http://www.w3.org/Style/CSS/learning" title="$learn_more_msg"><img src="images/woolly-icon" alt="CSS" /></a>
+ </p>
+ <p id="support_logo">
+ $support<br />
+ <a href="http://www.w3.org/Consortium/supporters">
+ <img src="http://www.w3.org/Consortium/supporter-logos/csupporter.png" alt="$supporter" />
+ </a>
+ </p>
+ <p class="copyright">
+ <a rel="Copyright" href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
+ © 1994-2007
+ <a href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a>®
+ (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>,
+ <a href="http://www.ercim.org/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>,
+ <a href="http://www.keio.ac.jp/">Keio</a>),
+ All Rights Reserved.
+ W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>,
+ <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a>,
+ <a rel="Copyright" href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a>
+ and <a rel="Copyright" href="http://www.w3.org/Consortium/Legal/copyright-software">software licensing</a>
+ rules apply. Your interactions with this site are in accordance
+ with our <a href="http://www.w3.org/Consortium/Legal/privacy-statement#Public">public</a> and
+ <a href="http://www.w3.org/Consortium/Legal/privacy-statement#Members">Member</a> privacy statements.
+ </p>
+ </body>
</html>
\ No newline at end of file
Index: ucn.properties
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/ucn.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ucn.properties 13 Jul 2007 13:32:19 -0000 1.1
+++ ucn.properties 24 Jul 2007 10:32:56 -0000 1.2
@@ -1,62 +1,62 @@
<?xml version='1.0' encoding="$charset"?>
<observationresponse xmlns="http://www.w3.org/unicorn/observationresponse"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.w3.org/unicorn/observationresponse file:observer-response.xsd">
- <uri>$file_title</uri>
- <checkedby>http://jigsaw.w3.org/css-validator/</checkedby>
- <version>$cssversion</version>
- <date>$currentdate</date>
- <passed>$is_valid</passed>
- <result>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.w3.org/unicorn/observationresponse file:observer-response.xsd">
+ <uri>$file_title</uri>
+ <checkedby>http://jigsaw.w3.org/css-validator/</checkedby>
+ <version>$cssversion</version>
+ <date>$currentdate</date>
+ <passed>$is_valid</passed>
+ <result>
#if ( $errors_count > 0 )
- <errors xml:lang="$lang">
- <errorcount>$errors_count</errorcount>
- #foreach ( $error_content in $errors_content )
- #set ( $err = $error_content.get("Error") )
- #set ( $error_msg = $error_content.get("ErrorMsg") )
- #set ( $context_name = $error_content.get("CtxName") )
- #set ( $context_msg = $error_content.get("CtxMsg") )
- #set ( $class_name = $error_content.get("ClassName") )
-
- <error>
- <line_number>$err.Line</line_number>
- <context_msg name="$context_name">#if ( $context_msg ) $context_msg #end</context_msg>
- <message name="$class_name">$error_msg</message>
- </error>
- #end
-
- </errors>
+ <errors xml:lang="$lang">
+ <errorcount>$errors_count</errorcount>
+ #foreach ( $error_content in $errors_content )
+ #set ( $err = $error_content.get("Error") )
+ #set ( $error_msg = $error_content.get("ErrorMsg") )
+ #set ( $context_name = $error_content.get("CtxName") )
+ #set ( $context_msg = $error_content.get("CtxMsg") )
+ #set ( $class_name = $error_content.get("ClassName") )
+
+ <error>
+ <line_number>$err.Line</line_number>
+ <context_msg name="$context_name">#if ( $context_msg ) $context_msg #end</context_msg>
+ <message name="$class_name">$error_msg</message>
+ </error>
+ #end
+
+ </errors>
#end
#if ( $warnings_count > 0 )
- <warnings xml:lang="$lang">
- <warningcount>$warnings_count</warningcount>
- #foreach ( $warning in $warnings_list )
-
- <warning>
- <line_number>$warning.Line</line_number>
- <code_context>#if ( $warning.Context ) $warning.Context #end</code_context>
- <message level="$warning.Level">$warning.WarningMessage</message>
- </warning>
- #end
-
- </warnings>
+ <warnings xml:lang="$lang">
+ <warningcount>$warnings_count</warningcount>
+ #foreach ( $warning in $warnings_list )
+
+ <warning>
+ <line_number>$warning.Line</line_number>
+ <code_context>#if ( $warning.Context ) $warning.Context #end</code_context>
+ <message level="$warning.Level">$warning.WarningMessage</message>
+ </warning>
+ #end
+
+ </warnings>
#end
#if ( $errors_count == 0 )
- <informations xml:lang="$lang">
- <infocount>1</infocount>
- <infolist>
- <uri>$file_title</uri>
- <info>
- <message>$doc_validates</message>
- <longmessage>
- <a href="http://jigsaw.w3.org/css-validator/">
- <img src="http://jigsaw.w3.org/css-validator/images/vcss" alt="$valid_CSS" />
- </a>
- </longmessage>
- <longmessage>$no_errors_interoperable_msg</longmessage>
- <longmessage>
- <code>
+ <informations xml:lang="$lang">
+ <infocount>1</infocount>
+ <infolist>
+ <uri>$file_title</uri>
+ <info>
+ <message>$doc_validates</message>
+ <longmessage>
+ <a href="http://jigsaw.w3.org/css-validator/">
+ <img src="http://jigsaw.w3.org/css-validator/images/vcss" alt="$valid_CSS" />
+ </a>
+ </longmessage>
+ <longmessage>$no_errors_interoperable_msg</longmessage>
+ <longmessage>
+ <code>
<p>
<a href="http://jigsaw.w3.org/css-validator/">
<img style="border:0;width:88px;height:31px"
@@ -64,23 +64,23 @@
alt="Valid CSS!" />
</a>
</p>
- </code>
- ($no_errors_close_tags_msg)
- </longmessage>
- <longmessage>$no_errors_dl_local_msg</longmessage>
- <longmessage>$no_errors_create_link_msg</longmessage>
- <longmessage>
- <code>
+ </code>
+ ($no_errors_close_tags_msg)
+ </longmessage>
+ <longmessage>$no_errors_dl_local_msg</longmessage>
+ <longmessage>$no_errors_create_link_msg</longmessage>
+ <longmessage>
+ <code>
http://jigsaw.w3.org/css-validator/validator?uri=http://www.w3.org
or http://jigsaw.w3.org/css-validator/check/referer
- </code>
- ($no_errors_forHTML_only_msg)
- </longmessage>
- <longmessage>($no_errors_bookmark_msg)</longmessage>
- <longmessage>$note_valide_html</longmessage>
- </info>
- </infolist>
- </informations>
+ </code>
+ ($no_errors_forHTML_only_msg)
+ </longmessage>
+ <longmessage>($no_errors_bookmark_msg)</longmessage>
+ <longmessage>$note_valide_html</longmessage>
+ </info>
+ </infolist>
+ </informations>
#end
- </result>
+ </result>
</observationresponse>
Index: StyleSheetGeneratorHTML.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetGeneratorHTML.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- StyleSheetGeneratorHTML.java 13 Jul 2007 13:32:19 -0000 1.8
+++ StyleSheetGeneratorHTML.java 24 Jul 2007 10:32:56 -0000 1.9
@@ -293,8 +293,7 @@
String str = stringError.substring(0, index);
// The Exception name 'StringError' was previously
// displayed
- errors_content[i].put("ErrorMsg", ac.getMsg().getGeneratorString("not-found") + ": <em>" + str
- + "</em>");
+ errors_content[i].put("ErrorMsg", ac.getMsg().getGeneratorString("not-found") + ": " + str);
} else if (ex instanceof CssParseException) {
produceParseException((CssParseException) ex, errors_content[i]);
@@ -384,39 +383,35 @@
}
ht_error.put("ClassName", "message");
String name = error.getProperty();
- String ret = "";
+ String ret;
if ((name != null) && (getURLProperty(name) != null)) {
- ret += ac.getMsg().getGeneratorString("property");
- ret += " : <a href=\"" + getURLProperty("@url-base");
- ret += getURLProperty(name) + "\">" + name + "</a> ";
+ ht_error.put("link_before_parse_error", ac.getMsg().getGeneratorString("property"));
+ ht_error.put("link_value_parse_error", getURLProperty("@url-base") + getURLProperty(name));
+ ht_error.put("link_name_parse_error", name);
}
if ((error.getException() != null) && (error.getMessage() != null)) {
if (error.isParseException()) {
- ret += queryReplace(error.getMessage());
+ ret = queryReplace(error.getMessage());
} else {
Exception ex = error.getException();
if (ex instanceof NumberFormatException) {
- ret += ac.getMsg().getGeneratorString("invalid-number");
+ ret = ac.getMsg().getGeneratorString("invalid-number");
} else {
- ret += queryReplace(ex.getMessage());
+ ret = queryReplace(ex.getMessage());
}
}
if (error.getSkippedString() != null) {
- ret += "<span class='skippedString'>";
- ret += queryReplace(error.getSkippedString());
- ret += "</span>";
+ ht_error.put("span_class_parse_error", "skippedString");
+ ht_error.put("span_value_parse_error", queryReplace(error.getSkippedString()));
} else if (error.getExp() != null) {
- ret += " : ";
- ret += queryReplace(error.getExp().toStringFromStart());
- ret += "<span class='exp'>";
- ret += queryReplace(error.getExp().toString());
- ret += "</span>";
+ ret += " : " + queryReplace(error.getExp().toStringFromStart());
+ ht_error.put("span_class_parse_error", "exp");
+ ht_error.put("span_value_parse_error", queryReplace(error.getExp().toString()));
}
} else {
- ret += ac.getMsg().getGeneratorString("unrecognize");
- ret += " - <span class='other'>";
- ret += queryReplace(error.getSkippedString());
- ret += "</span>";
+ ret = ac.getMsg().getGeneratorString("unrecognize");
+ ht_error.put("span_class_parse_error", "other");
+ ht_error.put("span_value_parse_error", queryReplace(error.getSkippedString()));
}
ht_error.put("ErrorMsg", ret);
}
@@ -431,7 +426,7 @@
switch (c = s.charAt(i)) {
case '&' : ret.append("&"); break;
case '\'' : ret.append("'"); break;
- case '\"' : ret.append(""e;"); break;
+ case '"' : ret.append("""); break;
case '<' : ret.append("<"); break;
case '>' : ret.append(">"); break;
default : ret.append(c);
Index: soap12.properties
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/soap12.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- soap12.properties 13 Jul 2007 13:32:19 -0000 1.1
+++ soap12.properties 24 Jul 2007 10:32:56 -0000 1.2
@@ -1,86 +1,85 @@
<?xml version='1.0' encoding="$charset"?>
<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope">
- <env:Body>
- <m:cssvalidationresponse
- env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"
- xmlns:m="http://www.w3.org/2005/07/css-validator">
- <m:uri>$file_title</m:uri>
- <m:checkedby>http://jigsaw.w3.org/css-validator/</m:checkedby>
- <m:csslevel>$cssversion</m:csslevel>
- <m:date>$currentdate</m:date>
- <m:validity>$is_valid</m:validity>
- <m:result>
+ <env:Body>
+ <m:cssvalidationresponse
+ env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"
+ xmlns:m="http://www.w3.org/2005/07/css-validator">
+ <m:uri>$file_title</m:uri>
+ <m:checkedby>http://jigsaw.w3.org/css-validator/</m:checkedby>
+ <m:csslevel>$cssversion</m:csslevel>
+ <m:date>$currentdate</m:date>
+ <m:validity>$is_valid</m:validity>
+ <m:result>
+ <m:errors xml:lang="$lang">
+ <m:errorcount>$errors_count</m:errorcount>
#if ( $errors_count > 0 )
- <m:errors xml:lang="$lang">
- <m:errorcount>$errors_count</m:errorcount>
- #foreach ( $error_content in $errors_content )
- #set ( $err = $error_content.get("Error") )
- #set ( $error_msg = $error_content.get("ErrorMsg") )
- #set ( $class_name = $error_content.get("ClassName") )
- #if ( $sf != $err.SourceFile )
- #if ( $open )
-
- </m:errorlist>
- #end
- #set ( $sf = $err.SourceFile )
-
- <m:errorlist>
- <m:uri>$sf</m:uri>
- #set ( $open = true )
- #end
-
- <m:error>
- <m:line>$err.Line</m:line>
- <m:errortype>$class_name</m:errortype>
- <m:message>$error_msg</m:message>
- </m:error>
- #end
- #if ( $open )
-
- </m:errorlist>
- #end
-
- </m:errors>
+ #foreach ( $error_content in $errors_content )
+ #set ( $err = $error_content.get("Error") )
+ #set ( $error_msg = $error_content.get("ErrorMsg") )
+ #set ( $class_name = $error_content.get("ClassName") )
+ #if ( $sf != $err.SourceFile )
+ #if ( $open )
+
+ </m:errorlist>
+ #end
+ #set ( $sf = $err.SourceFile )
+
+ <m:errorlist>
+ <m:uri>$sf</m:uri>
+ #set ( $open = true )
+ #end
+
+ <m:error>
+ <m:line>$err.Line</m:line>
+ <m:errortype>$class_name</m:errortype>
+ <m:message>$error_msg</m:message>
+ </m:error>
+ #end
+ #if ( $open )
+
+ </m:errorlist>
+ #end
#end
+
+ </m:errors>
+ <m:warnings xml:lang="$lang">
+ <m:warningcount>$warnings_count</m:warningcount>
#if ( $warnings_count > 0 )
- <m:warnings xml:lang="$lang">
- <m:warningcount>$warnings_count</m:warningcount>
- #set ( $sf = "" )
- #set ( $open = false )
- #foreach ( $warning in $warnings_list )
- #if ( $sf != $warning.SourceFile )
- #if ( $open )
-
- </m:warninglist>
- #end
- #set ( $sf = $warning.SourceFile )
-
- <m:warninglist>
- <m:uri>$sf</m:uri>
- #set ( $open = true )
- #end
- #if ( $warning.Level <= $warning_level )
-
- <m:warning>
- <m:line>$warning.Line</m:line>
- <m:level>$warning.Level</m:level>
- <m:message>$warning.WarningMessage</m:message>
+ #set ( $sf = "" )
+ #set ( $open = false )
+ #foreach ( $warning in $warnings_list )
+ #if ( $sf != $warning.SourceFile )
+ #if ( $open )
+
+ </m:warninglist>
+ #end
+ #set ( $sf = $warning.SourceFile )
+
+ <m:warninglist>
+ <m:uri>$sf</m:uri>
+ #set ( $open = true )
+ #end
+ #if ( $warning.Level <= $warning_level )
+
+ <m:warning>
+ <m:line>$warning.Line</m:line>
+ <m:level>$warning.Level</m:level>
+ <m:message>$warning.WarningMessage</m:message>
#if ( $warning.Context )
- <m:context>$warning.Context</m:context>
+ <m:context>$warning.Context</m:context>
#end
- </m:warning>
- #end
- #end
- #if ( $open )
-
- </m:warninglist>
- #end
-
- </m:warnings>
+ </m:warning>
+ #end
+ #end
+ #if ( $open )
+
+ </m:warninglist>
+ #end
#end
- </m:result>
- </m:cssvalidationresponse>
- </env:Body>
+ </m:warnings>
+ </m:result>
+ </m:cssvalidationresponse>
+ </env:Body>
</env:Envelope>
Received on Tuesday, 24 July 2007 10:33:08 UTC