community-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1689285 - in /comdev/projects.apache.org: scripts/README.txt site/js/projects.js site/json/foundation/HEADER.html site/json/foundation/podlings-evolution.json
Date Sun, 05 Jul 2015 20:05:26 GMT
Author: hboutemy
Date: Sun Jul  5 20:05:25 2015
New Revision: 1689285

URL: http://svn.apache.org/r1689285
Log:
podlings-evolution.json is not useful any more: replaced by podlings-history.json

Removed:
    comdev/projects.apache.org/site/json/foundation/podlings-evolution.json
Modified:
    comdev/projects.apache.org/scripts/README.txt
    comdev/projects.apache.org/site/js/projects.js
    comdev/projects.apache.org/site/json/foundation/HEADER.html

Modified: comdev/projects.apache.org/scripts/README.txt
URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/scripts/README.txt?rev=1689285&r1=1689284&r2=1689285&view=diff
==============================================================================
--- comdev/projects.apache.org/scripts/README.txt (original)
+++ comdev/projects.apache.org/scripts/README.txt Sun Jul  5 20:05:25 2015
@@ -18,10 +18,10 @@ various sources:
   List of committers with reference to groups (people.json) and groups with corresponding
committers (groups.json)
 
 - podlings.py: Reads podlings.xml from the incubator site and creates a JSON
-  with timeline data, as well as current podling projects information.
+  with history data, as well as current podling projects information.
   in: http://incubator.apache.org/podlings.xml
-  out: site/json/foundation/podlings.json + site/json/foundation/podlings-evolution.json
-  Current list of podlings (podlings.json) and monthly statisctics on podlings (podlings-evolution.json)
+  out: site/json/foundation/podlings.json + site/json/foundation/podlings-history.json
+  Current list of podlings (podlings.json) and ended podlings (podlings-history.json)
 
 - parsereleases.py
   in: http://www.apache.org/dist/

Modified: comdev/projects.apache.org/site/js/projects.js
URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/site/js/projects.js?rev=1689285&r1=1689284&r2=1689285&view=diff
==============================================================================
--- comdev/projects.apache.org/site/js/projects.js (original)
+++ comdev/projects.apache.org/site/js/projects.js Sun Jul  5 20:05:25 2015
@@ -27,7 +27,6 @@ var committees = {}; // id -> committee
 var committeesByName = {}; // name -> committee info
 var retiredCommittees = {}; // retired committees information: id -> committee info (established,
retired, homepage, id, name)
 var projects = {}; // Projects
-var evolution = {}; // Podling evolution
 var podlingsHistory = {}; // Podlings history (now graduated or retired)
 
 // --------- Global helpers ----------- \\
@@ -997,7 +996,7 @@ function renderFrontPage() {
     var numcommittees = 0;
     var i;
     for (i in committees) numcommittees++;
-    var cur = evolution[0].current;
+    var curPodlings = 0;
 
     var nsubs = 0; // number of projects with DOAP that do not have same name than a committee
     for (i in projects) {
@@ -1005,15 +1004,18 @@ function renderFrontPage() {
         if (i.pmc != 'incubator' && !isCommittee(i.name)) {
             nsubs++;
         }
+        if (i['podling']) {
+            curPodlings++;
+        }
     }
-    var initiatives = cur + numcommittees + nsubs; // podlings + committees + sub-projects
+    var initiatives = curPodlings + numcommittees + nsubs; // podlings + committees + sub-projects
     initiatives -= initiatives % 100; // round down
     var obj = document.getElementById('details');
     obj.innerHTML = "<h3 style='text-align: center;'>There are currently <span style='color:
#269;'>" + initiatives + "+</span> open source initatives at the ASF:</h3>"
         + "<ul style='width: 400px; margin: 0 auto; font-size: 18px; color: #269; font-weight:
bold;'>"
         + "<li>" + numcommittees + " committees managing " + (numcommittees + nsubs)
+ " projects</li>"
         + "<li>5 special committees*</li>"
-        + "<li>" + cur + " incubating podlings</li></ul>"
+        + "<li>" + curPodlings + " incubating podlings</li></ul>"
         + "<p><small>*Infrastructure, Travel Assistance, Security Team, Legal
Affairs and Brand Management</small></p>";
 
     renderCommitteeEvolution();
@@ -1549,7 +1551,6 @@ function preloadEverything(callback) {
         ["json/foundation/projects.json", "projects", weaveInProjects],
         ["json/foundation/podlings.json", "podlings", weaveInProjects],
         ["json/foundation/committees-retired.json", "retired committees", weaveInRetiredCommittees],
-        ["json/foundation/podlings-evolution.json", "podlings evolution", function(json)
{ evolution = json; }],
         ["json/foundation/podlings-history.json", "podlings history", function(json) { podlingsHistory
= json; }]
         ],
         callback);

Modified: comdev/projects.apache.org/site/json/foundation/HEADER.html
URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/site/json/foundation/HEADER.html?rev=1689285&r1=1689284&r2=1689285&view=diff
==============================================================================
--- comdev/projects.apache.org/site/json/foundation/HEADER.html (original)
+++ comdev/projects.apache.org/site/json/foundation/HEADER.html Sun Jul  5 20:05:25 2015
@@ -6,7 +6,7 @@ for more information.
 <li><a href="accounts-evolution.json"><code>accounts-evolution.json</code></a>
generated by <code>cronjobs/countaccounts.py</code> from LDAP</li>
 <li><i><a href="chairs.json"><code>chairs.json</code></a>
generated by <code>cronjobs/parsechairs.py</code> from <a href="http://www.apache.org/foundation/">http://www.apache.org/foundation/</a>
(not used any more, replaced by committees.json)</i></li>
 <li><a href="groups.json"><code>groups.json</code></a>, <a
href="people.json"><code>people.json</code></a> and <a href="people_name.json"><code>people_name.json</code></a>
generated by <code>cronjobs/parsecommitters.py</code> from <a href="http://people.apache.org/committer-index.html">http://people.apache.org/committer-index.html</a></li>
-<li><a href="podlings.json"><code>podlings.json</code></a>
and <a href="podlings-evolution.json"><code>podlings-evolution.json</code></a>
generated by <code>cronjobs/podlings.py</code> from <a href="http://incubator.apache.org/podlings.xml">http://incubator.apache.org/podlings.xml</a></li>
+<li><a href="podlings.json"><code>podlings.json</code></a>
and <a href="podlings-history.json"><code>podlings-history.json</code></a>
generated by <code>cronjobs/podlings.py</code> from <a href="http://incubator.apache.org/podlings.xml">http://incubator.apache.org/podlings.xml</a></li>
 <li><a href="projects.json"><code>projects.json</code></a>
imported with <code>import/rdfparse.py</code> from <a href='https://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/files.xml'>projects'
DOAP files</a></li>
 <li><a href="releases.json"><code>releases.json</code></a>
generated by <code>cronjobs/parsereleases.py</code> from <a href="http://www.apache.org/dist/">http://www.apache.org/dist/</a></li>
 <li><a href="committees.json"><code>committees.json</code></a>
and <a href="committees-retired.json"><code>committees-retired.json</code></a>
imported with <code>import/parsecommittees.py</code> from <code>https://svn.apache.org/repos/private/committers/board/committee-info.txt</code></li>



Mime
View raw message