Created new indexing mechanism for mutli-page tutorials. Still more w…

…ork to be done.
scala-improvement-bot · Oct 21, 2011 · 279448e · 279448e
1 parent 6f822c6
commit 279448e
Show file tree

Hide file tree

Showing 32 changed files with 97 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 _site
 .DS_Store
+.project
+.settings
diff --git a/_includes/tutorial-toc.txt b/_includes/tutorial-toc.txt
@@ -0,0 +1,12 @@
+      <div id="scroller-anchor">
+        <div id="scroller">
+          <p class="contents">Contents</p>
+          <ul>
+          {% for p in site.pages %}
+            {% if p.tutorial == page.tutorial %}
+              <li><a href="{{ p.url }}">{{p.title}}</a></li>
+            {% endif %}
+          {% endfor %}
+          </li>   
+	    </div>
+      </div>
diff --git a/_layouts/tutorial.html b/_layouts/tutorial.html
@@ -0,0 +1,26 @@
+---
+layout: default
+---
+{% include header.txt %}
+{% include topbar.txt %}
+
+<div class="container">
+  <div class="row">
+
+    <h1>{{ site.title }}</h1>
+    {% if page.title %}<h1>{{ page.title }}</h1>{% endif %}
+
+    <div class="span10">
+      {{ content }}
+      {% if page.disqus == true %}{% include disqus.txt %}{% endif %}
+    </div>
+
+    <div class="span6">
+      {% include tutorial-toc.txt %}
+    </div>
+
+
+  </div>
+</div>
+
+{% include footer.txt %}    
diff --git a/tutorials/tour/abstract-types.md b/tutorials/tour/abstract-types.md
@@ -1,6 +1,7 @@
 ---
 layout: overview
 title: Abstract Types
+tutorial: scala-tour
 ---
 
 In Scala, classes are parameterized with values (the constructor parameters) and with types (if classes are [generic](generic-classes.html)). For reasons of regularity, it is not only possible to have values as object members; types along with values are members of objects. Furthermore, both forms of members can be concrete and abstract.

diff --git a/tutorials/tour/anonymous-function-syntax.md b/tutorials/tour/anonymous-function-syntax.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Anonymous Function Syntax
 ---
 

diff --git a/tutorials/tour/automatic-closures.md b/tutorials/tour/automatic-closures.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Automatic Type-Dependent Closure Construction
 ---
 

diff --git a/tutorials/tour/case-classes.md b/tutorials/tour/case-classes.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Case Classes
 ---
 

diff --git a/tutorials/tour/classes.md b/tutorials/tour/classes.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Classes
 ---
 

diff --git a/tutorials/tour/compound-types.md b/tutorials/tour/compound-types.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Compound Types
 ---
 

diff --git a/tutorials/tour/currying.md b/tutorials/tour/currying.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Currying
 ---
 

diff --git a/tutorials/tour/explicitly-typed-self-references.md b/tutorials/tour/explicitly-typed-self-references.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Explicitly Typed Self References
 ---
 

diff --git a/tutorials/tour/extractor-objects.md b/tutorials/tour/extractor-objects.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Extractor Objects
 ---
 

diff --git a/tutorials/tour/generic-classes.md b/tutorials/tour/generic-classes.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Generic Classes
 ---
 

diff --git a/tutorials/tour/higher-order-functions.md b/tutorials/tour/higher-order-functions.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Higher-order Functions
 ---
 

diff --git a/tutorials/tour/implicit-parameters.md b/tutorials/tour/implicit-parameters.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Implicit Parameters
 ---
 

diff --git a/tutorials/tour/index.md b/tutorials/tour/index.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Tour of Scala
 ---
 

diff --git a/tutorials/tour/inner-classes.md b/tutorials/tour/inner-classes.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Inner Classes
 ---
 

diff --git a/tutorials/tour/local-type-inference.md b/tutorials/tour/local-type-inference.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Local Type Inference
 ---
 Scala has a built-in type inference mechanism which allows the programmer to omit certain type annotations. It is, for instance, often not necessary in Scala to specify the type of a variable, since the compiler can deduce the type from the initialization expression of the variable. Also return types of methods can often be omitted since they corresponds to the type of the body, which gets inferred by the compiler.

diff --git a/tutorials/tour/lower-type-bounds.md b/tutorials/tour/lower-type-bounds.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Lower Type Bounds
 ---
 

diff --git a/tutorials/tour/mixin-class-composition.md b/tutorials/tour/mixin-class-composition.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Mixin Class Composition
 ---
 

diff --git a/tutorials/tour/nested-functions.md b/tutorials/tour/nested-functions.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Nested Functions
 ---
 

diff --git a/tutorials/tour/operators.md b/tutorials/tour/operators.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Operators
 ---
 

diff --git a/tutorials/tour/pattern-matching.md b/tutorials/tour/pattern-matching.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Pattern Matching
 ---
 

diff --git a/tutorials/tour/polymorphic-methods.md b/tutorials/tour/polymorphic-methods.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Polymorphic Methods
 ---
 

diff --git a/tutorials/tour/regular-expression-patterns.md b/tutorials/tour/regular-expression-patterns.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Regular Expression Patterns
 ---
 

diff --git a/tutorials/tour/sequence-comprehensions.md b/tutorials/tour/sequence-comprehensions.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Sequence Comprehensions
 ---
 

diff --git a/tutorials/tour/traits.md b/tutorials/tour/traits.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Traits
 ---
 

diff --git a/tutorials/tour/unified_types.md b/tutorials/tour/unified_types.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Unified Types
 ---
 

diff --git a/tutorials/tour/upper-type-bounds.md b/tutorials/tour/upper-type-bounds.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Upper Type Bounds
 ---
 

diff --git a/tutorials/tour/variances.md b/tutorials/tour/variances.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Variances
 ---
 

diff --git a/tutorials/tour/views.md b/tutorials/tour/views.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: Views
 ---
 

diff --git a/tour/xml-processing.md → tutorials/tour/xml-processing.md b/tour/xml-processing.md → tutorials/tour/xml-processing.md
@@ -1,5 +1,6 @@
 ---
-layout: overview
+layout: tutorial
+tutorial: scala-tour
 title: XML Processing
 ---