- From: Ville Skytta <ville@dev.w3.org>
- Date: Sat, 15 Jan 2005 15:20:41 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/validator/share/templates/en_US
In directory hutz:/tmp/cvs-serv14788/share/templates/en_US
Modified Files:
feedback.tmpl invalid.tmpl opt_show_source.tmpl table.tmpl
tip.tmpl valid.tmpl
Log Message:
Move more HTML escaping to templates.
Index: table.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/table.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- table.tmpl 9 Jan 2005 19:22:26 -0000 1.12
+++ table.tmpl 15 Jan 2005 15:20:39 -0000 1.13
@@ -3,31 +3,31 @@
<table class="header">
<tr>
<TMPL_IF NAME="is_upload">
- <th>File:</th><td colspan="2"><TMPL_VAR NAME="file_uri"></td>
+ <th>File:</th><td colspan="2"><TMPL_VAR NAME="file_uri" ESCAPE="HTML"></td>
<TMPL_ELSE>
<th><label title="Address of Page to Validate (accesskey: 1)" for="uri">Address</label>:</th>
- <td colspan="2"><input accesskey="1" type="text" id="uri" name="uri" value="<TMPL_VAR NAME="file_uri">" /></td>
+ <td colspan="2"><input accesskey="1" type="text" id="uri" name="uri" value="<TMPL_VAR NAME="file_uri" ESCAPE="HTML">" /></td>
</TMPL_IF>
</tr>
<TMPL_IF NAME="opt_verbose">
- <tr><th>Modified:</th><td colspan="2"><TMPL_VAR NAME="file_modified"></td></tr>
- <tr><th>Server:</th><td colspan="2"><TMPL_VAR NAME="file_server"></td></tr>
- <tr><th>Size:</th><td colspan="2"><TMPL_VAR NAME="file_size"></td></tr>
- <tr><th>Content-Type:</th><td colspan="2"><TMPL_VAR NAME="file_contenttype"></td></tr>
+ <tr><th>Modified:</th><td colspan="2"><TMPL_VAR NAME="file_modified" ESCAPE="HTML"></td></tr>
+ <tr><th>Server:</th><td colspan="2"><TMPL_VAR NAME="file_server" ESCAPE="HTML"></td></tr>
+ <tr><th>Size:</th><td colspan="2"><TMPL_VAR NAME="file_size" ESCAPE="HTML"></td></tr>
+ <tr><th>Content-Type:</th><td colspan="2"><TMPL_VAR NAME="file_contenttype" ESCAPE="HTML"></td></tr>
</TMPL_IF>
<TMPL_IF NAME="opt_debug">
<TMPL_LOOP NAME="debug">
- <tr><th><TMPL_VAR NAME="name">:</th><td colspan="2"><TMPL_VAR NAME="value"></td></tr>
+ <tr><th><TMPL_VAR NAME="name" ESCAPE="HTML">:</th><td colspan="2"><TMPL_VAR NAME="value" ESCAPE="HTML"></td></tr>
</TMPL_LOOP>
</TMPL_IF>
<TMPL_IF NAME="is_upload">
- <tr><th>Encoding:</th><td colspan="2"><TMPL_VAR NAME="file_charset"></td></tr>
- <tr><th>Doctype:</th><td colspan="2"><TMPL_VAR NAME="file_version"></td></tr>
+ <tr><th>Encoding:</th><td colspan="2"><TMPL_VAR NAME="file_charset" ESCAPE="HTML"></td></tr>
+ <tr><th>Doctype:</th><td colspan="2"><TMPL_VAR NAME="file_version" ESCAPE="HTML"></td></tr>
<TMPL_ELSE>
<TMPL_IF NAME="file_charset">
<tr>
<th><label accesskey="2" title="Character Encoding (accesskey: 2)" for="charset">Encoding</label>:</th>
- <td><TMPL_VAR NAME="file_charset"></td><td><TMPL_INCLUDE NAME="popup_charset.tmpl"></td>
+ <td><TMPL_VAR NAME="file_charset" ESCAPE="HTML"></td><td><TMPL_INCLUDE NAME="popup_charset.tmpl"></td>
</tr>
<TMPL_ELSE>
<tr><th>Encoding:</th><td colspan="2"><TMPL_INCLUDE NAME="popup_charset.tmpl"></td></tr>
@@ -35,7 +35,7 @@
<TMPL_IF NAME="file_version">
<tr>
<th><label accesskey="3" for="doctype" title="Document Type (accesskey: 3)">Doctype</label>:</th>
- <td><TMPL_VAR NAME="file_version"></td><td><TMPL_INCLUDE NAME="popup_doctype.tmpl"></td>
+ <td><TMPL_VAR NAME="file_version" ESCAPE="HTML"></td><td><TMPL_INCLUDE NAME="popup_doctype.tmpl"></td>
</tr>
<TMPL_ELSE>
<tr><th>Doctype:</th><td colspan="2"><TMPL_INCLUDE NAME="popup_doctype.tmpl"></td></tr>
@@ -44,7 +44,7 @@
<TMPL_IF NAME="file_namespace">
<tr>
<th>Root Namespace:</th>
- <td colspan="2"><a href="<TMPL_VAR NAME="file_namespace">"><TMPL_VAR NAME="file_namespace"></a></td>
+ <td colspan="2"><a href="<TMPL_VAR NAME="file_namespace" ESCAPE="HTML">"><TMPL_VAR NAME="file_namespace" ESCAPE="HTML"></a></td>
</tr>
</TMPL_IF>
<TMPL_IF NAME="file_namespaces">
@@ -52,7 +52,7 @@
<th>Other Namespaces</th>
<td colspan="2">
<ul>
- <TMPL_LOOP NAME="file_namespaces"><li><a href="<TMPL_VAR NAME="uri">"><TMPL_VAR NAME="uri"></a></li></TMPL_LOOP>
+ <TMPL_LOOP NAME="file_namespaces"><li><a href="<TMPL_VAR NAME="uri" ESCAPE="HTML">"><TMPL_VAR NAME="uri" ESCAPE="HTML"></a></li></TMPL_LOOP>
</ul>
</td>
</tr>
Index: feedback.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/feedback.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- feedback.tmpl 13 Jan 2005 07:59:15 -0000 1.5
+++ feedback.tmpl 15 Jan 2005 15:20:39 -0000 1.6
@@ -23,9 +23,9 @@
<TMPL_IF NAME="errmsg_id">
- <p>You are sending feedback on error message [<TMPL_VAR NAME="errmsg_id">]: "<TMPL_VAR NAME="explanation">".</p>
+ <p>You are sending feedback on error message [<TMPL_VAR NAME="errmsg_id" ESCAPE="HTML">]: "<TMPL_VAR NAME="explanation" ESCAPE="HTML">".</p>
<p>Before you send this message, we encourage you to
- <a href="http://www.w3.org/Search/Mail/Public/search?type-index=www-validator&index-type=t&keywords=%5BVE%5D%5B<TMPL_VAR NAME="errmsg_id">%5D&search=Search">search the archives for existing messages</a> on this error
+ <a href="http://www.w3.org/Search/Mail/Public/search?type-index=www-validator&index-type=t&keywords=%5BVE%5D%5B<TMPL_VAR NAME="errmsg_id" ESCAPE="URL">%5D&search=Search">search the archives for existing messages</a> on this error
in case your feedback has already been sent, or answers to
your query have already been given. </p>
<TMPL_ELSE>
Index: opt_show_source.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/opt_show_source.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- opt_show_source.tmpl 3 Jan 2003 20:21:55 -0000 1.2
+++ opt_show_source.tmpl 15 Jan 2005 15:20:39 -0000 1.3
@@ -4,7 +4,7 @@
<p>Below is the source input I used for this validation:</p>
<ol class="source">
<TMPL_LOOP NAME="file_source">
- <li id="line-<TMPL_VAR NAME="file_source_i">"><TMPL_VAR NAME="file_source_line"></li>
+ <li id="line-<TMPL_VAR NAME="__counter__">"><TMPL_VAR NAME="file_source_line" ESCAPE="HTML"></li>
</TMPL_LOOP>
</ol>
</div>
Index: valid.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/valid.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- valid.tmpl 9 Jan 2005 14:29:34 -0000 1.6
+++ valid.tmpl 15 Jan 2005 15:20:39 -0000 1.7
@@ -1,17 +1,17 @@
<div id="result">
<TMPL_IF NAME="is_tentative">
- <h2 class="valid">This Page Is <em>Tentatively</em> Valid <TMPL_VAR NAME="file_version"> (Tentatively Valid)!</h2>
+ <h2 class="valid">This Page Is <em>Tentatively</em> Valid <TMPL_VAR NAME="file_version" ESCAPE="HTML"> (Tentatively Valid)!</h2>
<TMPL_ELSE>
- <h2 class="valid">This Page Is Valid <TMPL_VAR NAME="file_version">!</h2>
+ <h2 class="valid">This Page Is Valid <TMPL_VAR NAME="file_version" ESCAPE="HTML">!</h2>
</TMPL_IF>
<dl class="tip">
<dt><a href="http://www.w3.org/2001/06tips/">Tip Of The Day</a>:</dt>
- <dd><a href="<TMPL_VAR NAME="tip_uri">"><TMPL_VAR NAME="tip_slug"></a></dd>
+ <dd><a href="<TMPL_VAR NAME="tip_uri" ESCAPE="HTML">"><TMPL_VAR NAME="tip_slug"></a></dd>
</dl>
<TMPL_IF NAME="file_warnings">
<dl id="warnings">
<TMPL_LOOP NAME="file_warnings">
- <dt><TMPL_VAR NAME="Title"></dt>
+ <dt><TMPL_VAR NAME="Title" ESCAPE="HTML"></dt>
<dd>
<TMPL_VAR NAME="Message">
</dd>
@@ -20,23 +20,24 @@
</TMPL_IF>
<p>
<TMPL_IF NAME="is_upload">
- The uploaded document "<TMPL_VAR NAME="file_uri">"
+ The uploaded document "<TMPL_VAR NAME="file_uri" ESCAPE="HTML">"
<TMPL_ELSE>
The document located at
- <<a href="<TMPL_VAR NAME="file_uri">"><TMPL_VAR NAME="file_uri"></a>>
+ <<a href="<TMPL_VAR NAME="file_uri" ESCAPE="HTML">"><TMPL_VAR NAME="file_uri" ESCAPE="HTML"></a>>
</TMPL_IF>
- was checked and found to be valid <TMPL_VAR NAME="file_version">.
- This means that the resource in question identified itself as
- "<TMPL_VAR NAME="file_version">" and that we successfully performed a
- formal validation using an SGML or XML Parser (depending on the
- markup language used).
+ was checked and found to be valid
+ <TMPL_VAR NAME="file_version" ESCAPE="HTML">. 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 or XML Parser (depending on
+ the markup language used).
</p>
<TMPL_IF NAME="have_badge">
<p>
<img
class="inline-badge"
- src="<TMPL_VAR NAME="badge_uri">"
- alt="<TMPL_VAR NAME="badge_alt">"
+ src="<TMPL_VAR NAME="badge_uri" ESCAPE="HTML">"
+ alt="<TMPL_VAR NAME="badge_alt" ESCAPE="HTML">"
<TMPL_VAR NAME="badge_gifhw"> />
To show your readers that you have taken the care to create an
interoperable Web page, you may display this icon on any page
@@ -45,15 +46,15 @@
</p>
<pre>
<p>
- <a href="<TMPL_VAR NAME="cfg_home_page">/check/referer"><img
- src="<TMPL_VAR NAME="badge_uri">"
- alt="<TMPL_VAR NAME="badge_alt">"<TMPL_VAR NAME="badge_gifhw"><TMPL_VAR NAME="badge_xhtml">></a>
+ <a href="<TMPL_VAR NAME="cfg_home_page" ESCAPE="HTML">/check/referer"><img
+ src="<TMPL_VAR NAME="badge_uri" ESCAPE="HTML">"
+ alt="<TMPL_VAR NAME="badge_alt" ESCAPE="HTML">"<TMPL_VAR NAME="badge_gifhw"><TMPL_VAR NAME="badge_xhtml">></a>
</p>
</pre>
<p>
If you like, you can download a copy of this image (in
- <a href="<TMPL_VAR NAME="badge_uri">.png">PNG</a> or
- <a href="<TMPL_VAR NAME="badge_uri">.gif">GIF</a>
+ <a href="<TMPL_VAR NAME="badge_uri" ESCAPE="HTML">.png">PNG</a> or
+ <a href="<TMPL_VAR NAME="badge_uri" ESCAPE="HTML">.gif">GIF</a>
format) 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.
</p>
@@ -76,7 +77,7 @@
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">"><TMPL_VAR NAME="file_thispage"></a>>
+ <<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).
</p>
</TMPL_UNLESS>
Index: invalid.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/invalid.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- invalid.tmpl 16 Nov 2004 01:40:06 -0000 1.7
+++ invalid.tmpl 15 Jan 2005 15:20:39 -0000 1.8
@@ -1,9 +1,9 @@
<div id="result">
- <h2 id="results" class="invalid">This page is <strong>not</strong> Valid <TMPL_VAR NAME="file_version">!</h2>
+ <h2 id="results" class="invalid">This page is <strong>not</strong> Valid <TMPL_VAR NAME="file_version" ESCAPE="HTML">!</h2>
<TMPL_IF NAME="file_warnings">
<dl id="warnings">
<TMPL_LOOP NAME="file_warnings">
- <dt><TMPL_VAR NAME="Title"></dt>
+ <dt><TMPL_VAR NAME="Title" ESCAPE="HTML"></dt>
<dd>
<TMPL_VAR NAME="Message">
</dd>
@@ -25,10 +25,10 @@
<ol>
<TMPL_LOOP NAME="file_errors">
<li>
- <em>Line <a href="#line-<TMPL_VAR NAME="line">"><TMPL_VAR NAME="line"></a>,
- column <TMPL_VAR NAME="char"></em>:
- <span class="msg"><TMPL_VAR NAME="msg"></span>
-<TMPL_IF NAME="uri">(<a href="<TMPL_VAR NAME="uri">">explain...</a>)</TMPL_IF>.
+ <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>
Index: tip.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/tip.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tip.tmpl 2 Dec 2002 01:53:16 -0000 1.1
+++ tip.tmpl 15 Jan 2005 15:20:39 -0000 1.2
@@ -1,4 +1,4 @@
<dl class="tip">
<dt><a href="http://www.w3.org/2001/06tips/">Tip Of The Day</a>:</dt>
- <dd><a href="<TMPL_VAR NAME="tip_uri">"><TMPL_VAR NAME="tip_slug"></a></dd>
+ <dd><a href="<TMPL_VAR NAME="tip_uri" ESCAPE="HTML">"><TMPL_VAR NAME="tip_slug"></a></dd>
</dl>
Received on Saturday, 15 January 2005 15:20:42 UTC