Mostly translated into english. Page linking works. Language changing works. Fixes here and there.

This commit is contained in:
Mart-Erki.Noumees
2018-10-02 23:03:50 +03:00
parent 5da2e00009
commit 59ec2ee920
48 changed files with 988 additions and 1235 deletions

View File

@@ -3,31 +3,5 @@ layout: default
title: About us - Lapikud
language: en
---
{% assign locale = site.data.localisation.aboutus[page.language] %}
<div class="page">
<h1>MTÜ Lapikud</h1>
<!-- three icons -->
<div class="row">
<div class="column">
<div>
<h3>{{ locale.aboutus_StatuteHeading }}</h3>
<p><a href="/statute">{{ locale.aboutus_StatuteLink }}</a></p>
</div>
</div>
<div class="column">
<div>
<h3>{{ locale.aboutus_MembersHeading }}</h3>
<p><a href="/members">{{ locale.aboutus_MembersLink }}</a></p>
</div>
</div>
<div class="column">
<div>
<h3>{{ locale.aboutus_HistoryHeading }}</h3>
<p><a href="/history">{{ locale.aboutus_HistoryLink }}</a></p>
</div>
</div>
</div>
</div>
{% include pages/aboutus.html %}

View File

@@ -2,73 +2,6 @@
layout: default
title: Contact - Lapikud
language: en
ref: contact
---
{% assign locale = site.data.localisation.contact[page.language] %}
{% assign mgmt = site.data.management[page.language] %}
<div class="page" id="contact">
<h1>{{ locale.contact_ContactHeading }}</h1>
<h2>Helpdesk</h2>
<div id="helpdesk">
<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">
<h4>{{ locale.contact_ContactAddress }}</h4>
<h4>{{ locale.contact_ContactMail }} <a href="mailto:lapikud@lapikud.ee">lapikud@lapikud.ee</a></h4>
<h4>{{ locale.contact_ContactPhone }} <a href="tel:+372 58 160 799">+372 58 160 799</a></h4>
<h4>{{ locale.contact_ContactRegCode }}</h4>
<h4>Swedbank EE812200221019551756</h4>
</div>
<div id="maparea">
<div id="map"></div>
</div>
</div>
<div id="management">
<h2>{{ locale.contact_BoardHeading }}</h2>
<div id="container">
{% for person in mgmt %}
<div class="person">
<img src="{{ "/assets/management-images/" | append: person.photo }}" alt="{{ person.name }}">
<h4 class="centered-text">{{ person.name }}</h4>
<p class="centered-text">{{ person.role }}</p>
<p class="centered-text">{{ person.subrole }}</p>
<p>{{ locale.contact_ContactMail }}</p>
<a href="mailto:{{ person.email }}">{{ person.email }}</a>
<p>{{ locale.contact_ContactPhone }}</p>
<a href="tel:{{ person.phone }}">{{ person.phone }}</a>
</div>
{% endfor %}
</div>
</div>
</div>
<!-- leafletjs map styles -->
<script src="https://unpkg.com/leaflet@1.3.3/dist/leaflet.js"
integrity="sha512-tAGcCfR4Sc5ZP5ZoVz0quoZDYX5aCtEm/eu1KhSLj2c9eFrylXZknQYmxUssFaVJKvvc0dJQixhGjG2yXWiV9Q=="
crossorigin=""></script>
<script>
var map = L.map('map').setView([59.396342, 24.668718], 16);
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
}).addTo(map);
L.marker([59.396342, 24.668718]).addTo(map)
.openPopup();
</script>
{% include pages/contact.html %}

View File

@@ -3,207 +3,4 @@ layout: default
title: Helpdesk - Lapikud
language: en
---
{% assign locale = site.data.localisation.helpdesk[page.language] %}
<div class="page" id="helpdesk-page">
<div id="helpdesk-banner">
<div id="helpdesk-logo-container">
<img id="helpdesk-logo" src="/assets/helpdesk-on-black.png">
</div>
<div id="banner-text">
<h1>
{{ locale.helpdesk_BannerHeading1 }} <span class="emphasis-text-color">{{ locale.helpdesk_BannerHeading2 }}</span>!
</h1>
<h3>
<span class="emphasis-text-bold">HELPDESK</span> {{ locale.helpdesk_BannerSubHeading }}
</h3>
</div>
</div>
<div id="helpdesk-description">
<h1>{{ locale.helpdesk_WhatIsHeading }}</h1>
<p>
{{ locale.helpdesk_WhatIsDesc }}
</p>
</div>
<div id="helpdesk-services">
<h1>{{ locale.ServicesHeading }}</h1>
<ul>
<li>{{ locale.helpdesk_ServicesDesc1 }}</li>
<li>{{ locale.helpdesk_ServicesDesc2 }}</li>
<li>{{ locale.helpdesk_ServicesDesc3 }}</li>
<li>{{ locale.helpdesk_ServicesDesc4 }}</li>
<li>{{ locale.helpdesk_ServicesDesc5 }}</li>
</ul>
</div>
<div id="pricing">
<h1>{{ locale.helpdesk_TableHeading }}</h1>
<table>
<thead>
<tr>
<td>{{ locale.helpdesk_TableColHeading1 }}</td>
<td>{{ locale.helpdesk_TableColHeading2 }}</td>
<td>{{ locale.helpdesk_TableColHeading3 }}</td>
</tr>
</thead>
<tbody>
<tr>
<td>{{ locale.helpdesk_TableR1C1 }}</td>
<td>{{ locale.helpdesk_TableR1C2 }}</td>
<td>{{ locale.helpdesk_TableR1C3 }}</td>
</tr>
<tr>
<td>{{ locale.helpdesk_TableR2C1 }}</td>
<td>{{ locale.helpdesk_TableQuantity }}</td>
<td>20 €</td>
</tr>
<tr>
<td>{{ locale.helpdesk_TableR3C1 }}</td>
<td>{{ locale.helpdesk_TableQuantity }}</td>
<td>10-15 €</td>
</tr>
<tr>
<td>{{ locale.helpdesk_TableR4C1 }}</td>
<td>{{ locale.helpdesk_TableQuantity }}</td>
<td>10-20 €</td>
</tr>
<tr>
<td>{{ locale.helpdesk_TableR5C1 }}</td>
<td>{{ locale.helpdesk_TableQuantity }}</td>
<td>15 €</td>
</tr>
<tr>
<td>{{ locale.helpdesk_TableR6C1 }}</td>
<td>{{ locale.helpdesk_TableQuantity }}</td>
<td>20 €</td>
</tr>
<tr>
<td>{{ locale.helpdesk_TableR7C1 }}</td>
<td>{{ locale.helpdesk_TableQuantity }}</td>
<td>10-15 €</td>
</tr>
<tr>
<td>{{ locale.helpdesk_TableR8C1 }}</td>
<td>{{ locale.helpdesk_TableQuantity }}</td>
<td>10-50 €</td>
</tr>
<tr>
<td>{{ locale.helpdesk_TableR9C1 }}</td>
<td>{{ locale.helpdesk_TableQuantity }}</td>
<td>10-30 €</td>
</tr>
<tr>
<td>{{ locale.helpdesk_TableR10C1 }}</td>
<td>{{ locale.helpdesk_TableQuantity }}</td>
<td>15 €</td>
</tr>
<tr>
<td>{{ locale.helpdesk_TableR11C1 }}</td>
<td>{{ locale.helpdesk_TableQuantity }}</td>
<td>15 €</td>
</tr>
<tr>
<td>{{ locale.helpdesk_TableR12C1 }}</td>
<td>{{ locale.helpdesk_TableQuantity }}</td>
<td>15-30 €</td>
</tr>
</tbody>
</table>
<p>{{ locale.helpdesk_TableFooter1 }}</p>
<p>{{ locale.helpdesk_TableFooter2 }}</p>
<p>{{ locale.helpdesk_TableFooter3 }}</p>
</div>
<div id="location">
<div>
<h1>{{ locale.helpdesk_LocationHeading }}</h1>
<h4>{{ locale.helpdesk_Location1 }}</h4>
<h4>{{ locale.helpdesk_Location2 }}</h4>
</div>
<div id="maparea">
<div id="map"></div>
<div class="siema">
<div class="carousel-image-container">
<img src="/assets/carousel-images/1.jpg">
</div>
<div class="carousel-image-container">
<img src="/assets/carousel-images/2.jpg">
</div>
<div class="carousel-image-container">
<img src="/assets/carousel-images/3.jpg">
</div>
<div class="carousel-image-container">
<img src="/assets/carousel-images/4.jpg">
</div>
<div class="carousel-image-container">
<img src="/assets/carousel-images/5.jpg">
</div>
</div>
</div>
</div>
<div id="contact">
<div id="opening-times">
<h2>{{ locale.helpdesk_OpenHeading }}</h2>
<h3>{{ locale.helpdesk_OpenTime }}</h3>
<h5 class="subtext">{{ locale.helpdesk_OpenDetails }}</h5>
</div>
<div id="contact-methods">
<h1>{{ locale.helpdesk_ContactHeading }}</h1>
<div>
<h4>{{ locale.helpdesk_ContactMail }} </h4>
<a href="mailto:helpdesk@lapikud.ee"><h4>helpdesk@lapikud.ee</h4></a>
<h4>{{ locale.helpdesk_ContactPhone }} </h4>
<a href="tel:+37258160799"><h4>+372 581 607 99</h4></a>
</div>
</div>
<div class="fb-page" data-href="https://www.facebook.com/lapikudhelpdesk" data-width="260" data-small-header="false"
data-adapt-container-width="false" data-hide-cover="false" data-show-facepile="false">
<blockquote cite="https://www.facebook.com/lapikudhelpdesk" class="fb-xfbml-parse-ignore"><a
href="https://www.facebook.com/lapikudhelpdesk">Lapikud Helpdesk</a></blockquote>
</div>
</div>
</div>
<!--carousel support-->
<script src="https://cdn.jsdelivr.net/npm/siema@1.5.1/dist/siema.min.js"></script>
<script>
const mySiema = new Siema({
selector: '.siema',
duration: 500,
easing: 'ease-out',
perPage: 1,
startIndex: 0,
draggable: true,
multipleDrag: true,
threshold: 20,
loop: true,
});
// listen for keydown event
setInterval(() => mySiema.next(), 2500)
</script>
<!-- leafletjs map styles -->
<script src="https://unpkg.com/leaflet@1.3.3/dist/leaflet.js"
integrity="sha512-tAGcCfR4Sc5ZP5ZoVz0quoZDYX5aCtEm/eu1KhSLj2c9eFrylXZknQYmxUssFaVJKvvc0dJQixhGjG2yXWiV9Q=="
crossorigin=""></script>
<script>
var map = L.map('map').setView([59.396342, 24.668718], 16);
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
}).addTo(map);
L.marker([59.396342, 24.668718]).addTo(map)
.openPopup();
</script>
{% include pages/helpdesk.html %}

View File

@@ -3,29 +3,6 @@ layout: default
title: History - Lapikud
language: en
---
{% assign locale = site.data.localisation.history[page.language] %}
{% include pages/history.html %}
<div class="page" id="history">
<h1>{{ locale.history_HistoryHeading }}</h1>
<p>{{ locale.history_HistoryParagraph }}</p>
<h1 class="centered-text">{{ locale.history_HistoryPrevBoards }}</h1>
{% for management in site.data.past_management %}
<div class="management-for-year">
<h2 class="centered-text">{{management.year}}</h2>
<div class="year">
{% for member in management.members %}
<div class="person">
<div class="img-container">
<img src="{{ "/assets/past-management-images/optimised/" | append: member.image }}" alt="{{ member.name }}">
</div>
<h5 class="centered-text">{{ member.name }}</h5>
</div>
{% endfor %}
</div>
</div>
{% endfor %}
</div>

View File

@@ -3,78 +3,4 @@ layout: default
title: Lapikud
language: en
---
{% assign locale = site.data.localisation.index[page.language] %}
<!-- home -->
<section class="container home">
<div class="logo_container">
<img class="logo" src="{{ "/assets/logo.svg " | relative_url }}">
</div>
<!-- three icons -->
<div class="row row-center lg-icon-container">
<div class="column">
<svg class=lg-icon height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="M7 2v11h3v9l7-12h-4l4-8z"/>
</svg>
<div>
<h3>{{ locale.index_ForStudentHeader }}</h3>
<p>{{ locale.index_ForStudentDesc }}</p>
<p><a href="/student">{{ locale.index_ForStudentLink }}</a></p>
</div>
</div>
<div class="column">
<svg class=lg-icon height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path
d="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.23-.09-.49 0-.61.22l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98s.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.12.22.39.3.61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23.09.49 0 .61-.22l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"/>
</svg>
<div>
<h3>{{ locale.index_HelpdeskHeader }}</h3>
<p>{{ locale.index_HelpdeskDesc }}</p>
<p><a href="/helpdesk">{{ locale.index_HelpdeskLink }}</a></p>
</div>
</div>
<div class="column">
<svg class=lg-icon height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path
d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"/>
</svg>
<div>
<h3>{{ locale.index_ForBusinessesHeader }}</h3>
<p>{{ locale.index_ForBusinessesDesc }}</p>
<p><a href="/ourwork">{{ locale.index_ForBusinessesLink }}</a></p>
</div>
</div>
</div>
<div class="description">
<h1>{{ locale.index_WhoWeHeader }}</h1>
<p>
{{ locale.index_WhoWeDesc }}
</p>
<h1>{{ locale.index_WhatDoHeader }}</h1>
<p>
{{ locale.index_WhatDoDesc }}
<p>
</div>
<div class="partners">
<h1>{{ locale.index_Partners }}</h1>
<div id="partners-container">
{% for partner in site.data.partners %}
<a href="{{ partner.url }}" target="_blank" rel="noopener noreferrer">
<img src="{{ "/assets/partners/" | append: partner.image }}" alt="{{ partner.name }}">
{% if partner.additionalText != null %}
<h4>{{ partner.additionalText}}</h4>
{% endif %}
</a>
{% endfor %}
</div>
</div>
</section>
{% include pages/index.html %}

View File

@@ -3,41 +3,4 @@ layout: default
title: Members - Lapikud
language: en
---
{% assign locale = site.data.localisation.members[page.language] %}
<div class="page" id="members">
<h3 class="centered-text">{{ locale.members_MembersHeading }}</h3>
<a href="/student" id="banner-container-link">
<h3 class="centered-text banner">
{{ locale.members_MembersJoin }}
</h3>
</a>
<div class="members-container">
<h3 class="centered-text">{{ locale.members_JuniorsHeading }}</h3>
<ul>
{% for member in site.data.members.junior%}
<li>{{ member }}</li>
{% endfor %}
</ul>
</div>
<div class="members-container">
<h3 class="centered-text">{{ locale.members_SeniorsHeading }}</h3>
<ul>
{% for member in site.data.members.senior %}
<li>{{ member }}</li>
{% endfor %}
</ul>
</div>
<div class="members-container">
<h3 class="centered-text">{{ locale.members_AlumniHeading }}</h3>
<ul>
{% for member in site.data.members.graduates %}
<li>{{ member }}</li>
{% endfor %}
</ul>
</div>
</div>
{% include pages/members.html %}

6
en/mentors.html Normal file
View File

@@ -0,0 +1,6 @@
---
layout: default
title: Mentors- Lapikud
language: en
---
{% include pages/mentors.html %}

View File

@@ -1,42 +1,6 @@
---
layout: default
title: Tehtud tööd - Lapikud
title: Previous works - Lapikud
language: en
---
{% assign locale = site.data.localisation.ourwork[page.language] %}
{% assign works = site.data.ourwork[page.language] %}
<div class="page">
<div id="ourwork-banner">
<h1 class="centered-text">{{ locale.ourwork_BannerHeading }}</h1>
<a href="/contact">
<h1 class="centered-text banner">
{{ locale.ourwork_BannerButton }}
</h1>
</a>
</div>
<h1 class="centered-text">{{ locale.ourwork_DoneWorks }}</h1>
<div id="ourwork-done">
{% for work in works %}
<div class="work-item">
<div class="description">
<h2>{{ work.title }}</h2>
<p>{{ work.description }}</p>
</div>
{% if work.url == null %}
<div class="thumbnail">
<img src="{{ "/assets/ourwork-images/optimised/" | append: work.photo }}" alt="{{ work.title }}">
</div>
{% else %}
<a class="thumbnail" href="{{ work.url }}" target="_blank" rel="noopener noreferrer">
<img src="{{ "/assets/ourwork-images/optimised/" | append: work.photo }}" alt="{{ work.title }}">
</a>
{% endif %}
</div>
{% endfor %}
</div>
</div>
{% include pages/ourwork.html %}

View File

@@ -3,48 +3,4 @@ layout: default
title: For student - Lapikud
language: en
---
{% assign locale = site.data.localisation.student[page.language] %}
<div class="page">
<div class="activities-info">
<div class="desc">
<h1>{{ locale.student_WhatWeDoHeading }}</h1>
<p>{{ locale.student_WhatWeDoDesc1 }}</p>
<p>{{ locale.student_WhatWeDoDesc2 }}</p>
</div>
<div class="promo-image">
<img src="/assets/student-images/image_1.jpg">
</div>
</div>
<div class="activities-info">
<div class="desc">
<h1>{{ locale.student_WhatYouDoHeading }}</h1>
<p>{{ locale.student_WhatYouDoDesc1 }}</p>
<p>{{ locale.student_WhatYouDoDesc2 }}</p>
<p>{{ locale.student_WhatYouDoDesc3 }}</p>
<p>{{ locale.student_WhatYouDoDesc4 }}</p>
<p>{{ locale.student_WhatYouDoDesc5 }}</p>
<a href="/join">
<h3 class="centered-text banner">{{ locale.student_WhatYouDoJoin }}</h3>
</a>
</div>
<div class="promo-image">
<img src="/assets/student-images/image_2.jpg">
</div>
</div>
<div class="activities-info">
<div class="desc">
<h1>{{ locale.student_MentorsHeading }}</h1>
<p>
{{ locale.student_MentorsDesc }}
</p>
<a href="/mentors">
<h3 class="centered-text banner">{{ locale.student_MentorsMeet }}</h3>
</a>
</div>
<div class="promo-image" href="/mentors">
<img src="/assets/student-images/image_3.jpg">
</div>
</div>
</div>
{% include pages/student.html %}