Skip to content

Commit 1f2c8a2

Browse files
author
Vojin Jovanovic
committed
2 parents 4fa1d4e + b96d59f commit 1f2c8a2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1489
-510
lines changed

‎_includes/headerbottom.html

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
<!-- prettyprint js to prepend generated pre/code tags -->
2+
<script type="text/javascript">
3+
function styleCode()
4+
{
5+
if (typeof disableStyleCode != "undefined")
6+
{
7+
return;
8+
}
9+
var a = false;
10+
$("pre code").parent().each(function()
11+
{
12+
if (!$(this).hasClass("prettyprint"))
13+
{
14+
$(this).addClass("prettyprint lang-scala linenums");
15+
a = true
16+
}
17+
});
18+
if (a) { prettyPrint() }
19+
}
20+
</script>
121

222
<!--Google Analytics-->
323
<script type="text/javascript">
@@ -14,4 +34,4 @@
1434

1535
</script>
1636
</head>
17-
<body>
37+
<body onload="styleCode()">

‎_includes/headertop.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,15 @@
88
{% endif %}
99
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
1010

11+
<meta name="robots" content="noindex, nofollow, noarchive"/>
12+
1113
<link rel="icon" type="image/png" href="{{ site.baseurl }}/resources/favicon.ico">
1214
<link rel="shortcut icon" type="image/png" href="{{ site.baseurl }}/resources/favicon.ico">
1315

16+
<!-- prettify js and CSS -->
17+
<link rel="stylesheet" href="{{ site.baseurl }}/resources/css/prettify.css" type="text/css" />
18+
<script src="{{ site.baseurl }}/resources/js/prettify/prettify.js" type="text/javascript" ></script>
19+
1420
<!-- Typekit -->
1521
<script type="text/javascript" src="//use.typekit.net/tow7fvu.js"></script>
1622
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
@@ -29,4 +35,4 @@
2935
<link rel="stylesheet" href="{{ site.baseurl }}/resources/css/bootstrap.css" type="text/css" />
3036

3137
<!-- Custom stylesheet -->
32-
<link rel="stylesheet" href="{{ site.baseurl }}/resources/css/main.css" type="text/css" />
38+
<link rel="stylesheet" href="{{ site.baseurl }}/resources/css/main.css" type="text/css" />

‎_includes/maintainers.html

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
- **Standard Library**: @phaller (Philipp Haller), @axel22 (Aleksandar Prokopec -- concurrent & collection)
2+
- **Macros, Reflection, Manifests/TypeTags**: @xeno-by (Eugene Burmako), @cvogt (Christopher Vogt)
3+
- **Type Checker, Inference**: @odersky (Martin Odersky), @adriaanm (Adriaan Moors)
4+
- **New Pattern Matcher, Implicit Search**: @adriaanm (Adriaan Moors)
5+
- **Language Specification, String Interpolation, Value Classes**: @odersky (Martin Odersky)
6+
- **Documentation**: @heathermiller (Heather Miller)
7+
- **Error Handling, lazy vals**: @hubertp (Hubert Plociniczak)
8+
- **Scaladoc**: @vladureche (Vlad Ureche)
9+
- **REPL, Compiler Performance**: @paulp (Paul Phillips)
10+
- **Named/Default args, Annotations, Plugins**: @lrytz (Lukas Rytz)
11+
- **Partest, Continuations Plugin**: @phaller (Philipp Haller)
12+
- **The Build**: @jsuereth (Josh Suereth)
13+
- **Specialization**: @axel22 (Aleksander Prokopec), @vladureche (Vlad Ureche), @dragos (Iulian Dragos)
14+
- **Backend**: @magarciaEPFL (Miguel Garcia), @gkossakowski (Grzegorz Kossakowski), @dragos (Iulian Dragos)
15+
- **Optimizer**: @vladureche (Vlad Ureche), @magarciaEPFL (Miguel Garcia)
16+
- **Random Compiler Bugs**: @lrytz, @adria7834anm, @hubertp
17+
- **Swing**: @ingoem (Ingo Maier)
18+
- **CPS**: @TiarkRompf (Tiark Rompf)

‎_includes/navbar.html

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,25 @@
11
<ul class="nav">
22
<li>
33
<div class="dropdown">
4-
<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#"
5-
href="{{ site.baseurl }}/learn/">
6-
Learn
7-
<b class="caret"></b>
4+
<a href="{{ site.baseurl }}/documentation/">
5+
Documentation
86
</a>
9-
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
10-
<li><a href="{{ site.baseurl }}/learn/">Learning Scala</a>
11-
<li><a href="{{ site.baseurl }}/learn/books.html">Books</a></li>
12-
<li class="dropdown-submenu">
13-
<a tabindex="-1" href="#">API</a>
14-
<ul class="dropdown-menu">
15-
<li><a href="{{ site.baseurl }}/files/archive/api/2.10-latest">2.10</a></li>
16-
<li><a href="{{ site.baseurl }}/files/archive/api/2.9-latest">2.9</a></li>
17-
<li><a href="{{ site.baseurl }}/files/archive/nightly/docs/library">2.11 Nightly</a></li>
18-
</ul>
19-
</li>
20-
<li><a href="{{ site.baseurl }}/files/archive/nightly/pdfs/ScalaReference.pdf">Language Spec</a></li>
21-
</ul>
227
</div>
238
</li>
249
<li>
2510
<div class="dropdown">
26-
<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{{ site.baseurl }}/download/">
11+
<a href="{{ site.baseurl }}/download/">
2712
Download
28-
<b class="caret"></b>
2913
</a>
30-
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
31-
<li><a href="{{ site.baseurl }}/download/">Releases</a></li>
32-
<li><a href="{{ site.baseurl }}/download/getting-started.html">Getting Started</a></li>
33-
</ul>
3414
</div>
15+
</li>
3516
<li>
3617
<div class="dropdown">
3718
<a href="{{ site.baseurl }}/community/">
3819
Community
3920
</a>
4021
</div>
22+
</li>
4123
<li>
4224
<div class="dropdown">
4325
<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#"

‎_layouts/alldownloadspage.html

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
---
2+
layout: page
3+
---
4+
5+
6+
<p>
7+
The current development release is <a href="/download/{{ page.development_version }}.html">Scala {{ page.development_version }}</a>.
8+
</p>
9+
10+
<p>
11+
This page contains a comprehensive archive of previous Scala releases.
12+
</p>
13+
14+
{% for top in (0..3) reversed %}
15+
{% for major in (0..20) reversed %}
16+
17+
{% assign possibleVersionShort = top | append:'.' | append:major %}
18+
{% assign sz = possibleVersionShort | size %}
19+
{% if 3 == sz %}
20+
{% assign possibleVersion = possibleVersionShort | append:'.' %}
21+
{% else %}
22+
{% assign possibleVersion = possibleVersionShort %}
23+
{% endif %}
24+
25+
{% for page in site.categories.download %}
26+
27+
{% assign releaseVersion = page.release_version | truncate:4, '' %}
28+
29+
{% if releaseVersion == possibleVersion %}
30+
31+
<div>
32+
<a href="{{ page.url }}">{{ page.title }}</a>
33+
</div>
34+
35+
{% endif %}
36+
37+
{% endfor %}
38+
39+
{% endfor %}
40+
{% endfor %}
41+

‎_layouts/downloadpage.html

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
---
2+
layout: page
3+
---
4+
5+
6+
<h3>Download</h3>
7+
8+
<div>
9+
You can download Scala {{ page.release_version }} for <span id="os_name"></span> below.
10+
</div>
11+
12+
<br/>
13+
14+
<div class="download-wrapper">
15+
16+
<div id="download-space" class="download">
17+
</div>
18+
19+
</div>
20+
21+
<br/>
22+
<br/>
23+
24+
<h3>Software Requirements</h3>
25+
26+
{{ page.requirements }}
27+
28+
{% if page.show_resources == "true" %}
29+
30+
<div>
31+
32+
{% else %}
33+
34+
<div hidden>
35+
36+
{% endif %}
37+
38+
<h3>Other resources</h3>
39+
40+
<div>
41+
You can find the installer download links for other operating systems, as well as documentation and source code archives for Scala {{ page.release_version }} below.
42+
</div>
43+
44+
<br/>
45+
46+
<table>
47+
48+
<tr>
49+
<td style="font-weight: bold;">Archive</td>
50+
<td style="font-weight: bold;">System</td>
51+
<td style="font-weight: bold;">Size</td>
52+
</tr>
53+
54+
{% for resource in page.resources %}
55+
<tr>
56+
<td>
57+
<a id="#link{{ resource[0] }}" href="{{ resource[2] }}">
58+
{{ resource[1] }}
59+
</a>
60+
</td>
61+
<td>{{ resource[3] }}</td>
62+
<td>{{ resource[4] }}</td>
63+
<tr/>
64+
{% endfor %}
65+
66+
</table>
67+
68+
</div>
69+
70+
71+
{{ content }}
72+
73+
<br/>
74+

‎_layouts/maindownloadpage.html

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
layout: downloadpage
3+
---
4+
5+
6+
<h3>Additional information</h3>
7+
8+
New Scala users might want to read the <a href="{{ site.baseurl }}/documentation/getting-started.html">Getting Started</a> guide.
9+
10+
You can find the links to prior versions or the latest development version below.
11+
To see a detailed list of changes for each version of Scala please refer to the <a href="{{ site.baseurl }}/download/changelog.html">changelog</a>.
12+
Note that the different major releases of Scala (e.g. Scala 2.9.3 and Scala 2.10.1) are not binary compatible.
13+
14+
<table>
15+
<tr>
16+
<td><a href="/download/{{ page.maintenance_version }}.html" class="btn small" style="width: 400px;">Current maintenance release - Scala {{ page.maintenance_version }}</a></td>
17+
</tr>
18+
<tr>
19+
<td><a href="/download/{{ page.development_version }}.html" class="btn small" style="width: 400px;">Current development release - Scala {{ page.development_version }}</a></td>
20+
</tr>
21+
</table>
22+
<table><tbody>
23+
<tr>
24+
<td><a href="changelog.html" class="btn small" style="width: 100px;">Changelog</a></td>
25+
<td><a href="all.html" class="btn small" style="width: 256px;">All previous Scala Releases</a></td>
26+
</tr>
27+
</tbody></table>
28+
29+
<br/>
30+
31+
The Scala distribution is released under a <a href="{{ site.baseurl }}/download/license.html">BSD-like license</a>.
32+
33+
34+
{{ content }}

‎contribute/bug-reporting-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The Scala project tracker is located at:
1010
> [http://issues.scala-lang.org](http://issues.scala-lang.org)
1111
1212

13-
<!--
13+
{% comment %}
1414
WHAT THIS PAGE SHOULD TALK ABOUT:
1515
- tracker
1616
- what's a bug and what's not a bug?
@@ -52,4 +52,4 @@ WHAT THIS PAGE SHOULD TALK ABOUT:
5252
- the commands to trigger the bug
5353
- the expected output
5454
- the actual output
55-
-->
55+
{% endcomment %}

0 commit comments

Comments
 (0)