Repository: spark-website Updated Branches: refs/heads/asf-site 33d86d7bf -> d7dcb6c8b
removed old versions (<1.3) and re-arranged download options. Project: http://git-wip-us.apache.org/repos/asf/spark-website/repo Commit: http://git-wip-us.apache.org/repos/asf/spark-website/commit/d7dcb6c8 Tree: http://git-wip-us.apache.org/repos/asf/spark-website/tree/d7dcb6c8 Diff: http://git-wip-us.apache.org/repos/asf/spark-website/diff/d7dcb6c8 Branch: refs/heads/asf-site Commit: d7dcb6c8b96bffa894714f2348973c107b433738 Parents: 33d86d7 Author: Reynold Xin <r...@databricks.com> Authored: Tue Jul 26 21:13:36 2016 -0700 Committer: Reynold Xin <r...@databricks.com> Committed: Tue Jul 26 21:13:36 2016 -0700 ---------------------------------------------------------------------- js/downloads.js | 67 +++++++++++++++++++++++------------------------ site/js/downloads.js | 67 +++++++++++++++++++++++------------------------ 2 files changed, 66 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark-website/blob/d7dcb6c8/js/downloads.js ---------------------------------------------------------------------- diff --git a/js/downloads.js b/js/downloads.js index 1d125b6..88e4bb9 100644 --- a/js/downloads.js +++ b/js/downloads.js @@ -7,7 +7,7 @@ function addRelease(version, releaseDate, packages, downloadable, stable) { releases[version] = {released: releaseDate, packages: packages, downloadable: downloadable, stable: stable}; } -var sources = {pretty: "Source Code [can build several Hadoop versions]", tag: "sources"}; +var sources = {pretty: "Source Code", tag: "sources"}; var hadoopFree = {pretty: "Pre-build with user-provided Hadoop [can use with most Hadoop distributions]", tag: "without-hadoop"}; var hadoop1 = {pretty: "Pre-built for Hadoop 1.X", tag: "hadoop1"}; var cdh4 = {pretty: "Pre-built for CDH 4", tag: "cdh4"}; @@ -19,9 +19,8 @@ var hadoop2p7 = {pretty: "Pre-built for Hadoop 2.7 and later", tag: "hadoop2.7"} var mapr3 = {pretty: "Pre-built for MapR 3.X", tag: "mapr3"}; var mapr4 = {pretty: "Pre-built for MapR 4.X", tag: "mapr4"}; -var sources = [sources]; // 0.7+ -var packagesV1 = [hadoop1, cdh4]; +var packagesV1 = [hadoop1, cdh4, sources]; // 0.8.1+ var packagesV2 = [hadoop2].concat(packagesV1); // 1.0.1+ @@ -31,39 +30,39 @@ var packagesV4 = [hadoop2p4, hadoop2p3, mapr3, mapr4].concat(packagesV1); // 1.3.1+ var packagesV5 = [hadoop2p6].concat(packagesV4); // 1.4.0+ -var packagesV6 = [hadoopFree, hadoop2p6, hadoop2p4, hadoop2p3].concat(packagesV1); +var packagesV6 = [hadoop2p6, hadoop2p4, hadoop2p3, hadoopFree].concat(packagesV1); // 2.0.0+ -var packagesV7 = [hadoopFree, hadoop2p7, hadoop2p6, hadoop2p4, hadoop2p3]; +var packagesV7 = [hadoop2p7, hadoop2p6, hadoop2p4, hadoop2p3, hadoopFree, sources]; // addRelease("2.0.0-preview", new Date("05/24/2016"), sources.concat(packagesV7), true, false); -addRelease("2.0.0", new Date("07/27/2016"), sources.concat(packagesV7), true, true); -addRelease("1.6.2", new Date("06/25/2016"), sources.concat(packagesV6), true, true); -addRelease("1.6.1", new Date("03/09/2016"), sources.concat(packagesV6), true, true); -addRelease("1.6.0", new Date("01/04/2016"), sources.concat(packagesV6), true, true); -addRelease("1.5.2", new Date("11/09/2015"), sources.concat(packagesV6), true, true); -addRelease("1.5.1", new Date("10/02/2015"), sources.concat(packagesV6), true, true); -addRelease("1.5.0", new Date("9/09/2015"), sources.concat(packagesV6), true, true); -addRelease("1.4.1", new Date("7/15/2015"), sources.concat(packagesV6), true, true); -addRelease("1.4.0", new Date("6/11/2015"), sources.concat(packagesV6), true, true); -addRelease("1.3.1", new Date("4/17/2015"), sources.concat(packagesV5), true, true); -addRelease("1.3.0", new Date("3/13/2015"), sources.concat(packagesV4), true, true); -addRelease("1.2.2", new Date("4/17/2015"), sources.concat(packagesV4), true, true); -addRelease("1.2.1", new Date("2/9/2015"), sources.concat(packagesV4), true, true); -addRelease("1.2.0", new Date("12/18/2014"), sources.concat(packagesV4), true, true); -addRelease("1.1.1", new Date("11/26/2014"), sources.concat(packagesV4), true, true); -addRelease("1.1.0", new Date("9/11/2014"), sources.concat(packagesV4), true, true); -addRelease("1.0.2", new Date("8/5/2014"), sources.concat(packagesV3), true, true); -addRelease("1.0.1", new Date("7/11/2014"), sources.concat(packagesV3), false, true); -addRelease("1.0.0", new Date("5/30/2014"), sources.concat(packagesV2), false, true); -addRelease("0.9.2", new Date("7/23/2014"), sources.concat(packagesV2), true, true); -addRelease("0.9.1", new Date("4/9/2014"), sources.concat(packagesV2), false, true); -addRelease("0.9.0-incubating", new Date("2/2/2014"), sources.concat(packagesV2), false, true); -addRelease("0.8.1-incubating", new Date("12/19/2013"), sources.concat(packagesV2), true, true); -addRelease("0.8.0-incubating", new Date("9/25/2013"), sources.concat(packagesV1), true, true); -addRelease("0.7.3", new Date("7/16/2013"), sources.concat(packagesV1), true, true); -addRelease("0.7.2", new Date("2/6/2013"), sources.concat(packagesV1), false, true); -addRelease("0.7.0", new Date("2/27/2013"), sources, false, true); +addRelease("2.0.0", new Date("07/27/2016"), packagesV7, true, true); +addRelease("1.6.2", new Date("06/25/2016"), packagesV6, true, true); +addRelease("1.6.1", new Date("03/09/2016"), packagesV6, true, true); +addRelease("1.6.0", new Date("01/04/2016"), packagesV6, true, true); +addRelease("1.5.2", new Date("11/09/2015"), packagesV6, true, true); +addRelease("1.5.1", new Date("10/02/2015"), packagesV6, true, true); +addRelease("1.5.0", new Date("9/09/2015"), packagesV6, true, true); +addRelease("1.4.1", new Date("7/15/2015"), packagesV6, true, true); +addRelease("1.4.0", new Date("6/11/2015"), packagesV6, true, true); +addRelease("1.3.1", new Date("4/17/2015"), packagesV5, true, true); +addRelease("1.3.0", new Date("3/13/2015"), packagesV4, true, true); +// addRelease("1.2.2", new Date("4/17/2015"), packagesV4, true, true); +// addRelease("1.2.1", new Date("2/9/2015"), packagesV4, true, true); +// addRelease("1.2.0", new Date("12/18/2014"), packagesV4, true, true); +// addRelease("1.1.1", new Date("11/26/2014"), packagesV4, true, true); +// addRelease("1.1.0", new Date("9/11/2014"), packagesV4, true, true); +// addRelease("1.0.2", new Date("8/5/2014"), packagesV3, true, true); +// addRelease("1.0.1", new Date("7/11/2014"), packagesV3, false, true); +// addRelease("1.0.0", new Date("5/30/2014"), packagesV2, false, true); +// addRelease("0.9.2", new Date("7/23/2014"), packagesV2, true, true); +// addRelease("0.9.1", new Date("4/9/2014"), packagesV2, false, true); +// addRelease("0.9.0-incubating", new Date("2/2/2014"), packagesV2, false, true); +// addRelease("0.8.1-incubating", new Date("12/19/2013"), packagesV2, true, true); +// addRelease("0.8.0-incubating", new Date("9/25/2013"), packagesV1, true, true); +// addRelease("0.7.3", new Date("7/16/2013"), packagesV1, true, true); +// addRelease("0.7.2", new Date("2/6/2013"), packagesV1, false, true); +// addRelease("0.7.0", new Date("2/27/2013"), [sources], false, true); function append(el, contents) { el.innerHTML += contents; @@ -93,7 +92,7 @@ function initDownloads() { append(versionSelect, "</optgroup>"); // Populate other versions - append(versionSelect, "<optgroup label=\"Preview\">"); + // append(versionSelect, "<optgroup label=\"Preview\">"); for (var version in releases) { if (!releases[version].downloadable || releases[version].stable) { continue; } var releaseDate = releases[version].released; @@ -158,8 +157,8 @@ function onPackageSelect() { var external = "External Download (MAY CONTAIN INCOMPATIBLE LICENSES)"; append(downloadSelect, "<option value='external'>" + external + "</option>"); } else { - append(downloadSelect, "<option value='apache'>Select Apache Mirror</option>"); append(downloadSelect, "<option value='direct'>Direct Download</option>"); + append(downloadSelect, "<option value='apache'>Select Apache Mirror</option>"); } updateDownloadLink(); } http://git-wip-us.apache.org/repos/asf/spark-website/blob/d7dcb6c8/site/js/downloads.js ---------------------------------------------------------------------- diff --git a/site/js/downloads.js b/site/js/downloads.js index 1d125b6..88e4bb9 100644 --- a/site/js/downloads.js +++ b/site/js/downloads.js @@ -7,7 +7,7 @@ function addRelease(version, releaseDate, packages, downloadable, stable) { releases[version] = {released: releaseDate, packages: packages, downloadable: downloadable, stable: stable}; } -var sources = {pretty: "Source Code [can build several Hadoop versions]", tag: "sources"}; +var sources = {pretty: "Source Code", tag: "sources"}; var hadoopFree = {pretty: "Pre-build with user-provided Hadoop [can use with most Hadoop distributions]", tag: "without-hadoop"}; var hadoop1 = {pretty: "Pre-built for Hadoop 1.X", tag: "hadoop1"}; var cdh4 = {pretty: "Pre-built for CDH 4", tag: "cdh4"}; @@ -19,9 +19,8 @@ var hadoop2p7 = {pretty: "Pre-built for Hadoop 2.7 and later", tag: "hadoop2.7"} var mapr3 = {pretty: "Pre-built for MapR 3.X", tag: "mapr3"}; var mapr4 = {pretty: "Pre-built for MapR 4.X", tag: "mapr4"}; -var sources = [sources]; // 0.7+ -var packagesV1 = [hadoop1, cdh4]; +var packagesV1 = [hadoop1, cdh4, sources]; // 0.8.1+ var packagesV2 = [hadoop2].concat(packagesV1); // 1.0.1+ @@ -31,39 +30,39 @@ var packagesV4 = [hadoop2p4, hadoop2p3, mapr3, mapr4].concat(packagesV1); // 1.3.1+ var packagesV5 = [hadoop2p6].concat(packagesV4); // 1.4.0+ -var packagesV6 = [hadoopFree, hadoop2p6, hadoop2p4, hadoop2p3].concat(packagesV1); +var packagesV6 = [hadoop2p6, hadoop2p4, hadoop2p3, hadoopFree].concat(packagesV1); // 2.0.0+ -var packagesV7 = [hadoopFree, hadoop2p7, hadoop2p6, hadoop2p4, hadoop2p3]; +var packagesV7 = [hadoop2p7, hadoop2p6, hadoop2p4, hadoop2p3, hadoopFree, sources]; // addRelease("2.0.0-preview", new Date("05/24/2016"), sources.concat(packagesV7), true, false); -addRelease("2.0.0", new Date("07/27/2016"), sources.concat(packagesV7), true, true); -addRelease("1.6.2", new Date("06/25/2016"), sources.concat(packagesV6), true, true); -addRelease("1.6.1", new Date("03/09/2016"), sources.concat(packagesV6), true, true); -addRelease("1.6.0", new Date("01/04/2016"), sources.concat(packagesV6), true, true); -addRelease("1.5.2", new Date("11/09/2015"), sources.concat(packagesV6), true, true); -addRelease("1.5.1", new Date("10/02/2015"), sources.concat(packagesV6), true, true); -addRelease("1.5.0", new Date("9/09/2015"), sources.concat(packagesV6), true, true); -addRelease("1.4.1", new Date("7/15/2015"), sources.concat(packagesV6), true, true); -addRelease("1.4.0", new Date("6/11/2015"), sources.concat(packagesV6), true, true); -addRelease("1.3.1", new Date("4/17/2015"), sources.concat(packagesV5), true, true); -addRelease("1.3.0", new Date("3/13/2015"), sources.concat(packagesV4), true, true); -addRelease("1.2.2", new Date("4/17/2015"), sources.concat(packagesV4), true, true); -addRelease("1.2.1", new Date("2/9/2015"), sources.concat(packagesV4), true, true); -addRelease("1.2.0", new Date("12/18/2014"), sources.concat(packagesV4), true, true); -addRelease("1.1.1", new Date("11/26/2014"), sources.concat(packagesV4), true, true); -addRelease("1.1.0", new Date("9/11/2014"), sources.concat(packagesV4), true, true); -addRelease("1.0.2", new Date("8/5/2014"), sources.concat(packagesV3), true, true); -addRelease("1.0.1", new Date("7/11/2014"), sources.concat(packagesV3), false, true); -addRelease("1.0.0", new Date("5/30/2014"), sources.concat(packagesV2), false, true); -addRelease("0.9.2", new Date("7/23/2014"), sources.concat(packagesV2), true, true); -addRelease("0.9.1", new Date("4/9/2014"), sources.concat(packagesV2), false, true); -addRelease("0.9.0-incubating", new Date("2/2/2014"), sources.concat(packagesV2), false, true); -addRelease("0.8.1-incubating", new Date("12/19/2013"), sources.concat(packagesV2), true, true); -addRelease("0.8.0-incubating", new Date("9/25/2013"), sources.concat(packagesV1), true, true); -addRelease("0.7.3", new Date("7/16/2013"), sources.concat(packagesV1), true, true); -addRelease("0.7.2", new Date("2/6/2013"), sources.concat(packagesV1), false, true); -addRelease("0.7.0", new Date("2/27/2013"), sources, false, true); +addRelease("2.0.0", new Date("07/27/2016"), packagesV7, true, true); +addRelease("1.6.2", new Date("06/25/2016"), packagesV6, true, true); +addRelease("1.6.1", new Date("03/09/2016"), packagesV6, true, true); +addRelease("1.6.0", new Date("01/04/2016"), packagesV6, true, true); +addRelease("1.5.2", new Date("11/09/2015"), packagesV6, true, true); +addRelease("1.5.1", new Date("10/02/2015"), packagesV6, true, true); +addRelease("1.5.0", new Date("9/09/2015"), packagesV6, true, true); +addRelease("1.4.1", new Date("7/15/2015"), packagesV6, true, true); +addRelease("1.4.0", new Date("6/11/2015"), packagesV6, true, true); +addRelease("1.3.1", new Date("4/17/2015"), packagesV5, true, true); +addRelease("1.3.0", new Date("3/13/2015"), packagesV4, true, true); +// addRelease("1.2.2", new Date("4/17/2015"), packagesV4, true, true); +// addRelease("1.2.1", new Date("2/9/2015"), packagesV4, true, true); +// addRelease("1.2.0", new Date("12/18/2014"), packagesV4, true, true); +// addRelease("1.1.1", new Date("11/26/2014"), packagesV4, true, true); +// addRelease("1.1.0", new Date("9/11/2014"), packagesV4, true, true); +// addRelease("1.0.2", new Date("8/5/2014"), packagesV3, true, true); +// addRelease("1.0.1", new Date("7/11/2014"), packagesV3, false, true); +// addRelease("1.0.0", new Date("5/30/2014"), packagesV2, false, true); +// addRelease("0.9.2", new Date("7/23/2014"), packagesV2, true, true); +// addRelease("0.9.1", new Date("4/9/2014"), packagesV2, false, true); +// addRelease("0.9.0-incubating", new Date("2/2/2014"), packagesV2, false, true); +// addRelease("0.8.1-incubating", new Date("12/19/2013"), packagesV2, true, true); +// addRelease("0.8.0-incubating", new Date("9/25/2013"), packagesV1, true, true); +// addRelease("0.7.3", new Date("7/16/2013"), packagesV1, true, true); +// addRelease("0.7.2", new Date("2/6/2013"), packagesV1, false, true); +// addRelease("0.7.0", new Date("2/27/2013"), [sources], false, true); function append(el, contents) { el.innerHTML += contents; @@ -93,7 +92,7 @@ function initDownloads() { append(versionSelect, "</optgroup>"); // Populate other versions - append(versionSelect, "<optgroup label=\"Preview\">"); + // append(versionSelect, "<optgroup label=\"Preview\">"); for (var version in releases) { if (!releases[version].downloadable || releases[version].stable) { continue; } var releaseDate = releases[version].released; @@ -158,8 +157,8 @@ function onPackageSelect() { var external = "External Download (MAY CONTAIN INCOMPATIBLE LICENSES)"; append(downloadSelect, "<option value='external'>" + external + "</option>"); } else { - append(downloadSelect, "<option value='apache'>Select Apache Mirror</option>"); append(downloadSelect, "<option value='direct'>Direct Download</option>"); + append(downloadSelect, "<option value='apache'>Select Apache Mirror</option>"); } updateDownloadLink(); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
