From 044ed6a9d34345e54778ef1795611a51402521c1 Mon Sep 17 00:00:00 2001
From: Joey Lai <joeylai96@hotmail.com>
Date: Thu, 2 Feb 2017 13:19:39 +0100
Subject: [PATCH] Added noscript

---
 website/public/styles/index.css         | 8 +++++++-
 website/queries/checkInput.php          | 2 +-
 website/views/facebookRegisterModal.php | 3 +--
 website/views/login-view.php            | 7 +++++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/website/public/styles/index.css b/website/public/styles/index.css
index 196485e..c7a0aa8 100644
--- a/website/public/styles/index.css
+++ b/website/public/styles/index.css
@@ -133,6 +133,12 @@ label {
     color: red;
 }
 
+.login_containerNoscript {
+    padding: 4px;
+    text-align: center;
+    color: red;
+}
+
 @keyframes animatezoom {
     from {transform: scale(0)}
     to {transform: scale(1)}
@@ -150,7 +156,7 @@ label {
     margin: 16px auto;
     overflow-y: auto;
     padding: 20px;
-    width: 600px;
+    width: 650px;
 }
 
 select{
diff --git a/website/queries/checkInput.php b/website/queries/checkInput.php
index 8722418..69274ce 100644
--- a/website/queries/checkInput.php
+++ b/website/queries/checkInput.php
@@ -132,7 +132,7 @@ function validateFBEmail($variable){
     } else if (!filter_var($variable, FILTER_VALIDATE_EMAIL)) {
         throw new emailException("Geldige email invullen");
     } else if (getExistingFBEmail() == 1){
-        throw new emailException("Email bestaal al!");
+        throw new emailException("Uw email wordt al gebruikt voor een ander account!");
     } else if (strlen($variable) > 255) {
         throw new emailException("Mag maximaal 50 karakters!");
     }
diff --git a/website/views/facebookRegisterModal.php b/website/views/facebookRegisterModal.php
index 7db44b0..7271d63 100644
--- a/website/views/facebookRegisterModal.php
+++ b/website/views/facebookRegisterModal.php
@@ -55,7 +55,6 @@
                     *<span class="error"> <?php echo $fbConfirmpasswordErr;?></span>
                 </div>
 
-
                 <?php if(empty($userBday)) { ?>
                 <!-- Register birthday -->
                 <div class="login_containerregister">
@@ -67,6 +66,7 @@
                 </div>
                 <?php } ?>
             </div>
+            *<span class="error"> <?php echo $fbEmailErr;?></span>
             <div class="modal-footer">
                 <button type="submit"
                         value="fbRegister"
@@ -77,7 +77,6 @@
             </div>
         </div>
 
-
         <input type="hidden"
                name="fbName"
                value="<?php echo $fbName ?>">
diff --git a/website/views/login-view.php b/website/views/login-view.php
index 4f85b0a..98ce71c 100644
--- a/website/views/login-view.php
+++ b/website/views/login-view.php
@@ -1,3 +1,9 @@
+<div class="login_containerNoscript">
+    <noscript>
+        <a href="http://www.enable-javascript.com/nl/" target="_blank">Om deze site te gebruiken is het noodzakelijk om Javascript aan te zetten.
+            Klikt hier voor de instructies om je Javascript te activeren</a>.
+    </noscript>
+</div>
 <div>
     <img style="width:50%;margin-left:25%"
          src="/img/top-logo.png"
@@ -67,6 +73,7 @@
 ?>
 
 <script>
+
 // Get the modal
 var modal = document.getElementById('myModal');
 var registerModal = document.getElementById('registerModal');