Language changer with flag button. Grammar fixes.

pull/35/head
Mart-Erki.Noumees 7 years ago
parent 88639d1c93
commit 9d1c5cbda0
  1. 4
      _data/i18n/pages.yml
  2. 7
      _includes/header.html
  3. 4
      _includes/main_nav.html
  4. 13
      _sass/header.scss

@ -94,10 +94,10 @@ nav:
name : "Helpdesk" name : "Helpdesk"
url : "/en/helpdesk/" url : "/en/helpdesk/"
ourwork: ourwork:
name : "For businesses" name : "Our works"
url : "/en/ourwork/" url : "/en/ourwork/"
aboutus: aboutus:
name : "About us" name : "About"
url : "/en/aboutus/" url : "/en/aboutus/"
contact: contact:
name : "Contact" name : "Contact"

@ -13,13 +13,12 @@
</a> </a>
<ul id="main-menu"> <ul id="main-menu">
{% include main_nav.html %}
{% if page.language == "ee" %} {% 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" %} {% 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 %} {% endif %}
{% include main_nav.html %}
</ul> </ul>
</div> </div>

@ -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] %} {% for menu in site.data.i18n.pages.nav[page.language] %}
<li><a href="{{ menu[1].url}}">{{menu[1].name }}</a> </li> <li><a href="{{ menu[1].url}}">{{menu[1].name }}</a> </li>
{% endfor %} {% endfor %}

@ -65,6 +65,19 @@
fill: $color-primary; 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) { @media (min-width: 40.1rem) {

Loading…
Cancel
Save