[llvm-commits] [zorg] r125922 - in /zorg/trunk/llvmlab/llvmlab/ui/templates: dashboard.html phase_popup.html

[Daniel Dunbar]

Author: ddunbar
Date: Fri Feb 18 10:43:58 2011
New Revision: 125922

URL: http://llvm.org/viewvc/llvm-project?rev=125922&view=rev
Log:
llvmlab: Link phase popup builder names to buildbot builder page and individual
build status to build page.

Modified:
    zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html
    zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html

Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125922&r1=125921&r2=125922&view=diff
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original)
+++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:43:58 2011
@@ -13,7 +13,7 @@
 {% macro phase_popup_cell(phase, phase_info, build) %}
 {% if not build %}
 {%   set kind = "unknown" %}
-{% elif not build.end_time %}
+{% elif build.end_time == None %}
 {%   set kind = "running" %}
 {% elif build.result == 0 %}
 {%   set kind = "success" %}
@@ -202,6 +202,7 @@
 
 <hr>
 
+<h2>Recent Activity</h2>
 {# The results table... #}
 
 <table>

Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html?rev=125922&r1=125921&r2=125922&view=diff
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html (original)
+++ zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html Fri Feb 18 10:43:58 2011
@@ -7,16 +7,25 @@
   </thead>
   {% for name,builds in phased_builds|dictsort %}
   <tr>
-    <td>{{ name }}</td>
-    <td>
+    <td><a href="{{ config.status.master_url }}/builders/{{ name }}">{{
+        name }}</a></td>
+    <td class="phase-cell">
       {% for build in builds %}
       {% if build.end_time == None %}
-      RUNNING
+      {%   set kind = "running" %}
+      {%   set text = "RUNNING" %}
       {% elif build.result == 0 %}
-      PASS
+      {%   set kind = "success" %}
+      {%   set text = "PASS" %}
       {% else %}
-      FAIL
+      {%   set kind = "failing" %}
+      {%   set text = "FAIL" %}
       {% endif %}
+
+      <a class="phase-cell {{ kind }}"
+         href="{{ config.status.master_url }}/builders/{{
+                  name }}/builds/{{ build.number }}">{{ text }}</a>
+
       {% endfor %}
     </td>
   </tr>