Split localisation into separate files. Contact view more pleasing.

_data/localisation.yml

@@ -1,174 +0,0 @@
-en:
-
-  # index.html
-  index_ForStudentHeading   : "For Student"
-  index_ForStudentDesc      : "Come and develop your skills and befriend cool people"
-  index_ForStudentLink      : "Learn more about our activites ->"
-
-  index_HelpdeskHeading     : "Helpdesk"
-  index_HelpdeskDesc        : "Student-friendly PC repair"
-  index_HelpdeskLink        : "Pricelist ->"
-
-  index_ForBusinessesHeading: "For Businesses"
-  index_ForBusinessesDesc   : "We'll help to make your ideas reality"
-  index_ForBusinessesLink   : "Previous works ->"
-
-  index_WhoWeHeading        : "Who are we?"
-  index_WhoWeDesc           : "MTÜ Lapikud ( nonprofit organisation ) is a TUT software development club, which combines former and current students interested in IT.
-                              The organization was established in 2002 by computer science students whose speciality's identification code was \"LAP\".
-                              The wise men then decided that henceforth they are to be called \"Lapikud\"."
-
-  index_WhatDoHeading       : "What are we up to?"
-  index_WhatDoDesc          : "Our main goal is to complement TUT's IT students studies with relevant experience.
-                              We involve students in interesting IT themed projects and give them an opportunity to finish something meaningful on their own.
-                              Our projects often turn into compelling and useful theses. We offer clever students a chance to get their first work experience.
-                              Lapikud is not only a IT student organization - we also try to involve economics students in our projects so also business side would be represented."
-
-  index_Partners            : "Our partners"
-
-  # helpdesk.html
-  helpdesk_BannerHeading1    : "We'll give your computer "
-  helpdesk_BannerHeading2    : "a new life"
-  helpdesk_BannerSubHeading  : " solves problems involving PCs and other electronics."
-
-  helpdesk_WhatIsHeading    : "What is HELPDESK ?"
-  helpdesk_WhatIsDesc       : "HELPDESK is a service provided by MTÜ Lapikud. Service is aimed towards students, lecturers and people otherwise interested.
-                              Our team consists of wise and experienced IT students from TUT."
-  helpdesk_ServicesHeading  : "What services do we provide?"
-  helpdesk_ServicesDesc1    : "Computer hardware diagnostics and repair"
-  helpdesk_ServicesDesc2    : "Computer hardware maintenance"
-  helpdesk_ServicesDesc3    : "Software diagnostics and configuration"
-  helpdesk_ServicesDesc4    : "Software installation"
-  helpdesk_ServicesDesc5    : "Other electronics repair"
-
-  helpdesk_TableHeading     : "Pricelist"
-  helpdesk_TableColHeading1 : "Service"
-  helpdesk_TableColHeading2 : "Quantity"
-  helpdesk_TableColHeading3 : "Price"
-  helpdesk_TableR1C1        : "Computer diagnostics"
-  helpdesk_TableR1C2        : "15 min"
-  helpdesk_TableR1C3        : "free"
-  helpdesk_TableR2C1        : "Computer diagnostics (15+ minutes)"
-  helpdesk_TableQuantity    : "piece"
-  helpdesk_TableR3C1        : "Hardware installation"
-  helpdesk_TableR4C1        : "Laptop dusting + new thermal paste"
-  helpdesk_TableR5C1        : "Laptop display installation"
-  helpdesk_TableR6C1        : "PC building"
-  helpdesk_TableR7C1        : "Software maintenance and installation"
-  helpdesk_TableR8C1        : "General electronics repair"
-  helpdesk_TableR9C1        : "Data retrieval"
-  helpdesk_TableR10C1       : "Smart device software maintenance"
-  helpdesk_TableR11C1       : "Operating system reinstall"
-  helpdesk_TableR12C1       : "Smart phone glass/display/battery swap"
-  helpdesk_TableFooter1     : "All necessary components are provided by the client or ordered by the technician upon agreement."
-  helpdesk_TableFooter2     : "Technicians are able to come and service around campus and Tehnopol if necessary."
-  helpdesk_TableFooter3     : "With our student-friendly prices and personal approach we offer a service you don't have to be dissappointed in!"
-
-  helpdesk_LocationHeading  : "Location"
-  helpdesk_Location1        : "Akadeemia tee 5 dormitory"
-  helpdesk_Location2        : "room 008A"
-
-  helpdesk_OpenHeading      : "Opening hours:"
-  helpdesk_OpenTime         : "Mon - Fri 14-19*"
-  helpdesk_OpenDetails      : "* This is the time period when it's most likely to get ahold of someone.
-                              However we can't guarantee that anyone's in the office during given hours."
-
-  helpdesk_ContactHeading   : "Contact"
-  helpdesk_ContactMail      : "E-mail"
-  helpdesk_ContactPhone     : "Phone"
-
-  # contact.html
-  contact_ContactHeading    : "Contact"
-  contact_ContactMail       : "E-Mail:"
-  contact_ContactPhone      : "Phone:"
-  contact_ContactAddress    : "Adress: Akadeemia tee 5, Tallinn, Estonia"
-  contact_ContactRegCode    : "Reg.nr: 801 67 145"
-
-  contact_BoardHeading      : "Management"
-
-  # student.html
-  student_WhatWeDoHeading   : "What do we do ?"
-  student_WhatWeDoDesc1     : "The main goal of Lapikud is to connect IT students to together develop software projects
-                              and give students extra experience in addition to what they learn in university.
-                              For that purpose we have a software development team which deals with both inside and external projects.
-                              Helpdesk works on everything hardware and offers computer repair services."
-  student_WhatWeDoDesc2     : "In addition we organize events and gatherings and otherwise spend fun times together."
-
-  student_WhatYouDoHeading  : "What can you do?"
-  student_WhatYouDoDesc1    : "Join us !"
-  student_WhatYouDoDesc2    : "There are several ways to contribute to our cause if you wish.
-                              We have four teams: software development, Helpdesk, marketing and events"
-  student_WhatYouDoDesc3    : "Joining the developers team you get practice which is not offered in the school.
-                              You get to learn everything regarding software under our senior members,
-                              not to mention experience in teamwork and a check in your CV."
-  student_WhatYouDoDesc4    : "In Helpdesk's team you can repair and build PCs and work with other electronics."
-  student_WhatYouDoDesc5    : "Events and marketing teams respectively are responsible for events and their marketing in Lapikud,
-                              but also with some greater events (e.g. <a href=\"https://laphack.eu/\">LAPhack</a>)."
-  student_WhatYouDoJoin     : "Join!"
-  student_MentorsHeading    : "Mentors"
-
-  # V grammatically correct ??? V
-  student_MentorsDesc       : "If you want to join our organisation then fear not for you are helped by our experienced mentors
-                              who'll help you to get rolling initially. Upon joining you'll get a mentor who'll introduce each team
-                              and members of Lapikud to you and helps you with your first assignments."
-  student_MentorsMeet       : "Meet our mentors !"
-
-  # ourwork.html
-  ourwork_BannerHeading     : "Are you in need of a high quality software solution ?"
-  ourwork_BannerButton      : "Contact us !"
-  ourwork_DoneWorks         : "Previous solutions:"
-
-  # aboutus.html
-  aboutus_StatuteHeading    : "Statute"
-  aboutus_StatuteLink       : "Our statute which should be read by all our members."
-  aboutus_MembersHeading    : "Members"
-  aboutus_MembersLink       : "All who are and all who have been members of Lapikud."
-  aboutus_HistoryHeading    : "History"
-  aboutus_HistoryLink       : "Check out our history!"
-
-  # history.html
-  history_HistoryHeading    : "History"
-  history_HistoryParagraph  : "MTÜ Lapikud was established in 2002 23. February. Organisation was created by a fellowship of
-                              computer science students who liked to get together and dilly-dally. Reason why we were created a MTÜ ( nonprofit organization )
-                              was to get a .ee domain. The name \"Lapikud\" comes from times when computer science specialty's identification code was \"LAP\".
-                              Back in 2002 til 2010 the organization's goal was simply to fill IT students' time and support their studies.
-                              Since 2011 Lapikud titled themselves a Software development club and focused on involving students in development projects.
-                              In Spring 2012 a first ever thesis hatched from Lapikud was defended and graded 5."
-  history_HistoryPrevBoards : "Previous managers of Lapikud"
-
-  # members.html
-  members_MembersHeading    : "Want to see your name here?"
-  members_MembersJoin       : "Come and join us !"
-  members_JuniorsHeading    : "Junior members of MTÜ Lapikud:"
-  members_SeniorsHeading    : "Senior members of MTÜ Lapikud:"
-  members_AlumniHeading     : "Graduates of MTÜ Lapikud:"
-ee:
-
-  # index.html
-  index_ForStudentHeading   : "Tudengile"
-  index_ForStudentDesc      : "Tule arenda oma oskuseid ja saa ägedaid sõpru"
-  index_ForStudentLink      : "Uuri edasi meie tegevuste kohta ->"
-
-  index_HelpdeskHeading     : "Helpdesk"
-  index_HelpdeskDesc        : "Tudengisõbralik arvutiparandus!"
-  index_HelpdeskLink        : "Tööde hinnakiri ->"
-
-  index_ForBusinessesHeading: "Ettevõttele"
-  index_ForBusinessesDesc   : "Aitame sinu ideed ellu viia!"
-  index_ForBusinessesLink   : "Tehtud tööd ->"
-
-  index_WhoWeHeading        : "Kes me oleme?"
-  index_WhoWeDesc           : "MTÜ Lapikud on TTÜ Tarkvaraarendusklubi, mis ühendab endisi ja praegusi IT huvilisi tudengeid.
-                              Organisatsioon loodi 2002. aastal informaatika tudengite poolt, kelle erialatunnuseks oli “LAP”.
-                              Targad mehed otsustasid, et järelikult on nad “Lapikud”."
-
-  index_WhatDoHeading       : "Millega tegeleme?"
-  index_WhatDoDesc          : "Meie põhieesmärgiks on TTÜ IT tudengite erialase lisandväärtuse loomine.
-                               Kaasame tudengeid huvitavatesse IT projektidesse ning anname tudengitele võimaluse midagi reaalset oma käega midagi ära teha.
-                               Meie projektidest kooruvad välja huvitavad ja tarvilikud lõputööd.
-                               Pakume nutikatele tudengitele võimalust saada meie juures esimene töökogemus.
-                               Lapikud ei ole ainult IT tudengite organisatsioon – püüame kaasata oma tegevusse ka majandusteaduskonna tudengeid, et projektides oleks esindatud ka äriline pool."
-
-  index_Partners            : "Koostööpartnerid"
-
-  # todo : copy estonian text for other pages

_data/localisation/aboutus.yml

@@ -0,0 +1,9 @@
+en:
+  aboutus_StatuteHeading    : "Statute"
+  aboutus_StatuteLink       : "Our statute which should be read by all our members."
+  aboutus_MembersHeading    : "Members"
+  aboutus_MembersLink       : "All who are and all who have been members of Lapikud."
+  aboutus_HistoryHeading    : "History"
+  aboutus_HistoryLink       : "Check out our history!"
+
+  #todo estonian

_data/localisation/contact.yml

@@ -0,0 +1,8 @@
+en:
+  contact_ContactHeading    : "Contact"
+  contact_ContactMail       : "E-Mail:"
+  contact_ContactPhone      : "Phone:"
+  contact_ContactAddress    : "Address: Akadeemia tee 5, Tallinn, Estonia"
+  contact_ContactRegCode    : "Reg.nr: 801 67 145"
+
+  contact_BoardHeading      : "Management"

_data/localisation/helpdesk.yml

@@ -0,0 +1,50 @@
+en :
+  helpdesk_BannerHeading1    : "We'll give your computer "
+  helpdesk_BannerHeading2    : "a new life"
+  helpdesk_BannerSubHeading  : " solves problems involving PCs and other electronics."
+
+  helpdesk_WhatIsHeading    : "What is HELPDESK ?"
+  helpdesk_WhatIsDesc       : "HELPDESK is a service provided by MTÜ Lapikud. Service is aimed towards students, lecturers and people otherwise interested.
+                              Our team consists of wise and experienced IT students from TUT."
+  helpdesk_ServicesHeading  : "What services do we provide?"
+  helpdesk_ServicesDesc1    : "Computer hardware diagnostics and repair"
+  helpdesk_ServicesDesc2    : "Computer hardware maintenance"
+  helpdesk_ServicesDesc3    : "Software diagnostics and configuration"
+  helpdesk_ServicesDesc4    : "Software installation"
+  helpdesk_ServicesDesc5    : "Other electronics repair"
+
+  helpdesk_TableHeading     : "Pricelist"
+  helpdesk_TableColHeading1 : "Service"
+  helpdesk_TableColHeading2 : "Quantity"
+  helpdesk_TableColHeading3 : "Price"
+  helpdesk_TableR1C1        : "Computer diagnostics"
+  helpdesk_TableR1C2        : "15 min"
+  helpdesk_TableR1C3        : "free"
+  helpdesk_TableR2C1        : "Computer diagnostics (15+ minutes)"
+  helpdesk_TableQuantity    : "piece"
+  helpdesk_TableR3C1        : "Hardware installation"
+  helpdesk_TableR4C1        : "Laptop dusting + new thermal paste"
+  helpdesk_TableR5C1        : "Laptop display installation"
+  helpdesk_TableR6C1        : "PC building"
+  helpdesk_TableR7C1        : "Software maintenance and installation"
+  helpdesk_TableR8C1        : "General electronics repair"
+  helpdesk_TableR9C1        : "Data retrieval"
+  helpdesk_TableR10C1       : "Smart device software maintenance"
+  helpdesk_TableR11C1       : "Operating system reinstall"
+  helpdesk_TableR12C1       : "Smart phone glass/display/battery swap"
+  helpdesk_TableFooter1     : "All necessary components are provided by the client or ordered by the technician upon agreement."
+  helpdesk_TableFooter2     : "Technicians are able to come and service around campus and Tehnopol if necessary."
+  helpdesk_TableFooter3     : "With our student-friendly prices and personal approach we offer a service you don't have to be dissappointed in!"
+
+  helpdesk_LocationHeading  : "Location"
+  helpdesk_Location1        : "Akadeemia tee 5 dormitory"
+  helpdesk_Location2        : "room 008A"
+
+  helpdesk_OpenHeading      : "Opening hours:"
+  helpdesk_OpenTime         : "Mon - Fri 14-19*"
+  helpdesk_OpenDetails      : "* This is the time period when it's most likely to get ahold of someone.
+                              However we can't guarantee that anyone's in the office during given hours."
+
+  helpdesk_ContactHeading   : "Contact"
+  helpdesk_ContactMail      : "E-mail"
+  helpdesk_ContactPhone     : "Phone"

_data/localisation/history.yml

@@ -0,0 +1,9 @@
+en:
+  history_HistoryHeading    : "History"
+  history_HistoryParagraph  : "MTÜ Lapikud was established in 2002 23. February. Organisation was created by a fellowship of
+                              computer science students who liked to get together and dilly-dally. Reason why we were created a MTÜ ( nonprofit organization )
+                              was to get a .ee domain. The name \"Lapikud\" comes from times when computer science specialty's identification code was \"LAP\".
+                              Back in 2002 til 2010 the organization's goal was simply to fill IT students' time and support their studies.
+                              Since 2011 Lapikud titled themselves a Software development club and focused on involving students in development projects.
+                              In Spring 2012 a first ever thesis hatched from Lapikud was defended and graded 5."
+  history_HistoryPrevBoards : "Previous managers of Lapikud"

_data/localisation/index.yml

@@ -0,0 +1,52 @@
+en:
+  index_ForStudentHeading   : "For Student"
+  index_ForStudentDesc      : "Come and develop your skills and befriend cool people"
+  index_ForStudentLink      : "Learn more about our activites ->"
+
+  index_HelpdeskHeading     : "Helpdesk"
+  index_HelpdeskDesc        : "Student-friendly PC repair"
+  index_HelpdeskLink        : "Pricelist ->"
+
+  index_ForBusinessesHeading: "For Businesses"
+  index_ForBusinessesDesc   : "We'll help to make your ideas reality"
+  index_ForBusinessesLink   : "Previous works ->"
+
+  index_WhoWeHeading        : "Who are we?"
+  index_WhoWeDesc           : "MTÜ Lapikud ( nonprofit organisation ) is a TUT software development club, which combines former and current students interested in IT.
+                              The organization was established in 2002 by computer science students whose speciality's identification code was \"LAP\".
+                              The wise men then decided that henceforth they are to be called \"Lapikud\"."
+
+  index_WhatDoHeading       : "What are we up to?"
+  index_WhatDoDesc          : "Our main goal is to complement TUT's IT students studies with relevant experience.
+                              We involve students in interesting IT themed projects and give them an opportunity to finish something meaningful on their own.
+                              Our projects often turn into compelling and useful theses. We offer clever students a chance to get their first work experience.
+                              Lapikud is not only a IT student organization - we also try to involve economics students in our projects so also business side would be represented."
+
+  index_Partners            : "Our partners"
+
+ee:
+  index_ForStudentHeading   : "Tudengile"
+  index_ForStudentDesc      : "Tule arenda oma oskuseid ja saa ägedaid sõpru"
+  index_ForStudentLink      : "Uuri edasi meie tegevuste kohta ->"
+
+  index_HelpdeskHeading     : "Helpdesk"
+  index_HelpdeskDesc        : "Tudengisõbralik arvutiparandus!"
+  index_HelpdeskLink        : "Tööde hinnakiri ->"
+
+  index_ForBusinessesHeading: "Ettevõttele"
+  index_ForBusinessesDesc   : "Aitame sinu ideed ellu viia!"
+  index_ForBusinessesLink   : "Tehtud tööd ->"
+
+  index_WhoWeHeading        : "Kes me oleme?"
+  index_WhoWeDesc           : "MTÜ Lapikud on TTÜ Tarkvaraarendusklubi, mis ühendab endisi ja praegusi IT huvilisi tudengeid.
+                              Organisatsioon loodi 2002. aastal informaatika tudengite poolt, kelle erialatunnuseks oli “LAP”.
+                              Targad mehed otsustasid, et järelikult on nad “Lapikud”."
+
+  index_WhatDoHeading       : "Millega tegeleme?"
+  index_WhatDoDesc          : "Meie põhieesmärgiks on TTÜ IT tudengite erialase lisandväärtuse loomine.
+                               Kaasame tudengeid huvitavatesse IT projektidesse ning anname tudengitele võimaluse midagi reaalset oma käega midagi ära teha.
+                               Meie projektidest kooruvad välja huvitavad ja tarvilikud lõputööd.
+                               Pakume nutikatele tudengitele võimalust saada meie juures esimene töökogemus.
+                               Lapikud ei ole ainult IT tudengite organisatsioon – püüame kaasata oma tegevusse ka majandusteaduskonna tudengeid, et projektides oleks esindatud ka äriline pool."
+
+  index_Partners            : "Koostööpartnerid"

_data/localisation/members.yml

@@ -0,0 +1,6 @@
+en:
+  members_MembersHeading: "Want to see your name here?"
+  members_MembersJoin: "Come and join us !"
+  members_JuniorsHeading: "Junior members of MTÜ Lapikud:"
+  members_SeniorsHeading: "Senior members of MTÜ Lapikud:"
+  members_AlumniHeading: "Graduates of MTÜ Lapikud:"

_data/localisation/ourwork.yml

@@ -0,0 +1,4 @@
+en:
+  ourwork_BannerHeading     : "Are you in need of a high quality software solution ?"
+  ourwork_BannerButton      : "Contact us !"
+  ourwork_DoneWorks         : "Previous solutions:"

_data/localisation/student.yml

@@ -0,0 +1,26 @@
+en:
+  student_WhatWeDoHeading: "What do we do ?"
+  student_WhatWeDoDesc1: "The main goal of Lapikud is to connect IT students to together develop software projects
+                              and give students extra experience in addition to what they learn in university.
+                              For that purpose we have a software development team which deals with both inside and external projects.
+                              Helpdesk works on everything hardware and offers computer repair services."
+  student_WhatWeDoDesc2: "In addition we organize events and gatherings and otherwise spend fun times together."
+
+  student_WhatYouDoHeading: "What can you do?"
+  student_WhatYouDoDesc1: "Join us !"
+  student_WhatYouDoDesc2: "There are several ways to contribute to our cause if you wish.
+                              We have four teams: software development, Helpdesk, marketing and events"
+  student_WhatYouDoDesc3: "Joining the developers team you get practice which is not offered in the school.
+                              You get to learn everything regarding software under our senior members,
+                              not to mention experience in teamwork and a check in your CV."
+  student_WhatYouDoDesc4: "In Helpdesk's team you can repair and build PCs and work with other electronics."
+  student_WhatYouDoDesc5: "Events and marketing teams respectively are responsible for events and their marketing in Lapikud,
+                              but also with some greater events (e.g. <a href=\"https://laphack.eu/\">LAPhack</a>)."
+  student_WhatYouDoJoin: "Join!"
+  student_MentorsHeading: "Mentors"
+
+  # V grammatically correct ??? V
+  student_MentorsDesc: "If you want to join our organisation then fear not for you are helped by our experienced mentors
+                              who'll help you to get rolling initially. Upon joining you'll get a mentor who'll introduce each team
+                              and members of Lapikud to you and helps you with your first assignments."
+  student_MentorsMeet: "Meet our mentors !"

_sass/contact.scss

@@ -54,19 +54,21 @@
 
   #main-wrapper {
     width           : 100%;
-    margin-top      : 40px;
     display         : flex;
     flex-direction  : row;
     flex-wrap       : wrap;
+    justify-content : center;
+    align-items     : center;
   }
 
   #maparea {
-    margin        : 0 20px 0px auto;
+    margin        : 0 2rem 0 2rem;
     min-width     : 50%;
     flex          : 1;
 
     #map {
       width      : 100%;
+      float      : right;
       margin     : 0px auto;
       height     : 60vh;
       max-height : 300px;
@@ -74,10 +76,10 @@
   }
 
   #main {
-    margin            : 2rem 0;
+    margin            : 0 2rem;
-    padding-right     : 40px;
 
-    p{
+
+    h4{
       padding-bottom  : 5px;
     }
   }

contact.html

@@ -11,24 +11,24 @@ language: ee
 
   <h2>Helpdesk</h2>
   <div id="helpdesk">
-    <a id="helpdesk-banner-container" href="/helpdesk">
-      <img id="helpdesk-banner" src="/assets/helpdesk-on-black.png">
-    </a>
     <div id="helpdesk-info">
       <h4>E-mail: <a href="mailto:helpdesk@lapikud.ee">helpdesk@lapikud.ee</a></h4>
       <h4>Telefon: <a href="tel:+37258160799">+372 581 607 99</a></h4>
       <h4>Facebook: <a href="https://www.facebook.com/lapikudhelpdesk/">Lapikud Helpdesk</a></h4>
     </div>
+    <a id="helpdesk-banner-container" href="/helpdesk">
+      <img id="helpdesk-banner" src="/assets/helpdesk-on-black.png">
+    </a>
   </div>
 
+  <h2>MTÜ Lapikud</h2>
   <div id="main-wrapper">
     <div id="main">
-      <h2>MTÜ Lapikud</h2>
+      <h4>Aadress: Akadeemia tee 5, Tallinn, Eesti</h4>
-      <p>Aadress: Akadeemia tee 5, Tallinn, Eesti</p>
+      <h4>E-post: <a href="mailto:lapikud@lapikud.ee">lapikud@lapikud.ee</a></h4>
-      <p>E-post: <a href="mailto:lapikud@lapikud.ee">lapikud@lapikud.ee</a></p>
+      <h4>Telefon: <a href="tel:+372 58 160 799">+372 58 160 799</a></h4>
-      <p>Telefon: <a href="tel:+372 58 160 799">+372 58 160 799</a></p>
+      <h4>Reg. kood: 801 67 145</h4>
-      <p>Reg. kood: 801 67 145</p>
+      <h4>Swedbank EE812200221019551756</h4>
-      <p>Swedbank EE812200221019551756</p>
       </div>
     <div id="maparea">
       <div id="map"></div>

en/aboutus.html

@@ -3,7 +3,7 @@ layout: default
 title: About us - Lapikud
 language: en
 ---
-{% assign locale = site.data.localisation[page.language] %}
+{% assign locale = site.data.localisation.aboutus[page.language] %}
 
 <div class="page">
 

en/contact.html

@@ -3,7 +3,7 @@ layout: default
 title: Contact - Lapikud
 language: en
 ---
-{% assign locale = site.data.localisation[page.language] %}
+{% assign locale = site.data.localisation.contact[page.language] %}
 {% assign mgmt = site.data.management[page.language] %}
 
 <div class="page" id="contact">
@@ -11,24 +11,25 @@ language: en
 
     <h2>Helpdesk</h2>
     <div id="helpdesk">
-        <a id="helpdesk-banner-container" href="/helpdesk">
-            <img id="helpdesk-banner" src="/assets/helpdesk-on-black.png">
-        </a>
         <div id="helpdesk-info">
             <h4>{{ locale.contact_ContactMail }} <a href="mailto:helpdesk@lapikud.ee">helpdesk@lapikud.ee</a></h4>
             <h4>{{ locale.contact_ContactPhone }} <a href="tel:+37258160799">+372 581 607 99</a></h4>
             <h4>Facebook: <a href="https://www.facebook.com/lapikudhelpdesk/">Lapikud Helpdesk</a></h4>
         </div>
+        <a id="helpdesk-banner-container" href="/helpdesk">
+            <img id="helpdesk-banner" src="/assets/helpdesk-on-black.png">
+        </a>
     </div>
 
+    <h2>MTÜ Lapikud</h2>
     <div id="main-wrapper">
         <div id="main">
-            <h2>MTÜ Lapikud</h2>
+
-            <p>{{ locale.contact_ContactAddress }}</p>
+            <h4>{{ locale.contact_ContactAddress }}</h4>
-            <p>{{ locale.contact_ContactMail }} <a href="mailto:lapikud@lapikud.ee">lapikud@lapikud.ee</a></p>
+            <h4>{{ locale.contact_ContactMail }} <a href="mailto:lapikud@lapikud.ee">lapikud@lapikud.ee</a></h4>
-            <p>{{ locale.contact_ContactPhone }} <a href="tel:+372 58 160 799">+372 58 160 799</a></p>
+            <h4>{{ locale.contact_ContactPhone }} <a href="tel:+372 58 160 799">+372 58 160 799</a></h4>
-            <p>{{ locale.contact_ContactRegCode }}</p>
+            <h4>{{ locale.contact_ContactRegCode }}</h4>
-            <p>Swedbank EE812200221019551756</p>
+            <h4>Swedbank EE812200221019551756</h4>
         </div>
         <div id="maparea">
             <div id="map"></div>

en/helpdesk.html

@@ -3,7 +3,7 @@ layout: default
 title: Helpdesk - Lapikud
 language: en
 ---
-{% assign locale = site.data.localisation[page.language] %}
+{% assign locale = site.data.localisation.helpdesk[page.language] %}
 
 <div class="page" id="helpdesk-page">
 

en/history.html

@@ -3,7 +3,7 @@ layout: default
 title: History - Lapikud
 language: en
 ---
-{% assign locale = site.data.localisation[page.language] %}
+{% assign locale = site.data.localisation.history[page.language] %}
 
 <div class="page" id="history">
     <h1>{{ locale.history_HistoryHeading }}</h1>

en/index.html

@@ -3,7 +3,7 @@ layout: default
 title: Lapikud
 language: en
 ---
-{% assign locale = site.data.localisation[page.language] %}
+{% assign locale = site.data.localisation.index[page.language] %}
 
 <!-- home -->
 <section class="container home">

en/members.html

@@ -3,7 +3,7 @@ layout: default
 title: Members - Lapikud
 language: en
 ---
-{% assign locale = site.data.localisation[page.language] %}
+{% assign locale = site.data.localisation.members[page.language] %}
 
 <div class="page" id="members">
     <h3 class="centered-text">{{ locale.members_MembersHeading }}</h3>

en/ourwork.html

@@ -3,7 +3,7 @@ layout: default
 title: Tehtud tööd - Lapikud
 language: en
 ---
-{% assign locale = site.data.localisation[page.language] %}
+{% assign locale = site.data.localisation.ourwork[page.language] %}
 {% assign works = site.data.ourwork[page.language] %}
 
 <div class="page">

en/student.html

@@ -3,7 +3,7 @@ layout: default
 title: For student - Lapikud
 language: en
 ---
-{% assign locale = site.data.localisation[page.language] %}
+{% assign locale = site.data.localisation.student[page.language] %}
 
 <div class="page">
     <div class="activities-info">