Using local images for display, when available.

3 files changed, 63 insertions, 7 deletions

diff --git a/htdocs/config/types.conf b/htdocs/config/types.conf
index bf0fba2..daa8529 100644
--- a/htdocs/config/types.conf
+++ b/htdocs/config/types.conf
@@ -1,7 +1,7 @@
 #
 # Main Document Type Database for the W3C Markup Validation Service.
 #
-# $Id: types.conf,v 1.31 2007-06-25 04:08:47 ot Exp $
+# $Id: types.conf,v 1.32 2007-07-05 07:10:01 ot Exp $
 #
 # Maintains all information for each of the document types we support.
 # See 'perldoc Config::General' for the syntax, and be aware that the
@@ -31,6 +31,8 @@
   <Badge>
     URI     = http://www.w3.org/Icons/valid-html20
     ALT URI = http://www.w3.org/Icons/valid-html20-blue
+#    Local URI     = images/valid_icons/valid-html20
+#    Local ALT URI = images/valid_icons/valid-html20-blue
   </Badge>
 </HTML_2_0>
 
@@ -47,6 +49,8 @@
   <Badge>
     URI     = http://www.w3.org/Icons/valid-html20
     ALT URI = http://www.w3.org/Icons/valid-html20-blue
+    Local URI     = images/valid_icons/valid-html20
+    Local ALT URI = images/valid_icons/valid-html20-blue
   </Badge>
 </HTML_2_0_Level_2>
 
@@ -63,6 +67,8 @@
   <Badge>
     URI     = http://www.w3.org/Icons/valid-html20
     ALT URI = http://www.w3.org/Icons/valid-html20-blue
+    Local URI     = images/valid_icons/valid-html20
+    Local ALT URI = images/valid_icons/valid-html20-blue
   </Badge>
 </HTML_2_0_Strict>
 
@@ -79,6 +85,8 @@
   <Badge>
     URI     = http://www.w3.org/Icons/valid-html20
     ALT URI = http://www.w3.org/Icons/valid-html20-blue
+    Local URI     = images/valid_icons/valid-html20
+    Local ALT URI = images/valid_icons/valid-html20-blue
   </Badge>
 </HTML_2_0_Level_1>
 
@@ -95,6 +103,8 @@
   <Badge>
     URI     = http://www.w3.org/Icons/valid-html20
     ALT URI = http://www.w3.org/Icons/valid-html20-blue
+    Local URI     = images/valid_icons/valid-html20
+    Local ALT URI = images/valid_icons/valid-html20-blue
   </Badge>
 </HTML_2_0_Strict_Level_1>
 
@@ -114,6 +124,8 @@
   <Badge>
     URI    = http://www.w3.org/Icons/valid-html32
     ALT URI = http://www.w3.org/Icons/valid-html32-blue
+    Local URI    = images/valid_icons/valid-html32
+    Local ALT URI = images/valid_icons/valid-html32-blue
     Height = 31
     Width  = 88
   </Badge>
@@ -137,6 +149,8 @@
   <Badge>
     URI    = http://www.w3.org/Icons/valid-html40
     ALT URI = http://www.w3.org/Icons/valid-html40-blue
+    Local URI    = images/valid_icons/valid-html40
+    Local ALT URI = images/valid_icons/valid-html40-blue
     Height = 31
     Width  = 88
     Alt    = Valid HTML 4.0 Strict
@@ -157,6 +171,8 @@
   <Badge>
     URI    = http://www.w3.org/Icons/valid-html40
     ALT URI = http://www.w3.org/Icons/valid-html40-blue
+    Local URI    = images/valid_icons/valid-html40
+    Local ALT URI = images/valid_icons/valid-html40-blue
     Height = 31
     Width  = 88
     Alt    = Valid HTML 4.0 Transitional
@@ -177,6 +193,8 @@
   <Badge>
     URI    = http://www.w3.org/Icons/valid-html40
     ALT URI = http://www.w3.org/Icons/valid-html40-blue
+    Local URI    = images/valid_icons/valid-html40
+    Local ALT URI = images/valid_icons/valid-html40-blue
     Height = 31
     Width  = 88
     Alt    = Valid HTML 4.0 Frameset
@@ -197,6 +215,8 @@
   <Badge>
     URI    = http://www.w3.org/Icons/valid-html401
     ALT URI = http://www.w3.org/Icons/valid-html401-blue
+    Local URI    = images/valid_icons/valid-html401
+    Local ALT URI = images/valid_icons/valid-html401-blue
     Height = 31
     Width  = 88
     Alt    = Valid HTML 4.01 Strict
@@ -217,6 +237,8 @@
   <Badge>
     URI    = http://www.w3.org/Icons/valid-html401
     ALT URI = http://www.w3.org/Icons/valid-html401-blue
+    Local URI    = images/valid_icons/valid-html401
+    Local ALT URI = images/valid_icons/valid-html401-blue
     Height = 31
     Width  = 88
     Alt    = Valid HTML 4.01 Transitional
@@ -237,6 +259,8 @@
   <Badge>
     URI    = http://www.w3.org/Icons/valid-html401
     ALT URI = http://www.w3.org/Icons/valid-html401-blue
+    Local URI    = images/valid_icons/valid-html401
+    Local ALT URI = images/valid_icons/valid-html401-blue
     Height = 31
     Width  = 88
     Alt    = Valid HTML 4.01 Frameset
@@ -259,6 +283,8 @@
   <Badge>
     URI    = http://www.w3.org/Icons/valid-xhtml10
     ALT URI = http://www.w3.org/Icons/valid-xhtml10-blue
+    Local URI    = images/valid_icons/valid-xhtml10
+    Local ALT URI = images/valid_icons/valid-xhtml10-blue
     Height = 31
     Width  = 88
     Alt    = Valid XHTML 1.0 Strict
@@ -281,6 +307,8 @@
   <Badge>
     URI    = http://www.w3.org/Icons/valid-xhtml10
     ALT URI = http://www.w3.org/Icons/valid-xhtml10-blue
+    Local URI    = images/valid_icons/valid-xhtml10
+    Local ALT URI = images/valid_icons/valid-xhtml10-blue
     Height = 31
     Width  = 88
     Alt    = Valid XHTML 1.0 Transitional
@@ -303,6 +331,8 @@
   <Badge>
     URI    = http://www.w3.org/Icons/valid-xhtml10
     ALT URI = http://www.w3.org/Icons/valid-xhtml10-blue
+    Local URI    = images/valid_icons/valid-xhtml10
+    Local ALT URI = images/valid_icons/valid-xhtml10-blue
     Height = 31
     Width  = 88
     Alt    = Valid XHTML 1.0 Frameset
@@ -325,6 +355,8 @@
   <Badge>
     URI    = http://www.w3.org/Icons/valid-xhtmlbasic10
     ALT URI = http://www.w3.org/Icons/valid-xhtmlbasic10-blue
+    Local URI    = images/valid_icons/valid-xhtmlbasic10
+    Local ALT URI = images/valid_icons/valid-xhtmlbasic10-blue
     Height = 31
     Width  = 88
     Alt    = Valid XHTML Basic 1.0
@@ -363,6 +395,8 @@
   <Badge>
     URI    = http://www.w3.org/Icons/valid-xhtmlprint10
     ALT URI = http://www.w3.org/Icons/valid-xhtmlprint10-blue
+    Local URI    = images/valid_icons/valid-xhtmlprint10
+    Local ALT URI = images/valid_icons/valid-xhtmlprint10-blue
     Height = 31
     Width  = 88
     Alt    = Valid XHTML-Print 1.0
@@ -386,6 +420,8 @@
   <Badge>
     URI    = http://www.w3.org/Icons/valid-xhtml11
     ALT URI    = http://www.w3.org/Icons/valid-xhtml11-blue
+    Local URI    = images/valid_icons/valid-xhtml11
+    Local ALT URI    = images/valid_icons/valid-xhtml11-blue
     Height = 31
     Width  = 88
     Alt    = Valid XHTML 1.1
@@ -404,6 +440,7 @@
   </Types>
   <Badge>
     URI    = http://validator.w3.org/images/v15445
+    Local URI    = http://validator.w3.org/images/v15445
     Alt    = Valid ISO/IEC 15445:2000
   </Badge>
 </ISO_IEC_15445_2000>
@@ -420,6 +457,7 @@
   </Types>
   <Badge>
     URI    = http://validator.w3.org/images/v15445
+    Local URI    = /images/v15445
     Alt    = Valid ISO/IEC 15445:2000
   </Badge>
 </ISO_IEC_15445_2000_MARKUP>
@@ -442,6 +480,8 @@
   <Badge>
     URI    = http://www.w3.org/Icons/valid-mathml20
     ALT URI = http://www.w3.org/Icons/valid-mathml20-blue
+    Local URI    = images/valid_icons/valid-mathml20
+    Local ALT URI = images/valid_icons/valid-mathml20-blue
     Height = 31
     Width  = 88
     Alt    = Valid MathML 2.0
@@ -495,6 +535,8 @@
   <Badge>
     URI     = http://www.w3.org/Icons/valid-xhtml-rdfa
     ALT URI    = http://www.w3.org/Icons/valid-xhtml-rdfa-blue
+    Local URI     = images/valid_icons/valid-xhtml-rdfa
+    Local ALT URI    = images/valid_icons/valid-xhtml-rdfa-blue
     Alt     = Valid XHTML + RDFa
   </Badge>
   
@@ -518,7 +560,9 @@
   </Types>
   <Badge>
     URI    = http://www.w3.org/Icons/valid-svg10
-   ALT URI    = http://www.w3.org/Icons/valid-svg10-blue
+    ALT URI    = http://www.w3.org/Icons/valid-svg10-blue
+    Local URI    = images/valid_icons/valid-svg10
+    Local ALT URI    = images/valid_icons/valid-svg10-blue
     Alt    = Valid SVG 1.0
   </Badge>
 </SVG_1_0>
@@ -540,7 +584,9 @@
   </Types>
   <Badge>
     URI    = http://www.w3.org/Icons/valid-svg11
-   ALT URI = http://www.w3.org/Icons/valid-svg11-blue
+    ALT URI = http://www.w3.org/Icons/valid-svg11-blue
+    Local URI    = images/valid_icons/valid-svg11
+    Local ALT URI = images/valid_icons/valid-svg11-blue
     Alt    = Valid SVG 1.1
   </Badge>
 </SVG_1_1>
@@ -561,6 +607,8 @@
   <Badge>
     URI    = http://www.w3.org/Icons/valid-svgtiny11
     ALT URI = http://www.w3.org/Icons/valid-svgtiny11-blue
+    Local URI    = images/valid_icons/valid-svgtiny11
+    Local ALT URI = images/valid_icons/valid-svgtiny11-blue
     Alt    = Valid SVG 1.1 Tiny
   </Badge>
 </SVG_1_1_Tiny>
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check
index 68f713a..33b3e3c 100755
--- a/httpd/cgi-bin/check
+++ b/httpd/cgi-bin/check
@@ -14,7 +14,7 @@
 # This source code is available under the license at:
 #     http://www.w3.org/Consortium/Legal/copyright-software
 #
-# $Id: check,v 1.534 2007-06-29 00:37:37 ot Exp $
+# $Id: check,v 1.535 2007-07-05 07:10:01 ot Exp $
 
 #
 # Disable buffering on STDOUT!
@@ -181,7 +181,7 @@ Directory not readable (permission denied): @_r
 
   #
   # Strings
-  $VERSION =  q$Revision: 1.534 $;
+  $VERSION =  q$Revision: 1.535 $;
   $VERSION =~ s/Revision: ([\d\.]+) /$1/;
 
   #
@@ -1113,10 +1113,18 @@ sub report_valid {
       my $cfg = $CFG->{Types}->{$File->{DOCTYPE}};
       $T->param(have_badge => TRUE);
       $T->param(badge_uri  => $cfg->{Badge}->{URI});
+      if (exists $CFG->{Types}->{$File->{DOCTYPE}}->{Badge}->{'Local URI'}) {
+              $T->param(local_badge_uri  => $cfg->{Badge}->{'Local URI'});
+              $T->param(have_local_badge => TRUE);
+      }
       if (exists $CFG->{Types}->{$File->{DOCTYPE}}->{Badge}->{'ALT URI'}) {
       $T->param(badge_alt_uri  => $cfg->{Badge}->{'ALT URI'});
+        if (exists $CFG->{Types}->{$File->{DOCTYPE}}->{Badge}->{'Local ALT URI'}) {
+          $T->param(local_alt_badge_uri  => $cfg->{Badge}->{'Local ALT URI'});
+        }
       $T->param(have_alt_badge => TRUE);
       }
+      
       $T->param(badge_alt  => $cfg->{Badge}->{Alt});
       $T->param(badge_h    => $cfg->{Badge}->{Height});
       $T->param(badge_w    => $cfg->{Badge}->{Width});
diff --git a/share/templates/en_US/valid.tmpl b/share/templates/en_US/valid.tmpl
index 5f2414c..3b511aa 100644
--- a/share/templates/en_US/valid.tmpl
+++ b/share/templates/en_US/valid.tmpl
@@ -58,7 +58,7 @@
     to your Web page:
   </p>
   <img
-    class="inline-badge" src="<TMPL_VAR NAME="badge_uri" ESCAPE="HTML">"
+    class="inline-badge" src="<TMPL_IF NAME="have_local_badge"><TMPL_VAR NAME="local_badge_uri" ESCAPE="HTML"><TMPL_ELSE><TMPL_VAR NAME="badge_uri" ESCAPE="HTML"></TMPL_IF>"
     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>
@@ -71,7 +71,7 @@
   </pre>
   <TMPL_IF NAME="have_alt_badge">
   <img
-    class="inline-badge" src="<TMPL_VAR NAME="badge_alt_uri" ESCAPE="HTML">"
+    class="inline-badge" src="<TMPL_IF NAME="have_local_badge"><TMPL_VAR NAME="local_alt_badge_uri" ESCAPE="HTML"><TMPL_ELSE><TMPL_VAR NAME="badge_alt_uri" ESCAPE="HTML"></TMPL_IF>"
     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>