extras-buildsys/www config.psp, 1.3, 1.4 failed.psp, 1.7, 1.8 index.psp, 1.10, 1.11 success.psp, 1.8, 1.9

Daniel Williams (dcbw) fedora-extras-commits at redhat.com
Sat Nov 19 05:43:26 UTC 2005


Author: dcbw

Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18236/www

Modified Files:
	config.psp failed.psp index.psp success.psp 
Log Message:
2005-11-19  Dan Williams  <dcbw at redhat.com>

    * www/*
        - Add time columns to main, failed, and success pages
            showing relative times jobs started or finished




Index: config.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/config.psp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config.psp	31 Oct 2005 17:39:47 -0000	1.3
+++ config.psp	19 Nov 2005 05:43:24 -0000	1.4
@@ -11,6 +11,6 @@
 config_opts['server_ca_cert'] = CERT_BASE_DIR + "fedora-server-ca.cert"
 
 # Leave blank (zero-length) to disable
-config_opts['down_messagae'] = ""
+config_opts['down_message'] = ""
 
 %>


Index: failed.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/failed.psp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- failed.psp	31 Oct 2005 17:39:47 -0000	1.7
+++ failed.psp	19 Nov 2005 05:43:24 -0000	1.8
@@ -47,12 +47,13 @@
     <col align="left">
 </colgroup>
 <thead><tr>
-    <th class="jobs" width="5%">JOB ID</th>
-    <th class="jobs" width="10%">PACKAGE NAME</th>
-    <th class="jobs" width="20%">SOURCE</th>
+    <th class="jobs" width="5%">JOB ID</th>
+    <th class="jobs" width="10%">PACKAGE</th>
+    <th class="jobs" width="15%">SOURCE</th>
     <th class="jobs" width="10%">STATUS</th>
+    <th class="jobs" width="10%">FAILED</th>
     <th class="jobs" width="10%">TARGET</th>
-    <th class="jobs" width="10%">SUBMITTER</th>
+    <th class="jobs" width="25%">SUBMITTER</th>
 </tr></thead>
 <tbody>
 
@@ -82,6 +83,7 @@
             <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%>"><%=relative_date_short(job['endtime'])%></td>
             <td class="job<%=top%><%=col_mod%>"><%=target_str%></td>
             <td class="job<%=top%><%=col_mod%>"><%=despam_user(job['username'])%></td>
         <tr>
@@ -93,7 +95,7 @@
     if i == 1:
 %>
         <tr>
-            <td bgcolor="#efefef" colspan="6">No jobs found.</td>
+            <td bgcolor="#efefef" colspan="7">No jobs found.</td>
         <tr>
 <%
     # endif


Index: index.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- index.psp	31 Oct 2005 17:39:47 -0000	1.10
+++ index.psp	19 Nov 2005 05:43:24 -0000	1.11
@@ -44,12 +44,13 @@
     <col align="left">
 </colgroup>
 <thead><tr>
-    <th class="jobs" width="5%">JOB ID</th>
-    <th class="jobs" width="10%">PACKAGE NAME</th>
+    <th class="jobs" width="5%">JOB ID</th>
+    <th class="jobs" width="10%">PACKAGE</th>
     <th class="jobs" width="20%">SOURCE</th>
     <th class="jobs" width="10%">STATUS</th>
+    <th class="jobs" width="10%">STARTED</th>
     <th class="jobs" width="10%">TARGET</th>
-    <th class="jobs" width="10%">SUBMITTER</th>
+    <th class="jobs" width="20%">SUBMITTER</th>
 </tr></thead>
 <tbody>
 
@@ -79,6 +80,7 @@
             <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%>"><%=relative_date_short(job['starttime'])%></td>
             <td class="job<%=top%><%=col_mod%>"><%=target_str%></td>
             <td class="job<%=top%><%=col_mod%>"><%=despam_user(job['username'])%></td>
         <tr>
@@ -90,7 +92,7 @@
     if i == 1:
 %>
         <tr>
-            <td bgcolor="#efefef" colspan="6">No jobs found.</td>
+            <td bgcolor="#efefef" colspan="7">No jobs found.</td>
         <tr>
 <%
     # endif


Index: success.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/success.psp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- success.psp	31 Oct 2005 17:39:47 -0000	1.8
+++ success.psp	19 Nov 2005 05:43:24 -0000	1.9
@@ -45,12 +45,13 @@
     <col align="left">
 </colgroup>
 <thead><tr>
-    <th class="jobs" width="5%">JOB ID</th>
-    <th class="jobs" width="10%">PACKAGE NAME</th>
-    <th class="jobs" width="20%">SOURCE</th>
+    <th class="jobs" width="5%">JOB ID</th>
+    <th class="jobs" width="10%">PACKAGE</th>
+    <th class="jobs" width="15%">SOURCE</th>
     <th class="jobs" width="10%">STATUS</th>
+    <th class="jobs" width="10%">FINISHED</th>
     <th class="jobs" width="10%">TARGET</th>
-    <th class="jobs" width="10%">SUBMITTER</th>
+    <th class="jobs" width="25%">SUBMITTER</th>
 </tr></thead>
 <tbody>
 
@@ -80,6 +81,7 @@
             <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%>"><%=relative_date_short(job['endtime'])%></td>
             <td class="job<%=top%><%=col_mod%>"><%=target_str%></td>
             <td class="job<%=top%><%=col_mod%>"><%=despam_user(job['username'])%></td>
         <tr>
@@ -91,7 +93,7 @@
     if i == 1:
 %>
         <tr>
-            <td bgcolor="#efefef" colspan="6">No jobs found.</td>
+            <td bgcolor="#efefef" colspan="7">No jobs found.</td>
         <tr>
 <%
     # endif




More information about the fedora-extras-commits mailing list