extras-buildsys/www builders.psp, 1.10, 1.11 config.psp, 1.2, 1.3 failed.psp, 1.6, 1.7 index.psp, 1.9, 1.10 indiv.psp, 1.9, 1.10 job.psp, 1.12, 1.13 success.psp, 1.7, 1.8

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	builders.psp config.psp failed.psp index.psp indiv.psp job.psp 
	success.psp 
Log Message:
2005-10-31  Dan Williams  <dcbw at redhat.com>

    * www/*
        - Add a 'down_message' option to config.psp and show it, if one
            exists, on all pages




Index: builders.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- builders.psp	1 Sep 2005 18:45:01 -0000	1.10
+++ builders.psp	31 Oct 2005 17:39:47 -0000	1.11
@@ -28,8 +28,13 @@
     e = -1
 
 if e == -1:
+    if len(config_opts['down_message']) > 0:
 %>
-    <p><h2>The server could not process the request.</h2><br>Error was:  <%=msg%></p>
+        <p><h2><%=config_opts['down_message']%></h2></p>
+<%
+    else:
+%>
+        <p><h2>The server could not process the request.</h2><br>Error was:  <%=msg%></p>
 <%
 else:
     for builder in builders:


Index: config.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/config.psp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.psp	26 Jul 2005 23:38:52 -0000	1.2
+++ config.psp	31 Oct 2005 17:39:47 -0000	1.3
@@ -10,4 +10,7 @@
 config_opts['user_ca_cert'] = CERT_BASE_DIR + "fedora-upload-ca.cert"
 config_opts['server_ca_cert'] = CERT_BASE_DIR + "fedora-server-ca.cert"
 
+# Leave blank (zero-length) to disable
+config_opts['down_messagae'] = ""
+
 %>


Index: failed.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/failed.psp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- failed.psp	31 Aug 2005 19:31:00 -0000	1.6
+++ failed.psp	31 Oct 2005 17:39:47 -0000	1.7
@@ -27,8 +27,13 @@
     e = -1
 
 if e == -1:
+    if len(config_opts['down_message']) > 0:
 %>
-    <p><h2>The server could not process the request.</h2><br>Error was:  <%=msg%></p>
+        <p><h2><%=config_opts['down_message']%></h2></p>
+<%
+    else:
+%>
+        <p><h2>The server could not process the request.</h2><br>Error was:  <%=msg%></p>
 <%
 else:
     i = 1


Index: index.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- index.psp	31 Aug 2005 19:31:00 -0000	1.9
+++ index.psp	31 Oct 2005 17:39:47 -0000	1.10
@@ -24,8 +24,13 @@
     e = -1
 
 if e == -1:
+    if len(config_opts['down_message']) > 0:
 %>
-    <p><h2>The server could not process the request.</h2><br>Error was:  <%=msg%></p>
+        <p><h2><%=config_opts['down_message']%></h2></p>
+<%
+    else:
+%>
+        <p><h2>The server could not process the request.</h2><br>Error was:  <%=msg%></p>
 <%
 else:
     i = 1


Index: indiv.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/indiv.psp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- indiv.psp	31 Aug 2005 19:31:00 -0000	1.9
+++ indiv.psp	31 Oct 2005 17:39:47 -0000	1.10
@@ -49,8 +49,13 @@
         e = -1
 
     if e == -1:
+        if len(config_opts['down_message']) > 0:
 %>
-    <p><h2>The server could not process the request.</h2><br>Error was:  <%=msg%></p>
+            <p><h2><%=config_opts['down_message']%></h2></p>
+<%
+        else:
+%>
+            <p><h2>The server could not process the request.</h2><br>Error was:  <%=msg%></p>
 <%
     else:
 %>


Index: job.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- job.psp	1 Sep 2005 18:28:32 -0000	1.12
+++ job.psp	31 Oct 2005 17:39:47 -0000	1.13
@@ -32,8 +32,13 @@
         e = -1
 
     if e == -1:
+        if len(config_opts['down_message']) > 0:
 %>
-    <p><h2>The server could not process the request.</h2><br>Error was:  <%=msg%></p>
+            <p><h2><%=config_opts['down_message']%></h2></p>
+<%
+        else:
+%>
+            <p><h2>The server could not process the request.</h2><br>Error was:  <%=msg%></p>
 <%
     else:
         if job.has_key('version') and job.has_key('release'):


Index: success.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/success.psp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- success.psp	31 Aug 2005 19:31:00 -0000	1.7
+++ success.psp	31 Oct 2005 17:39:47 -0000	1.8
@@ -25,8 +25,13 @@
     e = -1
 
 if e == -1:
+    if len(config_opts['down_message']) > 0:
 %>
-    <p><h2>The server could not process the request.</h2><br>Error was:  <%=msg%></p>
+        <p><h2><%=config_opts['down_message']%></h2></p>
+<%
+    else:
+%>
+        <p><h2>The server could not process the request.</h2><br>Error was:  <%=msg%></p>
 <%
 else:
     i = 1