Merge branch 'gh-pages' of github.com:swcarpentry/styles into gh-pages

_includes/episode_break.html

 {% comment %}
-  Display information about a break.
+    Display a break's timings in a box similar to a learning episode's.
 {% endcomment %}
-<p>Break: {{page.break}} min</p>
+<blockquote class="objectives">
+  <h2>Overview</h2>
+
+  <div class="row">
+    <div class="col-md-3">
+      <strong>Break:</strong> {{ page.break }} min
+    </div>
+    <div class="col-md-9">
+    </div>
+  </div>
+
+</blockquote>

_includes/episode_overview.html

@@ -19,7 +19,7 @@
       </ul>
     </div>
   </div>
-  
+
   <div class="row">
     <div class="col-md-3">
     </div>
@@ -32,5 +32,5 @@
       </ul>
     </div>
   </div>
-  
+
 </blockquote>

_includes/syllabus.html

@@ -3,7 +3,7 @@
   Days are displayed if at least one episode has 'start = true'.
 {% endcomment %}
 <div class="syllabus">
-  <h2>Schedule</h2>
+  <h2 id="schedule">Schedule</h2>
 
   {% assign day = 0 %}
   {% assign multiday = false %}
@@ -62,4 +62,9 @@
     <td class="col-md-7"></td>
   </tr>
   </table>
+
+  <p>
+    The actual schedule may vary slightly depending on the topics and exercises chosen by the instructor.
+  </p>
+
 </div>

bin/lesson_check.py

@@ -155,6 +155,10 @@ def check_config(reporter, source_dir):
     reporter.check_field(config_file, 'configuration', config, 'title')
     reporter.check_field(config_file, 'configuration', config, 'email')
 
+    reporter.check({'values': {'root': '..'}} in config.get('defaults', []),
+                   'configuration',
+                   '"root" not set to ".." in configuration')
+
 
 def read_all_markdown(source_dir, parser):
     """Read source files, returning
@@ -424,6 +428,12 @@ class CheckIndex(CheckBase):
         super(CheckIndex, self).__init__(args, filename, metadata, metadata_len, text, lines, doc)
         self.layout = 'lesson'
 
+    def check_metadata(self):
+        super(CheckIndex, self).check_metadata()
+        self.reporter.check(self.metadata.get('root', '') == '.',
+                            self.filename,
+                            'Root not set to "."')
+
 
 class CheckEpisode(CheckBase):
     """Check an episode page."""

bin/lesson_initialize.py

@@ -319,7 +319,7 @@ permalink: /figures/
 EXTRAS_GUIDE_MD = '''\
 ---
 layout: page
-title: "Instructors' Guide"
+title: "Instructor Notes"
 permalink: /guide/
 ---
 FIXME

bin/markdown_ast.rb

@@ -3,7 +3,7 @@
 # Use Kramdown parser to produce AST for Markdown document.
 
 require "kramdown"
-require "json" 
+require "json"
 
 markdown = STDIN.read()
 doc = Kramdown::Document.new(markdown)