Bug 364095 - "Default template does not validate as valid HTML" [p=reed r=LpSolit a=LpSolit]

1 files changed, 24 insertions, 23 deletions

diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl
index 66e942802..5dff3d578 100644
--- a/template/en/default/global/useful-links.html.tmpl
+++ b/template/en/default/global/useful-links.html.tmpl
@@ -40,51 +40,51 @@
          || user.groups.editcomponents || user.groups.admin || user.groups.creategroups
          || user.groups.editkeywords || user.groups.bz_canusewhines) %]
 
-    [% sep = "" FILTER html %]
+    [% print_pipe = 0 %]
     <li id="links-edit">
       <div class="label">Edit: </div>
       <ul class="links">
         [% IF user.groups.tweakparams %]
-          <li><span class="separator">[% sep %]</span><a href="editparams.cgi">Parameters</a></li>
-          [% sep = "| " %]
-          <li><span class="separator">[% sep %]</span><a href="editsettings.cgi">User Preferences</a></li>
+          <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editparams.cgi">Parameters</a></li>
+          [% print_pipe = 1 %]
+          <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editsettings.cgi">User Preferences</a></li>
         [% END %]
         [% IF user.groups.editcomponents %]
-          <li><span class="separator">[% sep %]</span><a href="sanitycheck.cgi">Sanity Check</a></li>
-          [% sep = "| " %]
+          <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="sanitycheck.cgi">Sanity Check</a></li>
+          [% print_pipe = 1 %]
         [% END %]
         [% IF user.groups.editusers || user.can_bless %]
-          <li><span class="separator">[% sep %]</span><a href="editusers.cgi">Users</a></li>
-          [% sep = "| " %]
+          <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editusers.cgi">Users</a></li>
+          [% print_pipe = 1 %]
         [% END %]
         [% IF Param('useclassification') && user.groups.editclassifications %]
-          <li><span class="separator">[% sep %]</span><a href="editclassifications.cgi">Classifications</a></li>
-          [% sep = "| " %]
+          <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editclassifications.cgi">Classifications</a></li>
+          [% print_pipe = 1 %]
         [% END %]
         [% IF user.groups.editcomponents || user.get_products_by_permission("editcomponents").size %]
-          <li><span class="separator">[% sep %]</span><a href="editproducts.cgi">Products</a></li>
-          [% sep = "| " %]
+          <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editproducts.cgi">Products</a></li>
+          [% print_pipe = 1 %]
         [% END %]
         [% IF user.groups.editcomponents %]
-          <li><span class="separator">[% sep %]</span><a href="editflagtypes.cgi">Flags</a></li>
-          [% sep = "| " %]
+          <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editflagtypes.cgi">Flags</a></li>
+          [% print_pipe = 1 %]
         [% END %]
         [% IF user.groups.admin %]
-          <li><span class="separator">[% sep %]</span><a href="editfields.cgi">Custom Fields</a></li>
-          [% sep = "| " %]
-          <li><span class="separator">[% sep %]</span><a href="editvalues.cgi">Field Values</a></li>
+          <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editfields.cgi">Custom Fields</a></li>
+          [% print_pipe = 1 %]
+          <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editvalues.cgi">Field Values</a></li>
         [% END %]
         [% IF user.groups.creategroups %]
-          <li><span class="separator">[% sep %]</span><a href="editgroups.cgi">Groups</a></li>
-          [% sep = "| " %]
+          <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editgroups.cgi">Groups</a></li>
+          [% print_pipe = 1 %]
         [% END %]
         [% IF user.groups.editkeywords %]
-          <li><span class="separator">[% sep %]</span><a href="editkeywords.cgi">Keywords</a></li>
-          [% sep = "| " %]
+          <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editkeywords.cgi">Keywords</a></li>
+          [% print_pipe = 1 %]
         [% END %]
         [% IF user.groups.bz_canusewhines %]
-          <li><span class="separator">[% sep %]</span><a href="editwhines.cgi">Whining</a></li>
-          [% sep = "| " %]
+          <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editwhines.cgi">Whining</a></li>
+          [% print_pipe = 1 %]
         [% END %]
       </ul>
     </li>
@@ -95,6 +95,7 @@
   [% IF user.showmybugslink OR user.queries.size 
         OR user.queries_subscribed.size 
   %]
+    [% print_pipe = 0 %]
     <li id="links-saved">
       <div class="label">
         Saved Searches: