From 804d8b5bcc9489639c1eb4ccb7c01f2237a3bfca Mon Sep 17 00:00:00 2001
From: "Mart-Erki.Noumees" <mart-erki.noumees@ttu.ee>
Date: Wed, 3 Oct 2018 13:44:27 +0300
Subject: [PATCH] Fixed linking to join, and english page of statute(still in
 estonian). Grammar fixes on index.

---
 _data/i18n/index.yml         | 2 +-
 _data/i18n/pages.yml         | 6 ++++++
 _includes/pages/aboutus.html | 2 +-
 _includes/pages/join.html    | 3 +++
 _includes/pages/student.html | 2 +-
 en/join.html                 | 7 +++++++
 join.html                    | 7 +++----
 liitu.html                   | 1 -
 8 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 _includes/pages/join.html
 create mode 100644 en/join.html
 delete mode 120000 liitu.html

diff --git a/_data/i18n/index.yml b/_data/i18n/index.yml
index f0690d4..415cdb0 100644
--- a/_data/i18n/index.yml
+++ b/_data/i18n/index.yml
@@ -8,7 +8,7 @@ en:
   index_HelpdeskLink        : "Pricelist ->"
 
   index_ForBusinessesHeading: "For Businesses"
-  index_ForBusinessesDesc   : "We'll help to make your ideas reality"
+  index_ForBusinessesDesc   : "We'll help to bring your ideas into reality"
   index_ForBusinessesLink   : "Previous works ->"
 
   index_WhoWeHeading        : "Who are we?"
diff --git a/_data/i18n/pages.yml b/_data/i18n/pages.yml
index 9e2fe14..9f2dcba 100644
--- a/_data/i18n/pages.yml
+++ b/_data/i18n/pages.yml
@@ -35,6 +35,9 @@ all:
     striim:
       name  : "Striim"
       url   : "/striim/"
+    join:
+      name  : "Liitu"
+      url   : "/join/"
 
   en:
     home:
@@ -72,6 +75,9 @@ all:
     striim:
       name  : "Striim"
       url   : "/en/striim/"
+    join:
+      name  : "Join"
+      url   : "/en/join/"
 
 
 # For iterating through and populating navbar
diff --git a/_includes/pages/aboutus.html b/_includes/pages/aboutus.html
index 897ba97..2a293e1 100644
--- a/_includes/pages/aboutus.html
+++ b/_includes/pages/aboutus.html
@@ -8,7 +8,7 @@
         <div class="column">
             <div>
                 <h3>{{ locale.aboutus_StatuteHeading }}</h3>
-                <p><a href="/statute/">{{ locale.aboutus_StatuteLink }}</a></p>
+                <p><a href="{{ subpages.statute.url }}">{{ locale.aboutus_StatuteLink }}</a></p>
             </div>
         </div>
         <div class="column">
diff --git a/_includes/pages/join.html b/_includes/pages/join.html
new file mode 100644
index 0000000..d7131e5
--- /dev/null
+++ b/_includes/pages/join.html
@@ -0,0 +1,3 @@
+<div class="page">
+    <iframe src="https://docs.google.com/forms/d/e/1FAIpQLSf4wOLqTUROBh06KBGjqXVTehO815PZUiCJnXfIjLwX9yZvXw/viewform?embedded=true" width="100%" height="850" frameborder="0" marginheight="0" marginwidth="0">Laadimine...</iframe>
+</div>
diff --git a/_includes/pages/student.html b/_includes/pages/student.html
index 0f6784a..3ea63a6 100644
--- a/_includes/pages/student.html
+++ b/_includes/pages/student.html
@@ -19,7 +19,7 @@
             <p>{{ locale.student_WhatYouDoDesc3 }}</p>
             <p>{{ locale.student_WhatYouDoDesc4 }}</p>
             <p>{{ locale.student_WhatYouDoDesc5 }}</p>
-            <a href="/join">
+            <a href="{{ site.data.i18n.pages.all[page.language].join.url }}">
                 <h3 class="centered-text banner">{{ locale.student_WhatYouDoJoin }}</h3>
             </a>
         </div>
diff --git a/en/join.html b/en/join.html
new file mode 100644
index 0000000..ddbf0f8
--- /dev/null
+++ b/en/join.html
@@ -0,0 +1,7 @@
+---
+layout: default
+title: Join - Lapikud
+language: en
+tag: join
+---
+{% include pages/join.html %}
diff --git a/join.html b/join.html
index 0166b92..4ac05d2 100644
--- a/join.html
+++ b/join.html
@@ -1,8 +1,7 @@
 ---
 layout: default
 title: Liitu - Lapikud
+language: ee
+tag: join
 ---
-
-<div class="page">
-<iframe src="https://docs.google.com/forms/d/e/1FAIpQLSf4wOLqTUROBh06KBGjqXVTehO815PZUiCJnXfIjLwX9yZvXw/viewform?embedded=true" width="100%" height="850" frameborder="0" marginheight="0" marginwidth="0">Laadimine...</iframe>
-</div>
+{% include pages/join.html %}
diff --git a/liitu.html b/liitu.html
deleted file mode 120000
index 62de690..0000000
--- a/liitu.html
+++ /dev/null
@@ -1 +0,0 @@
-join.html
\ No newline at end of file