URI encode branch parameter.

[buildfarm-server.git] / templates / status.tt

diff --git a/templates/status.tt b/templates/status.tt
index 29be4e32d59a176829e427f17144197215588835..2e1f2e8aebabd860a45d573fe2ad034e5b6f5730 100644 (file)
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -7,14 +7,19 @@ See accompanying License file for license details
 -%]
 [%
  flag_imgs = {
-     perl = '/img/camel.png',
-     openssl => '/img/ssl_icon.gif',
+     dane => '/img/helmet.png',
+     doc => '/img/doc.png',
      gnutls => '/img/gnutls_icon.gif',
+     ldap => '/img/openldap_logo.jpg',
      mysql => '/img/mysql_logo.png',
+     openssl => '/img/ssl_icon.gif',
+     perl = '/img/camel.png',
      pgsql => '/img/postgresql-icon-32.png',
      ldap => '/img/openldap_logo.jpg',
+     dane => '/img/helmet.png',
      doc => '/img/doc.png',
-     test => '/img/hammer.jpeg',
+     ipv6 => '/img/6.png',
+     #test => '/img/hammer.jpeg',
      #python => '/img/python.png',
      #debug => '/img/bug.png',
      #pam => '/img/pam.png',
@@ -36,17 +41,17 @@ See accompanying License file for license details
      '.' => '/img/t_notdone.gif',
      }
 -%]
-[%- BLOCK img ; IF flag == 'depend' or flag == 'gnu-ld' ; ; ELSIF flag_imgs.$flag %]<img src="[% flag_imgs.$flag %]" title="[% flag %]" alt="[% flag %]" height="16" width="16" class="inline" align="bottom" />  [% ELSE %][%#
+[%- BLOCK img ; IF flag == 'depend' or flag == 'gnu-ld' ; ; ELSIF flag_imgs.$flag %]<img src=[% flag_imgs.$flag %] title="[% flag %]" alt="[% flag %]" height=16 width=16 class=inline align=bottom/>  [% ELSE %][%#
                                                                                                                                                                                                          flag ; ' '
 %][% END ; END -%]
-[%- BLOCK sysnotes ; IF row.sys_notes %]<img src="/img/notes.png" height="16" width="16" title="[% row.sys_notes_ts.replace(' .*','') | html %]: [% row.sys_notes | html %]" />
+[%- BLOCK sysnotes ; IF row.sys_notes %]<img src=/img/notes.png height=16 width=16 title="[% row.sys_notes_ts.replace(' .*','') | html %]: [% row.sys_notes | html %]"/>
 [%- ELSE %]&nbsp;[% END ; END -%]
 [%- BLOCK cl %] class="[% SWITCH bgfor.replace('-.*','') -%]
   [%- CASE 'OK' %]pass[% CASE 'ContribCheck' %]warn[% CASE [ 'Check' 'InstallCheck' ] %]warnx[% CASE %]fail[% END %]"
 [%- END -%]
 [%# The IF-backstop is ugly and I'm not understanding why the res_img lookup does not for for '.' -%]
 [%- BLOCK colour ; IF res_imgs.$c.defined ; res_imgs.$c ; ELSE %]/img/t_notdone.gif [% END; END %]
-[%- BLOCK colourbar %]<img src="[% PROCESS colour %]" title="[% st %]" alt="[% c %]" height="16" width="[% w %]" class="inline" align="bottom" />[%- END -%]
+[%- BLOCK colourbar %]<img src=[% PROCESS colour %] title="[% st %]-[% st + w - 1 %]" height=16 width=[% w %] class=inline align=bottom/>[%- END -%]
 [% WRAPPER 'page.tt' 
        title = 'Exim BuildFarm Status'
        bodyclass = 'none'
@@ -63,7 +68,7 @@ See accompanying License file for license details
     </p>
 <table><tr><th class="head" rowspan="2">Legend</th>
 [% FOREACH flagset IN flag_imgs %]
-<td><img src="[% flagset.value %]" title="[% flagset.key %]" alt="[% flagset.key %]" height="16" width="16" class="inline"  align="center"/> =  [% flagset.key %]</td>
+<td><img src=[% flagset.value %] title="[% flagset.key %]" alt="[% flagset.key %]" height=16 width=16 class=inline align=center/> =  [% flagset.key %]</td>
 [% IF loop.count == 7 %]</tr><tr>[% END %]
 [% END %]
 </tr></table>
@@ -77,7 +82,7 @@ See accompanying License file for license details
 [% END %]
 <tr [% PROCESS cl bgfor=row.stage %]>
     <td><a 
-    href="show_history.pl?nm=[% row.sysname %]&amp;br=[% row.branch %]"
+    href="show_history.pl?nm=[% row.sysname %]&amp;br=[% row.branch | uri %]"
     title="History"
     >[% row.sysname %]</a></td>
     <td>[% PROCESS sysnotes %]</td>
@@ -95,7 +100,7 @@ See accompanying License file for license details
                [%- row.snapshot | uri %]">
                 [%- IF row.stage != 'OK' %]Details[% ELSE %]Config[% END -%]</a></td>
 
-    <td class="flags">[% FOREACH flag IN row.build_flags.split().sort() ; PROCESS img ; END %]</td>
+    <td class="flags">[% FOREACH flag IN row.build_flags.split().unique().sort() ; PROCESS img ; END %]</td>
     <td class="tests">[% FOREACH range IN row.log_text ;
        r = range.split(' '); c = r.0; st = r.1; w = r.2; PROCESS colourbar; END %]</td>
 </tr>