Skip to content

Commit 12de631

Browse files
author
Javier de Silóniz Sandino
authored
Merge pull request scala#33 from 47deg/sl9-internal-pages-implementation
Internal pages implementation: first set
2 parents de74d98 + a96c9e0 commit 12de631

File tree

122 files changed

+681
-340
lines changed

Some content is hidden

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

122 files changed

+681
-340
lines changed

_books/1-programming-in-scala-3rd.md

Lines changed: 12 additions & 0 deletions

_books/2-scala-for-the-impatient.md

Lines changed: 22 additions & 0 deletions

_books/3-programming-scala.md

Lines changed: 11 additions & 0 deletions
Lines changed: 11 additions & 0 deletions

_books/5-scala-in-depth.md

Lines changed: 11 additions & 0 deletions

_books/6-scala-puzzlers.md

Lines changed: 11 additions & 0 deletions

_config.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ scalaversion: "2.12.1"
44

55
baseurl: ""
66
markdown: kramdown
7+
highlighter:
8+
79
exclude:
810
- bundle-vendor/
911
- blog/README.md
@@ -27,4 +29,12 @@ collections:
2729
trainings:
2830
output: false
2931
events:
30-
output: false
32+
output: false
33+
contribute_resources:
34+
output: false
35+
contribute_community_tickets:
36+
output: false
37+
books:
38+
output: false
39+
downloads:
40+
output: true
Lines changed: 6 additions & 0 deletions
Lines changed: 6 additions & 0 deletions
Lines changed: 6 additions & 0 deletions
Lines changed: 6 additions & 0 deletions
Lines changed: 6 additions & 0 deletions
Lines changed: 6 additions & 0 deletions
Lines changed: 6 additions & 0 deletions

_contribute_resources/2-bug-fixes.md

Lines changed: 6 additions & 0 deletions
Lines changed: 8 additions & 0 deletions
Lines changed: 6 additions & 0 deletions
Lines changed: 6 additions & 0 deletions
Lines changed: 6 additions & 0 deletions

_data/chats-forums.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Discourse forums
2+
discourseForums:
3+
- title: Scala Users Discourse
4+
subtitle: for general Scala questions, discussion and library announcements
5+
url: https://users.scala-lang.org/
6+
cssClass: scala-user-discourse
7+
- title: Scala Contributors Discourse
8+
subtitle: for Scala contributions, language evolution dicussions, standard library, Scala platform evolution discussions and more
9+
url: https://contributors.scala-lang.org/
10+
cssClass: scala-contributors-discourse
11+
12+
# Gitter channels
13+
gitterChannels:
14+
- name: scala
15+
url: https://gitter.im/scala/scala
16+
- name: center
17+
url: https://gitter.im/scala/center
18+
- name: contributors
19+
url: https://gitter.im/scala/contributors
20+
- name: pickling
21+
url: https://gitter.im/scala/pickling
22+
- name: scala-parser-combinator
23+
url: https://gitter.im/scala/scala-parser-combinator
24+
- name: collection-strawman
25+
url: https://gitter.im/scala/collection-strawman
26+
- name: scala-xml
27+
url: https://gitter.im/scala/scala-xml
28+
- name: scala-india
29+
url: https://gitter.im/scala/scala-india
30+
- name: community-builds
31+
url: https://gitter.im/scala/community-builds

_data/common.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ texts:
1414
scalaMaintainersTitle: The Scala language is maintained by
1515
scalaSupportersTitle: Scala Center is supported by
1616
frontpageMarker: "Scala began life in 2003, created by Martin Odersky and his research group at EPFL, next to Lake Geneva and the Alps, in Lausanne, Switzerland. Scala has since grown into a mature open source programming language, used by hundreds of thousands of developers, and is developed and maintained by scores of people all over the world."
17+
booksBy: "by"
1718

1819
copyrightText: "Copyright © 2002-2016 École Polytechnique Fédérale <br>Lausanne (EPFL) Lausanne, Switzerland"

_includes/column-list-of-items.html

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{% comment %}
2+
Layouts using this include should pass an include variable called 'collection' referencing a collection carrying the data (i.e.: contribute_community_tickets, contribute_resources...)
3+
{% endcomment %}
4+
<div class="documentation">
5+
{% for item in include.collection %}
6+
<div class="doc-item">
7+
<div class="doc-item-header">
8+
<i class="{{item.icon}}"></i>
9+
<a href="{{item.link}}">
10+
<h4>{{item.title}}</h4>
11+
</a>
12+
</div>
13+
<div class="doc-item-main">
14+
{{item.content}}
15+
</div>
16+
</div>
17+
{% endfor %}
18+
</div>
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{% comment %}
2+
Layouts using this include should pass an include variable called 'collection' referencing a collection carrying the data
3+
{% endcomment %}
4+
<div class="tools">
5+
{% for item in include.collection %}
6+
<div class="tool-item">
7+
<div class="tool-item-header">
8+
<a href="{{item.link}}">
9+
<img src="{{item.icon}}" alt="{{item.title}}">
10+
<h4>{{item.title}}</h4>
11+
</a>
12+
</div>
13+
<div class="tool-item-main">
14+
<p>{{item.description}}</p>
15+
<ul>
16+
{% if item.homeLink %}
17+
<li><a href="{{item.homeLink}}">Home</a></li>
18+
{% if item.contributingLink or item.readmeLink or item.issuesLink %}<li class="dot"></li>{% endif %}
19+
{% endif %}
20+
{% if item.issuesLink %}
21+
<li><a href="{{item.issuesLink}}">Issues</a></li>
22+
{% if item.contributingLink or item.readmeLink %}<li class="dot"></li>{% endif %}
23+
{% endif %}
24+
{% if item.readmeLink %}
25+
<li><a href="{{item.readmeLink}}">ReadMe</a></li>
26+
{% if item.contributingLink %}<li class="dot"></li>{% endif %}
27+
{% endif %}
28+
{% if item.contributingLink %}
29+
<li><a href="{{item.contributingLink}}">Contributing</a></li>
30+
{% endif %}
31+
</ul>
32+
</div>
33+
</div>
34+
{% endfor %}
35+
36+
</div>

_includes/downloads-list.html

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{% for top in (0..3) reversed %}
2+
{% for major in (0..20) reversed %}
3+
{% assign possibleVersionShort = top | append:'.' | append:major %}
4+
{% assign sz = possibleVersionShort | size %}
5+
{% if 3 == sz %}
6+
{% assign possibleVersion = possibleVersionShort | append:'.' %}
7+
{% else %}
8+
{% assign possibleVersion = possibleVersionShort %}
9+
{% endif %}
10+
{% for page in site.downloads %}
11+
{% assign releaseVersion = page.release_version | truncate:4, '' %}
12+
{% if releaseVersion == possibleVersion %}
13+
<div>
14+
<a href="{{ page.url }}">{{ page.title }}</a>
15+
</div>
16+
{% endif %}
17+
{% endfor %}
18+
{% endfor %}
19+
{% endfor %}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<section class="content">
2+
<div class="wrap">
3+
<div class="content-primary">
4+
<div class="inner-box">
5+
{{content}}
6+
</div>
7+
</div>
8+
9+
<!-- TOC -->
10+
{% include sidebar-toc.html %}
11+
</div>
12+
</section>

_includes/masthead-community.html

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<section class="table-of-content">
2+
<div class="wrap">
3+
<div class="inner-box">
4+
<div class="community">
5+
<div class="discourse">
6+
<h3>Discourse</h3>
7+
<span>Mailing list</span>
8+
<ul>
9+
{% for forum in site.data.chats-forums.discourseForums %}
10+
<li>
11+
<img src="/resources/img/frontpage/discourse-logo.png" alt="{{forum.title}}">
12+
<div>
13+
<h4><a href="{{forum.url}}">{{forum.title}}</a></h4>
14+
<p>{{forum.subtitle}}</p>
15+
</div>
16+
</li>
17+
{% endfor %}
18+
</ul>
19+
</div>
20+
<div class="gitter">
21+
<h3>Gitter</h3>
22+
<span>Real-time (topic-specialized) chat</span>
23+
<ul>
24+
{% for channel in site.data.chats-forums.gitterChannels %}
25+
<li>
26+
<a href="{{channel.url}}">
27+
<img src="/resources/img/frontpage/gitter-logo.png" alt="{{channel.name}}">
28+
<h4>{{channel.name}}</h4>
29+
</a>
30+
</li>
31+
{% endfor %}
32+
</ul>
33+
</div>
34+
</div>
35+
</div>
36+
</div>
37+
</section>

0 commit comments

Comments
 (0)