diff --git a/src/main/webapp/activate.jsp b/src/main/webapp/activate.jsp index 1dd380b..90b7a60 100644 --- a/src/main/webapp/activate.jsp +++ b/src/main/webapp/activate.jsp @@ -1,139 +1,80 @@ -<%-- - Created by IntelliJ IDEA. - User: sofia - Date: 20/10/2017 - Time: 3:43 μμ - To change this template use File | Settings | File Templates. ---%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - - OpenAIRE - Activation - - - - - - - - - - - - -
- - -
-
- -
+ + + + + +
+
+ +

Thank you for registering!

+
+ The next step is to activate your account.
- - -
-
-
+
+ An email with your username and an activation code + has been sent to you. Please use them in the form below to activate your account. + The activation code expires in 24 hours.
-
-
-
-
-
- -
-
-

Thank you for registering!
- The next step is to activate your account.

- An email with your username and an activation code has been sent to you. Please use them in the form below to activate your account.
- Note: the activation code expires in 24 hours. - - -

-
- -
-
- - - -
- ${message} - - ${msg_username_error} - -
-
- ${msg_activation_code_error} - -
-
-
- -
-
-
-
- - -
- -
-
- -
-
-
+
+
+ +
${message}
+ +
+
+
+
+ +
+
+ +
+
+ + ${msg_username_error} + +
- - -
-
-
-
-
-
- OpenAIRE -
-
-
Creative UNLESS OTHERWISE INDICATED, ALL MATERIALS CREATED BY THE OPENAIRE CONSORTIUM ARE LICENSED UNDER A CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE.
-
OPENAIRE IS POWERED BY D-NET.
-
-
- - -
-
-
-
+
+
+
+
+ +
+
+ +
+
+ + ${msg_activation_code_error} + +
- +
+ +
+
+ diff --git a/src/main/webapp/head.jsp b/src/main/webapp/head.jsp index 5ae8d91..85973c7 100644 --- a/src/main/webapp/head.jsp +++ b/src/main/webapp/head.jsp @@ -1,4 +1,5 @@ <%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> @@ -15,4 +16,7 @@ + + + \ No newline at end of file diff --git a/src/main/webapp/js/input.js b/src/main/webapp/js/input.js new file mode 100644 index 0000000..bf0b767 --- /dev/null +++ b/src/main/webapp/js/input.js @@ -0,0 +1,81 @@ +$(document).ready(function () { + let inputs = $('[input]').toArray(); + + $(window).click(function () { + blur(); + }); + + $.each(inputs, function (index, input) { + $(input).click(function (event) { + focus(input, index); + event.stopPropagation(); + }); + + isActive(input); + }); + + function isActive(input) { + let textField = getTextField(input); + let wrapper = getWrapper(input); + if(textField.val().length > 0) { + if (wrapper) { + wrapper.addClass('active'); + } + } + textField.on('input', function() { + if($(this).val().length > 0) { + wrapper.addClass('active'); + } else { + wrapper.removeClass('active'); + } + }) + } + + /** + * Focus current input and blur all the others in this page. + * */ + function focus(input, index) { + let textField = getTextField(input); + if(textField) { + textField.focus(); + let wrapper = getWrapper(input); + if (wrapper) { + wrapper.addClass('focused'); + } + } + blur(index); + } + + /** + * Blurs all inputs except this given index; + * */ + function blur(index = -1) { + $.each(inputs, function (j, input) { + let textField = getTextField(input); + if(textField && index !== j) { + textField.blur(); + let wrapper = getWrapper(input); + if(wrapper) { + wrapper.removeClass('focused'); + } + } + }); + } +}); + +function getWrapper(input) { + return $(input).find('.input-wrapper'); +} + + +/** + * Get the current textField + * Currently works for input and textarea + * */ +function getTextField(input) { + let textField = $(input).find('input'); + if(!textField) { + textField = $(input).find('textarea'); + } + return textField; +} \ No newline at end of file diff --git a/src/main/webapp/js/validation.js b/src/main/webapp/js/validation.js index 125efd7..bba4411 100644 --- a/src/main/webapp/js/validation.js +++ b/src/main/webapp/js/validation.js @@ -46,28 +46,25 @@ function validateForm() { // } // Check if username is filled - if($("#username").val() != undefined) { - if($.trim($("#username").val()).length <= 0) { - $("#username").addClass('uk-input aai-form-danger'); - $(".msg_username_error").show(); + let usernameInput = getTextField($("#username")); + if(usernameInput.val() !== undefined) { + let wrapper = getWrapper("#username"); + if($.trim(usernameInput.val()).length <= 0) { + wrapper.addClass('danger'); hasError = true; } else { - isUsernameFilled = true; - $(".msg_username_error").hide(); - $("#username").removeClass('aai-form-danger'); + wrapper.removeClass('danger'); } } - if($("#verification_code").val() != undefined) { - if($.trim($("#verification_code").val()).length <= 0) { - $("#verification_code").addClass('uk-input aai-form-danger'); - $(".msg_verification_code_error").show(); - $(".msg_activation_code_error").show(); + let verificationCodeInput = getTextField($("#verification_code")); + if(verificationCodeInput.val() !== undefined) { + let wrapper = getWrapper("#verification_code"); + if($.trim(verificationCodeInput.val()).length <= 0) { + wrapper.addClass('danger'); hasError = true; } else { - $(".msg_verification_code_error").hide(); - $(".msg_activation_code_error").hide(); - $("#verification_code").removeClass('aai-form-danger'); + wrapper.removeClass('danger'); } } @@ -230,10 +227,7 @@ function validatePassword(password) { } function confirm(first, second) { - if (first == second) - return true; - else - return false; + return first == second; } function loginForm(){