Drop unecessary have_*badge template variables.

3 files changed, 23 insertions, 37 deletions

diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check
index 5a1c515..a2dd6c2 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.716 2009-10-24 15:59:18 ville Exp $
+# $Id: check,v 1.717 2009-10-24 16:50:06 ville Exp $
 #
 # Disable buffering on STDOUT!
 $| = 1;
@@ -209,7 +209,7 @@ Directory not readable (permission denied): @_r
 
   #
   # Strings
-  $VERSION =  q$Revision: 1.716 $;
+  $VERSION =  q$Revision: 1.717 $;
   $VERSION =~ s/Revision: ([\d\.]+) /$1/;
 
   #
@@ -1468,31 +1468,17 @@ sub report_valid {
 
     if (exists $CFG->{Types}->{$File->{DOCTYPE}}->{Badge}) {
       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);
-      }
-
-      if (exists $CFG->{Types}->{$File->{DOCTYPE}}->{Badge}->{RDFa}) {
-        $T->param(have_badge_rdfa => TRUE);
-        $T->param(badge_rdfa => $CFG->{Types}->{$File->{DOCTYPE}}->{Badge}->{RDFa});
-      } else {
-        $T->param(have_badge_rdfa => FALSE);
-      }
-
-      $T->param(badge_alt  => $cfg->{Badge}->{Alt});
-      $T->param(badge_h    => $cfg->{Badge}->{Height});
-      $T->param(badge_w    => $cfg->{Badge}->{Width});
-      $T->param(badge_tagc => ($cfg->{'Parse Mode'} eq 'XML' ? ' /' : ''));
+      $T->param(
+        badge_uri           => $cfg->{Badge}->{URI},
+        local_badge_uri     => $cfg->{Badge}->{'Local URI'},
+        badge_alt_uri       => $cfg->{Badge}->{'Alt URI'},
+        local_alt_badge_uri => $cfg->{Badge}->{'Local ALT URI'},
+        badge_alt           => $cfg->{Badge}->{Alt},
+        badge_rdfa          => $cfg->{Badge}->{RDFa},
+        badge_h             => $cfg->{Badge}->{Height},
+        badge_w             => $cfg->{Badge}->{Width},
+        badge_tagc          => $cfg->{'Parse Mode'} eq 'XML' ? ' /' : '',
+      );
     }
   } elsif (defined $File->{Tentative}) {
     $T->param(is_tentative => TRUE);
diff --git a/share/templates/en_US/ucn_output.tmpl b/share/templates/en_US/ucn_output.tmpl
index 3a80a7f..bf42cfa 100644
--- a/share/templates/en_US/ucn_output.tmpl
+++ b/share/templates/en_US/ucn_output.tmpl
@@ -84,7 +84,7 @@ X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF>
                       </TMPL_IF>
                     </TMPL_IF>
                   </longmessage>
-                  <TMPL_IF NAME="have_badge">
+                  <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
@@ -97,7 +97,7 @@ X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></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>
-                    /> <code>&lt;p<TMPL_IF NAME="have_badge_rdfa"> about="" 
+                    /> <code>&lt;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>&gt;
     &lt;a href="<TMPL_VAR NAME="cfg_home_page" ESCAPE="HTML">check?uri=referer"&gt;
@@ -107,14 +107,14 @@ X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF>
     &lt;/a&gt;
 &lt;/p&gt;</code>
                   </longmessage>
-                  <TMPL_IF NAME="have_alt_badge">
+                  <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>&lt;p<TMPL_IF NAME="have_badge_rdfa"> about="" 
+                    /> <code>&lt;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>&gt;
     &lt;a href="<TMPL_VAR NAME="cfg_home_page" ESCAPE="HTML">check?uri=referer"&gt;
diff --git a/share/templates/en_US/valid.tmpl b/share/templates/en_US/valid.tmpl
index fb3f2b8..dd2a6a6 100644
--- a/share/templates/en_US/valid.tmpl
+++ b/share/templates/en_US/valid.tmpl
@@ -53,7 +53,7 @@
     </TMPL_IF>
 </TMPL_IF>
   </p>
-<TMPL_IF NAME="have_badge">
+<TMPL_IF NAME="badge_uri">
 <h4>"valid" Icon(s) on your Web page</h4>
   <p>
     To show your readers that you have taken the care to create an
@@ -62,12 +62,12 @@
     to your Web page:
   </p>
   <img
-    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>"
+    class="inline-badge" src="<TMPL_IF NAME="local_badge_uri"><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>
      /> <pre class="badgeSnippet">
-  &lt;p<TMPL_IF NAME="have_badge_rdfa"> about=""
+  &lt;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>&gt;
     &lt;a href="<TMPL_VAR NAME="cfg_home_page" ESCAPE="HTML">check?uri=referer"&gt;&lt;img
@@ -75,14 +75,14 @@
         <TMPL_IF NAME="badge_alt">alt="<TMPL_VAR NAME="badge_alt" ESCAPE="HTML">"</TMPL_IF> <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">&gt;&lt;/a&gt;
   &lt;/p&gt;
   </pre>
-  <TMPL_IF NAME="have_alt_badge">
+  <TMPL_IF NAME="badge_alt_uri">
   <img
-    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>"
+    class="inline-badge" src="<TMPL_IF NAME="local_alt_badge_uri"><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>
      /> <pre class="badgeSnippet">
-  &lt;p<TMPL_IF NAME="have_badge_rdfa"> about=""
+  &lt;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>&gt;
     &lt;a href="<TMPL_VAR NAME="cfg_home_page" ESCAPE="HTML">check?uri=referer"&gt;&lt;img