Merge branch 'joey-testing' into 'master'

Joey testing

See merge request !182

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 ?>">

website/views/homeLoginRegister.php

@@ -7,7 +7,6 @@ $fbUsername = $fbPassword = $fbConfirmpassword = "";
 $fbUsernameErr = $fbPasswordErr = $fbConfirmpasswordErr = $fbEmailErr = $fbBdayErr = "";
 $fbCorrect = true;
 $fbName = $fbSurname = $fbBday = $fbEmail = $fbUserID = "";
-$bdayExist = false;
 
 // Register variables
 $name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = $confirmEmail = $captcha = $ip = "";

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"
@@ -62,11 +68,12 @@
 <!--Login with facebook button-->
 <?php
     if(!isset($acces_token)) {
-        echo '<div class="login_containerlogin"><a class="fbButton" href="' . $loginurl . '">login with Facebook!</a></div>';
+        echo '<div class="login_containerlogin"><a class="fbButton" href="' . $loginurl . '"><i class="fa fa-facebook-square"></i> login met     Facebook!</a></div>';
     }
 ?>
 
 <script>
+
 // Get the modal
 var modal = document.getElementById('myModal');
 var registerModal = document.getElementById('registerModal');

website/views/login_head.php

@@ -7,7 +7,11 @@
     <link rel="stylesheet"
           type="text/css"
           href="styles/index.css">
+    <link rel="stylesheet"
+          type="text/css"
+          href="styles/font-awesome.css">
     <script src="js/jquery.js"></script>
     <script src="js/registerAndLogin.js"></script>
     <script src='https://www.google.com/recaptcha/api.js'></script>
+
 </head>