extras-buildsys/www builders.psp, 1.1, 1.2 index.psp, 1.1, 1.2 indiv.psp, 1.1, 1.2
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Fri Jul 22 05:39:21 UTC 2005
Author: dcbw
Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1981/www
Modified Files:
builders.psp index.psp indiv.psp
Log Message:
2005-07-22 Dan Williams <dcbw at redhat.com>
* Web front-end cleanup
- Use Diana Fong's new design. Delicious!
Index: builders.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- builders.psp 21 Jul 2005 04:07:54 -0000 1.1
+++ builders.psp 22 Jul 2005 05:39:19 -0000 1.2
@@ -50,11 +50,14 @@
# endif
%>
- <div id="builderlist">
- <table cellspacing="0" cellpadding="0">
+ <table class="builderlist" cellspacing="0" cellpadding="0">
<tr>
- <td class="builderlist-head" align="left"><font class="builderlistaddr" <%=unavail_color%>><%=addr%> (<%=builder['status']%>)</th>
- <td class="builderlist-head" align="right"><font class="builderlistarches"><%=arch_list%></font></th>
+ <td class="builderaddr-side"></td>
+ <td class="builderaddr" align="left">
+ <font class="builderaddr" <%=unavail_color%>><%=addr%> (<%=builder['status']%>)<br>
+ <font class="builderarches"><%=arch_list%></font>
+ </td>
+ <td class="builderaddr-side"></td>
</tr>
<%
bjob = None
@@ -68,18 +71,17 @@
%>
<tr>
<td colspan="2" align="left">
- <div id="archjoblist">
- <table cellspacing="0" cellpadding="0" border="0">
+ <table class="archjobs" cellspacing="0" cellpadding="0">
<tr>
- <td>
+ <td width="10" class="archjobs"></td>
+ <td class="archjobs">
<font class="archjobtag">Job:</font>
- <%=aj['parent_uid']%> (<%=job['package']%>/<%=aj['arch']%>)
+ <font class="archjob"> <%=aj['parent_uid']%> (<%=job['package']%>/<%=aj['arch']%>) </font>
<font class="archjobtag">Status:</font>
- <%=aj['status']%>/<%=aj['builder_status']%>
+ <font class="archjob"> <%=aj['status']%>/<%=aj['builder_status']%></font>
</td>
</tr>
</table>
- </div>
</td>
</tr>
<%
@@ -89,8 +91,7 @@
# endfor
%>
</table>
- </div>
- <br>
+ <br><br>
<%
# endfor
Index: index.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.psp 21 Jul 2005 04:07:54 -0000 1.1
+++ index.psp 22 Jul 2005 05:39:19 -0000 1.2
@@ -31,31 +31,32 @@
%>
<center>
-<div id="joblist">
-<table cellspacing=0 cellpadding=0>
+<table class="jobs" cellspacing="0" cellpadding="0">
<colgroup>
<col align="left">
<col align="left">
<col align="left">
</colgroup>
<thead><tr>
- <th align="left" width="5%">Job ID</th>
- <th align="left" width="10%">Package Name</th>
- <th align="left" width="20%">Source</th>
- <th align="left" width="10%">Status</th>
- <th align="left" width="10%">Target</th>
- <th align="left" width="10%">Submitter</th>
+ <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="10%">STATUS</th>
+ <th class="jobs" width="10%">TARGET</th>
+ <th class="jobs" width="10%">SUBMITTER</th>
</tr></thead>
<tbody>
<%
i = 1
for job in building_jobs:
- # Don't show finished jobs older than 1 day
- col = '#efefef'
+ top = ''
+ if i == 1:
+ top = '-top'
+ col_mod = ''
if int(i / 2.0) == (i / 2.0):
- col = '#dddddd'
- # endif
+ col_mod = '-alt'
+
source = job['source']
if '/' in source:
import os
@@ -63,23 +64,25 @@
# endif
%>
<tr>
- <td bgcolor="<%=str(col)%>"><%=job['uid']%></td>
- <td bgcolor="<%=str(col)%>"><%=job['package']%></td>
- <td bgcolor="<%=str(col)%>"><%=source%></td>
- <td bgcolor="<%=str(col)%>"><font class="status-<%=job['status']%>"><%=job['status']%></font></td>
- <td bgcolor="<%=str(col)%>"><%=job['target']%></td>
- <td bgcolor="<%=str(col)%>"><%=job['username']%></td>
+ <td class="job<%=top%><%=col_mod%>"><%=job['uid']%></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%>"><%=job['username']%></td>
<tr>
<%
i = i + 1
# endfor
for job in waiting_jobs:
- # Don't show finished jobs older than 1 day
- col = '#efefef'
+ top = ''
+ if i == 1:
+ top = '-top'
+ col_mod = ''
if int(i / 2.0) == (i / 2.0):
- col = '#dddddd'
- # endif
+ col_mod = '-alt'
+
source = job['source']
if '/' in source:
import os
@@ -87,12 +90,12 @@
# endif
%>
<tr>
- <td bgcolor="<%=str(col)%>"><%=job['uid']%></td>
- <td bgcolor="<%=str(col)%>"><%=job['package']%></td>
- <td bgcolor="<%=str(col)%>"><%=source%></td>
- <td bgcolor="<%=str(col)%>"><font class="status-<%=job['status']%>"><%=job['status']%></font></td>
- <td bgcolor="<%=str(col)%>"><%=job['target']%></td>
- <td bgcolor="<%=str(col)%>"><%=job['username']%></td>
+ <td class="job<%=top%><%=col_mod%>"><%=job['uid']%></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%>"><%=job['username']%></td>
<tr>
<%
i = i + 1
Index: indiv.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/indiv.psp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- indiv.psp 21 Jul 2005 04:07:54 -0000 1.1
+++ indiv.psp 22 Jul 2005 05:39:19 -0000 1.2
@@ -55,17 +55,15 @@
%>
<center>
-<div id="top-table">
-<table cellspacing="0" cellpadding="0" width="100%">
- <tr>
- <td width="100%">
- <table cellspacing="0" cellpadding="0">
- <form method="POST" action="indiv.psp?email=<%=str(user_email)%>">
- <tr>
- <td align="left"><strong>Filter by:</strong></td>
- <td>
- Status:
- <select name="status">
+<table class="filter" cellspacing="0" cellpadding="0">
+ <tr><td align="right">
+ <table class="filter-form" cellspacing="0" cellpadding="0">
+ <form method="POST" action="indiv.psp?email=<%=str(user_email)%>">
+ <tr>
+ <td class="filter-form-head">Filter by:</td>
+ <td class="filter-form-label">Status:</td>
+ <td class="filter-form-item">
+ <select name="status">
<%
for status in status_list:
sel_string = ''
@@ -73,15 +71,15 @@
sel_string = 'selected'
# endif
%>
- <option <%=str(sel_string)%>><%=str(status)%></option>
+ <option <%=str(sel_string)%>><%=str(status)%></option>
<%
# endfor
%>
- </select>
- </td>
- <td>
- Target:
- <select name="target">
+ </select>
+ </td>
+ <td class="filter-form-label">Target:</td>
+ <td class="filter-form-item">
+ <select name="target">
<%
for target in targets:
sel_string = ''
@@ -89,35 +87,31 @@
sel_string = 'selected'
# endif
%>
- <option <%=str(sel_string)%>><%=str(target)%></option>
+ <option <%=str(sel_string)%>><%=str(target)%></option>
<%
# endfor
%>
- </select>
- </td>
- <td><input type="submit" value="Filter"></td>
- </tr>
- </form>
- </table>
- </td>
- </tr>
+ </select>
+ </td>
+ <td class="filter-form-label"><input type="submit" value="Filter"></td>
+ </tr>
+ </form>
+ </table>
+ </td></tr>
</table>
-</div>
-<br>
-<div id="joblist">
-<table cellspacing=0 cellpadding=0>
+<table class="jobs" cellspacing="0" cellpadding="0">
<colgroup>
<col align="left">
<col align="left">
<col align="left">
</colgroup>
<thead><tr>
- <th align="left" width="5%">Job ID</th>
- <th align="left" width="20%">Package Name</th>
- <th align="left" width="20%">Source</th>
- <th align="left" width="10%">Status</th>
- <th align="left" width="10%">Target</th>
+ <th class="jobs" width="5%">JOB ID</th>
+ <th class="jobs" width="20%">PACKAGE NAME</th>
+ <th class="jobs" width="20%">SOURCE</th>
+ <th class="jobs" width="10%">STATUS</th>
+ <th class="jobs" width="10%">TARGET</th>
</tr></thead>
<tbody>
@@ -129,10 +123,12 @@
if job['status'] == 'killed' or job['status'] == 'needsign':
if job['endtime'] != 0 and job['endtime'] < time.time() - cutoff_time:
continue
- col = '#efefef'
+ top = ''
+ if i == 1:
+ top = '-top'
+ col_mod = ''
if int(i / 2.0) == (i / 2.0):
- col = '#dddddd'
- # endif
+ col_mod = '-alt'
source = job['source']
if '/' in source:
import os
@@ -140,11 +136,11 @@
# endif
%>
<tr>
- <td bgcolor="<%=str(col)%>"><%=job['uid']%></td>
- <td bgcolor="<%=str(col)%>"><%=job['package']%></td>
- <td bgcolor="<%=str(col)%>"><%=source%></td>
- <td bgcolor="<%=str(col)%>"><font class="status-<%=job['status']%>"><%=job['status']%></font></td>
- <td bgcolor="<%=str(col)%>"><%=job['target']%></td>
+ <td class="job<%=top%><%=col_mod%>"><%=job['uid']%></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>
<tr>
<%
i = i + 1
@@ -154,7 +150,7 @@
if i == 1:
%>
<tr>
- <td bgcolor="#efefef" colspan="5">No jobs found.</td>
+ <td class="job-top" colspan="5">No jobs found.</td>
<tr>
<%
# endif
@@ -163,7 +159,6 @@
</tbody>
</table>
-</div>
</center>
<%
More information about the fedora-extras-commits
mailing list