From 998f0c2c4ebf331c6db55ae597dc04f033321ac8 Mon Sep 17 00:00:00 2001
From: Jarrod Brockman <jarrodwb@jarrodwb.com>
Date: Sat, 22 Oct 2016 14:04:00 +0200
Subject: [PATCH 1/2] add resources to main index and add license other
download files
---
_layouts/downloadpage.html | 7 +++++--
_layouts/maindownloadpage.html | 6 ------
download/index.md | 11 +++++++++--
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/_layouts/downloadpage.html b/_layouts/downloadpage.html
index 696e9756e..e4c9d0ad7 100644
--- a/_layouts/downloadpage.html
+++ b/_layouts/downloadpage.html
@@ -66,6 +66,8 @@ <h3>Software Requirements</h3>
{{ page.requirements }}
+{{ content }}
+
{% if page.show_resources == "true" %}
<div>
@@ -116,7 +118,9 @@ <h3 hidden>Other resources</h3>
</div>
-{{ content }}
+<h3>License</h3>
+The Scala distribution is released under the <a href="{{ site.baseurl }}/license.html">3-clause BSD license</a>.
+
<div id="getting-started-popup">
<div class="popup">
@@ -129,4 +133,3 @@ <h3 hidden>Other resources</h3>
</ul>
</div>
</div>
-
diff --git a/_layouts/maindownloadpage.html b/_layouts/maindownloadpage.html
index a376ff280..596802644 100644
--- a/_layouts/maindownloadpage.html
+++ b/_layouts/maindownloadpage.html
@@ -17,9 +17,3 @@ <h3>Additional information</h3>
<li><a href="changelog.html">Changelog</a></li>
<li><a href="all.html">All previous Scala Releases</a></li>
</ul>
-
-<h3>License</h3>
-The Scala distribution is released under the <a href="{{ site.baseurl }}/license.html">3-clause BSD license</a>.
-
-
-{{ content }}
diff --git a/download/index.md b/download/index.md
index da51f4c6d..50f4fc859 100644
--- a/download/index.md
+++ b/download/index.md
@@ -3,6 +3,7 @@ layout: maindownloadpage
title: Download
release_version: 2.11.8
release_date: "March 8, 2016"
+show_resources: "true"
other_releases: [
["maintenance_version", "Last 2.9.x maintenance release", 2.9.3, "February 28, 2013"],
["maintenance_version", "Last 2.10.x maintenance release", 2.10.6, "September 18, 2015"],
@@ -11,7 +12,13 @@ other_releases: [
]
requirements: "The Scala software distribution can be installed on any platform with a <a href='http://www.java.com/'>Java runtime</a>, version 1.6 or later. Scala 2.12 requires Java 8."
resources: [
- ["-main-unixsys", "scala-2.11.8.tgz", "http://downloads.lightbend.com/scala/2.11.8/scala-2.11.8.tgz", "Mac OS X, Unix, Cygwin", "27.3M"],
- ["-main-windows", "scala-2.11.8.msi", "http://downloads.lightbend.com/scala/2.11.8/scala-2.11.8.msi", "Windows (msi installer)", "109.4M"]
+ ["-main-unixsys", "scala-2.11.8.tgz", "http://downloads.lightbend.com/scala/2.11.8/scala-2.11.8.tgz", "Mac OS X, Unix, Cygwin", "27.35M"],
+ ["-main-windows", "scala-2.11.8.msi", "http://downloads.lightbend.com/scala/2.11.8/scala-2.11.8.msi", "Windows (msi installer)", "109.35M"],
+ ["-non-main-sys", "scala-2.11.8.zip", "http://downloads.lightbend.com/scala/2.11.8/scala-2.11.8.zip", "Windows", "27.40M"],
+ ["-non-main-sys", "scala-2.11.8.deb", "http://downloads.lightbend.com/scala/2.11.8/scala-2.11.8.deb", "Debian", "76.02M"],
+ ["-non-main-sys", "scala-2.11.8.rpm", "http://downloads.lightbend.com/scala/2.11.8/scala-2.11.8.rpm", "RPM package", "108.16M"],
+ ["-non-main-sys", "scala-docs-2.11.8.txz", "http://downloads.lightbend.com/scala/2.11.8/scala-docs-2.11.8.txz", "API docs", "46.00M"],
+ ["-non-main-sys", "scala-docs-2.11.8.zip", "http://downloads.lightbend.com/scala/2.11.8/scala-docs-2.11.8.zip", "API docs", "84.21M"],
+ ["-non-main-sys", "scala-sources-2.11.8.tar.gz", "https://github.com/scala/scala/archive/v2.11.8.tar.gz", "Sources", ""]
]
---
From 6863284c1181b703ce2c8adbcd00529a66e1e4a4 Mon Sep 17 00:00:00 2001
From: Jarrod Brockman <jarrodwb@jarrodwb.com>
Date: Wed, 26 Oct 2016 08:15:25 +0200
Subject: [PATCH 2/2] remove changes to resources in index page
---
download/index.md | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/download/index.md b/download/index.md
index 50f4fc859..fac12f25c 100644
--- a/download/index.md
+++ b/download/index.md
@@ -12,13 +12,7 @@ other_releases: [
]
requirements: "The Scala software distribution can be installed on any platform with a <a href='http://www.java.com/'>Java runtime</a>, version 1.6 or later. Scala 2.12 requires Java 8."
resources: [
- ["-main-unixsys", "scala-2.11.8.tgz", "http://downloads.lightbend.com/scala/2.11.8/scala-2.11.8.tgz", "Mac OS X, Unix, Cygwin", "27.35M"],
- ["-main-windows", "scala-2.11.8.msi", "http://downloads.lightbend.com/scala/2.11.8/scala-2.11.8.msi", "Windows (msi installer)", "109.35M"],
- ["-non-main-sys", "scala-2.11.8.zip", "http://downloads.lightbend.com/scala/2.11.8/scala-2.11.8.zip", "Windows", "27.40M"],
- ["-non-main-sys", "scala-2.11.8.deb", "http://downloads.lightbend.com/scala/2.11.8/scala-2.11.8.deb", "Debian", "76.02M"],
- ["-non-main-sys", "scala-2.11.8.rpm", "http://downloads.lightbend.com/scala/2.11.8/scala-2.11.8.rpm", "RPM package", "108.16M"],
- ["-non-main-sys", "scala-docs-2.11.8.txz", "http://downloads.lightbend.com/scala/2.11.8/scala-docs-2.11.8.txz", "API docs", "46.00M"],
- ["-non-main-sys", "scala-docs-2.11.8.zip", "http://downloads.lightbend.com/scala/2.11.8/scala-docs-2.11.8.zip", "API docs", "84.21M"],
- ["-non-main-sys", "scala-sources-2.11.8.tar.gz", "https://github.com/scala/scala/archive/v2.11.8.tar.gz", "Sources", ""]
+ ["-main-unixsys", "scala-2.11.8.tgz", "http://downloads.lightbend.com/scala/2.11.8/scala-2.11.8.tgz", "Mac OS X, Unix, Cygwin", "27.3M"],
+ ["-main-windows", "scala-2.11.8.msi", "http://downloads.lightbend.com/scala/2.11.8/scala-2.11.8.msi", "Windows (msi installer)", "109.4M"]
]
---