From 5c2be3ea61f730b1f80e6bab802b926cc52ca866 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Tue, 7 Dec 2021 15:04:33 +0100
Subject: [PATCH] =?UTF-8?q?Revert=20"=E2=80=9Esrc/main/webapp/reset-passwo?=
 =?UTF-8?q?rd.jsp=E2=80=9C=20=C3=A4ndern"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 94fd048905de68a1d534166a12e1f03df3b2cdd9.
---
 src/main/webapp/reset-password.jsp | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/reset-password.jsp b/src/main/webapp/reset-password.jsp
index a41ef3b..5b03ccf 100644
--- a/src/main/webapp/reset-password.jsp
+++ b/src/main/webapp/reset-password.jsp
@@ -10,19 +10,17 @@
 	<c:url var="formaction" value="/passwordreset" />
     <div class="container">
     	<h1 class="col-sm-offset-3"><fmt:message key="password.reset.title"/></h1>
-		</br>
     	<c:if test="${ not empty errormessage }">
 			<div class="alert alert-error col-sm-offset-3">
 			  <a class="close" data-dismiss="alert">×</a>
 			  <strong><fmt:message key="password.error.title"/></strong> ${errormessage}
 			</div>
 		</c:if>
-
-		<label for="loginoremail" class="col-sm-offset-3 control-label"><fmt:message key="password.reset.loginoremail"/></label> 
     	<div class="control-group">
 			<form class="form-horizontal" method="post" action="${formaction}">
-				<fieldset class="col-sm-offset-3">
+				<fieldset class="col-sm-12">
 					<div class="form-group">
+						<label for="login" class="col-sm-3 control-label"><fmt:message key="password.reset.loginoremail"/></label> 
 						<div class="col-sm-5">
 							<input 
 								type="text" class="form-control" id="loginoremail" name="loginoremail"
@@ -30,16 +28,6 @@
 						</div>
 					</div>
 				</fieldset>
-				<p class="col-sm-offset-3"><strong>Hinweis:</strong></br>
-				Gib hier den GWÖ-Account an, dessen Passwort geändert werden soll.</br>
-				Der Passwort-Link wird aber gesendet an die <strong>dort hinterlegte E-Mail-Adresse</strong></br>
-				(entweder Deine private E-Mail-Adresse oder eine persönliche ecogood-Adresse bei Service-Postfächern)
-				</p>
-				<p class="col-sm-offset-3"><strong>Note:</strong></br>
-				Enter the ECG username here, that shall have a password change.</br>
-				But keep in mind, that the password link will be sent <strong>to the external email-address</strong></br>
-				(which is either your private email-address or a personal ecogood address in case of a service-mailbox)
-				</p>
 		    	<button type="submit" class="col-sm-offset-3 btn btn-primary additional-space-top"><fmt:message key="password.reset.submit"/></button>
 			</form>
 		</div>