From a98618d5b0bd0d99fe3a474586d84ee2d08981fa Mon Sep 17 00:00:00 2001
From: Veikka Kähkönen <insiding@gmail.com>
Date: Tue, 29 Aug 2017 22:42:36 +0300
Subject: Eliminate relative paths

---
 _data/navi.yaml       | 26 +++++++++++++-------------
 _includes/footer.html |  6 +++---
 _includes/header.html |  6 +++---
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/_data/navi.yaml b/_data/navi.yaml
index 7d8cddf..1fb00d2 100644
--- a/_data/navi.yaml
+++ b/_data/navi.yaml
@@ -7,21 +7,21 @@ items:
       directory: kilta
       items:
         - title: Hallitus
-          href: hallitus.html
+          href: /hallitus.html
         - title: Toimihenkilöt
-          href: toimihenkilot.html
+          href: /toimihenkilot.html
         - title: Viestintä
-          href: viestinta.html
+          href: /viestinta.html
         - title: Jäsenyys
-          href: jasenyys.html
+          href: /jasenyys.html
         - title: Aski
-          href: aski.html
+          href: /aski.html
         - title: Halloped
-          href: halloped.html
+          href: /halloped.html
         - title: GT
-          href: gt.html
+          href: /gt.html
         #- title: Säätökerho
-        #  href: saatokerho.html
+        #  href: /saatokerho.html
   - title: Opiskelu
     href: /opiskelu.html
   - title: Uudet opiskelijat
@@ -29,15 +29,15 @@ items:
     subnavi:
       items:
         - title: VarASlähtö
-          href: varaslahto.html
+          href: /varaslahto.html
         - title: Eka päivä
-          href: ekapaiva.html
+          href: /ekapaiva.html
         - title: Hyödyllisiä yhteystietoja / linkkejä
-          href: yhteystietojalinkkeja.html
+          href: /yhteystietojalinkkeja.html
         - title: Haalarit
-          href: haalarit.html
+          href: /haalarit.html
         - title: Teekkarilakki
-          href: teekkarilakki.html
+          href: /teekkarilakki.html
   - title: Tapahtumat
     href: /tapahtumat.html
   - title: Yrityksille
diff --git a/_includes/footer.html b/_includes/footer.html
index cea5f85..35eed2f 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -5,9 +5,9 @@
     <h2 class="footer-heading">Yhteistyössä</h2>
     <div class="footer-col-wrapper">
         <div class="footer-col footer-col-1">
-            <a href="http://new.abb.com/fi"><img width="100" style="margin:20px;border:0;" src="/static/sponsors/ABB.png" alt=""></a>
-           <a href="http://reaktor.com/"><img width="150" style="margin:20px;border:0;" src="/static/sponsors/reaktor.png" alt=""></a>
-           <a href="http://www.eficode.fi/"><img width="100" style="margin:20px;border:0;" src="/static/sponsors/eficode.png" alt=""></a>
+            <a href="http://new.abb.com/fi"><img width="100" style="margin:20px;border:0;" src="{{ site.url }}/static/sponsors/ABB.png" alt=""></a>
+           <a href="http://reaktor.com/"><img width="150" style="margin:20px;border:0;" src="{{ site.url }}/static/sponsors/reaktor.png" alt=""></a>
+           <a href="http://www.eficode.fi/"><img width="100" style="margin:20px;border:0;" src="{{ site.url }}/static/sponsors/eficode.png" alt=""></a>
         </div>
     </div>
 
diff --git a/_includes/header.html b/_includes/header.html
index e826f2e..2c18219 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -8,7 +8,7 @@
     <nav class="navigation header__navigation">
       {% assign url_tokens = page.url | split: '/' %}
       {% assign main_page_href = '/' | append: url_tokens[1] %}
-      {% assign subpage_href = url_tokens[2] %}
+      {% assign subpage_href = '/' | append: url_tokens[2] %}
       <ul>
         {% if site.data.navi.items[0] %}
           {% for item in site.data.navi.items %}
@@ -18,7 +18,7 @@
                 {% assign current_page = false %}
               {% endif %}
             <li class="navigation__item {% if current_page %}active{% endif %}">
-              <a href="{{ item.href }}">{{ item.title }}</a>
+              <a href="{{ site.url }}{{ item.href }}">{{ item.title }}</a>
             </li>
             {% if current_page and item.subnavi %}
               {% assign subnavi = item.subnavi %}
@@ -32,7 +32,7 @@
         <ul>
             {% for subitem in subnavi.items %}
               <li class="navigation__item {% if subitem.href == subpage_href %}active{% endif %}">
-                <a href="{{ subitem.href }}">{{ subitem.title }}</a>
+                <a href="{{ site.url }}{{ main_page_href }}{{ subitem.href }}">{{ subitem.title }}</a>
               </li>
             {% endfor %}
         </ul>
-- 
cgit v1.3