KTH-dESA · lorenzo-sani · Apr 17, 2020 · Apr 17, 2020 · Apr 17, 2020 · Apr 17, 2020
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,7 @@ scripts/pptx_extract_shapes.py
 scripts/test.py
 *.pyc
 *__pycache__
+includes/header.html
+includes/navigation.html
+includes/site_structure.html
+
diff --git a/README.md b/README.md
@@ -30,7 +30,8 @@ In case of working from Windows it is useful  setting up a Linux subsystem.
 1. Import the powerpoint presentations in ```files/ppt_presentations```
 1. Tranform the presentations in modules. Run the script ```main.py``` to convert powerpoint presentations to markdown files, type ```python scripts/main.py```. The modules will be saved in presentations/modules
 1. Apply tags to the modules running the script ```tags.py```
-1. Create lectures combining the modules imported using the scripts ```create_lecture.py``` 
+1. Create lectures combining the modules imported using the scripts ```create_lecture.py```
+1. Create course pages as a combination of lectures using the script  ```create_course.py```
 1. You can preview the website locally at http://127.0.0.1:4000/teaching_kit/ typing ```jekyll serve``` (the first time use ```bundle exec jekyll serve```)
 
 ### Upload changes

diff --git a/_config.yml b/_config.yml
@@ -43,8 +43,10 @@ exclude:
 collections:
   posts:
     output: false
+
     permalink: /:categories/:title:output_ext
 
+
 defaults:
   - scope:
       path: ""

diff --git a/_includes/header.html b/_includes/header.html
@@ -0,0 +1,31 @@
+<header class="site-header">
+
+    <div class="wrapper">
+      {%- assign default_paths = site.pages | map: "path" -%}
+      {%- assign page_paths = site.header_pages | default: default_paths -%}
+      {%- assign titles_size = site.pages | map: 'title' | join: '' | size -%}
+      <a class="site-title" rel="author" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>
+
+      {%- if titles_size > 0 -%}
+        <nav class="site-nav">
+          <input type="checkbox" id="nav-trigger" class="nav-trigger" />
+          <label for="nav-trigger">
+            <span class="menu-icon">
+              <svg viewBox="0 0 18 15" width="18px" height="15px">
+                <path d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.032C17.335,0,18,0.665,18,1.484L18,1.484z M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.032C17.335,6.031,18,6.696,18,7.516L18,7.516z M18,13.516C18,14.335,17.335,15,16.516,15H1.484 C0.665,15,0,14.335,0,13.516l0,0c0-0.82,0.665-1.483,1.484-1.483h15.032C17.335,12.031,18,12.695,18,13.516L18,13.516z"/>
+              </svg>
+            </span>
+          </label>
+
+          <div class="trigger">
+            {%- for path in page_paths -%}
+              {%- assign my_page = site.pages | where: "path", path | first -%}
+              {%- if my_page.title -%}
+              <a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
+              {%- endif -%}
+            {%- endfor -%}
+          </div>
+        </nav>
+      {%- endif -%}
+    </div>
+  </header>
diff --git a/_includes/navigation.html b/_includes/navigation.html
@@ -0,0 +1,41 @@
+<!-- Belongs at: /_includes/navigation.html -->
+
+<!-- This finds the current page so it can be highlighted. -->
+
+<!--{% for entry in site.data.navigation %}
+{% capture fullurl %}{{ site.baseurl }}{{ entry.url }}{% endcapture %}
+    {% if fullurl == page.url %}
+        {% assign current_page = fullurl %}
+        {% break %}
+    {% elsif page.url contains fullurl %}
+        {% assign current_page = fullurl %}
+    {% endif %}
+{% endfor %} 
+-->
+
+<!-- Then we build the nav bar. -->
+<nav>
+    <ul>
+    {% for entry in site.data.navigation %}
+        {% if entry.url == current_page %}
+            {% assign current = ' class="current"' %}
+        {% else %}
+            <!-- We have to declare it 'null' to ensure it doesn't propagate. -->
+            {% assign current = null %}
+        {% endif %}
+        {% assign sublinks = entry.sublinks %}
+        {% if sublinks %}
+        <li{{ current }}>
+            <a href="{{ site.baseurl }}{{ entry.url }}">{{ entry.title }}</a>
+            <ul>
+                {% for sublink in sublinks %}
+                <li><a href="{{ site.baseurl }}{{ sublink.url }}">{{ sublink.title }}</a></li>
+                {% endfor %}
+            </ul>
+        </li>
+        {% else %}
+        <li{{ current }}><a href="{{ site.baseurl }}{{ entry.url }}">{{ entry.title }}</a></li>
+        {% endif %}
+    {% endfor %}
+    </ul>
+</nav>
diff --git a/_includes/site_structure.html b/_includes/site_structure.html
diff --git a/_posts/2020-04-20-Lecture_Clews.html → _posts/2020-01-01-Lecture_Clews.html b/_posts/2020-04-20-Lecture_Clews.html → _posts/2020-01-01-Lecture_Clews.html
@@ -1,18 +1,22 @@
 ---
+author: Lorenzo Sani
 categories: lecture
+course: Introduction to CLEWS
+date: 2020-04-20
 layout: presentation
-author: Lorenzo Sani
 title: Lecture Clews
-date: 2020-04-20
 ---
+
 #Lecture Clews
 
 This is a short lecture focused on CLEWS
 
 Author: Lorenzo Sani
 
+This lecture is part of: {{ page.course }} 
+
 Date: 2020-04-20
----
+
 {% include_relative /modules/2020-01-01-climate.html %}
 {% include_relative /modules/2020-01-01-energy.html %}
 {% include_relative /modules/2020-01-01-land.html %}

diff --git a/_posts/2020-04-20-Lecture_Water.html → _posts/2020-01-01-Lecture_Water.html b/_posts/2020-04-20-Lecture_Water.html → _posts/2020-01-01-Lecture_Water.html
@@ -1,18 +1,22 @@
 ---
+author: Lorenzo Sani
 categories: lecture
+course: Introduction to CLEWS
+date: 2020-04-20
 layout: presentation
-author: Lorenzo Sani
 title: Lecture Water
-date: 2020-04-20
 ---
+
 #Lecture Water
 
 This is a lecture about water
 
 Author: Lorenzo Sani
 
+This lecture is part of: {{ page.course }} 
+
 Date: 2020-04-20
----
+
 {% include_relative /modules/2020-01-01-water.html %}
 {% include_relative /modules/2020-01-01-teaching_kit.html %}
 ---

diff --git a/_posts/2020-01-01-Lecture_clews_demo.html b/_posts/2020-01-01-Lecture_clews_demo.html
diff --git a/_posts/2020-04-20-Lecture_demo.html → _posts/2020-01-01-Lecture_demo.html b/_posts/2020-04-20-Lecture_demo.html → _posts/2020-01-01-Lecture_demo.html
@@ -1,18 +1,23 @@
 ---
+author: Lorenzo Sani
 categories: lecture
+course: First Demo Course
+date: 2020-01-01
 layout: presentation
-author: Lorenzo Sani
 title: Lecture demo
-date: 2020-04-20
 ---
+
 #Lecture demo
 
 This lecture contains some demo material extracted from PowerPoint presentations
 
 Author: Lorenzo Sani
 
-Date: 2020-04-20
----
+This lecture is part of: {{ page.course }} 
+
+Date: 2020-01-01
+
+
 {% include_relative /modules/2020-01-01-ppt_demo.html %}
 {% include_relative /modules/2020-01-01-teaching_kit.html %}
 ---

diff --git a/_posts/2020-04-20-Lecture_demo_2.html → _posts/2020-01-01-Lecture_demo_2.html b/_posts/2020-04-20-Lecture_demo_2.html → _posts/2020-01-01-Lecture_demo_2.html
@@ -1,18 +1,23 @@
 ---
+author: Lorenzo Sani
 categories: lecture
+course: First Demo Course
+date: 2020-01-01
 layout: presentation
-author: Lorenzo Sani
 title: Lecture demo 2
-date: 2020-04-20
 ---
+
 #Lecture demo 2
 
 This lecture contains other demo material extracted from a PowerPoint presentation
 
 Author: Lorenzo Sani
 
-Date: 2020-04-20
----
+This lecture is part of: {{ page.course }} 
+
+Date: 2020-01-01
+
+
 {% include_relative /modules/2020-01-01-ppt_demo_2.html %}
 {% include_relative /modules/2020-01-01-teaching_kit.html %}
 ---

diff --git a/_posts/modules/2020-01-01-climate.html b/_posts/modules/2020-01-01-climate.html
@@ -2,7 +2,9 @@
 author: Will Usher
 categories: module
 exclude: true
-tags: climate clews
+tags:
+- climate
+- clews
 title: What is climate?
 ---
 

diff --git a/_posts/modules/2020-01-01-energy.html b/_posts/modules/2020-01-01-energy.html
@@ -2,7 +2,9 @@
 author: Will Usher
 categories: module
 exclude: true
-tags: energy clews
+tags:
+- energy
+- clews
 title: What is energy?
 ---
 

diff --git a/_posts/modules/2020-01-01-land.html b/_posts/modules/2020-01-01-land.html
@@ -2,7 +2,9 @@
 author: Will Usher
 categories: module
 exclude: true
-tags: land clews
+tags:
+- land
+- clews
 title: What is land?
 ---
 

diff --git a/_posts/modules/2020-01-01-ppt_demo_2.html b/_posts/modules/2020-01-01-ppt_demo_2.html
@@ -3,8 +3,9 @@
 categories: module
 exclude: true
 layout: presentation
+tags:
+- demo
 title: ppt_demo_2
-tags: demo
 ---
 
 #Introduction to linear optimisation and OSeMOSYS
@@ -207,20 +208,23 @@
 
 ---
 #Types of modelling tools
-***MISSING OBJECT*** insert manually
+***MISSING OBJECT*** insert manually 
+
 
 <style> div.box42 {position: absolute; left: 141.65850393700788px; top:119.17086614173229px; width: 240.27944881889763px; height: 38.77503937007874} </style>
 <div class=box42>
 <div style=font-size:16.0px>Draw on macroeconomic relationships and cross-sectoral dependencies.</div><br>
 </div>
-***MISSING OBJECT*** insert manually
+***MISSING OBJECT*** insert manually 
+
 
 <style> div.box43 {position: absolute; left: 141.65850393700788px; top:430.176062992126px; width: 219.51031496062993px; height: 58.16251968503937} </style>
 <div class=box43>
 <div style=font-size:16.0px>Provide a more detailed technological representation of the system.</div><br>
 <div style=font-size:16.0px>Resource – to –use representation.</div><br>
 </div>
-***MISSING OBJECT*** insert manually
+***MISSING OBJECT*** insert manually 
+
 
 <style> div.box44 {position: absolute; left: 543.3123622047244px; top:155.55031496062992px; width: 291.13062992125987px; height: 19.38748031496063} </style>
 <div class=box44>
@@ -668,7 +672,8 @@
 <div class=box129>
 <div style=font-size:18px></div><br>
 </div>
-***MISSING OBJECT*** insert manually
+***MISSING OBJECT*** insert manually 
+
 
 ---
 #OSeMOSYS
@@ -777,7 +782,8 @@
 </div>
 
 ---
-#OSeMOSYS Structure – Blocks of functionality
+#OSeMOSYS Structure – Blocks of functionality 
+
 
 <style> div.box146 {position: absolute; left: 678.0px; top:500.5px; width: 216.0px; height: 28.75} </style>
 <div class=box146>
@@ -847,7 +853,8 @@
 </div>
 
 ---
-#OSeMOSYS – Key terms
+#OSeMOSYS – Key terms 
+
 
 <style> div.box159 {position: absolute; left: 66.0px; top:127.25582677165355px; width: 828.0px; height: 358.3255118110236} </style>
 <div class=box159>
@@ -1070,7 +1077,8 @@
 <div class=box200>
 <div style=font-size:18px><b>Hydro and CCGT most competitive</b></div><br>
 </div>
-***MISSING OBJECT*** insert manually
+***MISSING OBJECT*** insert manually 
+
 
 <style> div.box201 {position: absolute; left: 194.06094488188975px; top:236.44803149606298px; width: 284.2724409448819px; height: 50.892204724409446} </style>
 <div class=box201>
@@ -1111,7 +1119,8 @@
 <div class=box209>
 <div style=font-size:24.0px><b>What happens in a climate ‘water scarcity’ scenario?</b></div><br>
 </div>
-***MISSING OBJECT*** insert manually
+***MISSING OBJECT*** insert manually 
+
 
 <style> div.box211 {position: absolute; left: 66.0px; top:500.5px; width: 216.0px; height: 28.75} </style>
 <div class=box211>

diff --git a/courses/Course_Demo.md → courses/First_Demo_Course.md b/courses/Course_Demo.md → courses/First_Demo_Course.md
@@ -2,14 +2,13 @@
 categories: course
 layout: page
 author: Lorenzo Sani
-title: Course Demo
+title: First Demo Course
 ---
+<h1>{{ page.title }}</h1>
 
-# Course Demo
+Authors: {{page.author}}
 
 This course contains the lectures showing our capabilities of transforming PowerPoint presentations to markdown presentations
 
-Author: Lorenzo Sani
-
 1. [Lecture demo]({{base.url}}/teaching_kit/lecture/Lecture_demo.html)
 1. [Lecture demo 2]({{base.url}}/teaching_kit/lecture/Lecture_demo_2.html)
diff --git a/courses/Introduction_to_CLEWS.md b/courses/Introduction_to_CLEWS.md
@@ -4,12 +4,11 @@ layout: page
 author: Lorenzo Sani
 title: Introduction to CLEWS
 ---
+<h1>{{ page.title }}</h1>
 
-# Introduction to CLEWS
+Authors: {{page.author}}
 
 This course is an introduction to CLEWS
 
-Author: Lorenzo Sani
-
 1. [Lecture Clews]({{base.url}}/teaching_kit/lecture/Lecture_Clews.html)
 1. [Lecture Water]({{base.url}}/teaching_kit/lecture/Lecture_Water.html)