[pypy-commit] buildbot add-header-to-nightly: remove testing columns if empty and add numpy-status pages to header

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: add-header-to-nightly
Changeset: r888:a970180c8b91
Date: 2013-11-11 22:38 +0200
http://bitbucket.org/pypy/buildbot/changeset/a970180c8b91/

Log:	remove testing columns if empty and add numpy-status pages to header

diff --git a/bot2/pypybuildbot/pypylist.py b/bot2/pypybuildbot/pypylist.py
--- a/bot2/pypybuildbot/pypylist.py
+++ b/bot2/pypybuildbot/pypylist.py
@@ -152,9 +152,6 @@
                         self.contentEncodings,
                         self.defaultType)
 
-class NumpyStatusList(File):
-    pass
-
 class PyPyDirectoryLister(DirectoryLister):
     '''template based, uses master/templates/directory.html
     '''
@@ -233,3 +230,6 @@
         else:
             return rowClass + '-failed'
 
+class NumpyStatusList(PyPyList):
+    pass
+
diff --git a/master/templates/directory.html b/master/templates/directory.html
--- a/master/templates/directory.html
+++ b/master/templates/directory.html
@@ -39,6 +39,9 @@
 
 {% set row_class = cycler('odd', 'even') %}
 
+{% set has_tests = files|join('', attribute='own_summary')|length > 0 or 
+      files|join('', attribute='app_summary')|length > 0 %}
+
 <table>
 
 {% if files|length > 0 %}
@@ -46,16 +49,20 @@
 <th>Filename</th>
 <th>Size</th>
 <th>Date</th>
+{% if has_tests %}
 <th><i>own</i> tests</th>
 <th><i>applevel</i> tests</th>
+{% endif %}
 </tr>
 {% else %}
 <tr class="{{ row_class.next() }}">
 <th>Directory</th>
 <th>Size</th>
 <th>Date</th>
+{% if has_tests %}
 <th></th>
 <th></th>
+{% endif %}
 </tr>
 {% endif %}
 
@@ -64,8 +71,10 @@
     <td><a href="{{ d.href }}"><b>{{ d.text }}</b></a></td>
     <td>{{ d.size}}</td>
     <td>{{ d.date}}</td>
+{% if has_tests %}
     <td></td>
     <td></td>
+{% endif %}
   </tr>
 {% endfor %}
 
@@ -74,8 +83,10 @@
     <td><a href="{{ f.href }}">{{ f.text }}</a></td>
     <td>{{ f.size }}</td>
     <td>{{ f.date }}</td>
+{% if has_tests %}
     <td class="{{ f.own_summary_class }}">{{ f.own_summary }}</td>
     <td class="{{ f.app_summary_class }}">{{ f.app_summary }}</td>
+{% endif %}
   </tr>
 {% endfor %}
 </table>
diff --git a/master/templates/layout.html b/master/templates/layout.html
--- a/master/templates/layout.html
+++ b/master/templates/layout.html
@@ -23,19 +23,19 @@
     {% block header -%}
     <div class="header">
         <a href="{{ path_to_root or '.' }}">Home</a>
-        -
         <!-- PyPy specific items -->
-        <a href="http://speed.pypy.org/">Speed</a>
-        <a href="{{ path_to_root }}summary?branch=<trunk>">Summary (trunk)</a>
-        <a href="{{ path_to_root }}summary">Summary</a>
-        <a href="{{ path_to_root }}nightly/">Nightly builds</a>
+        - <a href="http://speed.pypy.org/">Speed</a>
+        - <a href="{{ path_to_root }}numpy-status/">Numpy compatability</a>
+        - <a href="{{ path_to_root }}summary?branch=<trunk>">Summary (trunk)</a>
+        - <a href="{{ path_to_root }}summary">Summary</a>
+        - <a href="{{ path_to_root }}nightly/">Nightly builds</a>
         <!-- end of PyPy specific items -->
 
-        <a href="{{ path_to_root }}waterfall">Waterfall</a>
+        - <a href="{{ path_to_root }}waterfall">Waterfall</a>
         <!-- <a href="{{ path_to_root }}grid">Grid</a> -->
         <!-- <a href="{{ path_to_root }}tgrid">T-Grid</a> -->
         <!-- <a href="{{ path_to_root }}console">Console</a> -->
-        <a href="{{ path_to_root }}builders">Builders</a>
+        - <a href="{{ path_to_root }}builders">Builders</a>
         <!-- <a href="{{ path_to_root }}one_line_per_build">Recent Builds</a> -->
         <!-- <a href="{{ path_to_root }}buildslaves">Buildslaves</a> -->
         <!-- <a href="{{ path_to_root }}changes">Changesources</a> -->