scala · heathermiller · Feb 13, 2017 · Feb 13, 2017 · Feb 13, 2017 · Feb 13, 2017
diff --git a/_includes/tutorial-tour-list.txt b/_includes/tutorial-tour-list.txt
@@ -1,20 +1,15 @@
-{% for pg in site.pages %}
-  {% if pg.tutorial == "scala-tour" and pg.outof and pg.language == page.language %}
-    {% assign totalPagesTour = pg.outof %}
-  {% endif %}
-{% endfor %}
+{% assign sorted_tour_posts = site.categories.tour | sort: 'num' %}
+{% assign tour_posts_size = sorted_tour_posts | size %}
 
-{% if totalPagesTour %}
+{% if tour_posts_size %}
   <ul>
-  {% for i in (1..totalPagesTour) %}
-    {% for pg in site.pages %}
-      {% if pg.tutorial == "scala-tour" and pg.num and pg.num == i and pg.language == page.language %}
+    {% for pg in sorted_tour_posts %}
+      {% if pg.language == page.language %}
         <li class="tour-of-scala {% if page.title == pg.title %} current-page {% endif %}">
           <a href="{{ pg.url }}">{{ pg.title }}</a>
         </li>
       {% endif %}
     {% endfor %}
-  {% endfor %}
   </ul>
 {% 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 %}
diff --git a/_layouts/tutorial.html b/_layouts/tutorial.html
@@ -1,5 +1,6 @@
 ---
-layout: default
+layout: post
+permalink: /tutorials/:categories/:title/
 ---
 {% include header.txt %}
 <div class="wrapper">
@@ -10,8 +11,8 @@
 
       <div class="span10">{% if page.title %}<h1>{{ page.title }}</h1>{% else %}<h1>{{ site.title }}</h1>{% endif %}</div>
 
-      {% for pg in site.pages %}
-        {% if pg.tutorial == "scala-tour" and pg.languages %}
+      {% for pg in site.categories.tour %}
+        {% if pg.languages %}
           {% assign languages = pg.languages %}
         {% endif %}
       {% endfor %}

diff --git a/tutorials/tour/abstract-types.md → ...s/2017-02-13-2017-02-13-abstract-types.md b/tutorials/tour/abstract-types.md → ...s/2017-02-13-2017-02-13-abstract-types.md
@@ -5,6 +5,7 @@ title: Abstract Types
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 23
 next-page: compound-types
 previous-page: inner-classes

diff --git a/tutorials/tour/annotations.md → ...als/tour/_posts/2017-02-13-annotations.md b/tutorials/tour/annotations.md → ...als/tour/_posts/2017-02-13-annotations.md
@@ -5,6 +5,7 @@ title: Annotations
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 32
 next-page: default-parameter-values
 previous-page: automatic-closures

diff --git a/tutorials/tour/anonymous-function-syntax.md → ...s/2017-02-13-anonymous-function-syntax.md b/tutorials/tour/anonymous-function-syntax.md → ...s/2017-02-13-anonymous-function-syntax.md
@@ -5,6 +5,7 @@ title: Anonymous Function Syntax
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 7
 next-page: higher-order-functions
 previous-page: mixin-class-composition

diff --git a/tutorials/tour/automatic-closures.md → ...r/_posts/2017-02-13-automatic-closures.md b/tutorials/tour/automatic-closures.md → ...r/_posts/2017-02-13-automatic-closures.md
@@ -5,6 +5,7 @@ title: Automatic Type-Dependent Closure Construction
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 31
 next-page: annotations
 previous-page: operators

diff --git a/tutorials/tour/basics.md → tutorials/tour/_posts/2017-02-13-basics.md b/tutorials/tour/basics.md → tutorials/tour/_posts/2017-02-13-basics.md
@@ -5,6 +5,7 @@ title: Basics
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 2
 next-page: unified-types
 previous-page: tour-of-scala

diff --git a/tutorials/tour/case-classes.md → ...ls/tour/_posts/2017-02-13-case-classes.md b/tutorials/tour/case-classes.md → ...ls/tour/_posts/2017-02-13-case-classes.md
@@ -5,6 +5,7 @@ title: Case Classes
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 11
 next-page: pattern-matching
 previous-page: currying

diff --git a/tutorials/tour/classes.md → tutorials/tour/_posts/2017-02-13-classes.md b/tutorials/tour/classes.md → tutorials/tour/_posts/2017-02-13-classes.md
@@ -5,6 +5,7 @@ title: Classes
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 4
 next-page: traits
 previous-page: unified-types

diff --git a/tutorials/tour/compound-types.md → .../tour/_posts/2017-02-13-compound-types.md b/tutorials/tour/compound-types.md → .../tour/_posts/2017-02-13-compound-types.md
@@ -5,6 +5,7 @@ title: Compound Types
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 24
 next-page: explicitly-typed-self-references
 previous-page: abstract-types

diff --git a/tutorials/tour/currying.md → tutorials/tour/_posts/2017-02-13-currying.md b/tutorials/tour/currying.md → tutorials/tour/_posts/2017-02-13-currying.md
@@ -5,6 +5,7 @@ title: Currying
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 10
 next-page: case-classes
 previous-page: nested-functions

diff --git a/tutorials/tour/default-parameter-values.md → ...ts/2017-02-13-default-parameter-values.md b/tutorials/tour/default-parameter-values.md → ...ts/2017-02-13-default-parameter-values.md
@@ -5,6 +5,7 @@ title: Default Parameter Values
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 33
 next-page: named-parameters
 previous-page: annotations

diff --git a/.../tour/explicitly-typed-self-references.md → ...02-13-explicitly-typed-self-references.md b/.../tour/explicitly-typed-self-references.md → ...02-13-explicitly-typed-self-references.md
@@ -5,6 +5,7 @@ title: Explicitly Typed Self References
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 25
 next-page: implicit-parameters
 previous-page: compound-types

diff --git a/tutorials/tour/extractor-objects.md → ...ur/_posts/2017-02-13-extractor-objects.md b/tutorials/tour/extractor-objects.md → ...ur/_posts/2017-02-13-extractor-objects.md
@@ -5,6 +5,7 @@ title: Extractor Objects
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 16
 next-page: sequence-comprehensions
 previous-page: regular-expression-patterns

diff --git a/tutorials/tour/generic-classes.md → ...tour/_posts/2017-02-13-generic-classes.md b/tutorials/tour/generic-classes.md → ...tour/_posts/2017-02-13-generic-classes.md
@@ -5,6 +5,7 @@ title: Generic Classes
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 18
 next-page: variances
 previous-page: sequence-comprehensions

diff --git a/tutorials/tour/higher-order-functions.md → ...osts/2017-02-13-higher-order-functions.md b/tutorials/tour/higher-order-functions.md → ...osts/2017-02-13-higher-order-functions.md
@@ -5,6 +5,7 @@ title: Higher-order Functions
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 8
 next-page: nested-functions
 previous-page: anonymous-function-syntax

diff --git a/tutorials/tour/implicit-conversions.md → ..._posts/2017-02-13-implicit-conversions.md b/tutorials/tour/implicit-conversions.md → ..._posts/2017-02-13-implicit-conversions.md
@@ -5,6 +5,7 @@ title: Implicit Conversions
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 27
 next-page: polymorphic-methods
 previous-page: implicit-parameters

diff --git a/tutorials/tour/implicit-parameters.md → .../_posts/2017-02-13-implicit-parameters.md b/tutorials/tour/implicit-parameters.md → .../_posts/2017-02-13-implicit-parameters.md
@@ -5,6 +5,7 @@ title: Implicit Parameters
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 26
 next-page: implicit-conversions
 previous-page: explicitly-typed-self-references

diff --git a/tutorials/tour/inner-classes.md → ...s/tour/_posts/2017-02-13-inner-classes.md b/tutorials/tour/inner-classes.md → ...s/tour/_posts/2017-02-13-inner-classes.md
@@ -5,6 +5,7 @@ title: Inner Classes
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 22
 next-page: abstract-types
 previous-page: lower-type-bounds

diff --git a/tutorials/tour/local-type-inference.md → ..._posts/2017-02-13-local-type-inference.md b/tutorials/tour/local-type-inference.md → ..._posts/2017-02-13-local-type-inference.md
@@ -5,6 +5,7 @@ title: Local Type Inference
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 29
 next-page: operators
 previous-page: polymorphic-methods

diff --git a/tutorials/tour/lower-type-bounds.md → ...ur/_posts/2017-02-13-lower-type-bounds.md b/tutorials/tour/lower-type-bounds.md → ...ur/_posts/2017-02-13-lower-type-bounds.md
@@ -5,6 +5,7 @@ title: Lower Type Bounds
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 21
 next-page: inner-classes
 previous-page: upper-type-bounds

diff --git a/tutorials/tour/mixin-class-composition.md → ...sts/2017-02-13-mixin-class-composition.md b/tutorials/tour/mixin-class-composition.md → ...sts/2017-02-13-mixin-class-composition.md
@@ -5,6 +5,7 @@ title: Mixin Class Composition
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 6
 next-page: anonymous-function-syntax
 previous-page: traits

diff --git a/tutorials/tour/named-parameters.md → ...our/_posts/2017-02-13-named-parameters.md b/tutorials/tour/named-parameters.md → ...our/_posts/2017-02-13-named-parameters.md
@@ -5,6 +5,7 @@ title: Named Parameters
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 34
 previous-page: default-parameter-values
 ---

diff --git a/tutorials/tour/nested-functions.md → ...our/_posts/2017-02-13-nested-functions.md b/tutorials/tour/nested-functions.md → ...our/_posts/2017-02-13-nested-functions.md
@@ -5,6 +5,7 @@ title: Nested Functions
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 9
 next-page: currying
 previous-page: higher-order-functions

diff --git a/tutorials/tour/operators.md → ...rials/tour/_posts/2017-02-13-operators.md b/tutorials/tour/operators.md → ...rials/tour/_posts/2017-02-13-operators.md
@@ -5,6 +5,7 @@ title: Operators
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 30
 next-page: automatic-closures
 previous-page: local-type-inference

diff --git a/tutorials/tour/pattern-matching.md → ...our/_posts/2017-02-13-pattern-matching.md b/tutorials/tour/pattern-matching.md → ...our/_posts/2017-02-13-pattern-matching.md
@@ -5,6 +5,7 @@ title: Pattern Matching
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 12
 
 next-page: singleton-objects

diff --git a/tutorials/tour/polymorphic-methods.md → .../_posts/2017-02-13-polymorphic-methods.md b/tutorials/tour/polymorphic-methods.md → .../_posts/2017-02-13-polymorphic-methods.md
@@ -5,6 +5,7 @@ title: Polymorphic Methods
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 28
 
 next-page: local-type-inference

diff --git a/...rials/tour/regular-expression-patterns.md → ...2017-02-13-regular-expression-patterns.md b/...rials/tour/regular-expression-patterns.md → ...2017-02-13-regular-expression-patterns.md
@@ -5,6 +5,7 @@ title: Regular Expression Patterns
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 15
 
 next-page: extractor-objects

diff --git a/tutorials/tour/sequence-comprehensions.md → ...sts/2017-02-13-sequence-comprehensions.md b/tutorials/tour/sequence-comprehensions.md → ...sts/2017-02-13-sequence-comprehensions.md
@@ -5,6 +5,7 @@ title: Sequence Comprehensions
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 17
 next-page: generic-classes
 previous-page: extractor-objects

diff --git a/tutorials/tour/singleton-objects.md → ...ur/_posts/2017-02-13-singleton-objects.md b/tutorials/tour/singleton-objects.md → ...ur/_posts/2017-02-13-singleton-objects.md
@@ -5,6 +5,7 @@ title: Singleton Objects
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 13
 
 next-page: xml-processing

diff --git a/tutorials/tour/tour-of-scala.md → ...s/tour/_posts/2017-02-13-tour-of-scala.md b/tutorials/tour/tour-of-scala.md → ...s/tour/_posts/2017-02-13-tour-of-scala.md
@@ -5,6 +5,7 @@ title: Introduction
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 1
 languages: [ba, es, ko, pt-br, pl]
 outof: 34

diff --git a/tutorials/tour/traits.md → tutorials/tour/_posts/2017-02-13-traits.md b/tutorials/tour/traits.md → tutorials/tour/_posts/2017-02-13-traits.md
@@ -5,6 +5,7 @@ title: Traits
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 5
 next-page: mixin-class-composition
 previous-page: classes

diff --git a/tutorials/tour/unified-types.md → ...s/tour/_posts/2017-02-13-unified-types.md b/tutorials/tour/unified-types.md → ...s/tour/_posts/2017-02-13-unified-types.md
@@ -5,6 +5,7 @@ title: Unified Types
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 3
 next-page: classes
 previous-page: basics

diff --git a/tutorials/tour/upper-type-bounds.md → ...ur/_posts/2017-02-13-upper-type-bounds.md b/tutorials/tour/upper-type-bounds.md → ...ur/_posts/2017-02-13-upper-type-bounds.md
@@ -5,6 +5,7 @@ title: Upper Type Bounds
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 20
 next-page: lower-type-bounds
 previous-page: variances

diff --git a/tutorials/tour/variances.md → ...rials/tour/_posts/2017-02-13-variances.md b/tutorials/tour/variances.md → ...rials/tour/_posts/2017-02-13-variances.md
diff --git a/tutorials/tour/xml-processing.md → .../tour/_posts/2017-02-13-xml-processing.md b/tutorials/tour/xml-processing.md → .../tour/_posts/2017-02-13-xml-processing.md
@@ -5,6 +5,7 @@ title: XML Processing
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 14
 next-page: regular-expression-patterns
 previous-page: singleton-objects