scala · heathermiller · Nov 27, 2012 · Nov 8, 2012
diff --git a/_includes/localized-overview-index.txt b/_includes/localized-overview-index.txt
@@ -0,0 +1,34 @@
+{% 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 }} <span class="label {{ post.label-color }}">{{ post.label-text }}</span>
+  {% 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 %}
+  <ul>
+  {% 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 %}
+        <li><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 %}
+{% else %}
+  {% if post.hidden == true %}
+  {% else %}
+* [{{ post.title }}]({{ site.baseurl }}{{ post.url }}) <span class="label {{ post.label-color }}">{{ post.label-text }}</span>
+  {% endif %}
+{% endif %}
+
+{% endif %}
+{% endfor %}
+{% endfor %} 
diff --git a/_layouts/guides-index.html b/_layouts/guides-index.html
@@ -2,16 +2,39 @@
 layout: index
 ---
 
-<div class="span10">			
-  {{ content }}
-</div>
+<div class="container">
+  <div class="row">
+    {% for pg in site.pages %}
+      {% if pg.layout == "guides-index" and pg.languages %}
+        {% assign languages = pg.languages %}
+      {% endif %}
+    {% endfor %}
 
-<div class="span6">
-<!--  <div class="page-header-index">
-    <h1>About</h1>
-  </div>
+    {% if page.language %}
+      {% capture intermediate %}{{ page.url | remove_first: page.language }}{% endcapture %}
+      {% capture rootIndexURL %}{{ intermediate | remove_first: '/' }}{% endcapture %}
+    {% else %}
+      {% assign rootIndexURL = page.url %}
+    {% endif %}
 
-  <p></p>
--->  
-</div>
+    <div class="span10">      
+      {{ content }}
+    </div>
+
+    <div class="span6">
+    <!--  <div class="page-header-index">
+        <h1>About</h1>
+      </div>
 
+      <p></p>
+    -->  
+
+      {% if languages %}
+        <a href="{{ site.baseurl }}{{ rootIndexURL }}"><img src="{{ site.baseurl }}/resources/images/language/en.png" title="Language: en"/></a>
+        {% for l in languages %}
+          <a href="{{ site.baseurl }}/{{ l }}{{ rootIndexURL }}"><img src="{{ site.baseurl }}/resources/images/language/{{ l }}.png" title="Language: {{ l }}"/></a>
+        {% endfor %}
+      {% endif %}
+    </div>
+  </div>
+</div>
diff --git a/es/overviews/core/actors.md b/es/overviews/core/actors.md
@@ -4,6 +4,7 @@ title: The Scala Actors API
 label-color: success
 label-text: Available
 language: es
+overview: actors
 ---
 
 **Philipp Haller and Stephen Tu**

diff --git a/es/overviews/core/parallel-collections.md b/es/overviews/core/parallel-collections.md
@@ -0,0 +1,7 @@
+---
+layout: overview
+overview: parallel-collections
+partof: parallel-collections
+language: es
+title: Las Colecciones Paralelizadas
+---
diff --git a/es/overviews/core/string-interpolation.md b/es/overviews/core/string-interpolation.md
@@ -4,6 +4,7 @@ title: Interpolación de cadenas
 disqus: true
 label-color: success
 label-text: New in 2.10
+overview: string-interpolation
 ---
 
 **Josh Suereth**

diff --git a/ja/overviews/core/parallel-collections.md b/ja/overviews/core/parallel-collections.md
@@ -0,0 +1,7 @@
+---
+layout: overview
+overview: parallel-collections
+partof: parallel-collections
+language: ja
+title: Scala 並列コレクションライブラリ
+---
diff --git a/ja/overviews/index.md b/ja/overviews/index.md
@@ -0,0 +1,12 @@
+---
+layout: guides-index
+language: ja
+title: ガイドと概要
+---
+
+<div class="page-header-index">
+  <h1>コアライブラリ</h1>
+</div>
+
+{% include localized-overview-index.txt %}
+<!--* Swing <span class="label important">In Progress</span>-->
diff --git a/overviews/core/_posts/2010-09-07-collections.md b/overviews/core/_posts/2010-09-07-collections.md
@@ -3,4 +3,5 @@ layout: overview
 title: Scala's Collections Library
 disqus: true
 partof: collections
+overview: collections
 ---
diff --git a/overviews/core/_posts/2010-11-30-actors.md b/overviews/core/_posts/2010-11-30-actors.md
@@ -1,6 +1,7 @@
 ---
 layout: overview
 title: The Scala Actors API
+overview: actors
 ---
 
 **Philipp Haller and Stephen Tu**

diff --git a/overviews/core/_posts/2010-12-15-architecture-of-scala-collections.md b/overviews/core/_posts/2010-12-15-architecture-of-scala-collections.md
@@ -1,6 +1,7 @@
 ---
 layout: overview
 title: The Architecture of Scala Collections
+overview: architecture-of-scala-collections
 ---
 
 **Martin Odersky and Lex Spoon**

diff --git a/overviews/core/_posts/2012-03-27-parallel-collections.md b/overviews/core/_posts/2012-03-27-parallel-collections.md
@@ -3,4 +3,5 @@ layout: overview
 title: Scala's Parallel Collections Library
 disqus: true
 partof: parallel-collections
+overview: parallel-collections
 ---
diff --git a/overviews/core/_posts/2012-09-20-futures.md b/overviews/core/_posts/2012-09-20-futures.md
@@ -3,6 +3,7 @@ layout: overview
 title: Futures and Promises
 label-color: success
 label-text: New in 2.10
+overview: futures
 ---
 
 **By: Philipp Haller, Aleksandar Prokopec, Heather Miller, Viktor Klang, Roland Kuhn, and Vojin Jovanovic**

diff --git a/overviews/core/_posts/2012-09-21-string-interpolation.md b/overviews/core/_posts/2012-09-21-string-interpolation.md
@@ -4,6 +4,7 @@ title: String Interpolation
 disqus: true
 label-color: success
 label-text: New in 2.10
+overview: string-interpolation
 ---
 
 **Josh Suereth**

diff --git a/overviews/core/_posts/2012-10-8-macros.md b/overviews/core/_posts/2012-10-8-macros.md
@@ -4,6 +4,7 @@ title: Macros
 label-color: success
 label-text: New in 2.10
 hidden: true
+overview: macro
 ---
 
 This document is in progress and will be ready in a few days.

diff --git a/overviews/core/_posts/2012-11-03-value-classes.md b/overviews/core/_posts/2012-11-03-value-classes.md
@@ -3,6 +3,7 @@ layout: overview
 title: Value Classes and Universal Traits
 label-color: success
 label-text: New in 2.10
+overview: value-classes
 ---
 
 **Mark Harrah**

diff --git a/overviews/index.md b/overviews/index.md
@@ -1,6 +1,7 @@
 ---
 layout: guides-index
 title: Guides and Overviews
+languages: ja
 ---
 
 <div class="page-header-index">