From ac49a07c4c9aee0d015e3f3dbd7fba243e31d1ef Mon Sep 17 00:00:00 2001 From: Travis Lee Date: Fri, 5 May 2017 16:07:03 +0200 Subject: [PATCH 01/47] Update JSON, add redirect-from --- Gemfile | 1 + Gemfile.lock | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 37f5eaa42e..bcd3be7d03 100644 --- a/Gemfile +++ b/Gemfile @@ -1,2 +1,3 @@ source 'https://rubygems.org' gem 'github-pages', group: :jekyll_plugins +gem 'jekyll-redirect-from' diff --git a/Gemfile.lock b/Gemfile.lock index f3afc6d455..2b1dd61641 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -98,7 +98,7 @@ GEM gemoji (~> 2.0) html-pipeline (~> 2.2) jekyll (>= 3.0) - json (1.8.3) + json (1.8.6) kramdown (1.11.1) liquid (3.0.6) listen (3.0.6) @@ -140,6 +140,7 @@ PLATFORMS DEPENDENCIES github-pages + jekyll-redirect-from BUNDLED WITH - 1.13.6 + 1.14.6 From cc88ed1ce7506681648b8660d1ea3cb44394cc86 Mon Sep 17 00:00:00 2001 From: Travis Lee Date: Fri, 5 May 2017 16:07:41 +0200 Subject: [PATCH 02/47] Guides to replace overviews landing --- guides.md | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 guides.md diff --git a/guides.md b/guides.md new file mode 100644 index 0000000000..140e0085df --- /dev/null +++ b/guides.md @@ -0,0 +1,91 @@ +--- +layout: guides-index +title: Guides and Overviews +languages: [ja, zh-cn, es] +redirect_from: + - /overviews +--- + +## Guides +* [Frequently Asked Questions](http://docs.scala-lang.org/tutorials/FAQ/finding-symbols) from StackOverflow. +* [Scala for Java Programmers](http://docs.scala-lang.org/tutorials/scala-for-java-programmers.html) compares the two languages. +* [Style Guide](http://docs.scala-lang.org/style/) + +
+

Core Scala

+
+ * Scala's Collections Library + * [Introduction](/overviews/collections/introduction.html) + * [Mutable and Immutable Collections](/overviews/collections/overview.html) + * [Trait Traversable](/overviews/collections/trait-traversable.html) + * [Trait Iterable](/overviews/collections/trait-iterable.html) + * [The sequence traits Seq, IndexedSeq, and LinearSeq](/overviews/collections/seqs.html) + * [Sets](/overviews/collections/sets.html) + * [Maps](/overviews/collections/maps.html) + * [Concrete Immutable Collection Classes](/overviews/collections/concrete-immutable-collection-classes.html) + * [Concrete Mutable Collection Classes](/overviews/collections/concrete-mutable-collection-classes.html) + * [Arrays](/overviews/collections/arrays.html) + * [Strings](/overviews/collections/strings.html) + * [Performance Characteristics](/overviews/collections/performance-characteristics.html) + * [Equality](/overviews/collections/equality.html) + * [Views](/overviews/collections/views.html) + * [Iterators](/overviews/collections/iterators.html) + * [Creating Collections From Scratch](/overviews/collections/creating-collections-from-scratch.html) + * [Conversions Between Java and Scala Collections](/overviews/collections/conversions-between-java-and-scala-collections.html) + * [Migrating from Scala 2.7](/overviews/collections/migrating-from-scala-27.html) + * [The Architecture of Scala Collections](/overviews/core/architecture-of-scala-collections.html) + * [String Interpolation](/overviews/core/string-interpolation.html) New in 2.10 + * [Implicit Classes](/overviews/core/implicit-classes.html) New in 2.10 + * [Value Classes and Universal Traits](/overviews/core/value-classes.html) New in 2.10 + * [Binary Compatibility of Scala Releases](/overviews/core/binary-compatibility-of-scala-releases.html) + +
+

Reference / Documentation

+
+ * Scaladoc + * [Overview](/overviews/scaladoc/overview.html) + * [Using Scaladoc Effectively](/overviews/scaladoc/interface.html) + * [Authoring Scaladoc](/overviews/scaladoc/for-library-authors.html) + * Scala REPL + * [Overview](/overviews/repl/overview.html) + +
+

Parallel and Concurrent Programming

+
+ * [Futures and Promises](/overviews/core/futures.html) New in 2.10 + * Scala's Parallel Collections Library + * [Overview](/overviews/parallel-collections/overview.html) + * [Concrete Parallel Collection Classes](/overviews/parallel-collections/concrete-parallel-collections.html) + * [Parallel Collection Conversions](/overviews/parallel-collections/conversions.html) + * [Concurrent Tries](/overviews/parallel-collections/ctries.html) + * [Architecture of the Parallel Collections Library](/overviews/parallel-collections/architecture.html) + * [Creating Custom Parallel Collections](/overviews/parallel-collections/custom-parallel-collections.html) + * [Configuring Parallel Collections](/overviews/parallel-collections/configuration.html) + * [Measuring Performance](/overviews/parallel-collections/performance.html) + * [The Scala Actors Migration Guide](/overviews/core/actors-migration-guide.html) New in 2.10 + * [The Scala Actors API](/overviews/core/actors.html) Deprecated + +
+

Metaprogramming

+
+ * Reflection Experimental + * [Overview](/overviews/reflection/overview.html) + * [Environment, Universes, and Mirrors](/overviews/reflection/environment-universes-mirrors.html) + * [Symbols, Trees, and Types](/overviews/reflection/symbols-trees-types.html) + * [Annotations, Names, Scopes, and More](/overviews/reflection/annotations-names-scopes.html) + * [TypeTags and Manifests](/overviews/reflection/typetags-manifests.html) + * [Thread Safety](/overviews/reflection/thread-safety.html) + * [Changes in Scala 2.11](/overviews/reflection/changelog211.html) + * Macros Experimental + * [Use Cases](/overviews/macros/usecases.html) + * [Blackbox Vs Whitebox](/overviews/macros/blackbox-whitebox.html) + * [Def Macros](/overviews/macros/overview.html) + * [Quasiquotes](/overviews/quasiquotes/intro.html) + * [Macro Bundles](/overviews/macros/bundles.html) + * [Implicit Macros](/overviews/macros/implicits.html) + * [Extractor Macros](/overviews/macros/extractors.html) + * [Type Providers](/overviews/macros/typeproviders.html) + * [Macro Annotations](/overviews/macros/annotations.html) + * [Macro Paradise](/overviews/macros/paradise.html) + * [Roadmap](/overviews/macros/roadmap.html) + * [Changes in 2.11](/overviews/macros/changelog211.html) From 814e2a62358dc52cd91398cba19b6cb1e25c83b5 Mon Sep 17 00:00:00 2001 From: Travis Lee Date: Fri, 5 May 2017 16:11:53 +0200 Subject: [PATCH 03/47] Updated description --- guides.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guides.md b/guides.md index 140e0085df..6e2ee4c10b 100644 --- a/guides.md +++ b/guides.md @@ -3,12 +3,12 @@ layout: guides-index title: Guides and Overviews languages: [ja, zh-cn, es] redirect_from: - - /overviews + - /overviews/index.html --- ## Guides * [Frequently Asked Questions](http://docs.scala-lang.org/tutorials/FAQ/finding-symbols) from StackOverflow. -* [Scala for Java Programmers](http://docs.scala-lang.org/tutorials/scala-for-java-programmers.html) compares the two languages. +* [Scala for Java Programmers](http://docs.scala-lang.org/tutorials/scala-for-java-programmers.html): a comparison of the two languages. * [Style Guide](http://docs.scala-lang.org/style/)
From d39f6cdff0115b7bb1091cf89693cdb3dd5d7a8e Mon Sep 17 00:00:00 2001 From: Travis Lee Date: Mon, 8 May 2017 14:18:07 +0200 Subject: [PATCH 04/47] Ignore ruby version --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 22a496be82..c4dfe40928 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ _site +.ruby-version .DS_Store .project .settings From d4b0479be260e0b6e27b00cd45ab5afbbc488849 Mon Sep 17 00:00:00 2001 From: Travis Lee Date: Fri, 26 May 2017 14:18:43 +0200 Subject: [PATCH 05/47] updated json --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f3afc6d455..e83f3fe6d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -98,7 +98,7 @@ GEM gemoji (~> 2.0) html-pipeline (~> 2.2) jekyll (>= 3.0) - json (1.8.3) + json (1.8.6) kramdown (1.11.1) liquid (3.0.6) listen (3.0.6) @@ -142,4 +142,4 @@ DEPENDENCIES github-pages BUNDLED WITH - 1.13.6 + 1.14.6 From 408561548bbc52fbd61129f8df7a245b520b5a60 Mon Sep 17 00:00:00 2001 From: Travis Lee Date: Fri, 26 May 2017 14:20:51 +0200 Subject: [PATCH 06/47] jekyll-redirect-from --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 37f5eaa42e..bcd3be7d03 100644 --- a/Gemfile +++ b/Gemfile @@ -1,2 +1,3 @@ source 'https://rubygems.org' gem 'github-pages', group: :jekyll_plugins +gem 'jekyll-redirect-from' From 83cf79baddb6242a2b8b2285e3b3482db4d60a32 Mon Sep 17 00:00:00 2001 From: Travis Lee Date: Fri, 26 May 2017 14:26:02 +0200 Subject: [PATCH 07/47] bumped scala version --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index e6e6343bf4..4a966d7cdc 100644 --- a/_config.yml +++ b/_config.yml @@ -15,7 +15,7 @@ keywords: - Document - Guide -scala-version: 2.12.0 +scala-version: 2.12.2 highlighter: rouge permalink: /:categories/:title.html From 531539d24b5a430e0dd73fc12e17c99c519a3b18 Mon Sep 17 00:00:00 2001 From: Travis Lee Date: Fri, 26 May 2017 14:27:07 +0200 Subject: [PATCH 08/47] Added redirect-from gem --- Gemfile.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile.lock b/Gemfile.lock index e83f3fe6d5..2b1dd61641 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -140,6 +140,7 @@ PLATFORMS DEPENDENCIES github-pages + jekyll-redirect-from BUNDLED WITH 1.14.6 From 6a03b97e79bc92ff2a38ad407a053bce3abdfacd Mon Sep 17 00:00:00 2001 From: Travis Lee Date: Fri, 26 May 2017 14:50:02 +0200 Subject: [PATCH 09/47] New headers --- _data/nav-header.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 _data/nav-header.yml diff --git a/_data/nav-header.yml b/_data/nav-header.yml new file mode 100644 index 0000000000..204e1c1b38 --- /dev/null +++ b/_data/nav-header.yml @@ -0,0 +1,12 @@ +- title: Documentation + url: / +- title: Download + url: https://scala-lang.org/download/ +- title: Community + url: https://scala-lang.org/community/ +- title: Libraries + url: https://index.scala-lang.org +- title: Contribute + url: https://scala-lang.org/contribute/ +- title: Blog + url: https://scala-lang.org/blog/ From 970b29d863b9feab6c235aace5465b4d1eb6cdab Mon Sep 17 00:00:00 2001 From: Travis Lee Date: Fri, 26 May 2017 14:52:48 +0200 Subject: [PATCH 10/47] replaced layouts --- _includes/allsids.txt | 28 -- _includes/blog-list.html | 75 ++++ _includes/cheatsheet-header.txt | 352 ---------------- _includes/cheatsheet-sidebar.txt | 40 -- _includes/collections.txt | 4 - _includes/column-list-of-items.html | 18 + _includes/contributing-header.txt | 217 ---------- _includes/contributing-toc.txt | 7 - _includes/contributions-projects-list.html | 36 ++ _includes/coursera-stats-js.txt | 21 - _includes/{disqus.txt => disqus.html} | 0 _includes/download-resource-list.html | 31 ++ _includes/downloads-list.html | 19 + _includes/events-training-list-bottom.html | 12 + _includes/events-training-list-top.html | 73 ++++ _includes/footer.html | 55 +++ _includes/footer.txt | 15 - _includes/footerbar.txt | 53 --- _includes/frontpage-content.txt | 72 ---- _includes/frontpage-footer.txt | 6 - _includes/frontpage-header.txt | 153 ------- _includes/gen-toc.txt | 6 - _includes/glossary-header.txt | 349 ---------------- _includes/glossary-sidebar.txt | 6 - _includes/header-coursera.txt | 180 -------- _includes/header.txt | 159 ------- _includes/headerbottom.html | 3 + _includes/headertop.html | 30 ++ _includes/index-header.txt | 264 ------------ .../inner-page-blog-detail-main-content.html | 27 ++ _includes/inner-page-main-content.html | 12 + _includes/localized-overview-index.txt | 34 -- _includes/masthead-community.html | 37 ++ _includes/masthead-documentation.html | 19 + _includes/navbar-inner.html | 19 + _includes/online-courses.html | 91 ++++ _includes/pager.txt | 10 - _includes/paginator.html | 9 + _includes/scastie.html | 23 ++ _includes/search-header.txt | 267 ------------ _includes/sidebar-toc.html | 39 ++ _includes/sips-topbar.txt | 17 - _includes/thanks-to.txt | 14 - _includes/toc-large.txt | 28 -- _includes/toc.txt | 57 --- _includes/topbar.txt | 47 --- _includes/tutorial-list.html | 7 + _includes/tutorial-toc.txt | 6 - _includes/twitter-feed.html | 15 + _includes/upcoming-training.html | 38 ++ _includes/worldmap.html | 0 _layouts/blog-detail.html | 6 + _layouts/blog-list.html | 9 + _layouts/cheatsheet.html | 32 -- _layouts/contribute.html | 33 -- _layouts/default.html | 2 - _layouts/downloadpage.html | 100 +++++ _layouts/events.html | 13 + _layouts/frontpage.html | 387 +++++++++++++++++- _layouts/glossary.html | 35 -- _layouts/guides-index.html | 43 -- _layouts/guides-thanks.html | 12 - _layouts/index.html | 23 -- _layouts/inner-page-community.html | 9 + _layouts/inner-page-documentation.html | 9 + _layouts/inner-page-no-masthead.html | 6 + _layouts/inner-page-parent-searchbar.html | 32 ++ _layouts/inner-page-parent.html | 23 ++ _layouts/learn.html | 38 ++ _layouts/news-coursera.html | 21 - _layouts/news.html | 25 -- _layouts/overview-large.html | 79 ++-- _layouts/overview.html | 55 --- _layouts/page.html | 33 -- _layouts/redirected.html | 16 - _layouts/search.html | 23 -- _layouts/sip-landing.html | 28 -- _layouts/sip.html | 23 -- _layouts/slip.html | 23 -- _layouts/training.html | 9 + _layouts/tutorial.html | 53 --- 81 files changed, 1354 insertions(+), 2946 deletions(-) delete mode 100644 _includes/allsids.txt create mode 100644 _includes/blog-list.html delete mode 100644 _includes/cheatsheet-header.txt delete mode 100644 _includes/cheatsheet-sidebar.txt delete mode 100644 _includes/collections.txt create mode 100644 _includes/column-list-of-items.html delete mode 100644 _includes/contributing-header.txt delete mode 100644 _includes/contributing-toc.txt create mode 100644 _includes/contributions-projects-list.html delete mode 100644 _includes/coursera-stats-js.txt rename _includes/{disqus.txt => disqus.html} (100%) create mode 100644 _includes/download-resource-list.html create mode 100644 _includes/downloads-list.html create mode 100644 _includes/events-training-list-bottom.html create mode 100644 _includes/events-training-list-top.html create mode 100644 _includes/footer.html delete mode 100644 _includes/footer.txt delete mode 100644 _includes/footerbar.txt delete mode 100644 _includes/frontpage-content.txt delete mode 100644 _includes/frontpage-footer.txt delete mode 100644 _includes/frontpage-header.txt delete mode 100644 _includes/gen-toc.txt delete mode 100644 _includes/glossary-header.txt delete mode 100644 _includes/glossary-sidebar.txt delete mode 100644 _includes/header-coursera.txt delete mode 100644 _includes/header.txt create mode 100644 _includes/headerbottom.html create mode 100644 _includes/headertop.html delete mode 100644 _includes/index-header.txt create mode 100644 _includes/inner-page-blog-detail-main-content.html create mode 100644 _includes/inner-page-main-content.html delete mode 100644 _includes/localized-overview-index.txt create mode 100644 _includes/masthead-community.html create mode 100644 _includes/masthead-documentation.html create mode 100644 _includes/navbar-inner.html create mode 100644 _includes/online-courses.html delete mode 100644 _includes/pager.txt create mode 100644 _includes/paginator.html create mode 100644 _includes/scastie.html delete mode 100644 _includes/search-header.txt create mode 100644 _includes/sidebar-toc.html delete mode 100644 _includes/sips-topbar.txt delete mode 100644 _includes/thanks-to.txt delete mode 100644 _includes/toc-large.txt delete mode 100644 _includes/toc.txt delete mode 100644 _includes/topbar.txt create mode 100644 _includes/tutorial-list.html delete mode 100644 _includes/tutorial-toc.txt create mode 100644 _includes/twitter-feed.html create mode 100644 _includes/upcoming-training.html delete mode 100644 _includes/worldmap.html create mode 100644 _layouts/blog-detail.html create mode 100644 _layouts/blog-list.html delete mode 100644 _layouts/cheatsheet.html delete mode 100644 _layouts/contribute.html delete mode 100644 _layouts/default.html create mode 100644 _layouts/downloadpage.html create mode 100644 _layouts/events.html delete mode 100644 _layouts/glossary.html delete mode 100644 _layouts/guides-index.html delete mode 100644 _layouts/guides-thanks.html delete mode 100644 _layouts/index.html create mode 100644 _layouts/inner-page-community.html create mode 100644 _layouts/inner-page-documentation.html create mode 100644 _layouts/inner-page-no-masthead.html create mode 100644 _layouts/inner-page-parent-searchbar.html create mode 100644 _layouts/inner-page-parent.html create mode 100644 _layouts/learn.html delete mode 100644 _layouts/news-coursera.html delete mode 100644 _layouts/news.html delete mode 100644 _layouts/overview.html delete mode 100644 _layouts/page.html delete mode 100644 _layouts/redirected.html delete mode 100644 _layouts/search.html delete mode 100644 _layouts/sip-landing.html delete mode 100644 _layouts/sip.html delete mode 100644 _layouts/slip.html create mode 100644 _layouts/training.html delete mode 100644 _layouts/tutorial.html diff --git a/_includes/allsids.txt b/_includes/allsids.txt deleted file mode 100644 index dd33e8b365..0000000000 --- a/_includes/allsids.txt +++ /dev/null @@ -1,28 +0,0 @@ -

Pending SIPs

-
    - {% for post in site.categories.pending %} -
  • {{ post.title }} ( {{ post.date | date: "%b %Y" }} ) - {% if post.vote-status %} - {% if post.vote-status == 'accepted' %} - Accepted - {% elsif post.vote-status == 'deferred' %} - Deferred - {% elsif post.vote-status == 'postponed' %} - Postponed - {% elsif post.vote-status == 'under review' %} - Under Review - {% elsif post.vote-status == 'under revision' %} - Under Revision - {% elsif post.vote-status == 'numbered' %} - Numbered - {% elsif post.vote-status == 'dormant' %} - Dormant - {% elsif post.vote-status == 'not accepted' %} - Not Accepted - {% elsif post.vote-status == 'rejected' %} - Not Accepted - {% endif %} - {% endif %} -
  • - {% endfor %} -
diff --git a/_includes/blog-list.html b/_includes/blog-list.html new file mode 100644 index 0000000000..a82eeccc4e --- /dev/null +++ b/_includes/blog-list.html @@ -0,0 +1,75 @@ +{% comment %}Use the include variable 'category' to select the category to show (included in blog-categories.yml), or assign it to "all" if you want to show all posts.{% endcomment %} + +
+
+
+
+ +
+ {% for post in paginator.posts %} +
+

{{post.title}}

+

{{post.date | date: "%A %-d %B %Y"}}

+ {% if post.by %}

{{post.by}}

{% endif %} + {% if post.tags %} +
    + {% for tag in post.tags %} +
  • {{tag}}
  • + {% endfor %} +
+ {% endif %} +
+ {% endfor %} +
+
+ {% for category in site.data.blog-categories %} + {% if category.categoryId == include.category %} + {% assign currentCategoryPath = category.url %} + {% endif %} + {% endfor %} + + {% capture urlPath %}{% if include.category == "all" %}blog{% else %}{{currentCategoryPath}}{% endif %}{% endcapture %} + {% assign urlPath = urlPath | split: '/' | join: '/' | remove_first: '/' %} + {% include paginator.html urlPath=urlPath %} +
+ {% assign highlights = "" | split: "," %} + {% for post in site.posts %} + {% if post.isHighlight == true %} + {% assign highlights = highlights | push: post %} + {% endif %} + {% endfor %} + + {% for post in highlights %} + {% if forloop.first %} +
+
+
Highlights
+
+ {% endif %} +
+

{{post.title}}

+ {% if post.by %}

{{post.by}}

{% endif %} + {% if post.tags %} + {% for tag in post.tags %} +
    +
  • {{tag}}
  • +
+ {% endfor %} + {% endif %} +
+ {% if forloop.last %} +
+
+
+ {% endif %} + {% endfor %} + +
+
\ No newline at end of file diff --git a/_includes/cheatsheet-header.txt b/_includes/cheatsheet-header.txt deleted file mode 100644 index 32965d410c..0000000000 --- a/_includes/cheatsheet-header.txt +++ /dev/null @@ -1,352 +0,0 @@ - - - - - {% if page.title %}{{ page.title }} - {% endif %}{{ site.title }} - {% if page.description %} - - {% endif %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/_includes/cheatsheet-sidebar.txt b/_includes/cheatsheet-sidebar.txt deleted file mode 100644 index af79fde132..0000000000 --- a/_includes/cheatsheet-sidebar.txt +++ /dev/null @@ -1,40 +0,0 @@ -{% for pg in site.pages %} - {% if pg.layout == 'cheatsheet' and pg.title == page.title and pg.languages %} - {% assign languages = pg.languages %} - {% endif %} -{% endfor %} - -{% if page.language %} - {% capture intermediate %}{{ page.url | remove_first: page.language }}{% endcapture %} - {% capture rootTutorialURL %}{{ intermediate | remove_first: '/' }}{% endcapture %} -{% else %} - {% assign rootTutorialURL = page.url %} -{% endif %} - -
-
- {% if languages %} -

Languages

-
    -
  • English
  • - {% for l in languages %} - {% assign lang = site.data.languages[l] %} -
  • {{lang.name}}
  • - {% endfor %} -
- {% endif %} -

Contents

-
-

Other Cheatsheets

-
    - {% for pg in site.pages %} - {% if pg.layout == 'cheatsheet' and pg.title != page.title %} -
  • {{ pg.title }}
  • - {% endif %} - {% endfor %} -
- {% if page.about %} -
About

{{ page.about }}

- {% endif %} -
-
\ No newline at end of file diff --git a/_includes/collections.txt b/_includes/collections.txt deleted file mode 100644 index 826c2699b8..0000000000 --- a/_includes/collections.txt +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/_includes/column-list-of-items.html b/_includes/column-list-of-items.html new file mode 100644 index 0000000000..eb9e1600be --- /dev/null +++ b/_includes/column-list-of-items.html @@ -0,0 +1,18 @@ +{% comment %} + Layouts using this include should pass an include variable called 'collection' referencing a collection carrying the data (i.e.: contribute_community_tickets, contribute_resources...) +{% endcomment %} +
+ {% for item in include.collection %} +
+ +
+ {{item.content}} +
+
+ {% endfor %} +
\ No newline at end of file diff --git a/_includes/contributing-header.txt b/_includes/contributing-header.txt deleted file mode 100644 index 338528e402..0000000000 --- a/_includes/contributing-header.txt +++ /dev/null @@ -1,217 +0,0 @@ - - - - - {% if page.title %}{{ page.title }} - {% endif %}{{ site.title }} - {% if page.description %} - - {% endif %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/_includes/contributing-toc.txt b/_includes/contributing-toc.txt deleted file mode 100644 index 471940e7ec..0000000000 --- a/_includes/contributing-toc.txt +++ /dev/null @@ -1,7 +0,0 @@ -
-
-

Contents

-
- {% include thanks-to.txt %} -
-
diff --git a/_includes/contributions-projects-list.html b/_includes/contributions-projects-list.html new file mode 100644 index 0000000000..5a4c9bdbe7 --- /dev/null +++ b/_includes/contributions-projects-list.html @@ -0,0 +1,36 @@ +{% comment %} + Layouts using this include should pass an include variable called 'collection' referencing a collection carrying the data +{% endcomment %} +
+ {% for item in include.collection %} +
+ +
+

{{item.description}}

+
    + {% if item.homeLink %} +
  • Home
  • + {% if item.contributingLink or item.readmeLink or item.issuesLink %}
  • {% endif %} + {% endif %} + {% if item.issuesLink %} +
  • Issues
  • + {% if item.contributingLink or item.readmeLink %}
  • {% endif %} + {% endif %} + {% if item.readmeLink %} +
  • ReadMe
  • + {% if item.contributingLink %}
  • {% endif %} + {% endif %} + {% if item.contributingLink %} +
  • Contributing
  • + {% endif %} +
+
+
+ {% endfor %} + +
\ No newline at end of file diff --git a/_includes/coursera-stats-js.txt b/_includes/coursera-stats-js.txt deleted file mode 100644 index a65c30925b..0000000000 --- a/_includes/coursera-stats-js.txt +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/_includes/disqus.txt b/_includes/disqus.html similarity index 100% rename from _includes/disqus.txt rename to _includes/disqus.html diff --git a/_includes/download-resource-list.html b/_includes/download-resource-list.html new file mode 100644 index 0000000000..017af455af --- /dev/null +++ b/_includes/download-resource-list.html @@ -0,0 +1,31 @@ +

Other resources

+ +

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.

+ +
+ + + + + {% unless page.dont_show_sizes %} + + {% endunless %} + + + +{% for resource in page.resources %} + + + + {% unless page.dont_show_sizes %} + + {% endunless %} + +{% endfor %} + +
ArchiveSystemSize
+ + {{ resource[1] }} + + {{ resource[3] }}{{ resource[4] }}
+
diff --git a/_includes/downloads-list.html b/_includes/downloads-list.html new file mode 100644 index 0000000000..f8a7554901 --- /dev/null +++ b/_includes/downloads-list.html @@ -0,0 +1,19 @@ +{% for top in (0..3) reversed %} + {% for major in (0..20) reversed %} + {% assign possibleVersionShort = top | append:'.' | append:major %} + {% assign sz = possibleVersionShort | size %} + {% if 3 == sz %} + {% assign possibleVersion = possibleVersionShort | append:'.' %} + {% else %} + {% assign possibleVersion = possibleVersionShort %} + {% endif %} + {% for page in site.downloads %} + {% assign releaseVersion = page.release_version | truncate:4, '' %} + {% if releaseVersion == possibleVersion %} + + {% endif %} + {% endfor %} + {% endfor %} +{% endfor %} \ No newline at end of file diff --git a/_includes/events-training-list-bottom.html b/_includes/events-training-list-bottom.html new file mode 100644 index 0000000000..f863e64506 --- /dev/null +++ b/_includes/events-training-list-bottom.html @@ -0,0 +1,12 @@ +
+ + {% if paginator.total_pages > 1 %} +
    + {% for page in (1..paginator.total_pages) %} +
  • + {{page}} +
  • + {% endfor %} +
+ {% endif %} + \ No newline at end of file diff --git a/_includes/events-training-list-top.html b/_includes/events-training-list-top.html new file mode 100644 index 0000000000..e3a7d0004c --- /dev/null +++ b/_includes/events-training-list-top.html @@ -0,0 +1,73 @@ +{% capture currentYear %}{{site.time | date: '%Y' | plus: 0}}{% endcapture %} + +
+
+
+ {% comment %}Because of Jekyll limitations, we need to pass the paginated collection to iterate in an include variable 'collection'{% endcomment %} + + {% capture firstMonth %}{{include.collection.first.date | date: "%m"}}{% endcapture %} + {% assign firstMonthNum = firstMonth | plus: 0 %} + {% capture lastMonth %}{{include.collection.last.date | date: "%m"}}{% endcapture %} + {% assign lastMonthNum = lastMonth | plus: 0 %} + + {% for m in (firstMonth..lastMonth) %} + {% assign currentMonthEvents = '' | split: ','' %} + + {% for event in include.collection %} + {% capture month %}{{event.date | date: "%m"}}{% endcapture %} + {% assign monthNum = month | plus: 0 %} + {% if monthNum == m %} + {% assign currentMonthEvents = currentMonthEvents | push: event %} + {% endif %} + {% endfor %} + + {% capture monthName %} + {% case m %} + {% when 1 %}January + {% when 2 %}February + {% when 3 %}March + {% when 4 %}April + {% when 5 %}May + {% when 6 %}June + {% when 7 %}July + {% when 8 %}August + {% when 9 %}September + {% when 10 %}October + {% when 11 %}November + {% when 12 %}December + {% endcase %} + {% endcapture %} + + {% for event in currentMonthEvents %} + {% capture year %}{{event.date | date: "%Y"}}{% endcapture %} + {% capture day %}{{event.date | date: "%d"}}{% endcapture %} + {% if forloop.first %} +

{{monthName}} {{year}}

+ + {% endif %} + {% endfor %} + {% endfor %} \ No newline at end of file diff --git a/_includes/footer.html b/_includes/footer.html new file mode 100644 index 0000000000..e333a548ac --- /dev/null +++ b/_includes/footer.html @@ -0,0 +1,55 @@ +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + {% if page.includeTOC == true %} + + + {% endif %} + + + + + + + + diff --git a/_includes/footer.txt b/_includes/footer.txt deleted file mode 100644 index 65dfc817bc..0000000000 --- a/_includes/footer.txt +++ /dev/null @@ -1,15 +0,0 @@ -{% include footerbar.txt %} - - - - - - - - diff --git a/_includes/footerbar.txt b/_includes/footerbar.txt deleted file mode 100644 index 881aad4375..0000000000 --- a/_includes/footerbar.txt +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - diff --git a/_includes/frontpage-content.txt b/_includes/frontpage-content.txt deleted file mode 100644 index d45b10893a..0000000000 --- a/_includes/frontpage-content.txt +++ /dev/null @@ -1,72 +0,0 @@ -
- -

Community-driven documentation for Scala.

- -
    -
  • - Thumbnail -

    Overviews and Guides

    -

    Collections, Actors, Swing, and more.

    -

    Go there

    -
  • -
  • - Thumbnail -

    Tutorials

    -

    Coming from Java? Python? Ruby? Tutorials which help the transition from language XYZ to Scala.

    -

    Go there

    -
  • -
  • - Thumbnail -

    Glossary

    -

    Lost on some terminology? Check the glossary, direct from the book, Programming in Scala.

    -

    Go there

    -
  • -
-
- -
-
-
- -
- -

Available Documentation

- -

Scala Improvement Process Available

-

Read language improvement proposals, participate in discussions surrounding submitted proposals, or submit your own improvement proposal.

- -

Guides and Overviews Some Available

-

Some guides, such as Martin Odersky’s Collections Overview are now available.

- -

Tutorials Some Available

-

Some tutorials, such as the Scala for Java Programmers guide, are now available.

- -

Glossary Available

-

With permission from Artima Inc., we reproduce the glossary from Programming in Scala here, for easy reference.

- -

Cheatsheets Available

-

We've currently got one cheatsheet, thanks to Brendan O’Connor. Contributions in this area are welcome.

- -

Scala Style Guide Available

-

Thanks to Daniel Spiewak and David Copeland for putting together such an excellent style guide, and thanks to Simon Ochsenreither for converting it to Markdown.

- -

Language Specification Available

-

The official definition of Scala. For when you just have to know the truth.

- -

 

 

- -
-
-

Contributions Welcomed!

- This site was designed for core committers and the community alike to build documentation. We’d love help of any kind – from detailed articles or overviews of Scala’s language features, to help converting documents to Markdown. -

 

-

If you’d like to help, please see the Contribute section of the site, and feel free to contact Heather.

- -

Recent Comments

- - -
- -
-
-
diff --git a/_includes/frontpage-footer.txt b/_includes/frontpage-footer.txt deleted file mode 100644 index 5dd888b0d8..0000000000 --- a/_includes/frontpage-footer.txt +++ /dev/null @@ -1,6 +0,0 @@ - - {% include footerbar.txt %} - - - - diff --git a/_includes/frontpage-header.txt b/_includes/frontpage-header.txt deleted file mode 100644 index 9a41e3c5d5..0000000000 --- a/_includes/frontpage-header.txt +++ /dev/null @@ -1,153 +0,0 @@ - - - - - {% if page.title %}{{ page.title }} - {% endif %}{{ site.title }} - {% if page.description %} - - {% endif %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/_includes/gen-toc.txt b/_includes/gen-toc.txt deleted file mode 100644 index c5124cfd18..0000000000 --- a/_includes/gen-toc.txt +++ /dev/null @@ -1,6 +0,0 @@ -
-
-

Contents

-
-
-
diff --git a/_includes/glossary-header.txt b/_includes/glossary-header.txt deleted file mode 100644 index 12ad34335e..0000000000 --- a/_includes/glossary-header.txt +++ /dev/null @@ -1,349 +0,0 @@ - - - - - {% if page.title %}{{ page.title }} - {% endif %}{{ site.title }} - {% if page.description %} - - {% endif %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/_includes/glossary-sidebar.txt b/_includes/glossary-sidebar.txt deleted file mode 100644 index e047cce8c2..0000000000 --- a/_includes/glossary-sidebar.txt +++ /dev/null @@ -1,6 +0,0 @@ -
-
-

Terms

-
-
-
diff --git a/_includes/header-coursera.txt b/_includes/header-coursera.txt deleted file mode 100644 index 49a664246c..0000000000 --- a/_includes/header-coursera.txt +++ /dev/null @@ -1,180 +0,0 @@ - - - - - {% if page.partof %}{{ page.partof | replace: '-',' ' | split:" " | capitalize | join:" " }} - {% endif %}{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }} - {% if page.description %} - - {% endif %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/_includes/header.txt b/_includes/header.txt deleted file mode 100644 index ff4295a4b0..0000000000 --- a/_includes/header.txt +++ /dev/null @@ -1,159 +0,0 @@ - - - - {% if page.partof %}{% assign words = page.partof | split: '-' %}{% for word in words %}{{ word | capitalize }} {% endfor %}- {% endif %}{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }} - {% if page.description %} - - {% endif %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/_includes/headerbottom.html b/_includes/headerbottom.html new file mode 100644 index 0000000000..75ae52c268 --- /dev/null +++ b/_includes/headerbottom.html @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/_includes/headertop.html b/_includes/headertop.html new file mode 100644 index 0000000000..bfc55927d5 --- /dev/null +++ b/_includes/headertop.html @@ -0,0 +1,30 @@ + + + + {% if page.title %}{{ page.title }} | {% endif %}{{ site.title }} + {% if page.description %} + + {% endif %} + + + + + + + + + + + + + + + + + + + + + + diff --git a/_includes/index-header.txt b/_includes/index-header.txt deleted file mode 100644 index 4a2043a74e..0000000000 --- a/_includes/index-header.txt +++ /dev/null @@ -1,264 +0,0 @@ - - - - - {% if page.title %}{{ page.title }} - {% endif %}{{ site.title }} - {% if page.description %} - - {% endif %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/_includes/inner-page-blog-detail-main-content.html b/_includes/inner-page-blog-detail-main-content.html new file mode 100644 index 0000000000..bf616325b4 --- /dev/null +++ b/_includes/inner-page-blog-detail-main-content.html @@ -0,0 +1,27 @@ +
+
+
+
+
+
+

{{page.date | date: "%A %-d %B %Y"}}

+

{{page.by}}

+
+ {% if page.tags %} +
    + {% for tag in page.tags %} +
  • {{tag}}
  • + {% endfor %} +
+ {% endif %} +
+
{{page.category | upcase}}
+

{{page.title}}

+ {{content}} +
+
+ + {% include sidebar-toc.html %} +
+
+
\ No newline at end of file diff --git a/_includes/inner-page-main-content.html b/_includes/inner-page-main-content.html new file mode 100644 index 0000000000..9587a304cb --- /dev/null +++ b/_includes/inner-page-main-content.html @@ -0,0 +1,12 @@ +
+
+
+
+ {{content}} +
+
+ + + {% include sidebar-toc.html %} +
+
diff --git a/_includes/localized-overview-index.txt b/_includes/localized-overview-index.txt deleted file mode 100644 index c63454870b..0000000000 --- a/_includes/localized-overview-index.txt +++ /dev/null @@ -1,34 +0,0 @@ -{% for enpost in site.categories.core %} -{% for post in site.pages %} -{% if post.overview and post.overview == enpost.overview and post.language == page.language %} - -{% if post.partof %} -* {{ post.title }} {{ post.label-text }} - {% for pg in site.pages %} - {% if pg.partof == post.partof and pg.outof and pg.language == page.language %} - {% assign totalPages = pg.outof %} - {% endif %} - {% endfor %} - - {% if totalPages %} -
    - {% for i in (1..totalPages) %} - {% for pg in site.pages %} - {% if pg.partof == post.partof and pg.num and pg.num == i and pg.language == page.language %} -
  • {{ pg.title }}
  • - {% endif %} - {% endfor %} - {% endfor %} -
- {% else %} **ERROR**. Couldn't find the total number of pages in this set of tutorial articles. Have you declared the `outof` tag in your YAML front matter? - {% endif %} -{% else %} - {% if post.hidden == true %} - {% else %} -* [{{ post.title }}]({{ site.baseurl }}{{ post.url }}) {{ post.label-text }} - {% endif %} -{% endif %} - -{% endif %} -{% endfor %} -{% endfor %} diff --git a/_includes/masthead-community.html b/_includes/masthead-community.html new file mode 100644 index 0000000000..76f7b0628a --- /dev/null +++ b/_includes/masthead-community.html @@ -0,0 +1,37 @@ +
+
+
+
+
+

Discourse

+ Mailing list +
    + {% for forum in site.data.chats-forums.discourseForums %} +
  • + {{forum.title}} +
    +

    {{forum.title}}

    +

    {{forum.subtitle}}

    +
    +
  • + {% endfor %} +
+
+
+

Gitter

+ Real-time (topic-specialized) chat + +
+
+
+
+
\ No newline at end of file diff --git a/_includes/masthead-documentation.html b/_includes/masthead-documentation.html new file mode 100644 index 0000000000..a773e89d0c --- /dev/null +++ b/_includes/masthead-documentation.html @@ -0,0 +1,19 @@ +
+
+
+
+ {% for link in page.links %} + +
+ +
{{link.title}}
+
+
+

{{link.description}}

+
+
+ {% endfor %} +
+
+
+
\ No newline at end of file diff --git a/_includes/navbar-inner.html b/_includes/navbar-inner.html new file mode 100644 index 0000000000..c68cdda64b --- /dev/null +++ b/_includes/navbar-inner.html @@ -0,0 +1,19 @@ + diff --git a/_includes/online-courses.html b/_includes/online-courses.html new file mode 100644 index 0000000000..9f91d0404b --- /dev/null +++ b/_includes/online-courses.html @@ -0,0 +1,91 @@ + +
+
+

Online Courses

+
+ + {% comment %} + We're going to follow the next ordering for the online courses: + 1- First we'll show those items that belong to an specific specialization (i.e.: Scala's progfun in Coursera). Those will be ordered alphabetically by title and each item under the specialization by the `specialization-order` tag in each one. + 2- After those, courses that don't belong to any specific specialization. + We'll only show those courses that are not finished yet. + {% endcomment %} + + {% assign specializations = '' | split: ',' %} + {% assign courses = '' | split: ',' %} + {% assign upcomingCourses = '' | split: ',' %} + {% capture now %}{{site.time | date: '%s' | plus: 0}}{% endcapture %} + + {% for course in site.online_courses %} + {% unless specializations contains course.specialization %} + {% assign specializations = specializations | push: course.specialization %} + {% endunless %} + + {% capture endDate %}{{course.end-date | date: '%s' | plus: 86400}}{% endcapture %} + {% if now <= endDate %} + {% assign upcomingCourses = upcomingCourses | push: course %} + {% endif %} + {% endfor %} + + {% for specialization in specializations %} + {% assign specCourses = '' | split: ',' %} + + {% for course in upcomingCourses %} + {% if course.specialization %} + {% if course.specialization == specialization %} + {% assign specCourses = specCourses | push: course %} + {% endif %} + + {% assign sortedSpecCourses = specCourses | sort: 'specialization-order' %} + {% endif %} + {% endfor %} + {% for sortedCourse in sortedSpecCourses %} + {% assign courses = courses | push: sortedCourse %} + {% endfor %} + {% endfor %} + + {% for course in upcomingCourses %} + {% unless course.specialization %} + {% assign courses = courses | push: course %} + {% endunless %} + {% endfor %} + + +
+

Visit all the Online Courses courses

+
+
\ No newline at end of file diff --git a/_includes/pager.txt b/_includes/pager.txt deleted file mode 100644 index 417efc705a..0000000000 --- a/_includes/pager.txt +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/_includes/paginator.html b/_includes/paginator.html new file mode 100644 index 0000000000..7212e643f4 --- /dev/null +++ b/_includes/paginator.html @@ -0,0 +1,9 @@ +{% if paginator.total_pages > 1 %} +
    + {% for page in (1..paginator.total_pages) %} +
  • + {{page}} +
  • + {% endfor %} +
+{% endif %} \ No newline at end of file diff --git a/_includes/scastie.html b/_includes/scastie.html new file mode 100644 index 0000000000..fb7a6ec65a --- /dev/null +++ b/_includes/scastie.html @@ -0,0 +1,23 @@ +
+
+
+

Run Scala in your browser

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer commodo neque eget placerat dapibus. Mauris ullamcorper dui eu pellentesque venenatis. Nam non elit vitae dolor posuere eleifend a facilisis diam

+
+
+ +
+
+
+
+ +
+
+ + Run Scala code interactively +
+
+
+
\ No newline at end of file diff --git a/_includes/search-header.txt b/_includes/search-header.txt deleted file mode 100644 index a013e1d165..0000000000 --- a/_includes/search-header.txt +++ /dev/null @@ -1,267 +0,0 @@ - - - - - {% if page.title %}{{ page.title }} - {% endif %}{{ site.title }} - {% if page.description %} - - {% endif %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/_includes/sidebar-toc.html b/_includes/sidebar-toc.html new file mode 100644 index 0000000000..1f5216067d --- /dev/null +++ b/_includes/sidebar-toc.html @@ -0,0 +1,39 @@ +{% if page.includeTOC or layout.includeTOC %} + {% if page.includeTOC != false %} + +
+ +
+ {% endif %} +{% endif %} diff --git a/_includes/sips-topbar.txt b/_includes/sips-topbar.txt deleted file mode 100644 index 65400087e2..0000000000 --- a/_includes/sips-topbar.txt +++ /dev/null @@ -1,17 +0,0 @@ - - diff --git a/_includes/thanks-to.txt b/_includes/thanks-to.txt deleted file mode 100644 index 1c375077b8..0000000000 --- a/_includes/thanks-to.txt +++ /dev/null @@ -1,14 +0,0 @@ -
-

Thank you

It helps many

-
- -This site and the documentation it contains is the result of a tremendous amount of work by a large number of people over time, from the first Scala team members, to today’s newcomers. In an effort to only scratch the surface, we list some of those whose help was invaluable in the realization of this iteration of the Scala Documentation repository. - -