+
+
+
+

+
+
+
+ {{ locale.helpdesk_BannerHeading1 }} {{ locale.helpdesk_BannerHeading2 }}!
+
+
+ HELPDESK {{ locale.helpdesk_BannerSubHeading }}
+
+
+
+
+
+
+
{{ locale.helpdesk_WhatIsHeading }}
+
+ {{ locale.helpdesk_WhatIsDesc }}
+
+
+
+
+
{{ locale.ServicesHeading }}
+
+ - {{ locale.helpdesk_ServicesDesc1 }}
+ - {{ locale.helpdesk_ServicesDesc2 }}
+ - {{ locale.helpdesk_ServicesDesc3 }}
+ - {{ locale.helpdesk_ServicesDesc4 }}
+ - {{ locale.helpdesk_ServicesDesc5 }}
+
+
+
+
+
{{ locale.helpdesk_TableHeading }}
+
+
+
+ {{ locale.helpdesk_TableColHeading1 }} |
+ {{ locale.helpdesk_TableColHeading2 }} |
+ {{ locale.helpdesk_TableColHeading3 }} |
+
+
+
+
+ {{ locale.helpdesk_TableR1C1 }} |
+ {{ locale.helpdesk_TableR1C2 }} |
+ {{ locale.helpdesk_TableR1C3 }} |
+
+
+ {{ locale.helpdesk_TableR2C1 }} |
+ {{ locale.helpdesk_TableQuantity }} |
+ 20 € |
+
+
+ {{ locale.helpdesk_TableR3C1 }} |
+ {{ locale.helpdesk_TableQuantity }} |
+ 10-15 € |
+
+
+ {{ locale.helpdesk_TableR4C1 }} |
+ {{ locale.helpdesk_TableQuantity }} |
+ 10-20 € |
+
+
+ {{ locale.helpdesk_TableR5C1 }} |
+ {{ locale.helpdesk_TableQuantity }} |
+ 15 € |
+
+
+ {{ locale.helpdesk_TableR6C1 }} |
+ {{ locale.helpdesk_TableQuantity }} |
+ 20 € |
+
+
+ {{ locale.helpdesk_TableR7C1 }} |
+ {{ locale.helpdesk_TableQuantity }} |
+ 10-15 € |
+
+
+ {{ locale.helpdesk_TableR8C1 }} |
+ {{ locale.helpdesk_TableQuantity }} |
+ 10-50 € |
+
+
+ {{ locale.helpdesk_TableR9C1 }} |
+ {{ locale.helpdesk_TableQuantity }} |
+ 10-30 € |
+
+
+ {{ locale.helpdesk_TableR10C1 }} |
+ {{ locale.helpdesk_TableQuantity }} |
+ 15 € |
+
+
+ {{ locale.helpdesk_TableR11C1 }} |
+ {{ locale.helpdesk_TableQuantity }} |
+ 15 € |
+
+
+ {{ locale.helpdesk_TableR12C1 }} |
+ {{ locale.helpdesk_TableQuantity }} |
+ 15-30 € |
+
+
+
+
{{ locale.helpdesk_TableFooter1 }}
+
{{ locale.helpdesk_TableFooter2 }}
+
{{ locale.helpdesk_TableFooter3 }}
+
+
+
+
+
{{ locale.helpdesk_LocationHeading }}
+ {{ locale.helpdesk_Location1 }}
+ {{ locale.helpdesk_Location2 }}
+
+
+
+
+
+

+
+
+

+
+
+

+
+
+

+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/_includes/pages/history.html b/_includes/pages/history.html
new file mode 100644
index 0000000..87a73f9
--- /dev/null
+++ b/_includes/pages/history.html
@@ -0,0 +1,25 @@
+{% assign locale = site.data.i18n.history[page.language] %}
+
+
+
{{ locale.history_HistoryHeading }}
+
{{ locale.history_HistoryParagraph }}
+
+
{{ locale.history_HistoryPrevBoards }}
+
+ {% for management in site.data.past_management %}
+
+
{{management.year}}
+
+ {% for member in management.members %}
+
+
+

+
+
{{ member.name }}
+
+ {% endfor %}
+
+
+ {% endfor %}
+
+
diff --git a/_includes/pages/index.html b/_includes/pages/index.html
new file mode 100644
index 0000000..02fe341
--- /dev/null
+++ b/_includes/pages/index.html
@@ -0,0 +1,76 @@
+{% assign locale = site.data.i18n.index[page.language] %}
+{% assign subpages = site.data.i18n.pages.nav[page.language] %}
+
+
+
+
{{ locale.mentors_PageHeading }}
+
{{ locale.mentors_PageDesc }}
+
+ {% for mentor in site.data.mentors %}
+
+
+
+

+
+
+
+
{{ mentor.name }}
+
{{ locale.mentors_MentorAge }}{{ mentor.age }}
+
+ {% if mentor.specialty != null %}
+
{{ locale.mentors_MentorSpecialty }}{{ mentor.specialty }}
+ {% endif %}
+
+ {% if mentor.term != null %}
+
{{ locale.mentors_MentorTerm }}{{ mentor.term }}
+ {% endif %}
+
+
{{ locale.mentors_MentorTeams }}
+
+ {% for team in mentor.teams %}
+ - {{ team }}
+ {% endfor %}
+
+
+ {% if mentor.contactMethods != null %}
+
{{ locale.mentors_MentorContacts }}
+ {% endif %}
+
+ {% for contactMethod in mentor.contactMethods %}
+
+ {% if contactMethod.name == 'Telefon' %}
+
{{ locale.mentors_MentorPhone }} {{ contactMethod.value }}
+ {% endif %}
+
+ {% if contactMethod.name == 'E-mail' %}
+
E-mail: {{ contactMethod.value }}
+ {% endif %}
+
+ {% if contactMethod.name == 'Messenger' %}
+
Messenger {{ contactMethod.value }}
+ {% endif %}
+
+ {% if contactMethod.name == 'other' %}
+
{{ contactMethod.value }}
+ {% endif %}
+
+ {% endfor %}
+
+
+
+
+
{{ locale.mentors_VariaWhyMe }}
+
{{ mentor.description }}
+
{{ locale.mentors_VariaInterests }}
+
{{ mentor.activities }}
+
+
+
+
+ {% endfor %}
+
+
\ No newline at end of file
diff --git a/_includes/pages/ourwork.html b/_includes/pages/ourwork.html
new file mode 100644
index 0000000..e17a050
--- /dev/null
+++ b/_includes/pages/ourwork.html
@@ -0,0 +1,37 @@
+{% assign locale = site.data.i18n.ourwork[page.language] %}
+{% assign works = site.data.ourwork[page.language] %}
+
+
+
+
{{ locale.ourwork_DoneWorks }}
+
+
+ {% for work in works %}
+
+
+
{{ work.title }}
+
{{ work.description }}
+
+ {% if work.url == null %}
+
+

+
+ {% else %}
+
+
+
+ {% endif %}
+
+ {% endfor %}
+
+
+
+
\ No newline at end of file
diff --git a/_includes/pages/student.html b/_includes/pages/student.html
new file mode 100644
index 0000000..0f6784a
--- /dev/null
+++ b/_includes/pages/student.html
@@ -0,0 +1,47 @@
+{% assign locale = site.data.i18n.student[page.language] %}
+
+
-
-
-
-

-
-
-
- {{ locale.helpdesk_BannerHeading1 }} {{ locale.helpdesk_BannerHeading2 }}!
-
-
- HELPDESK {{ locale.helpdesk_BannerSubHeading }}
-
-
-
-
-
-
-
{{ locale.helpdesk_WhatIsHeading }}
-
- {{ locale.helpdesk_WhatIsDesc }}
-
-
-
-
-
{{ locale.ServicesHeading }}
-
- - {{ locale.helpdesk_ServicesDesc1 }}
- - {{ locale.helpdesk_ServicesDesc2 }}
- - {{ locale.helpdesk_ServicesDesc3 }}
- - {{ locale.helpdesk_ServicesDesc4 }}
- - {{ locale.helpdesk_ServicesDesc5 }}
-
-
-
-
-
{{ locale.helpdesk_TableHeading }}
-
-
-
- {{ locale.helpdesk_TableColHeading1 }} |
- {{ locale.helpdesk_TableColHeading2 }} |
- {{ locale.helpdesk_TableColHeading3 }} |
-
-
-
-
- {{ locale.helpdesk_TableR1C1 }} |
- {{ locale.helpdesk_TableR1C2 }} |
- {{ locale.helpdesk_TableR1C3 }} |
-
-
- {{ locale.helpdesk_TableR2C1 }} |
- {{ locale.helpdesk_TableQuantity }} |
- 20 € |
-
-
- {{ locale.helpdesk_TableR3C1 }} |
- {{ locale.helpdesk_TableQuantity }} |
- 10-15 € |
-
-
- {{ locale.helpdesk_TableR4C1 }} |
- {{ locale.helpdesk_TableQuantity }} |
- 10-20 € |
-
-
- {{ locale.helpdesk_TableR5C1 }} |
- {{ locale.helpdesk_TableQuantity }} |
- 15 € |
-
-
- {{ locale.helpdesk_TableR6C1 }} |
- {{ locale.helpdesk_TableQuantity }} |
- 20 € |
-
-
- {{ locale.helpdesk_TableR7C1 }} |
- {{ locale.helpdesk_TableQuantity }} |
- 10-15 € |
-
-
- {{ locale.helpdesk_TableR8C1 }} |
- {{ locale.helpdesk_TableQuantity }} |
- 10-50 € |
-
-
- {{ locale.helpdesk_TableR9C1 }} |
- {{ locale.helpdesk_TableQuantity }} |
- 10-30 € |
-
-
- {{ locale.helpdesk_TableR10C1 }} |
- {{ locale.helpdesk_TableQuantity }} |
- 15 € |
-
-
- {{ locale.helpdesk_TableR11C1 }} |
- {{ locale.helpdesk_TableQuantity }} |
- 15 € |
-
-
- {{ locale.helpdesk_TableR12C1 }} |
- {{ locale.helpdesk_TableQuantity }} |
- 15-30 € |
-
-
-
-
{{ locale.helpdesk_TableFooter1 }}
-
{{ locale.helpdesk_TableFooter2 }}
-
{{ locale.helpdesk_TableFooter3 }}
-
-
-
-
-
{{ locale.helpdesk_LocationHeading }}
- {{ locale.helpdesk_Location1 }}
- {{ locale.helpdesk_Location2 }}
-
-
-
-
-
-

-
-
-

-
-
-

-
-
-

-
-
-

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+{% include pages/helpdesk.html %}
\ No newline at end of file
diff --git a/en/history.html b/en/history.html
index 006e9ed..c49d8ed 100644
--- a/en/history.html
+++ b/en/history.html
@@ -3,29 +3,6 @@ layout: default
title: History - Lapikud
language: en
---
-{% assign locale = site.data.localisation.history[page.language] %}
+{% include pages/history.html %}
-
-
{{ locale.history_HistoryHeading }}
-
{{ locale.history_HistoryParagraph }}
-
-
{{ locale.history_HistoryPrevBoards }}
-
- {% for management in site.data.past_management %}
-
-
{{management.year}}
-
- {% for member in management.members %}
-
-
-

-
-
{{ member.name }}
-
- {% endfor %}
-
-
- {% endfor %}
-
-
diff --git a/en/index.html b/en/index.html
index fce2798..0c8e20b 100644
--- a/en/index.html
+++ b/en/index.html
@@ -3,78 +3,4 @@ layout: default
title: Lapikud
language: en
---
-{% assign locale = site.data.localisation.index[page.language] %}
-
-
-
-
-
{{ locale.ourwork_DoneWorks }}
-
-
- {% for work in works %}
-
-
-
{{ work.title }}
-
{{ work.description }}
-
- {% if work.url == null %}
-
-

-
- {% else %}
-
-
-
- {% endif %}
-
- {% endfor %}
-
-
-
-
\ No newline at end of file
+{% include pages/ourwork.html %}
\ No newline at end of file
diff --git a/en/student.html b/en/student.html
index e2b8e04..db8e9eb 100644
--- a/en/student.html
+++ b/en/student.html
@@ -3,48 +3,4 @@ layout: default
title: For student - Lapikud
language: en
---
-{% assign locale = site.data.localisation.student[page.language] %}
-
-
-
-
-
-

-
-
-
- Anname sinu arvutile uue elu!
-
-
- HELPDESK lahendab probleemid seoses arvuti ja muu elektroonikaga.
-
-
-
-
-
-
-
Mis on HELPDESK?
-
- HELPDESK on MTÜ Lapikute poolt pakutav arvutiabiteenus. Teenus on suunatud tudengitele, õppejõududele ning
- kõikidele huvilistele ka väljaspool TTÜ-d. Meie meeskond koosneb kogenud ja nutikatest TTÜ IT-tudengitest.
-
-
-
-
-
Mis teenuseid osutame?
-
- - Arvuti riistvara diagnostika ja remont
- - Arvuti riistvara hooldus
- - Tarkvara diagnostika ja seadistamine
- - Tarkvara paigaldamine
- - Muu elektroonika parandamine
-
-
-
-
-
Hinnakiri
-
-
-
- Teenus |
- Kogus |
- Hind |
-
-
-
-
- Arvuti diagnostika |
- 15 min |
- tasuta |
-
-
- Arvuti diagnostika (alates 15 min +) |
- tk |
- 20 € |
-
-
- Detaili paigaldamine arvutisse |
- tk |
- 10-15 € |
-
-
- Sülearvuti tolmupuhastus + termopasta |
- tk |
- 10-20 € |
-
-
- Sülearvuti ekraani paigaldus |
- tk |
- 15 € |
-
-
- Arvuti komplekteerimine |
- tk |
- 20 € |
-
-
- Tarkvara hooldustöö ja paigaldamine |
- tk |
- 10-15 € |
-
-
- Muu elektroonika parandus |
- tk |
- 10-50 € |
-
-
- Andmete taastamine |
- tk |
- 10-30 € |
-
-
- Nutiseadmete tarkvarahooldus |
- tk |
- 15 € |
-
-
- Operatsioonisüsteemi taaspaigaldus |
- tk |
- 15 € |
-
-
- Nutitelefoni klaasi/display/aku vahetus |
- tk |
- 15-30 € |
-
-
-
-
Jupid tellitakse kliendi enda poolt või kokkuleppel tehnikuga.
-
Vajadusel tuleme üliõpilasküla ja Tehnopoli piires kohale.
-
Oma tudengisõbralike hindade ja personaalse lähenemisega pakume teenust, milles ei pea pettuma!
-
-
-
-
-
Asukoht
- Akadeemia tee 5 ühiselamu
- ruum 008A
-
-
-
-
-
-

-
-
-

-
-
-

-
-
-

-
-
-

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+{% include pages/helpdesk.html %}
\ No newline at end of file
diff --git a/history.html b/history.html
index 3fa6d1c..3fbf2d1 100644
--- a/history.html
+++ b/history.html
@@ -1,32 +1,6 @@
---
layout: default
title: Ajalugu - Lapikud
+language: ee
---
-
-
Ajalugu
-
MTÜ Lapikud loodi 2002. aasta 23. veebruaril. Organisatsiooni lõi sõpruskond informaatikuid, kellele meeldis koos
- aega viita. Põhjus, miks üldse MTÜ tehti seisnes selles, et saada .ee domeen. Nimi “Lapikud” tuleneb sellest, et
- siis oli informaatikute erialatähiseks “LAP”. Organisatsioon tegutses aastatel 2002 kuni 2010 eesmärgiga sisustada
- IT tudengite vaba aega ning toetada IT õpinguid. Aastast 2011 tituleerisid Lapikud ennast Tarkvaraarenduse klubiks,
- ning organisatsiooni fookus on suunatud tudengite kaasamisse erinevatesse tarkvaraarenduse projektidesse. 2012.
- aasta kevadel kaitsti ära esimene Lapikutest koorunud lõputöö hindele 5.
-
-
Organisatsiooni juhtinud inimesed läbi aegade
-
- {% for management in site.data.past_management %}
-
-
{{management.year}}
-
- {% for member in management.members %}
-
-
-

-
-
{{ member.name }}
-
- {% endfor %}
-
-
- {% endfor %}
-
-
+{% include pages/history.html %}
\ No newline at end of file
diff --git a/index.html b/index.html
index ed03260..e7941b6 100644
--- a/index.html
+++ b/index.html
@@ -3,78 +3,5 @@ layout: default
title: Lapikud
language: ee
---
-{% assign locale = site.data.localisation[page.language] %}
+{% include pages/index.html %}
-
-
-
Mentorid
-
Siin on meie mentorid. Kui leiad kellegi, kellega huvid kattuvad, võta temaga julgelt ühendust!
-
- {% for mentor in site.data.mentors %}
-
-
-
-

-
-
-
-
{{ mentor.name }}
-
Vanus: {{ mentor.age }}
-
- {% if mentor.specialty != null %}
-
Eriala: {{ mentor.specialty }}
- {% endif %}
-
- {% if mentor.term != null %}
-
Kursus: {{ mentor.term }}
- {% endif %}
-
-
Tiimid:
-
- {% for team in mentor.teams %}
- - {{ team }}
- {% endfor %}
-
-
- {% if mentor.contactMethods != null %}
-
Kontaktid:
- {% endif %}
-
- {% for contactMethod in mentor.contactMethods %}
-
- {% if contactMethod.name == 'Telefon' %}
-
Telefon: {{ contactMethod.value }}
- {% endif %}
-
- {% if contactMethod.name == 'E-mail' %}
-
E-mail: {{ contactMethod.value }}
- {% endif %}
-
- {% if contactMethod.name == 'Messenger' %}
-
Messenger {{ contactMethod.value }}
- {% endif %}
-
- {% if contactMethod.name == 'other' %}
-
{{ contactMethod.value }}
- {% endif %}
-
- {% endfor %}
-
-
-
-
-
Miks peaksid valima minu enda mentoriks?
-
{{ mentor.description }}
-
Millega tegelen väljaspool Lapikuid?
-
{{ mentor.activities }}
-
-
-
-
- {% endfor %}
-
-
-
+{% include pages/mentors.html%}
diff --git a/ourwork.html b/ourwork.html
index ec32648..6f38bd2 100644
--- a/ourwork.html
+++ b/ourwork.html
@@ -3,40 +3,4 @@ layout: default
title: Tehtud tööd - Lapikud
language: ee
---
-{% assign locale = site.data.localisation[page.language] %}
-{% assign works = site.data.ourwork[page.language] %}
-
-
-
-
Tehtud tööd:
-
-
- {% for work in works %}
-
-
-
{{ work.title }}
-
{{ work.description }}
-
- {% if work.url == null %}
-
-

-
- {% else %}
-
-
-
- {% endif %}
-
- {% endfor %}
-
-
-
-
+{% include pages/ourwork.html %}
\ No newline at end of file
diff --git a/student.html b/student.html
index 9c7e26d..37293f2 100644
--- a/student.html
+++ b/student.html
@@ -1,56 +1,6 @@
---
layout: default
title: Tudengile - Lapikud
+language: ee
---
-
-