Merge branch 'copychanges'

travissarles · travissarles · commit 1627215ff2f5 · 2017-06-03T21:04:44.000+02:00
diff --git a/_includes/pager.txt b/_includes/pager.txt
@@ -0,0 +1,10 @@
+<nav>
+  <div class="pager">
+  {% if page.previous-page %}
+      <div class="previous"><a href="{{ page.previous-page }}.html""><span aria-hidden="true">&larr;</span> Previous</a></div>
+   {% endif %}
+   {% if page.next-page %}
+      <div class="next"><a href="{{ page.next-page }}.html">Next <span aria-hidden="true">&rarr;</span></a></div>
+   {% endif %}
+  </div>
+</nav>
diff --git a/_includes/sidebar-toc.html b/_includes/sidebar-toc.html
@@ -1,8 +1,35 @@
 {% if page.includeTOC or layout.includeTOC %}
 	{% if page.includeTOC != false %}
 		<!-- Don't include TOC -->
+
+		{% for pg in site.posts %}
+      {% if pg.overview == page.overview and pg.languages %}
+        {% assign languages = pg.languages %}
+      {% endif %}
+    {% endfor %}
+
+    {% for pg in site.pages %}
+      {% if pg.overview == page.overview 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 %}
+
 <div class="content-nav">
 	<div class="inner-box sidebar-toc-wrapper" style="">
+
+		<li><a href="{{ site.baseurl }}{{ rootTutorialURL }}" class="lang">English</a></li>
+		{% for l in languages %}
+			{% assign lang = site.data.languages[l] %}
+			<li><a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}" class="lang">{{lang.name}}</a></li>
+		{% endfor %}
+
 		<h5>Contents</h5>
 		<div class="inner-toc" id="sidebar-toc">
       {% if page.includeCollectionTOC or layout.includeCollectionTOC %}
diff --git a/_includes/tutorial-toc.html b/_includes/tutorial-toc.html
@@ -0,0 +1,29 @@
+
+      {% for pg in site.categories.tour %}
+        {% if 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 %}
+
+<div class="content-nav">
+	<div class="inner-box sidebar-toc-wrapper" style="">
+    <li><a href="{{ site.baseurl }}{{ rootTutorialURL }}" class="lang">English</a></li>
+    {% for l in languages %}
+      {% assign lang = site.data.languages[l] %}
+      <li><a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}" class="lang">{{lang.name}}</a></li>
+    {% endfor %}
+		<h5>Contents</h5>
+		<div class="inner-toc" id="sidebar-toc">
+      {% include tutorial-tour-list.txt %}
+		</div>
+		<hr>
+		<div class="help-us"><a href="/contribute/documentation/#updating-scala-langorg">Problem with this page?<br> Please help us fix it!</a></div>
+	</div>
+</div>
diff --git a/_layouts/overview.html b/_layouts/overview.html
@@ -23,17 +23,5 @@
   {% assign rootTutorialURL = page.url %}
 {% endif %}
 
-<div class="span6">
-  {% if languages %}
-  <ul class="langbar">
-    <li><a href="{{ site.baseurl }}{{ rootTutorialURL }}" class="lang">English</a></li>
-    {% for l in languages %}
-      {% assign lang = site.data.languages[l] %}
-      <li><a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}" class="lang">{{lang.name}}</a></li>
-    {% endfor %}
-  </ul>
-  {% endif %}
-</div>
-
 <!-- Main content -->
 {% include inner-page-main-content.html %}
diff --git a/_layouts/tour.html b/_layouts/tour.html
@@ -1,6 +1,17 @@
 ---
-layout: inner-page-no-masthead
-includeTOC: true
-includeCollectionTOC: true
+layout: inner-page-parent
+permalink: /tutorials/:categories/:title/
 ---
-{{content}}
+<section class="content">
+	<div class="wrap">
+		<div class="content-primary">
+			<div class="inner-box">
+				{{content}}
+        {% include pager.txt %}
+			</div>
+		</div>
+
+		<!-- TOC -->
+		{% include tutorial-toc.html %}
+	</div>
+</section>
diff --git a/guides.md b/guides.md
@@ -32,11 +32,10 @@ redirect_from:
     * [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) <span class="label success">New in 2.10</span>
-  * [Implicit Classes](/overviews/core/implicit-classes.html) <span class="label success">New in 2.10</span>
-  * [Value Classes and Universal Traits](/overviews/core/value-classes.html) <span class="label success">New in 2.10</span>
+  * [String Interpolation](/overviews/core/string-interpolation.html)
+  * [Implicit Classes](/overviews/core/implicit-classes.html)
+  * [Value Classes and Universal Traits](/overviews/core/value-classes.html)
   * [Binary Compatibility of Scala Releases](/overviews/core/binary-compatibility-of-scala-releases.html)
 
 <div class="page-header-index">
@@ -52,7 +51,7 @@ redirect_from:
 <div class="page-header-index">
   <h2>Parallel and Concurrent Programming</h2>
 </div>
-  * [Futures and Promises](/overviews/core/futures.html) <span class="label success">New in 2.10</span>
+  * [Futures and Promises](/overviews/core/futures.html)
   * Scala's Parallel Collections Library
     * [Overview](/overviews/parallel-collections/overview.html)
     * [Concrete Parallel Collection Classes](/overviews/parallel-collections/concrete-parallel-collections.html)
@@ -62,7 +61,7 @@ redirect_from:
     * [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) <span class="label success">New in 2.10</span>
+  * [The Scala Actors Migration Guide](/overviews/core/actors-migration-guide.html)
   * [The Scala Actors API](/overviews/core/actors.html) <span class="label important">Deprecated</span>
 
 <div class="page-header-index">
diff --git a/tutorials/tour/_posts/2017-02-13-abstract-types.md b/tutorials/tour/_posts/2017-02-13-abstract-types.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Abstract Types
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-annotations.md b/tutorials/tour/_posts/2017-02-13-annotations.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Annotations
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-basics.md b/tutorials/tour/_posts/2017-02-13-basics.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Basics
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-by-name-parameters.md b/tutorials/tour/_posts/2017-02-13-by-name-parameters.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: By-name Parameters
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-case-classes.md b/tutorials/tour/_posts/2017-02-13-case-classes.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Case Classes
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-classes.md b/tutorials/tour/_posts/2017-02-13-classes.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Classes
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-compound-types.md b/tutorials/tour/_posts/2017-02-13-compound-types.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Compound Types
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-currying.md b/tutorials/tour/_posts/2017-02-13-currying.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Currying
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-default-parameter-values.md b/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Default Parameter Values
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-extractor-objects.md b/tutorials/tour/_posts/2017-02-13-extractor-objects.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Extractor Objects
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-generic-classes.md b/tutorials/tour/_posts/2017-02-13-generic-classes.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Generic Classes
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-higher-order-functions.md b/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Higher-order Functions
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-implicit-conversions.md b/tutorials/tour/_posts/2017-02-13-implicit-conversions.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Implicit Conversions
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-implicit-parameters.md b/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Implicit Parameters
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-inner-classes.md b/tutorials/tour/_posts/2017-02-13-inner-classes.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Inner Classes
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-local-type-inference.md b/tutorials/tour/_posts/2017-02-13-local-type-inference.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Local Type Inference
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md b/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Lower Type Bounds
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md b/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Mixin Class Composition
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-named-arguments.md b/tutorials/tour/_posts/2017-02-13-named-arguments.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Named Arguments
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-nested-functions.md b/tutorials/tour/_posts/2017-02-13-nested-functions.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Nested Methods
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-operators.md b/tutorials/tour/_posts/2017-02-13-operators.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Operators
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-pattern-matching.md b/tutorials/tour/_posts/2017-02-13-pattern-matching.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Pattern Matching
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md b/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Polymorphic Methods
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md b/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Regular Expression Patterns
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-self-types.md b/tutorials/tour/_posts/2017-02-13-self-types.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Self-type
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md b/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Sequence Comprehensions
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-singleton-objects.md b/tutorials/tour/_posts/2017-02-13-singleton-objects.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Singleton Objects
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-tour-of-scala.md b/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Introduction
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-traits.md b/tutorials/tour/_posts/2017-02-13-traits.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Traits
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-unified-types.md b/tutorials/tour/_posts/2017-02-13-unified-types.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Unified Types
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md b/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Upper Type Bounds
 
 disqus: true
diff --git a/tutorials/tour/_posts/2017-02-13-variances.md b/tutorials/tour/_posts/2017-02-13-variances.md
@@ -1,5 +1,5 @@
 ---
-layout: overview
+layout: tour
 title: Variances
 
 disqus: true
