validator/share/templates/en_US error_loop.tmpl,1.3,1.4 error_loop_grouped.tmpl,1.2,1.3 fatal-error.tmpl,1.15,1.16 warnings.tmpl,1.21,1.22

Update of /sources/public/validator/share/templates/en_US
In directory hutz:/tmp/cvs-serv842/share/templates/en_US

Modified Files:
	error_loop.tmpl error_loop_grouped.tmpl fatal-error.tmpl 
	warnings.tmpl 
Log Message:
Using little icons to mark error, warnings, info, based on public domain images.



Index: error_loop_grouped.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/error_loop_grouped.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- error_loop_grouped.tmpl	15 Mar 2007 07:02:35 -0000	1.2
+++ error_loop_grouped.tmpl	29 Mar 2007 06:17:55 -0000	1.3
@@ -2,8 +2,8 @@
         <ol id="error_loop"></TMPL_IF>
   <TMPL_LOOP NAME="file_errors">
       <li class="grouped <TMPL_VAR NAME="class">">
-<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>
-<span class="msg"><TMPL_VAR NAME="msg" ESCAPE="HTML"></span> 
+          <span class="err_type"><TMPL_IF NAME="err_type_info"><img src="images/info_icons/info.png" alt="Info" title="Info" /></TMPL_IF><TMPL_IF NAME="err_type_warn"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></TMPL_IF><TMPL_IF NAME="err_type_err"><img src="images/info_icons/error.png" alt="Error" title="Error" /></TMPL_IF></span>
+<span class="msg"><TMPL_VAR NAME="generic_msg" ESCAPE="HTML"></span> 
 <TMPL_IF NAME="expl"><TMPL_VAR NAME="expl"></TMPL_IF>
         <TMPL_IF NAME="instances">
         <ul>
@@ -11,7 +11,8 @@
                         <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>
+                              column <TMPL_VAR NAME="char" ESCAPE="HTML"></em>:
+                              <span><TMPL_VAR NAME="msg" ESCAPE="HTML"></span> 
                               <pre><code class="input"><TMPL_VAR NAME="src"></code></pre>
                         </li>
               

Index: fatal-error.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/fatal-error.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- fatal-error.tmpl	12 Oct 2006 04:30:50 -0000	1.15
+++ fatal-error.tmpl	29 Mar 2007 06:17:55 -0000	1.16
@@ -1,13 +1,7 @@
 <TMPL_INCLUDE NAME="header.tmpl">
 
     <div id="main">
-      <div id="head">
-        <TMPL_INCLUDE NAME="table.tmpl">
-      </div><!-- end of "head" -->
-      <TMPL_IF NAME="have_warnings">
-        <TMPL_INCLUDE NAME="warnings.tmpl">
-      </TMPL_IF>
-
+      
 	  <div id="result">
 	    <h2 id="results" class="invalid">Sorry! This document can not be checked.</h2>
 

Index: warnings.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/warnings.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- warnings.tmpl	16 Mar 2007 12:44:07 -0000	1.21
+++ warnings.tmpl	29 Mar 2007 06:17:55 -0000	1.22
@@ -4,7 +4,7 @@
 <ol id="warnings">
 
 <TMPL_IF NAME="W01">
-  <li class="msg_warn" id="W01"><span class="err_type">Warning</span> <span class="msg">Missing "<code>charset</code>" attribute for
+  <li class="msg_warn" id="W01"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">Missing "<code>charset</code>" attribute for
     "<code><TMPL_VAR NAME="W01_ct" ESCAPE="HTML"></code>" document.</span>
     <p>
       The HTTP <code>Content-Type</code> header
@@ -28,7 +28,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W02">
-  <li class="msg_warn" id="W02"><span class="err_type">Warning</span> <span class="msg">No Character Encoding Found!</span>
+  <li class="msg_warn" id="W02"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">No Character Encoding Found!</span>
   
     <p>
       Falling back to
@@ -38,7 +38,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W03">
-  <li class="msg_warn" id="W03"><span class="err_type">Warning</span> <span class="msg">Character Encoding Override in effect!</span>
+  <li class="msg_warn" id="W03"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">Character Encoding Override in effect!</span>
   
     <p>
       The detected character encoding
@@ -49,7 +49,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W04">
-  <li class="msg_warn" id="W04"><span class="err_type">Warning</span> <span class="msg">No Character Encoding Found!</span>
+  <li class="msg_warn" id="W04"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">No Character Encoding Found!</span>
     <TMPL_IF NAME="W04_override">
       Using
     <TMPL_ELSE>
@@ -118,7 +118,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W05">
-  <li class="msg_warn" id="W05"><span class="err_type">Warning</span> <span class="msg"><code>DOCTYPE</code> Override in effect!</span>
+  <li class="msg_warn" id="W05"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg"><code>DOCTYPE</code> Override in effect!</span>
   
     <p>
       Any DOCTYPE Declaration in the document has been suppressed and the
@@ -130,7 +130,7 @@
 </TMPL_IF>
 
 <TMPL_IF NAME="W23">
-  <li class="msg_warn" id="W23"><span class="err_type">Warning</span> <span class="msg">Conflict between Mime Type and Document Type</span>
+  <li class="msg_warn" id="W23"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">Conflict between Mime Type and Document Type</span>
   
     <p>The document is being served with the  <code><TMPL_VAR NAME="W23_type" ESCAPE="HTML"></code> Mime Type
       which is not a registered media type for the 
@@ -153,13 +153,13 @@
 </TMPL_IF>
 
 <TMPL_IF NAME="W06">
-  <li class="msg_warn" id="W06"><span class="err_type">Warning</span> <span class="msg">Unable to Determine Parse Mode!</span>
+  <li class="msg_warn" id="W06"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">Unable to Determine Parse Mode!</span>
   <p>Neither the MIME Media Type (<code><TMPL_VAR NAME="W06_mime" ESCAPE="HTML"></code>)
      nor the document type for this document are sufficient to reliably choose 
      a parsing mode. Falling back to SGML mode.</p></li>
 </TMPL_IF>
 <TMPL_IF NAME="W07">
-  <li class="msg_warn" id="W07"><span class="err_type">Warning</span> <span class="msg">Contradictory Parse Modes Detected!</span>
+  <li class="msg_warn" id="W07"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">Contradictory Parse Modes Detected!</span>
   
     <p>
       The MIME Media Type
@@ -173,7 +173,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W08">
-  <li class="msg_warn" id="W08"><span class="err_type">Warning</span> <span class="msg">Unknown Parse Mode!</span>
+  <li class="msg_warn" id="W08"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">Unknown Parse Mode!</span>
   
     <p>
       The MIME Media Type
@@ -186,7 +186,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W09">
-  <li class="msg_warn" id="W09"><span class="err_type">Warning</span> <span class="msg">No <code>DOCTYPE</code> found! Attempting validation with <TMPL_VAR NAME="W09_dtd" ESCAPE="HTML">.</span>
+  <li class="msg_warn" id="W09"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">No <code>DOCTYPE</code> found! Attempting validation with <TMPL_VAR NAME="W09_dtd" ESCAPE="HTML">.</span>
   
     <p>
       The DOCTYPE Declaration was not recognized or is missing. This
@@ -238,7 +238,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W10">
-  <li class="msg_warn" id="W10"><span class="err_type">Warning</span> <span class="msg">Unknown Namespace Found</span>
+  <li class="msg_warn" id="W10"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">Unknown Namespace Found</span>
   
     <p>
       Unknown namespace "<code><TMPL_VAR NAME="W10_ns" ESCAPE="HTML"></code>"
@@ -247,7 +247,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W11">
-  <li class="msg_warn" id="W11"><span class="err_type">Warning</span> <span class="msg">Namespace Found in non-XML Document</span>
+  <li class="msg_warn" id="W11"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">Namespace Found in non-XML Document</span>
   
     <p>
       Namespace "<code><TMPL_VAR NAME="W11_rns" ESCAPE="HTML"></code>" found,
@@ -256,7 +256,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W12">
-  <li class="msg_warn" id="W12"><span class="err_type">Warning</span> <span class="msg">No Namespace Found</span>
+  <li class="msg_warn" id="W12"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">No Namespace Found</span>
   
     <p>
       No Namespace was found, but document type requires one to be present!
@@ -264,7 +264,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W13">
-  <li class="msg_warn" id="W13"><span class="err_type">Warning</span> <span class="msg"><code>DOCTYPE</code> Override in effect!</span>
+  <li class="msg_warn" id="W13"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg"><code>DOCTYPE</code> Override in effect!</span>
   
     <p>
       The detected DOCTYPE Declaration
@@ -277,7 +277,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W14">
-  <li class="msg_warn" id="W14"><span class="err_type">Warning</span> <span class="msg">No <code>DOCTYPE</code> Found!</span>
+  <li class="msg_warn" id="W14"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">No <code>DOCTYPE</code> Found!</span>
   
     <p>
       Falling back to HTML 4.01 Transitional.
@@ -286,7 +286,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W15">
-  <li class="msg_warn" id="W15"><span class="err_type">Warning</span> <span class="msg"><code>DOCTYPE</code> Override in effect!</span>
+  <li class="msg_warn" id="W15"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg"><code>DOCTYPE</code> Override in effect!</span>
   
     <p>
       The DOCTYPE Declaration for "<TMPL_VAR NAME="W15_dtd" ESCAPE="HTML">"
@@ -297,7 +297,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W16">
-  <li class="msg_warn" id="W16"><span class="err_type">Warning</span> <span class="msg">No DOCTYPE Found! Falling Back to
+  <li class="msg_warn" id="W16"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">No DOCTYPE Found! Falling Back to
     <TMPL_VAR NAME="W16_dtd" ESCAPE="HTML">.</span>
   
     <p>
@@ -326,7 +326,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W17">
-  <li class="msg_warn" id="W17"><span class="err_type">Warning</span> <span class="msg">No Character Encoding detected!</span>
+  <li class="msg_warn" id="W17"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">No Character Encoding detected!</span>
   
     <p>
       To ensure correct validation, processing, and display, it is important
@@ -337,7 +337,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W18">
-  <li class="msg_warn" id="W18"><span class="err_type">Warning</span> <span class="msg">Character Encoding mismatch!</span>
+  <li class="msg_warn" id="W18"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">Character Encoding mismatch!</span>
   
     <p>
       The character encoding specified in the HTTP header
@@ -350,7 +350,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W19">
-  <li class="msg_warn" id="W19"><span class="err_type">Warning</span> <span class="msg">Character Encoding mismatch!</span>
+  <li class="msg_warn" id="W19"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">Character Encoding mismatch!</span>
   
     <p>
       The character encoding specified in the HTTP header
@@ -364,7 +364,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W20">
-  <li class="msg_warn" id="W20"><span class="err_type">Warning</span> <span class="msg">Character Encoding mismatch!</span>
+  <li class="msg_warn" id="W20"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">Character Encoding mismatch!</span>
   
     <p>
       The character encoding specified in the XML declaration
@@ -378,7 +378,7 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W21">
-  <li class="msg_warn" id="W21"><span class="err_type">Warning</span> <span class="msg">Byte-Order Mark found in UTF-8 File.</span>
+  <li class="msg_warn" id="W21"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">Byte-Order Mark found in UTF-8 File.</span>
   
     <p>
       The Unicode Byte-Order Mark (BOM) in UTF-8 encoded files is known to
@@ -388,13 +388,6 @@
   </li>
 </TMPL_IF>
 
-<TMPL_IF NAME="W22">
-  <li class="msg_warn" id="W22"><span class="err_type">Warning</span> <span class="msg">XML not well-formed</span>
-  
-    <p><TMPL_VAR NAME="W22_Messages" ESCAPE="HTML">
-    </p>
-  </li>
-</TMPL_IF>
 
 
 <TMPL_IF NAME="W@@">

Index: error_loop.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/error_loop.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- error_loop.tmpl	20 Feb 2007 02:09:11 -0000	1.3
+++ error_loop.tmpl	29 Mar 2007 06:17:55 -0000	1.4
@@ -2,9 +2,9 @@
 <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>
+<span class="err_type"><TMPL_IF NAME="err_type_info"><img src="images/info_icons/info.png" alt="Info" title="Info" /></TMPL_IF><TMPL_IF NAME="err_type_warn"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></TMPL_IF><TMPL_IF NAME="err_type_err"><img src="images/info_icons/error.png" alt="Error" title="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>:
+            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>
@@ -14,8 +14,8 @@
 <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="err_type"><TMPL_IF NAME="err_type_info"><img src="images/info_icons/info.png" alt="Info" title="Info" /></TMPL_IF><TMPL_IF NAME="err_type_warn"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></TMPL_IF><TMPL_IF NAME="err_type_err"><img src="images/info_icons/error.png" alt="Error" title="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>    

Received on Thursday, 29 March 2007 06:18:09 UTC