From 87ad0f8a96022d569f4e2a3c06d8b033ffa0f372 Mon Sep 17 00:00:00 2001
From: Gabriel Copat <copatg@cardiff.ac.uk>
Date: Wed, 13 Dec 2023 10:42:38 +0000
Subject: [PATCH] Fixed logout button functionality
---
src/main/resources/static/css/login.css | 15 +++++++++++----
src/main/resources/static/css/mobile-style.css | 2 --
.../resources/templates/fragments/banners.html | 5 ++++-
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/static/css/login.css b/src/main/resources/static/css/login.css
index f0e1bb74..88bfc63e 100644
--- a/src/main/resources/static/css/login.css
+++ b/src/main/resources/static/css/login.css
@@ -310,13 +310,13 @@ and (max-device-width: 640px) {
}
.container.active .sign-in{
- transform: translateY(0);
+ transform: translateY(-100%);
opacity: 0;
z-index: -1;
}
.container.active .sign-up{
opacity: 1;
- z-index: 5;
+ z-index: 10;
transform: translateY(100%);
}
@@ -355,7 +355,14 @@ and (max-device-width: 640px) {
}
}
.alert {
- color: var(--error-colour);
- text-shadow: var(--error-colour) 0 0 10px;
+ color: var(--alert-colour, black);
+ text-shadow: 0 0 10px var(--alert-colour, black);
+}
+
+.alert-error {
+ --alert-colour: red;
+}
+.alert-success {
+ --alert-colour: green;
}
diff --git a/src/main/resources/static/css/mobile-style.css b/src/main/resources/static/css/mobile-style.css
index cba00c1c..6be7d20c 100644
--- a/src/main/resources/static/css/mobile-style.css
+++ b/src/main/resources/static/css/mobile-style.css
@@ -170,8 +170,6 @@ and (max-device-width: 640px) {
aspect-ratio: 1;
}
}
-
-
}
diff --git a/src/main/resources/templates/fragments/banners.html b/src/main/resources/templates/fragments/banners.html
index 2a56ff54..c336ba3b 100644
--- a/src/main/resources/templates/fragments/banners.html
+++ b/src/main/resources/templates/fragments/banners.html
@@ -15,7 +15,10 @@
<a href="/login" class="nav-links">Log In</a>
</li>
<li class="nav-li li-last" th:if="${#authentication.principal}!=anonymousUser">
- <a href="/logout" class="nav-links">Log Out</a>
+ <a class="nav-links" href="javascript: document.logoutForm.submit()" role="menuitem">Log Out</a>
+ <form name="logoutForm" th:action="@{/logout}" method="post" th:hidden="true">
+ <input hidden type="submit" value="Sign Out"/>
+ </form>
</li>
</ul>
</nav>
--
GitLab