Update scripts, templates, add ldap logo

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

diff --git a/templates/status.tt b/templates/status.tt
index 32a17d6fde49552e98947f85a5e2c0a24b4667d3..6c66ccd96fdacd98debfd53a25eb32d3aa305790 100644 (file)
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -1,33 +1,46 @@
+[%#
+
+Copyright (c) 2003-2010, Andrew Dunstan
+
+See accompanying License file for license details
+
+-%]
 [%
  flag_imgs = {
      perl = '/img/camel.png',
-     python = '/img/python.png',
-     debug = '/img/bug.png',
-     pam => '/img/pam.png',
-     cassert => '/img/cassert.png',
      openssl => '/img/ssl_icon.gif',
-     nls => '/img/translateicon.gif',
-     krb5 => '/img/krb.gif',
-     tcl => '/img/tcl.png',
-     vpath => '/img/vpath.png',
-     xml => '/img/xml.png',
-     'thread-safety' => '/img/threads.gif',
-     'integer-datetimes' = '/img/days.png',
-     git => '/img/git.png',
+     gnutls => '/img/gnutls_icon.gif',
+     mysql => '/img/mysql_logo.png',
+     pgsql => '/img/postgresql-icon-32.png',
+     ldap => '/img/openldap_logo.jpg',
+     #python => '/img/python.png',
+     #debug => '/img/bug.png',
+     #pam => '/img/pam.png',
+     #cassert => '/img/cassert.png',
+     #nls => '/img/translateicon.gif',
+     #krb5 => '/img/krb.gif',
+     #gssapi => '/img/gssapi.gif',
+     #tcl => '/img/tcl.png',
+     #vpath => '/img/vpath.png',
+     #xml => '/img/xml.png',
+     #'thread-safety' => '/img/threads.gif',
+     #'integer-datetimes' => '/img/days.png',
      }
 -%]
 [%- 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 %]" />
+[%- ELSE %]&nbsp;[% END ; END -%]
 [%- BLOCK cl %] class="[% SWITCH bgfor.replace('-.*','') -%]
   [%- CASE 'OK' %]pass[% CASE 'ContribCheck' %]warn[% CASE [ 'Check' 'InstallCheck' ] %]warnx[% CASE %]fail[% END %]"
 [%- END -%]
 [% WRAPPER 'page.tt' 
-       title = 'PostgreSQL BuildFarm Status'
+       title = 'Exim BuildFarm Status'
        bodyclass = 'none'
        pagebutton = 'status'
 %]
-    <h1>PostgreSQL BuildFarm Status</h1>
+    <h1>Exim BuildFarm Status</h1>
     <p>
       Shown here is the latest status of each farm member 
       for each branch it has reported on in the last 30 days.
@@ -47,14 +60,15 @@
 [% brch = "" %]
 [% FOREACH row IN statrows %]
 [% IF row.branch != brch ; brch = row.branch %]
-<tr><th class="head" colspan="4">Branch: [% brch %]</th></tr>
-<tr><th>Alias</th><th>System</th><th>Status</th><th>Flags</th></tr>
+<tr><th class="head" colspan="5">Branch: [% brch %]</th></tr>
+<tr><th colspan="2">Alias</th><th>System</th><th>Status</th><th>Flags</th></tr>
 [% END %]
 <tr [% PROCESS cl bgfor=row.stage %]>
     <td><a 
     href="show_history.pl?nm=[% row.sysname %]&amp;br=[% row.branch %]"
     title="History"
     >[% row.sysname %]</a></td>
+    <td>[% PROCESS sysnotes %]</td>
     <td><span class="opsys">[% row.operating_system %]
             [% row.os_version %]</span> <span class="compiler">
             [%- row.compiler %]
@@ -63,6 +77,7 @@
     <td class="status">
             [%- row.when_ago | replace('\s','&nbsp;') %]&nbsp;ago&nbsp;
             [% row.stage -%]
+           [[% row.git_head_ref.substr(0,7) %]]
             <a href="show_log.pl?nm=
                [%- row.sysname %]&amp;dt=
                [%- row.snapshot | uri %]">