X-Git-Url: https://git.arvados.org/rnaseq-cwl-training.git/blobdiff_plain/29bafe041d63548bf0c86f2c475254653ae4e720..HEAD:/_includes/episode_overview.html

diff --git a/_includes/episode_overview.html b/_includes/episode_overview.html
index 85261e0..169ab26 100644
--- a/_includes/episode_overview.html
+++ b/_includes/episode_overview.html
@@ -1,19 +1,59 @@
 {% comment %}
-Muestre los tiempos y los objetivos de aprendizaje de un episodio.
+    Display episode's timings and learning objectives.
+
+    Regarding the `if page.*** == nil` below:
+    all-in-one page combines all episodes into one.
+    It, therefore, does not define its own objectives, exercises,
+    and questions, which 'normal' episodes define in the front matter.
+
+    To display episodes' teaching and exercise times, as well as episode
+    questions and objectives, we pass them as parameters to the Liquid's
+    `include` statement when we generate the page:
+
+	 include episode_overview.html teaching_time=e.teaching ...
+
+    Here we obtain the information we need either from the episode itself or
+    from the parameters passed in.
 {% endcomment %}
+
+{% if page.teaching == nil %}
+{% assign teaching_time = include.teaching_time %}
+{% else %}
+{% assign teaching_time = page.teaching %}
+{% endif %}
+
+{% if page.exercises == nil %}
+{% assign exercise_time = include.exercise_time %}
+{% else %}
+{% assign exercise_time = page.exercises %}
+{% endif %}
+
+{% if page.questions == nil %}
+{% assign episode_questions = include.episode_questions %}
+{% else %}
+{% assign episode_questions = page.questions %}
+{% endif %}
+
+{% if page.objectives == nil %}
+{% assign episode_objectives = include.episode_objectives %}
+{% else %}
+{% assign episode_objectives = page.objectives %}
+{% endif %}
+
+
 <blockquote class="objectives">
-  <h2>Hoja de ruta</h2>
+  <h2>Overview</h2>
 
   <div class="row">
     <div class="col-md-3">
-        <strong>Leccion:</strong> {{ page.teaching }} min
+      <strong>Teaching:</strong> {{ teaching_time }} min
       <br/>
-      <strong>Prácticas:</strong> {{ page.exercises }} min
+      <strong>Exercises:</strong> {{ exercise_time }} min
     </div>
     <div class="col-md-9">
-      <strong>Preguntas</strong>
+      <strong>Questions</strong>
       <ul>
-	{% for question in page.questions %}
+	{% for question in episode_questions %}
 	<li>{{ question|markdownify }}</li>
 	{% endfor %}
       </ul>
@@ -24,9 +64,9 @@ Muestre los tiempos y los objetivos de aprendizaje de un episodio.
     <div class="col-md-3">
     </div>
     <div class="col-md-9">
-      <strong>Objetivos</strong>
+      <strong>Objectives</strong>
       <ul>
-	{% for objective in page.objectives %}
+	{% for objective in episode_objectives %}
 	<li>{{ objective|markdownify }}</li>
 	{% endfor %}
       </ul>