Merge changes jgh did on krot

diff --git a/htdocs/branches_of_interest.txt b/htdocs/branches_of_interest.txt
index 3fa7bd87d5065ced0d1e834163f8851b49930955..7db822163c52fd4adce8f947bc22d25928d16ecd 100644 (file)
--- a/htdocs/branches_of_interest.txt
+++ b/htdocs/branches_of_interest.txt
@@ -1,2 +1,2 @@
 HEAD
-4.next
+release_4_89_redux

diff --git a/templates/status.tt b/templates/status.tt
index 4807d66769a6eaa62e8b1396c1cee8704e22d52a..573dfb06776b985836fcced4e15642a8fd4af2e6 100644 (file)
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -7,14 +7,18 @@ 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',
+     ipv6 => '/img/6.png',
      #test => '/img/hammer.jpeg',
      #python => '/img/python.png',
      #debug => '/img/bug.png',
@@ -40,7 +44,7 @@ See accompanying License file for license details
 [%- 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 %]"
@@ -64,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>