From 3cbe299f1c4c069fbabab5f404fe0f5ddb94da30 Mon Sep 17 00:00:00 2001
From: Pekka Helenius <fincer89@hotmail.com>
Date: Tue, 6 Oct 2020 12:31:30 +0300
Subject: [PATCH] Un-hardcode more messages; update web forms

Signed-off-by: Pekka Helenius <fincer89@hotmail.com>
---
 .../src/main/resources/messages.properties    | 14 ++++-
 .../templates/fragments/bookfields.html       | 51 ++++++++++++++-----
 .../templates/fragments/loginout.html         | 43 +++++++++++++++-
 3 files changed, 93 insertions(+), 15 deletions(-)

diff --git a/bookstore/src/main/resources/messages.properties b/bookstore/src/main/resources/messages.properties
index 46fc3d8..4f95392 100644
--- a/bookstore/src/main/resources/messages.properties
+++ b/bookstore/src/main/resources/messages.properties
@@ -45,7 +45,14 @@ book.error.id.invalid              = Wrong book
 
 book.null.author                   = Unknown
 book.null.category                 = None
-                        
+
+book.placeholder.title             = Book title
+book.placeholder.author.firstname  = Book author first name
+book.placeholder.author.lastname   = Book author last name
+book.placeholder.isbn              = Book ISBN code
+book.placeholder.year              = Book publication year \(\YYYY\)
+book.placeholder.price             = 0.00
+  
 page.title.browser.list            = Bookstore page
 page.title.browser.add             = Add book
 page.title.browser.edit            = Update book
@@ -98,6 +105,11 @@ page.text.apiref.link              = Link
 
 page.text.error                    = Error while processing your request
 
+page.auth.failure                  = Authentication failure\!
+
+auth.field.placeholder.username    = User name
+auth.field.placeholder.password    = Password
+
 button.book.add                    = Add book
 button.book.edit                   = Update book
 
diff --git a/bookstore/src/main/resources/templates/fragments/bookfields.html b/bookstore/src/main/resources/templates/fragments/bookfields.html
index 97acb72..d67713b 100644
--- a/bookstore/src/main/resources/templates/fragments/bookfields.html
+++ b/bookstore/src/main/resources/templates/fragments/bookfields.html
@@ -22,7 +22,10 @@
 						th:text="${#messages.msgOrNull('book.author.firstName')} ?: 'book.author.firstName'">
 						book.author.firstName
 						</label>
-						<input class="form-control" type="text" th:field="*{author.firstName}"  placeholder="Book author first name"/>
+						<input class="form-control" type="text" th:field="*{author.firstName}"
+						placeholder="Book author first name"
+						th:placeholder="#{book.placeholder.author.firstname}"
+						/>
 
 						<small class="form-text text-muted"
 						th:text="${#messages.msgOrNull('book.desc.set.author.firstname')} ?: 'book.desc.set.author.firstname'">
@@ -40,7 +43,9 @@
 						</small>
 
 						<div class="alert alert-danger mt-2" th:if="${#fields.hasErrors('author.firstName')}"
-						th:errors="*{author.firstName}">Invalid author first name value</div>
+						th:errors="*{author.firstName}">
+						Invalid author first name value
+						</div>
 					</div>
 
 					<div class="col">
@@ -48,7 +53,10 @@
 						th:text="${#messages.msgOrNull('book.author.lastName')} ?: 'book.author.lastName'">
 						book.author.lastName
 						</label>
-						<input class="form-control" type="text" th:field="*{author.lastName}"  placeholder="Book author last name"/>
+						<input class="form-control" type="text" th:field="*{author.lastName}"
+						placeholder="Book author last name"
+						th:placeholder="#{book.placeholder.author.lastname}"
+						/>
 
 						<small class="form-text text-muted"
 						th:text="${#messages.msgOrNull('book.desc.set.author.lastname')} ?: 'book.desc.set.author.lastname'">
@@ -66,7 +74,9 @@
 						</small>
 
 						<div class="alert alert-danger mt-2" th:if="${#fields.hasErrors('author.lastName')}"
-						th:errors="*{author.lastName}">Invalid author last name value</div>
+						th:errors="*{author.lastName}">
+						Invalid author last name value
+						</div>
 					</div>
 				</div>
 			</div>
@@ -76,7 +86,10 @@
 				th:text="${#messages.msgOrNull('book.title')} ?: 'book.title'">
 				book.title
 				</label>
-				<input class="form-control" type="text" th:field="*{title}" placeholder="Book title"/>
+				<input class="form-control" type="text" th:field="*{title}"
+				placeholder="Book title"
+				th:placeholder="#{book.placeholder.title}"
+				/>
 
 				<small class="form-text text-muted"
 				th:text="${#messages.msgOrNull('book.desc.set.title')} ?: 'book.desc.set.title'">
@@ -94,7 +107,9 @@
 				</small>
 
 				<div class="alert alert-danger mt-2" th:if="${#fields.hasErrors('title')}"
-				th:errors="*{title}">Invalid title value</div>
+				th:errors="*{title}">
+				Invalid title value
+				</div>
 			</div>
 
 			<div class="form-group bookform-section">
@@ -102,7 +117,9 @@
 				th:text="${#messages.msgOrNull('book.isbn')} ?: 'book.isbn'">
 				book.isbn
 				</label>
-				<input class="form-control" type="text" th:field="*{isbn}" placeholder="Book ISBN code"/>
+				<input class="form-control" type="text" th:field="*{isbn}"
+				placeholder="Book ISBN code"
+				th:placeholder="#{book.placeholder.isbn}"/>
 
 				<small class="form-text text-muted"
 				th:text="${#messages.msgOrNull('book.desc.set.isbn')} ?: 'book.desc.set.isbn'">
@@ -120,7 +137,9 @@
 				</small>
 
 				<div class="alert alert-danger mt-2" th:if="${#fields.hasErrors('isbn')}"
-				th:errors="*{isbn}">Invalid ISBN code</div>
+				th:errors="*{isbn}">
+				Invalid ISBN code
+				</div>
 			</div>
 
 			<div class="form-group bookform-section">
@@ -128,7 +147,9 @@
 				th:text="${#messages.msgOrNull('book.year')} ?: 'book.year'">
 				book.year
 				</label>
-				<input class="form-control" type="text" th:field="*{year}" placeholder="Book publication year (YYYY)"/>
+				<input class="form-control" type="text" th:field="*{year}"
+				placeholder="Book publication year (YYYY)"
+				th:placeholder="#{book.placeholder.year}"/>
 
 				<small class="form-text text-muted"
 				th:text="${#messages.msgOrNull('book.desc.set.year')} ?: 'book.desc.set.year'">
@@ -146,7 +167,9 @@
 				</small>
 
 				<div class="alert alert-danger mt-2" th:if="${#fields.hasErrors('year')}"
-				th:errors="*{year}">Invalid year value</div>
+				th:errors="*{year}">
+				Invalid year value
+				</div>
 			</div>
 
 			<div class="form-group bookform-section" th:if="${#authorization.expression('hasAuthority(''MARKETING'')')}">
@@ -162,7 +185,9 @@
 					 	page.symbols.currency
 					 	</div>
 					 </div>
-					<input class="form-control" type="text" th:field="*{price}" placeholder="0.00"/>
+					<input class="form-control" type="text" th:field="*{price}"
+					placeholder="0.00"
+					th:placeholder="#{book.placeholder.price}"/>
 				</div>
 				<small class="form-text text-muted"
 				th:text="${#messages.msgOrNull('book.desc.set.price')} ?: 'book.desc.set.price'">
@@ -180,7 +205,9 @@
 				</small>
 
 				<div class="alert alert-danger mt-2" th:if="${#fields.hasErrors('price')}"
-				th:errors="*{price}">Invalid price value</div>
+				th:errors="*{price}">
+				Invalid price value
+				</div>
 			</div>
 
 			<div class="form-group bookform-section">
diff --git a/bookstore/src/main/resources/templates/fragments/loginout.html b/bookstore/src/main/resources/templates/fragments/loginout.html
index cb4b2a8..fd9ca23 100644
--- a/bookstore/src/main/resources/templates/fragments/loginout.html
+++ b/bookstore/src/main/resources/templates/fragments/loginout.html
@@ -8,6 +8,12 @@
 <body>
 	<th:block th:fragment="loginout">
 		<div id="bookstore-loginout">
+		
+			<!--/*
+			HTML element blocks when a user is authenticated
+
+			** START: logout elements **
+			*/-->
 			<div sec:authorize="isAuthenticated()">
 				<div>
 					<form th:action="@{__${logoutpage}__}" method="post">
@@ -23,15 +29,44 @@
 				page.text.list.authenticated httpServletRequest.remoteUser
 				</p>
 			</div>
+			<!--/*
+			** END: logout elements **
+			*/-->
+
+			<!--/*
+			HTML element blocks when a user is not authenticated
 
+			** START: login elements **
+			*/-->
 			<div sec:authorize="isAnonymous()">
 			
 				<form th:action="@{__${loginpage}__}" method="post">
 				
-					<input type="text" id="b_username" name="b_username" placeholder="User name">
+					<!--/*
+					Keep normal id field as fallback (i.e. for defining plain HTML CSS styles)
+					*/-->
+					<input type="text"
+					id="b_username"
+					th:id="${@environment.getProperty('auth.field.username')}"
+					th:name="${@environment.getProperty('auth.field.username')}"
+					placeholder="User name"
+					th:placeholder="#{auth.field.placeholder.username}"
+					/>
 					
-					<input type="password" id="b_password" name="b_password" placeholder="Password">
+					<!--/*
+					Keep normal id field as fallback (i.e. for defining plain HTML CSS styles)
+					*/-->
+					<input type="password"
+					id="b_password"
+					th:id="${@environment.getProperty('auth.field.password')}"
+					th:name="${@environment.getProperty('auth.field.password')}"
+					placeholder="Password"
+					th:placeholder="#{auth.field.placeholder.password}"
+					/>
 
+					<!--/*
+					This element is filled only when authentication fails
+					*/-->
 					<p th:text="${authfailure}"></p>
 
 					<div class="mt-2">
@@ -44,6 +79,10 @@
 				</form>
 				<th:block th:replace="fragments/devusers :: devusers"/>
 			</div>
+			<!--/*
+			** END: login elements **
+			*/-->
+
 		</div>
 	</th:block>
 </body>