incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1441368 - in /incubator/public/trunk/voter: ./ status.py utility.py
Date Fri, 01 Feb 2013 10:06:55 GMT
Author: brane
Date: Fri Feb  1 10:06:55 2013
New Revision: 1441368

URL: http://svn.apache.org/viewvc?rev=1441368&view=rev
Log:
Generate embeddable vote status page that does not depend on the rest of the incubator site.

Modified:
    incubator/public/trunk/voter/   (props changed)
    incubator/public/trunk/voter/status.py
    incubator/public/trunk/voter/utility.py

Propchange: incubator/public/trunk/voter/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb  1 10:06:55 2013
@@ -1,3 +1,4 @@
 *.pyc
 votes.sqlite
 votes.html
+embedded-votes.html

Modified: incubator/public/trunk/voter/status.py
URL: http://svn.apache.org/viewvc/incubator/public/trunk/voter/status.py?rev=1441368&r1=1441367&r2=1441368&view=diff
==============================================================================
--- incubator/public/trunk/voter/status.py (original)
+++ incubator/public/trunk/voter/status.py Fri Feb  1 10:06:55 2013
@@ -93,7 +93,7 @@ __standalone = __Template(
 </head>
 <body>
   <h1>Apache Incubator Voting Status</h1>
-  <p>Last recorded change: %(lastchange)s</p>
+  <p style="whitespace: pre">Last recorded change: %(lastchange)s</p>
 %(current)s
 %(closed)s
 %(issues)s
@@ -137,7 +137,8 @@ __standalone = __Template(
       <td>%(closed)s</td>
     </tr>""",
     issues_table = """\
-  <h2>Problems Found</h2>
+  <h2>Issues</h2>
+  <p>Problems encountered during vote status page generation:</p>
   <table>
     <tr>
       <th>Severity</th>
@@ -153,79 +154,88 @@ __standalone = __Template(
 
 __embedded = __Template(
     page = """\
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document
-[
-<!ENTITY ndash  "&#8211;">
-<!ENTITY nbsp    "&#160;">
-]>
-<document>
-  <properties>
-    <title>Apache Incubator Voting Status</title>
-    <link href="http://purl.org/DC/elements/1.0/" rel="schema.DC"/>
-  </properties>
-  <body>
-    <section id="Apache+Incubator+Voting+Status">
-      <title>Apache Incubator Voting Status</title>
-      <p>Last recorded change: %(lastchange)s</p>
+<!DOCTYPE html>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<html lang="en">
+<body>
+  <div id="voter" class="section-content">
+    <p style="whitespace: pre">Last recorded change: %(lastchange)s</p>
 %(current)s
 %(closed)s
 %(issues)s
-    </section>
-  </body>
-</document>
+  </div>
+</body>
+</html>
 """,
     current_table = """\
-      <section id="Current+Votes">
-        <title>Current Votes</title>
-        <table id="votero">
-          <tr>
-           <th>Subject</th>
-           <th>Activity</th>
-           <th>Started</th>
-           <th>Age</th>
-          </tr>
+    <h3 id="Current+Votes">Current Votes</h3>
+    <div class="section-content">
+      <table class="colortable" width="100%%">
+        <tr>
+          <th>Subject</th>
+          <th>Activity</th>
+          <th>Started</th>
+          <th>Age</th>
+        </tr>
 %s
-        </table>
-      </section>""",
+      </table>
+    </div>""",
     current_row = """\
-          <tr class="%(klass)s">
-            <td>%(subject)s</td>
-            <td>%(updated)s</td>
-            <td>%(noticed)s</td>
-            <td>%(duration)s</td>
-          </tr>""",
+        <tr class="%(klass)s">
+          <td>%(subject)s</td>
+          <td>%(updated)s</td>
+          <td>%(noticed)s</td>
+          <td>%(duration)s</td>
+        </tr>""",
     closed_table = """\
-      <section id="Recently+Closed+Votes">
-        <title>Recently Closed Votes</title>
-        <table id="voterc">
-          <tr>
-           <th>Status</th>
-           <th>Subject</th>
-           <th>Started</th>
-           <th>Closed</th>
-          </tr>
+    <h3 id="Recently+Closed+Votes">Recently Closed Votes</h3>
+    <div class="section-content">
+      <table class="colortable" width="100%%">
+        <tr>
+          <th>Status</th>
+          <th>Subject</th>
+          <th>Started</th>
+          <th>Closed</th>
+        </tr>
 %s
-        </table>
-      </section>""",
+      </table>
+    </div>""",
     closed_row = """\
-          <tr class="%(klass)s">
-            <td>%(status)s</td>
-            <td>%(subject)s</td>
-            <td>%(noticed)s</td>
-            <td>%(closed)s</td>
-          </tr>""",
+        <tr class="%(klass)s">
+          <td>%(status)s</td>
+          <td>%(subject)s</td>
+          <td>%(noticed)s</td>
+          <td>%(closed)s</td>
+        </tr>""",
     issues_table = """\
-      <section id="Problems+Found">
-        <title>Problems Found</title>
-        <table id="votere">
-          <tr>
-            <th>Severity</th>
-            <th>Description</th>
-          </tr>
+    <h3 id="Problems+Found">Issues</h3>
+    <div class="section-content">
+      <p>Problems encountered during vote status page generation:</p>
+      <table class="colortable" width="100%%">
+        <tr>
+          <th>Severity</th>
+          <th>Description</th>
+        </tr>
 %s
-        </table>
-      </section>""",
+      </table>
+    </div>""",
     issues_row = """\
         <tr class="%(klass)s">
           <td>%(kind)s</td>

Modified: incubator/public/trunk/voter/utility.py
URL: http://svn.apache.org/viewvc/incubator/public/trunk/voter/utility.py?rev=1441368&r1=1441367&r2=1441368&view=diff
==============================================================================
--- incubator/public/trunk/voter/utility.py (original)
+++ incubator/public/trunk/voter/utility.py Fri Feb  1 10:06:55 2013
@@ -97,7 +97,7 @@ class SiteStructure(object):
 
     @classmethod
     def status_page_template(cls):
-        return cls.content_path('votes.xml')
+        return cls.incuvoter_path('embedded-votes.html')
 
     @classmethod
     def podlings(cls):



---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org


Mime
View raw message