Merge pull request #497 from jarrodwb/issue-448

add resources to main index and add license to other download files

Author: SethTisue

Diff for: _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 for: _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 for: 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"],