extras-buildsys/www builders.psp, 1.8, 1.9 failed.psp, 1.5, 1.6 index.psp, 1.8, 1.9 indiv.psp, 1.8, 1.9 success.psp, 1.6, 1.7
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Wed Aug 31 19:31:02 UTC 2005
Author: dcbw
Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17761/www
Modified Files:
builders.psp failed.psp index.psp indiv.psp success.psp
Log Message:
2005-08-31 Dan Williams <dcbw at redhat.com>
* www/
- Fix up web frontend for latest server code
Index: builders.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- builders.psp 25 Aug 2005 18:15:14 -0000 1.8
+++ builders.psp 31 Aug 2005 19:31:00 -0000 1.9
@@ -41,16 +41,18 @@
# endfor
unavail_color = ''
- if builder['status'] == 'unavailable':
+ if builder['alive'] == False:
unavail_color = 'color="#ff4444"'
# endif
+
+ num_building = builder['num_slots'] - builder['free_slots']
%>
<table class="builderlist" cellspacing="0" cellpadding="0">
<tr>
<td class="builderaddr-side"></td>
<td class="builderaddr" align="left">
- <font class="builderaddr" <%=unavail_color%>><%=builder['address']%> (<%=builder['status']%>)<br>
+ <font class="builderaddr" <%=unavail_color%>><%=builder['address']%> (<%=num_building%>/<%=builder['num_slots']%>)<br>
<font class="builderarches"><%=arch_list%></font>
</td>
<td class="builderaddr-side"></td>
Index: failed.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/failed.psp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- failed.psp 11 Aug 2005 19:32:38 -0000 1.5
+++ failed.psp 31 Aug 2005 19:31:00 -0000 1.6
@@ -66,13 +66,18 @@
import os
source = os.path.basename(source)
# endif
+
+ target_distro = job['target_distro']
+ target_target = job['target_target']
+ target_repo = job['target_repo']
+ target_str = "%s-%s-%s" % (target_distro, target_target, target_repo)
%>
<tr>
<td class="job<%=top%><%=col_mod%>"><a href="job.psp<%=job_link(job['uid'])%>"><%=job['uid']%></a></td>
<td class="job<%=top%><%=col_mod%>"><%=job['package']%></td>
<td class="job<%=top%><%=col_mod%>"><%=source%></td>
<td class="job<%=top%><%=col_mod%>"><font class="status-<%=job['status']%>"><%=job['status']%></font></td>
- <td class="job<%=top%><%=col_mod%>"><%=job['target']%></td>
+ <td class="job<%=top%><%=col_mod%>"><%=target_str%></td>
<td class="job<%=top%><%=col_mod%>"><%=despam_user(job['username'])%></td>
<tr>
<%
Index: index.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- index.psp 11 Aug 2005 19:32:38 -0000 1.8
+++ index.psp 31 Aug 2005 19:31:00 -0000 1.9
@@ -63,13 +63,18 @@
import os
source = os.path.basename(source)
# endif
+
+ target_distro = job['target_distro']
+ target_target = job['target_target']
+ target_repo = job['target_repo']
+ target_str = "%s-%s-%s" % (target_distro, target_target, target_repo)
%>
<tr>
<td class="job<%=top%><%=col_mod%>"><a href="job.psp<%=job_link(job['uid'])%>"><%=job['uid']%></a></td>
<td class="job<%=top%><%=col_mod%>"><%=job['package']%></td>
<td class="job<%=top%><%=col_mod%>"><%=source%></td>
<td class="job<%=top%><%=col_mod%>"><font class="status-<%=job['status']%>"><%=job['status']%></font></td>
- <td class="job<%=top%><%=col_mod%>"><%=job['target']%></td>
+ <td class="job<%=top%><%=col_mod%>"><%=target_str%></td>
<td class="job<%=top%><%=col_mod%>"><%=despam_user(job['username'])%></td>
<tr>
<%
Index: indiv.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/indiv.psp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- indiv.psp 11 Aug 2005 19:32:38 -0000 1.8
+++ indiv.psp 31 Aug 2005 19:31:00 -0000 1.9
@@ -153,13 +153,18 @@
import os
source = os.path.basename(source)
# endif
+
+ target_distro = job['target_distro']
+ target_target = job['target_target']
+ target_repo = job['target_repo']
+ target_str = "%s-%s-%s" % (target_distro, target_target, target_repo)
%>
<tr>
<td class="job<%=top%><%=col_mod%>"><a href="job.psp<%=job_link(job['uid'])%>"><%=job['uid']%></a></td>
<td class="job<%=top%><%=col_mod%>"><%=job['package']%></td>
<td class="job<%=top%><%=col_mod%>"><%=source%></td>
<td class="job<%=top%><%=col_mod%>"><font class="status-<%=job['status']%>"><%=job['status']%></font>/<font class="result-<%=job['result']%>"><%=job['result']%></font></td>
- <td class="job<%=top%><%=col_mod%>"><%=job['target']%></td>
+ <td class="job<%=top%><%=col_mod%>"><%=target_str%></td>
<tr>
<%
i = i + 1
Index: success.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/success.psp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- success.psp 11 Aug 2005 19:32:38 -0000 1.6
+++ success.psp 31 Aug 2005 19:31:00 -0000 1.7
@@ -64,13 +64,18 @@
import os
source = os.path.basename(source)
# endif
+
+ target_distro = job['target_distro']
+ target_target = job['target_target']
+ target_repo = job['target_repo']
+ target_str = "%s-%s-%s" % (target_distro, target_target, target_repo)
%>
<tr>
<td class="job<%=top%><%=col_mod%>"><a href="job.psp<%=job_link(job['uid'])%>"><%=job['uid']%></a></td>
<td class="job<%=top%><%=col_mod%>"><%=job['package']%></td>
<td class="job<%=top%><%=col_mod%>"><%=source%></td>
<td class="job<%=top%><%=col_mod%>"><font class="status-<%=job['status']%>"><%=job['status']%></font></td>
- <td class="job<%=top%><%=col_mod%>"><%=job['target']%></td>
+ <td class="job<%=top%><%=col_mod%>"><%=target_str%></td>
<td class="job<%=top%><%=col_mod%>"><%=despam_user(job['username'])%></td>
<tr>
<%
More information about the fedora-extras-commits
mailing list