From 9d1c5cbda028df8e059081d3b74994d7fbbbe772 Mon Sep 17 00:00:00 2001
From: "Mart-Erki.Noumees" <mart-erki.noumees@ttu.ee>
Date: Wed, 3 Oct 2018 00:25:06 +0300
Subject: [PATCH] Language changer with flag button. Grammar fixes.

---
 _data/i18n/pages.yml    |  4 ++--
 _includes/header.html   |  7 +++----
 _includes/main_nav.html |  4 ----
 _sass/header.scss       | 13 +++++++++++++
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/_data/i18n/pages.yml b/_data/i18n/pages.yml
index 3da9ff1..4c3bc7c 100644
--- a/_data/i18n/pages.yml
+++ b/_data/i18n/pages.yml
@@ -94,10 +94,10 @@ nav:
       name  : "Helpdesk"
       url   :  "/en/helpdesk/"
     ourwork:
-      name  : "For businesses"
+      name  : "Our works"
       url   :  "/en/ourwork/"
     aboutus:
-      name  : "About us"
+      name  : "About"
       url   :  "/en/aboutus/"
     contact:
       name  : "Contact"
diff --git a/_includes/header.html b/_includes/header.html
index 8d1d89f..cfb85e3 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -13,13 +13,12 @@
     </a>
 
     <ul id="main-menu">
+      {% include main_nav.html %}
       {% if page.language == "ee" %}
-      <a href="{{ pages.en[page.tag].url }}">In English</a>
+      <li><a class="flag" id="flag-en" href="{{ pages.en[page.tag].url }}"></a></li>
       {% elsif page.language == "en" %}
-      <a href="{{pages.ee[page.tag].url}}">Eesti keeles</a>
+      <li><a class="flag" id="flag-ee" href="{{pages.ee[page.tag].url}}"></a></li>
       {% endif %}
-
-      {% include main_nav.html %}
     </ul>
   </div>
 
diff --git a/_includes/main_nav.html b/_includes/main_nav.html
index e07561e..beac3d4 100644
--- a/_includes/main_nav.html
+++ b/_includes/main_nav.html
@@ -1,8 +1,4 @@
 
-<!--
-    This iterates through navbar pages in current language
-    and gets url and name for navbar.
--->
 {% for menu in site.data.i18n.pages.nav[page.language] %}
     <li><a href="{{ menu[1].url}}">{{menu[1].name }}</a> </li>
 {% endfor %}
diff --git a/_sass/header.scss b/_sass/header.scss
index 0e7829f..d5942c5 100644
--- a/_sass/header.scss
+++ b/_sass/header.scss
@@ -65,6 +65,19 @@
                 fill: $color-primary;
             }
         }
+        .flag {
+            display         : inline-block;
+            width           : 32px;
+            height          : 32px;
+            margin-left     : 1rem;
+            vertical-align  : middle;
+        }
+        #flag-en {
+            background-image: url("/assets/en.svg");
+        }
+        #flag-ee {
+            background-image: url("/assets/est.svg");
+        }
     }
 
     @media (min-width: 40.1rem) {