On 16 October 2015 at 21:53, <rbo...@apache.org> wrote: > Author: rbowen > Date: Fri Oct 16 20:53:52 2015 > New Revision: 1709110 > > URL: http://svn.apache.org/viewvc?rev=1709110&view=rev > Log: > Yes, I know, LDAP isn't necessarily authoritative, but people shouldn't
LDAP committee membership has no direct relation with PMC membership. > be blindly copy/pasting this anyways. The current phrasing always trips > me up when I'm reading these reports. This still isn't ideal, but it's > an improvement. Please feel free to reformat. -1 The new text makes the output even more confusing. If the problem is with the board report, then the obvious solution is to drop the LDAP committee section from the board report skeleton, and not change the main body of the web app. Please let's ensure that the data is described correctly. > Modified: > comdev/reporter.apache.org/trunk/site/render.js > > Modified: comdev/reporter.apache.org/trunk/site/render.js > URL: > http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/render.js?rev=1709110&r1=1709109&r2=1709110&view=diff > ============================================================================== > --- comdev/reporter.apache.org/trunk/site/render.js (original) > +++ comdev/reporter.apache.org/trunk/site/render.js Fri Oct 16 20:53:52 2015 > @@ -353,7 +353,7 @@ function renderFrontPage(json) { > GetAsyncJSON("reportingcycles.json?" + Math.random(), [pmc, > reportdate, json.pdata[pmc].name], setReportDate) > > > - // LDAP committee + Committer changes > + // PMC + Committer changes > > var mo = new Date().getMonth() - 3; > var after = new Date(); > @@ -361,7 +361,7 @@ function renderFrontPage(json) { > > PMCchanges(json, pmc, after) > > - var changes = buildPanel(pmc, "LDAP changes"); > + var changes = buildPanel(pmc, "PMC changes"); > > var c = 0; > for (i in json.changes[pmc].committer) c++; > @@ -370,16 +370,16 @@ function renderFrontPage(json) { > var np = 0; > var ncn = null; > var npn = null; > - addLine(pmc, "## LDAP changes:") > + // addLine(pmc, "## LDAP changes:") > addLine(pmc) > - addLine(pmc, " - Currently " + json.count[pmc][1] + " > committers and " + json.count[pmc][0] + " committee group members.") > + addLine(pmc, " - Currently " + json.count[pmc][1] + " > committers and " + json.count[pmc][0] + " PMC members.") > if (c == 0) { > if (isNewPMC(json,pmc,after)) { > changes.innerHTML += "No changes - the PMC was established > in the last 3 months." > addLine(pmc, " - No changes (the PMC was established in the > last 3 months)") > } else { > - changes.innerHTML += "<font color='red'><b>No new > changes to the committee group or committer base detected - (LDAP error or no > changes for >2 years)</b></font>" > - addLine(pmc, " - No new changes to the committee > group or committership since last report.") > + changes.innerHTML += "<font color='red'><b>No new > changes to the PMC or committer base detected - (LDAP error or no changes for > >2 years)</b></font>" > + addLine(pmc, " - No new changes to the PMC or > committership since last report.") > } > addLine(pmc) > } else { > @@ -395,7 +395,7 @@ function renderFrontPage(json) { > } > } > if (npmc > 1) { > - addLine(pmc, " - New committee group > members:") > + addLine(pmc, " - New PMC members:") > } > > for (i in json.changes[pmc].pmc) { > @@ -406,24 +406,24 @@ function renderFrontPage(json) { > } > if (entry[1] > after.getTime() / 1000) { > l++; > - changes.innerHTML += "→ " + > entry[0] + " was added to the committee group on " + new Date(entry[1] * > 1000).toDateString() + "<br>"; > - addLine(pmc, (npmc > 1 ? " " : "") > + " - " + entry[0] + " was added to the committee group on " + new > Date(entry[1] * 1000).toDateString()) > + changes.innerHTML += "→ " + > entry[0] + " was added to the PMC on " + new Date(entry[1] * > 1000).toDateString() + "<br>"; > + addLine(pmc, (npmc > 1 ? " " : "") > + " - " + entry[0] + " was added to the PMC on " + new Date(entry[1] * > 1000).toDateString()) > } > } > if (l == 0) { // PMC older than 3 months itself > if (isNewPMC(json,pmc,after)) { > - addLine(pmc, " - No new committee group members added in > the 3 months since the PMC was established") > - changes.innerHTML += "→ No new committee group > members in the 3 months since the PMC was established<br>"; > + addLine(pmc, " - No new PMC members added in the 3 > months since the PMC was established") > + changes.innerHTML += "→ No new PMC members in the 3 > months since the PMC was established<br>"; > } else { > - addLine(pmc, " - No new committee group > members added in the last 3 months") > - changes.innerHTML += "→ <font > color='red'><b>No new committee group members in the last 3 > months.</b></font><br>"; > + addLine(pmc, " - No new PMC members added > in the last 3 months") > + changes.innerHTML += "→ <font > color='red'><b>No new PMC members in the last 3 months.</b></font><br>"; > } > } > if (npn) { > if (np < after.getTime() / 1000) { > - addLine(pmc, " - Last committee group > addition was " + npn + " at " + new Date(np * 1000).toDateString()) > + addLine(pmc, " - Last PMC addition > was " + npn + " at " + new Date(np * 1000).toDateString()) > } > - changes.innerHTML += "→ " + "<b>Latest > committee group addition: </b>" + new Date(np * 1000).toDateString() + " (" + > npn + ")<br>" > + changes.innerHTML += "→ " + "<b>Latest > PMC addition: </b>" + new Date(np * 1000).toDateString() + " (" + npn + > ")<br>" > } > > > @@ -464,7 +464,7 @@ function renderFrontPage(json) { > addLine(pmc, " - Last committer addition was > more than 2 years ago") > changes.innerHTML += "→ " + "<b>Latest > committer addition: </b><font color='red'>more than two years ago (not in the > archive!)</font><br>" > } > - changes.innerHTML += "→ " + "<b>Currently " + > json.count[pmc][1] + " committers and " + json.count[pmc][0] + " committee > members." > + changes.innerHTML += "→ " + "<b>Currently " + > json.count[pmc][1] + " committers and " + json.count[pmc][0] + " PMC members." > addLine(pmc) > } > > >
