incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1441376 - in /incubator/public/trunk: build.xml content/ content/style/style.css content/stylesheets/project.xml content/votes.xml
Date Fri, 01 Feb 2013 10:17:59 GMT
Author: brane
Date: Fri Feb  1 10:17:59 2013
New Revision: 1441376

URL: http://svn.apache.org/viewvc?rev=1441376&view=rev
Log:
Embed generated vote status page into the incubator site.

* build.xml: Remove target votestats.
* content/: Do not ignore votes.xml.
* content/style/style.css: Simplify voter-related styles.
* content/stylesheets/project.xml: Update vote status links.
* content/votes.xml: New; embeds status tables from elsewhere.
  FIXME: Currently that "elsewhere" is from people.apache.org, not
         incubator.apache.org. That will probably not work due to
         security constraints, so need to set up a redirect.

Added:
    incubator/public/trunk/content/votes.xml   (with props)
Modified:
    incubator/public/trunk/build.xml
    incubator/public/trunk/content/   (props changed)
    incubator/public/trunk/content/style/style.css
    incubator/public/trunk/content/stylesheets/project.xml

Modified: incubator/public/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/public/trunk/build.xml?rev=1441376&r1=1441375&r2=1441376&view=diff
==============================================================================
--- incubator/public/trunk/build.xml (original)
+++ incubator/public/trunk/build.xml Fri Feb  1 10:17:59 2013
@@ -35,21 +35,6 @@
         </echo>
     </target>
 
-    <target name="votestats" depends="prepare-error"
-            if="AnakiaTask.present"
-            description="Build embedded vote page">
-      <taskdef name="anakia" classname="org.apache.anakia.AnakiaTask">
-        <classpath refid="classpath"/>
-      </taskdef>
-      <anakia basedir="${docs.src}" destdir="${docs.dest}/"
-              extension=".html" style="./site.vsl"
-              projectFile="stylesheets/project.xml"
-              includes="votes.xml"
-              lastModifiedCheck="false"
-              templatePath="${docs.src}/stylesheets"
-              velocityPropertiesFile="build.props"/>
-    </target>
-
     <target name="docs" depends="prepare-error,generate-site-map,generate-menu,generate-index,report-groups,report-next-month,history"
         if="AnakiaTask.present"
         description="Build all the documents">

Propchange: incubator/public/trunk/content/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb  1 10:17:59 2013
@@ -1,2 +1 @@
 sitemap.xml
-votes.xml

Modified: incubator/public/trunk/content/style/style.css
URL: http://svn.apache.org/viewvc/incubator/public/trunk/content/style/style.css?rev=1441376&r1=1441375&r2=1441376&view=diff
==============================================================================
--- incubator/public/trunk/content/style/style.css (original)
+++ incubator/public/trunk/content/style/style.css Fri Feb  1 10:17:59 2013
@@ -56,20 +56,20 @@ a:visited {color: #00438a;}
     border: 2px solid #bbbbbb;
     white-space: pre;
 }
-table#votero, table#voterc, table#votere, {
+table#voter {
   white-space: pre;
 }
 
-#clutch th, #votero th, #voterc th, #votere th {
+#clutch th, #voter th {
   background-color: #cccccc;
 }
-#votero th, #voterc th, #votere th, #votero td, #voterc td, #votere td {
+#votero th, #voter th, #voter td {
   padding: 0.2em 0.5em;
 }
-#votero td, #voterc td, #votere td {
+#voter td {
   background-color: inherit;
 }
-#votero tr.normal, #voterc tr.normal, #votere tr.normal {}
+#voter tr.normal {}
 #clutch td {
   padding: 0.2em;
 }
@@ -79,16 +79,16 @@ table#votero, table#voterc, table#votere
 #clutch td.number {
   text-align: right;
 }
-#clutch td.issue, #votero tr.yell, #voterc tr.yell, #votere tr.yell {
+#clutch td.issue, #voter tr.yell {
   background-color: #d55e00;
 }
-#clutch td.care, #votero tr.nag, #voterc tr.nag, #votere tr.nag {
+#clutch td.care, #voter tr.nag {
   background-color: #e69f00;
 }
 #clutch td.cool1 {
   background-color: #009e73;
 }
-#clutch td.cool2, #votero tr.nudge, #voterc tr.nudge, #votere tr.nudge {
+#clutch td.cool2, #voter tr.nudge {
   background-color: #f0e442;
 }
 #clutch td.cool3 {

Modified: incubator/public/trunk/content/stylesheets/project.xml
URL: http://svn.apache.org/viewvc/incubator/public/trunk/content/stylesheets/project.xml?rev=1441376&r1=1441375&r2=1441376&view=diff
==============================================================================
--- incubator/public/trunk/content/stylesheets/project.xml [utf-8] (original)
+++ incubator/public/trunk/content/stylesheets/project.xml [utf-8] Fri Feb  1 10:17:59 2013
@@ -29,8 +29,8 @@ limitations under the License.
 
     <projects>
       <title href="/projects/index.html">Incubator Projects</title>
-      <li><a href="http://people.apache.org/~brane/fakeubator/votes.html" target="_blank">Voting
Status (embeded)</a></li>
-      <li><a href="http://people.apache.org/~brane/incubator-votes.html" target="_blank">Voting
Status (standalone)</a></li>
+      <li><a href="/votes.html" target="_blank">Voting Status (embedded)</a></li>
+      <li><a href="http://people.apache.org/~brane/incubator/votes.html" target="_blank">Voting
Status (standalone)</a></li>
     </projects>
 
     <projects><title href="http://www.apache.org/foundation/glossary.html#Podling">Podlings
(What's that?)</title>

Added: incubator/public/trunk/content/votes.xml
URL: http://svn.apache.org/viewvc/incubator/public/trunk/content/votes.xml?rev=1441376&view=auto
==============================================================================
--- incubator/public/trunk/content/votes.xml (added)
+++ incubator/public/trunk/content/votes.xml [utf-8] Fri Feb  1 10:17:59 2013
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document>
+  <properties>
+    <title>Voting Status</title>
+    <link href="http://purl.org/DC/elements/1.0/" rel="schema.DC"/>
+    <script>
+      var fragment_loader;
+      if (window.XMLHttpRequest) { // IE7+, Firefox, Chrome, Opera, Safari
+        fragment_loader = new XMLHttpRequest();
+      } else { // IE6, IE5
+        fragment_loader = new ActiveXObject("Microsoft.XMLHTTP");
+      }
+      fragment_loader.onreadystatechange = function() {
+        if (fragment_loader.readyState != 4)
+          return;
+        if (fragment_loader.status != 200)
+          html = "<p>Content is not available</p>";
+        else {
+          container = document.getElementById("voter").parentNode;
+          container.innerHTML = fragment_loader.responseText;
+        }
+      }
+      window.onload = function() {
+        // FIXME: cross-domain loading ... set up a redirect here from incubator.apache.org
+        fragment_loader.open("GET", "http://people.apache.org/~brane/incubator/embedded-votes.html",
true);
+        fragment_loader.send();
+      }
+    </script>
+  </properties>
+  <body>
+    <section id="Apache+Incubator+Voting+Status">
+      <title>Apache Incubator Voting Status</title>
+      <div id="voter"/>
+    </section>
+  </body>
+</document>

Propchange: incubator/public/trunk/content/votes.xml
------------------------------------------------------------------------------
    svn:eol-style = native



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


Mime
View raw message