From f5c4819fed19f0f567ec86d05889133244b46a1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20M=C3=BCller?= <daniel.mueller@uni-muenster.de>
Date: Mon, 2 Aug 2021 12:32:13 +0200
Subject: [PATCH] Form improvements

---
 pkg/siteacc/account/contact/template.go      | 4 ++--
 pkg/siteacc/account/edit/template.go         | 4 ++--
 pkg/siteacc/account/login/template.go        | 4 ++--
 pkg/siteacc/account/registration/template.go | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/siteacc/account/contact/template.go b/pkg/siteacc/account/contact/template.go
index 54a2ddfbb1..9a5b76e1be 100644
--- a/pkg/siteacc/account/contact/template.go
+++ b/pkg/siteacc/account/contact/template.go
@@ -87,7 +87,7 @@ const tplBody = `
 </div>
 <div>&nbsp;</div>
 <div>
-	<form id="form" method="POST" class="box container-inline" style="width: 100%;">
+	<form id="form" method="POST" class="box container-inline" style="width: 100%;" onSubmit="handleAction('contact'); return false;">
 		<div style="grid-row: 1;"><label for="subject">Subject: <span class="mandatory">*</span></label></div>
 		<div style="grid-row: 2; grid-column: 1 / span 2;"><input type="text" id="subject" name="subject" {{if .Params.Subject}}value="{{.Params.Subject}}" readonly{{end}}/></div>
 
@@ -101,7 +101,7 @@ const tplBody = `
 		</div>
 		<div style="grid-row: 5; grid-column: 2; text-align: right;">
 			<button type="reset">Reset</button>
-			<button type="button" style="font-weight: bold;" onClick="handleAction('contact');">Send</button>
+			<button type="submit" style="font-weight: bold;">Send</button>
 		</div>
 	</form>
 </div>
diff --git a/pkg/siteacc/account/edit/template.go b/pkg/siteacc/account/edit/template.go
index decdcddeef..283d1bd7f8 100644
--- a/pkg/siteacc/account/edit/template.go
+++ b/pkg/siteacc/account/edit/template.go
@@ -110,7 +110,7 @@ const tplBody = `
 </div>
 <div>&nbsp;</div>
 <div>
-	<form id="form" method="POST" class="box container-inline" style="width: 100%;">
+	<form id="form" method="POST" class="box container-inline" style="width: 100%;"  onSubmit="handleAction('update?invoker=user'); return false;">
 		<div style="grid-row: 1;"><label for="fname">First name: <span class="mandatory">*</span></label></div>
 		<div style="grid-row: 2;"><input type="text" id="fname" name="fname" value="{{.Account.FirstName}}"/></div>
 		<div style="grid-row: 1;"><label for="lname">Last name: <span class="mandatory">*</span></label></div>
@@ -149,7 +149,7 @@ const tplBody = `
 		</div>
 		<div style="grid-row: 12; grid-column: 2; text-align: right;">
 			<button type="reset">Reset</button>
-			<button type="button" style="font-weight: bold;" onClick="handleAction('update?invoker=user');">Save</button>
+			<button type="submit" style="font-weight: bold;">Save</button>
 		</div>
 	</form>
 </div>
diff --git a/pkg/siteacc/account/login/template.go b/pkg/siteacc/account/login/template.go
index 87a1bfc5ca..501ff5609d 100644
--- a/pkg/siteacc/account/login/template.go
+++ b/pkg/siteacc/account/login/template.go
@@ -113,7 +113,7 @@ const tplBody = `
 </div>
 <div>&nbsp;</div>
 <div>
-	<form id="form" method="POST" class="box container-inline" style="width: 100%;">
+	<form id="form" method="POST" class="box container-inline" style="width: 100%;" onSubmit="handleAction('login'); return false;">
 		<div style="grid-row: 1;"><label for="email">Email address: <span class="mandatory">*</span></label></div>
 		<div style="grid-row: 2;"><input type="text" id="email" name="email" placeholder="me@example.com"/></div>
 		<div style="grid-row: 1;"><label for="password">Password: <span class="mandatory">*</span></label></div>
@@ -127,7 +127,7 @@ const tplBody = `
 		</div>
 		<div style="grid-row: 4; grid-column: 2; text-align: right;">
 			<button type="reset">Reset</button>
-			<button type="button" style="font-weight: bold;" onClick="handleAction('login');">Login</button>
+			<button type="submit" style="font-weight: bold;">Login</button>
 		</div>	
 	</form>	
 </div>
diff --git a/pkg/siteacc/account/registration/template.go b/pkg/siteacc/account/registration/template.go
index 2ac4232b1a..69a92a00ff 100644
--- a/pkg/siteacc/account/registration/template.go
+++ b/pkg/siteacc/account/registration/template.go
@@ -121,7 +121,7 @@ const tplBody = `
 </div>
 <div>&nbsp;</div>
 <div>
-	<form id="form" method="POST" class="box container-inline" style="width: 100%;">
+	<form id="form" method="POST" class="box container-inline" style="width: 100%;" onSubmit="handleAction('create'); return false;">
 		<div style="grid-row: 1;"><label for="email">Email address: <span class="mandatory">*</span></label></div>
 		<div style="grid-row: 2;"><input type="text" id="email" name="email" placeholder="me@example.com"/></div>
 		<div style="grid-row: 3;"><label for="fname">First name: <span class="mandatory">*</span></label></div>
@@ -161,7 +161,7 @@ const tplBody = `
 		</div>
 		<div style="grid-row: 13; grid-column: 2; text-align: right;">
 			<button type="reset">Reset</button>
-			<button type="button" style="font-weight: bold;" onClick="handleAction('create');">Register</button>
+			<button type="submit" style="font-weight: bold;">Register</button>
 		</div>
 	</form>	
 </div>