From af1d854539812bc902513a718787baadf14fabc2 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Thu, 19 Jan 2017 20:05:13 +0100
Subject: i18n: fix navigation

---
 common/header.inc.j2     |  2 --
 common/navigation.inc.j2 | 26 +++++++++++++-------------
 2 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'common')

diff --git a/common/header.inc.j2 b/common/header.inc.j2
index 738feff1..2923e700 100644
--- a/common/header.inc.j2
+++ b/common/header.inc.j2
@@ -33,12 +33,10 @@
     <link href="/dist/css/bootstrap.min.css" rel="stylesheet">
     <!-- Custom styles for this template -->
     <link href="justified-nav.css" rel="stylesheet">
-    <link href="lang.css" rel="stylesheet">
     <link href="styles.css" rel="stylesheet">
 
     <script src="/dist/js/jquery-1.11.1.min.js"></script>
     <script src="/dist/js/bootstrap.min.js"></script>
-    <script src="lang.js"></script>
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
diff --git a/common/navigation.inc.j2 b/common/navigation.inc.j2
index 4e19e852..4f621b3d 100644
--- a/common/navigation.inc.j2
+++ b/common/navigation.inc.j2
@@ -9,23 +9,23 @@
         </div>
         <div class="collapse navbar-collapse" id="main-navbar">
           <ul class="nav nav-justified">
-            <li class="m_index">{{ _("<a href='/'>Home</a>") }}</li>
-            <li class="m_demo btn btn-outline-success">{{ _("<a href='https://demo.taler.net/' target='_blank'>Demo</a>") }}</li>
-	    <li class="m_citizens">{{ _("<a href='/citizens'>Citizens</a>") }}</li>
-            <li class="m_merchants">{{ _("<a href='/merchants'>Merchants</a>") }}</li>
-            <li class="m_governments">{{ _("<a href='/governments'>Governments</a>") }}</li>
-            <li class="m_investors">{{ _("<a href='/investors'>Operators</a>") }}</li>
-            <li class="m_developers">{{ _("<a href='/developers'>Developers</a>") }}</li>
-            <li class="m_about">{{ _("<a href='/about'>About&nbsp;us</a>") }}</li>
+            <li class="m_index"><a href=".">{{ _("Home") }}</a></li>
+            <li class="m_demo btn btn-outline-success"><a href="https://demo.taler.net/" target="_blank">{{ _("Demo") }}</a></li>
+	    <li class="m_citizens"><a href='citizens'>{{ _("Citizens") }}</a></li>
+            <li class="m_merchants"><a href='merchants'>{{ _("Merchants") }}</a></li>
+            <li class="m_governments"><a href='governments'>{{ _("Governments") }}</a></li>
+            <li class="m_investors"><a href='investors'>{{ _("Operators") }}</a></li>
+            <li class="m_developers"><a href='developers'>{{ _("Developers") }}</a></li>
+            <li class="m_about"><a href='about'>{{ _("About&nbsp;us") }}</a></li>
           </ul>
         </div>
       </div>
        <div class="navbar navbar-default navbar-fixed-bottom" role="navigation">
          <div class="container lang-slector">
-           <a href="#" onclick="setLang('en');"><img src="images/gb.png" height="15" width="23" alt="English"></a>
-           <a href="#" onclick="setLang('de');"><img src="images/de.png" height="15" width="25" alt="Deutsch"></a>
-           <a href="#" onclick="setLang('fr');"><img src="images/fr.png" height="15" width="22" alt="Français"></a>
-           <a href="#" onclick="setLang('it');"><img src="images/it.png" height="15" width="22" alt="Italiano"></a>
-           <a href="#" onclick="setLang('es');"><img src="images/es.png" height="15" width="23" alt="Español"></a>
+           <a href="/en/"><img src="images/gb.png" height="15" width="23" alt="English"></a>
+           <a href="/de/"><img src="images/de.png" height="15" width="25" alt="Deutsch"></a>
+           <a href="/fr/"><img src="images/fr.png" height="15" width="22" alt="Français"></a>
+           <a href="/it/"><img src="images/it.png" height="15" width="22" alt="Italiano"></a>
+           <a href="/es/"><img src="images/es.png" height="15" width="23" alt="Español"></a>
          </div>
        </div>
-- 
cgit v1.2.3