diff options
| -rw-r--r-- | share/templates/en_US/ucn_output.tmpl | 264 | ||||
| -rw-r--r-- | share/templates/en_US/ucn_warnings.tmpl | 74 |
2 files changed, 157 insertions, 181 deletions
diff --git a/share/templates/en_US/ucn_output.tmpl b/share/templates/en_US/ucn_output.tmpl index bf42cfa..946e56e 100644 --- a/share/templates/en_US/ucn_output.tmpl +++ b/share/templates/en_US/ucn_output.tmpl @@ -6,146 +6,124 @@ X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num"> X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF> <?xml version="1.0" encoding="UTF-8"?> -<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 http://www.w3.org/QA/2006/obs_framework/response/observer-response.xsd"> - <uri><TMPL_VAR NAME="file_uri" ESCAPE="HTML"></uri> - <checkedby><TMPL_VAR NAME="cfg_home_page" ESCAPE="HTML"></checkedby> - <passed><TMPL_IF NAME="VALID">true<TMPL_ELSE>false</TMPL_IF></passed> - <result> - <errors> - <errorcount><TMPL_VAR NAME="valid_errors_num"></errorcount> - <errorlist> - <uri><TMPL_VAR NAME="file_uri" ESCAPE="HTML"></uri> - <TMPL_LOOP NAME="file_errors"><TMPL_IF NAME="err_type_err"> - <error> - <line><TMPL_VAR NAME="line"></line> - <column><TMPL_VAR NAME="char" ESCAPE="HTML"></column> - <message><TMPL_VAR NAME="msg" ESCAPE="HTML"></message> - <context><TMPL_VAR NAME="src"></context> - </error> - </TMPL_IF></TMPL_LOOP> - </errorlist> - </errors> - <warnings> - <warningcount><TMPL_VAR NAME="valid_warnings_num"></warningcount> - <warninglist> - <uri><TMPL_VAR NAME="file_uri" ESCAPE="HTML"></uri> - <TMPL_IF NAME="have_warnings"><TMPL_INCLUDE NAME="ucn_warnings.tmpl"></TMPL_IF> - <TMPL_LOOP NAME="file_errors"><TMPL_IF NAME="err_type_warn"> - <warning> - <line><TMPL_VAR NAME="line"></line> - <column><TMPL_VAR NAME="char" ESCAPE="HTML"></column> - <message><TMPL_VAR NAME="msg" ESCAPE="HTML"></message> - <context><TMPL_VAR NAME="src"></context> - </warning> - </TMPL_IF></TMPL_LOOP> - </warninglist> - </warnings> - <TMPL_IF NAME="VALID"> - <informations> - <infocount>1</infocount> - <infolist> - <uri><TMPL_VAR NAME="file_uri" ESCAPE="HTML"></uri> - <info> - <message>This Page Is Valid <TMPL_VAR NAME="file_version" ESCAPE="HTML">!</message> - <longmessage> - <TMPL_IF NAME="is_upload"> - The uploaded document "<TMPL_VAR NAME="file_uri" ESCAPE="HTML">" - <TMPL_ELSE> - <TMPL_IF NAME="is_direct_input"> - The uploaded document - <TMPL_ELSE> - The document located at - <<a href="<TMPL_VAR NAME="file_uri" ESCAPE="HTML">"><TMPL_VAR NAME="file_uri" ESCAPE="HTML"></a>> - </TMPL_IF> - </TMPL_IF> - <TMPL_IF NAME="is_tentative"> - was <em>tentatively</em> checked as <TMPL_VAR NAME="file_version" ESCAPE="HTML">. - This means that with the use of some fallback or override mechanism, - we successfully performed a formal validation using an SGML, HTML5 and/or XML - Parser(s). In other words, the document would validate as - <TMPL_VAR NAME="file_version" ESCAPE="HTML"> if you changed the markup - to match the changes we have performed automatically, but - <strong>it will not be valid until you make these changes</strong>. - <TMPL_ELSE> - was successfully checked as - <TMPL_IF NAME="xmlwf_only">well-formed</TMPL_IF> - <TMPL_VAR NAME="file_version" ESCAPE="HTML">. - <TMPL_IF NAME="xmlwf_only">This means that we were not able to determine - the exact document type, but that the document passed the XML well-formedness - syntax check. If you wish to wish to perform formal validation of the document, - you can use the "Document Type:" option of the validator. - <TMPL_ELSE> - This means that the resource in question identified itself as - "<TMPL_VAR NAME="file_version" ESCAPE="HTML">" and that we successfully - performed a formal validation using an SGML, HTML5 and/or XML - Parser(s) (depending on the markup language used). - </TMPL_IF> - </TMPL_IF> - </longmessage> - <TMPL_IF NAME="badge_uri"> - <longmessage> - To show your readers that you have taken the care to create an - interoperable Web page, you may display this icon on any page - that validates. Here is the HTML you could use to add this icon - to your Web page: - </longmessage> - <longmessage> - <img - class="inline-badge" src="<TMPL_VAR NAME="badge_uri" ESCAPE="HTML">" - alt="<TMPL_VAR NAME="badge_alt" ESCAPE="HTML">" - <TMPL_IF NAME="badge_h">height="<TMPL_VAR NAME="badge_h">"</TMPL_IF> - <TMPL_IF NAME="badge_w">width="<TMPL_VAR NAME="badge_w">"</TMPL_IF> - /> <code><p<TMPL_IF NAME="badge_rdfa"> about="" - resource="<TMPL_VAR NAME="badge_rdfa">" - rel="dc:conformsTo" xmlns:dc="http://purl.org/dc/terms/"</TMPL_IF>> - <a href="<TMPL_VAR NAME="cfg_home_page" ESCAPE="HTML">check?uri=referer"> - <img src="<TMPL_VAR NAME="badge_uri" ESCAPE="HTML">" - <TMPL_IF NAME="badge_alt">alt="<TMPL_VAR NAME="badge_alt" ESCAPE="HTML">"</TMPL_IF> - style="<TMPL_IF NAME="badge_h">height: <TMPL_VAR NAME="badge_h">;</TMPL_IF> <TMPL_IF NAME="badge_w">width: <TMPL_VAR NAME="badge_w">;</TMPL_IF>"<TMPL_VAR NAME="badge_tagc">> - </a> -</p></code> - </longmessage> - <TMPL_IF NAME="badge_alt_uri"> - <longmessage> - <img - class="inline-badge" src="<TMPL_VAR NAME="badge_alt_uri" ESCAPE="HTML">" - alt="<TMPL_VAR NAME="badge_alt" ESCAPE="HTML">" - <TMPL_IF NAME="badge_h">height="<TMPL_VAR NAME="badge_h">"</TMPL_IF> - <TMPL_IF NAME="badge_w">width="<TMPL_VAR NAME="badge_w">"</TMPL_IF> - /> <code><p<TMPL_IF NAME="badge_rdfa"> about="" - resource="<TMPL_VAR NAME="badge_rdfa">" - rel="dc:conformsTo" xmlns:dc="http://purl.org/dc/terms/"</TMPL_IF>> - <a href="<TMPL_VAR NAME="cfg_home_page" ESCAPE="HTML">check?uri=referer"> - <img src="<TMPL_VAR NAME="badge_alt_uri" ESCAPE="HTML">" - <TMPL_IF NAME="badge_alt">alt="<TMPL_VAR NAME="badge_alt" ESCAPE="HTML">"</TMPL_IF> - style="<TMPL_IF NAME="badge_h">height: <TMPL_VAR NAME="badge_h">;</TMPL_IF> <TMPL_IF NAME="badge_w">width: <TMPL_VAR NAME="badge_w">;</TMPL_IF>"<TMPL_VAR NAME="badge_tagc">> - </a> -</p></code> - </longmessage> - </TMPL_IF> - <longmessage> - A <a href="http://www.w3.org/QA/Tools/Icons">full list</a> of icons, with links to alternate formats and colors, is available: - If you like, you can download a copy of the icons - to keep in your local web directory, and change the HTML fragment - above to reference your local image rather than the one on this server. - </longmessage> - </TMPL_IF> - <TMPL_UNLESS NAME="is_upload"> - <TMPL_UNLESS NAME="is_direct_input"> - <longmessage> - If you would like to create a link to <em>this</em> page (i.e., this - validation result) to make it easier to revalidate this page in the - future or to allow others to validate your page, the URI is - <<a href="<TMPL_VAR NAME="file_thispage" ESCAPE="HTML">"><TMPL_VAR NAME="file_thispage" ESCAPE="HTML"></a>> - (or you can just add the current page to your bookmarks or hotlist). - </longmessage> - </TMPL_UNLESS> - </TMPL_UNLESS> - </info> - </infolist> - </informations> - </TMPL_IF> - </result> - </observationresponse> +<observationresponse xmlns="http://www.w3.org/2009/10/unicorn/observationresponse" ref="<TMPL_VAR NAME="file_uri" ESCAPE="HTML">" xml:lang="en"> + +<TMPL_IF NAME="VALID"> +<status value="passed"/> + +<message type="info"> + <title>This Page Is Valid <TMPL_VAR NAME="file_version" ESCAPE="HTML">!</title> + <description> + <TMPL_IF NAME="is_upload"> + The uploaded document "<TMPL_VAR NAME="file_uri" ESCAPE="HTML">" + <TMPL_ELSE> + <TMPL_IF NAME="is_direct_input"> + The uploaded document + <TMPL_ELSE> + The document located at <<a href="<TMPL_VAR NAME="file_uri" ESCAPE="HTML">"><TMPL_VAR NAME="file_uri" ESCAPE="HTML"></a>> + </TMPL_IF> + </TMPL_IF> + <TMPL_IF NAME="is_tentative"> + was <em>tentatively</em> checked as <TMPL_VAR NAME="file_version" ESCAPE="HTML">. + This means that with the use of some fallback or override mechanism, + we successfully performed a formal validation using an SGML, HTML5 and/or XML + Parser(s). In other words, the document would validate as + <TMPL_VAR NAME="file_version" ESCAPE="HTML"> if you changed the markup + to match the changes we have performed automatically, but + <em>it will not be valid until you make these changes</em>. + <TMPL_ELSE> + was successfully checked as + <TMPL_IF NAME="xmlwf_only">well-formed</TMPL_IF> + <TMPL_VAR NAME="file_version" ESCAPE="HTML">. + <TMPL_IF NAME="xmlwf_only"> + This means that we were not able to determine + the exact document type, but that the document passed the XML well-formedness + syntax check. If you wish to wish to perform formal validation of the document, + you can use the "Document Type:" option of the validator. + <TMPL_ELSE> + This means that the resource in question identified itself as + "<TMPL_VAR NAME="file_version" ESCAPE="HTML">" and that we successfully + performed a formal validation using an SGML, HTML5 and/or XML + Parser(s) (depending on the markup language used). + </TMPL_IF> + </TMPL_IF> + <TMPL_IF NAME="badge_uri"> + To show your readers that you have taken the care to create an + interoperable Web page, you may display this icon on any page + that validates. Here is the HTML you could use to add this icon + to your Web page: + <img class="inline-badge" src="<TMPL_VAR NAME="badge_uri" ESCAPE="HTML">" + alt="<TMPL_VAR NAME="badge_alt" ESCAPE="HTML">" + <TMPL_IF NAME="badge_h">height="<TMPL_VAR NAME="badge_h">"</TMPL_IF> + <TMPL_IF NAME="badge_w">width="<TMPL_VAR NAME="badge_w">"</TMPL_IF> + /> +<pre><code><p<TMPL_IF NAME="badge_rdfa"> about="" + resource="<TMPL_VAR NAME="badge_rdfa">" + rel="dc:conformsTo" xmlns:dc="http://purl.org/dc/terms/"</TMPL_IF>> + <a href="<TMPL_VAR NAME="cfg_home_page" ESCAPE="HTML">check?uri=referer"> + <img src="<TMPL_VAR NAME="badge_uri" ESCAPE="HTML">" + <TMPL_IF NAME="badge_alt">alt="<TMPL_VAR NAME="badge_alt" ESCAPE="HTML">"</TMPL_IF> + style="<TMPL_IF NAME="badge_h">height: <TMPL_VAR NAME="badge_h">;</TMPL_IF> <TMPL_IF NAME="badge_w">width: <TMPL_VAR NAME="badge_w">;</TMPL_IF>"<TMPL_VAR NAME="badge_tagc">> + </a> +</p></code></pre> + + <TMPL_IF NAME="badge_alt_uri"> + <img class="inline-badge" src="<TMPL_VAR NAME="badge_alt_uri" ESCAPE="HTML">" + alt="<TMPL_VAR NAME="badge_alt" ESCAPE="HTML">" + <TMPL_IF NAME="badge_h">height="<TMPL_VAR NAME="badge_h">"</TMPL_IF> + <TMPL_IF NAME="badge_w">width="<TMPL_VAR NAME="badge_w">"</TMPL_IF> + /> +<pre><code><p<TMPL_IF NAME="badge_rdfa"> about="" + resource="<TMPL_VAR NAME="badge_rdfa">" + rel="dc:conformsTo" xmlns:dc="http://purl.org/dc/terms/"</TMPL_IF>> + <a href="<TMPL_VAR NAME="cfg_home_page" ESCAPE="HTML">check?uri=referer"> + <img src="<TMPL_VAR NAME="badge_alt_uri" ESCAPE="HTML">" + <TMPL_IF NAME="badge_alt">alt="<TMPL_VAR NAME="badge_alt" ESCAPE="HTML">"</TMPL_IF> + style="<TMPL_IF NAME="badge_h">height: <TMPL_VAR NAME="badge_h">;</TMPL_IF> <TMPL_IF NAME="badge_w">width: <TMPL_VAR NAME="badge_w">;</TMPL_IF>"<TMPL_VAR NAME="badge_tagc">> + </a> +</p></code></pre> + + </TMPL_IF> + A <a href="http://www.w3.org/QA/Tools/Icons">full list</a> of icons, with links to alternate formats and colors, is available: + If you like, you can download a copy of the icons + to keep in your local web directory, and change the HTML fragment + above to reference your local image rather than the one on this server. + </TMPL_IF> + <TMPL_UNLESS NAME="is_upload"> + <TMPL_UNLESS NAME="is_direct_input"> + If you would like to create a link to <em>this</em> page (i.e., this + validation result) to make it easier to revalidate this page in the + future or to allow others to validate your page, the URI is + <<a href="<TMPL_VAR NAME="file_thispage" ESCAPE="HTML">"><TMPL_VAR NAME="file_thispage" ESCAPE="HTML"></a>> + (or you can just add the current page to your bookmarks or hotlist). + </TMPL_UNLESS> + </TMPL_UNLESS> + </description> +</message> +</TMPL_IF> + +<TMPL_LOOP NAME="file_errors"> + +<TMPL_IF NAME="have_warnings"> +<message type="warning"> + <title><TMPL_INCLUDE NAME="ucn_warnings.tmpl"></title> +</message> +</TMPL_IF> + +<TMPL_IF NAME="err_type_err"> +<message type="error"> + <context line="<TMPL_VAR NAME="line">" column="<TMPL_VAR NAME="char" ESCAPE="HTML">"><TMPL_VAR NAME="src"></context> + <title><TMPL_VAR NAME="msg" ESCAPE="HTML"></title> +</message> +</TMPL_IF> + +<TMPL_IF NAME="err_type_warn"> +<message type="warning"> + <context line="<TMPL_VAR NAME="line">" column="<TMPL_VAR NAME="char" ESCAPE="HTML">"><TMPL_VAR NAME="src"></context> + <title><TMPL_VAR NAME="msg" ESCAPE="HTML"></title> +</message> +</TMPL_IF> + +</TMPL_LOOP> + +</observationresponse> diff --git a/share/templates/en_US/ucn_warnings.tmpl b/share/templates/en_US/ucn_warnings.tmpl index 6e97c24..4249ecc 100644 --- a/share/templates/en_US/ucn_warnings.tmpl +++ b/share/templates/en_US/ucn_warnings.tmpl @@ -1,95 +1,93 @@ <TMPL_IF NAME="W01"> - <warning><messageid>W01</messageid><message>Missing "charset" attribute for - "<TMPL_VAR NAME="W01_ct" ESCAPE="HTML">" document.</message></warning> + Missing "charset" attribute for "<TMPL_VAR NAME="W01_ct" ESCAPE="HTML">" document. </TMPL_IF> <TMPL_IF NAME="W02"> - <warning><messageid>W02</messageid><message>No Character Encoding Found!</message></warning> + No Character Encoding Found! </TMPL_IF> <TMPL_IF NAME="W03"> - <warning><messageid>W03</messageid><message>Character Encoding Override in effect!</message></warning> + Character Encoding Override in effect! </TMPL_IF> <TMPL_IF NAME="W04"> - <warning><messageid>W04</messageid><message>No Character Encoding Found! - <TMPL_IF NAME="W04_override"> - Using - <TMPL_ELSE> - Falling back to - </TMPL_IF> - <TMPL_IF NAME="W04_charset"><TMPL_VAR NAME="W04_charset" ESCAPE="HTML"><TMPL_ELSE>UTF-8</TMPL_IF>. - </message></warning> + No Character Encoding Found! + <TMPL_IF NAME="W04_override"> + Using + <TMPL_ELSE> + Falling back to + </TMPL_IF> + <TMPL_IF NAME="W04_charset"><TMPL_VAR NAME="W04_charset" ESCAPE="HTML"><TMPL_ELSE>UTF-8</TMPL_IF>. </TMPL_IF> <TMPL_IF NAME="W05"> - <warning><messageid>W05</messageid><message>DOCTYPE Override in effect!</message></warning> + DOCTYPE Override in effect! </TMPL_IF> <TMPL_IF NAME="W06"> - <warning><messageid>W06</messageid><message>Unable to Determine Parse Mode!</message></warning> + Unable to Determine Parse Mode! </TMPL_IF> <TMPL_IF NAME="W07"> - <warning><messageid>W07</messageid><message>Contradictory Parse Modes Detected!</message></warning> + Contradictory Parse Modes Detected! </TMPL_IF> <TMPL_IF NAME="W08"> - <warning><messageid>W08</messageid><message>No Content-Type Found!</message></warning> + No Content-Type Found! </TMPL_IF> <TMPL_IF NAME="W09"> - <warning><messageid>W09</messageid><message>No DOCTYPE found! Attempting validation with <TMPL_VAR NAME="W09_dtd" ESCAPE="HTML">.</message></warning> + No DOCTYPE found! Attempting validation with <TMPL_VAR NAME="W09_dtd" ESCAPE="HTML">. </TMPL_IF> <TMPL_IF NAME="W09xml"> - <warning><messageid>W09xml</messageid><message>No DOCTYPE found! Checking XML syntax only.</message></warning> + xmlNo DOCTYPE found! Checking XML syntax only. </TMPL_IF> <TMPL_IF NAME="W10"> - <warning><messageid>W10</messageid><message>Unknown Namespace Found</message></warning> + Unknown Namespace Found </TMPL_IF> <TMPL_IF NAME="W11"> - <warning><messageid>W11</messageid><message>Namespace Found in non-XML Document</message></warning> + Namespace Found in non-XML Document </TMPL_IF> <TMPL_IF NAME="W12"> - <warning><messageid>W12</messageid><message>No Namespace Found</message></warning> + No Namespace Found </TMPL_IF> <TMPL_IF NAME="W13"> - <warning><messageid>W13</messageid><message>DOCTYPE Override in effect!</message></warning> + DOCTYPE Override in effect! </TMPL_IF> <TMPL_IF NAME="W14"> - <warning><messageid>W14</messageid><message>No DOCTYPE Found!</message></warning> + No DOCTYPE Found! </TMPL_IF> <TMPL_IF NAME="W15"> - <warning><messageid>W15</messageid><message>DOCTYPE Override in effect!</message></warning> + DOCTYPE Override in effect! </TMPL_IF> <TMPL_IF NAME="W16"> - <warning><messageid>W16</messageid><message>No DOCTYPE Found! Falling Back to - <TMPL_VAR NAME="W16_dtd" ESCAPE="HTML">.</message></warning> + No DOCTYPE Found! Falling Back to + <TMPL_VAR NAME="W16_dtd" ESCAPE="HTML">. </TMPL_IF> <TMPL_IF NAME="W17"> - <warning><messageid>W17</messageid><message>No Character Encoding detected!</message></warning> + No Character Encoding detected! </TMPL_IF> <TMPL_IF NAME="W18"> - <warning><messageid>W18</messageid><message>Character Encoding mismatch!</message></warning> + Character Encoding mismatch! </TMPL_IF> <TMPL_IF NAME="W19"> - <warning><messageid>W19</messageid><message>Character Encoding mismatch!</message></warning> + Character Encoding mismatch! </TMPL_IF> <TMPL_IF NAME="W20"> - <warning><messageid>W20</messageid><message>Character Encoding mismatch!</message></warning> + Character Encoding mismatch! </TMPL_IF> <TMPL_IF NAME="W21"> - <warning><messageid>W21</messageid><message>Byte-Order Mark found in UTF-8 File.</message></warning> + Byte-Order Mark found in UTF-8 File. </TMPL_IF> <TMPL_IF NAME="W22"> -<warning><messageid>W22</messageid><message>Character Encoding suggestion: use -<TMPL_VAR NAME="W22_suggested" ESCAPE="HTML"> instead of <TMPL_VAR NAME="W22_declared" ESCAPE="HTML"></warning></message> + Character Encoding suggestion: use + <TMPL_VAR NAME="W22_suggested" ESCAPE="HTML"> instead of <TMPL_VAR NAME="W22_declared" ESCAPE="HTML"></warning></message> </TMPL_IF> <TMPL_IF NAME="W23"> - <warning><messageid>W23</messageid><message>Conflict between Mime Type and Document Type</message></warning> + Conflict between Mime Type and Document Type </TMPL_IF> <TMPL_IF NAME="W24"> - <warning><messageid>W24</messageid><message>Rare or unregistered Character Encoding detected</message></warning> + Rare or unregistered Character Encoding detected </TMPL_IF> <TMPL_IF NAME="W25"> - <warning><messageid>W25</messageid><message><TMPL_VAR NAME="W25_dtd" ESCAPE="HTML"> document without DOCTYPE detected</message></warning> + <TMPL_VAR NAME="W25_dtd" ESCAPE="HTML"> document without DOCTYPE detected </TMPL_IF> <TMPL_IF NAME="W26"> - <warning><messageid>W26</messageid><message>Mismatch between Public and System identifiers in the DOCTYPE declaration</message></warning> + Mismatch between Public and System identifiers in the DOCTYPE declaration </TMPL_IF> <TMPL_IF NAME="W@@"> - <warning><messageid>W@@</messageid><message></message></warning> + W@@ </TMPL_IF> |