diff --git a/src/main/resources/templates/errors/alreadyVoted.html b/src/main/resources/templates/errors/alreadyVoted.html index bcad6ee..e6cb039 100644 --- a/src/main/resources/templates/errors/alreadyVoted.html +++ b/src/main/resources/templates/errors/alreadyVoted.html @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@

Jeder darf nur einmal abstimmen!

- Return to Login-Site + Return to Login-Site \ No newline at end of file diff --git a/src/main/resources/templates/errors/alreadyVotedForMotto.html b/src/main/resources/templates/errors/alreadyVotedForMotto.html index e69de29..572e139 100644 --- a/src/main/resources/templates/errors/alreadyVotedForMotto.html +++ b/src/main/resources/templates/errors/alreadyVotedForMotto.html @@ -0,0 +1,14 @@ + + + + + + Title + + + +

Du hast deine Motto schon gewählt!

+ Return to Login-Site + + + \ No newline at end of file diff --git a/src/main/resources/templates/errors/alreadysubmittedcandidates.html b/src/main/resources/templates/errors/alreadysubmittedcandidates.html index d9001b7..e976e5b 100644 --- a/src/main/resources/templates/errors/alreadysubmittedcandidates.html +++ b/src/main/resources/templates/errors/alreadysubmittedcandidates.html @@ -1,10 +1,14 @@ + Title - + +

Du hast deine Kandidaten schon vorgeschlagen!

+ Return to Login-Site + \ No newline at end of file diff --git a/src/main/resources/templates/errors/falseInput.html b/src/main/resources/templates/errors/falseInput.html index e69de29..8c17df0 100644 --- a/src/main/resources/templates/errors/falseInput.html +++ b/src/main/resources/templates/errors/falseInput.html @@ -0,0 +1,14 @@ + + + + + + Abizeitung 2020/2021 Voting + + + +

Der eingegebene Name entspricht nicht den Vorgaben

+ Return to Login-Site + + + \ No newline at end of file diff --git a/src/main/resources/templates/errors/notRegistered.html b/src/main/resources/templates/errors/notRegistered.html index beec180..6ef3123 100644 --- a/src/main/resources/templates/errors/notRegistered.html +++ b/src/main/resources/templates/errors/notRegistered.html @@ -8,7 +8,7 @@

Überprüfe noch einmal die eingegebene E-Mail Adresse Sollte der Fall eintreten, dass du deine E-Mail Adresse richtig eingegeben hast und du Schüler der Q2 bist, schreibe eine Mail an simon.bussmann@adolfinum.de mit dem Betreff LoginFehler

- Try again + Return to Login-Site \ No newline at end of file diff --git a/src/main/resources/templates/start.html b/src/main/resources/templates/start.html index 42bf0c0..011229f 100644 --- a/src/main/resources/templates/start.html +++ b/src/main/resources/templates/start.html @@ -18,7 +18,7 @@ function test() { let input_field = document.getElementById("email_input"); let input = input_field.value; - if (!input.match("[a-z]+\\.[a-z]+@adolfinum+\\.de$")) { + if (!input.trim().match("[a-z]+\\.[a-z]+@adolfinum+\\.de$")) { input_field.value = ""; alert("Die Email-Adresse \"" + input + "\" entspricht nicht den Vorgaben"); }