From 88b5fec90a0e249f6b89a24f29aa536f1ef0b986 Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Fri, 10 Feb 2017 18:24:29 +0100 Subject: [PATCH] Merge changes jgh did on krot --- htdocs/branches_of_interest.txt | 2 +- templates/status.tt | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/htdocs/branches_of_interest.txt b/htdocs/branches_of_interest.txt index 3fa7bd8..7db8221 100644 --- 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 4807d66..573dfb0 100644 --- 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 %][% flag %] [% ELSE %][%# flag ; ' ' %][% END ; END -%] -[%- BLOCK sysnotes ; IF row.sys_notes %] +[%- BLOCK sysnotes ; IF row.sys_notes %] [%- ELSE %] [% 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

[% FOREACH flagset IN flag_imgs %] - + [% IF loop.count == 7 %][% END %] [% END %]
Legend[% flagset.key %] = [% flagset.key %][% flagset.key %] = [% flagset.key %]
-- 2.30.2