From d92a4218dd6678261f17b4b8a3ab0838d6241ea1 Mon Sep 17 00:00:00 2001
From: Antoine Rey <antoine.rey@gmail.com>
Date: Thu, 15 Feb 2018 17:44:48 +0100
Subject: [PATCH] Add placeholder YYYY-MM-DD for date input field
Closes gh-303
---
src/main/resources/templates/fragments/inputField.html | 10 +++++++---
.../templates/owners/createOrUpdateOwnerForm.html | 10 +++++-----
.../templates/pets/createOrUpdatePetForm.html | 4 ++--
.../templates/pets/createOrUpdateVisitForm.html | 4 ++--
4 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/templates/fragments/inputField.html b/src/main/resources/templates/fragments/inputField.html
index 7cef1ee..c3373be 100644
--- a/src/main/resources/templates/fragments/inputField.html
+++ b/src/main/resources/templates/fragments/inputField.html
@@ -1,14 +1,18 @@
<html>
<body>
<form>
- <th:block th:fragment="input (label, name)">
+ <th:block th:fragment="input (label, name, type)">
<div th:with="valid=${!#fields.hasErrors(name)}"
th:class="${'form-group' + (valid ? '' : ' has-error')}"
class="form-group">
<label class="col-sm-2 control-label" th:text="${label}">Label</label>
<div class="col-sm-10">
- <input class="form-control" type="text"
- th:field="*{__${name}__}" />
+ <div th:switch="${type}">
+ <input th:case="'text'" class="form-control" type="text" th:field="*{__${name}__}" />
+ <input th:case="'date'" class="form-control" type="text" th:field="*{__${name}__}"
+ placeholder="YYYY-MM-DD" title="Enter a date in this format: YYYY-MM-DD"
+ pattern="(?:19|20)[0-9]{2}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-9])|(?:(?!02)(?:0[1-9]|1[0-2])-(?:30))|(?:(?:0[13578]|1[02])-31))"/>
+ </div>
<span th:if="${valid}"
class="glyphicon glyphicon-ok form-control-feedback"
aria-hidden="true"></span>
diff --git a/src/main/resources/templates/owners/createOrUpdateOwnerForm.html b/src/main/resources/templates/owners/createOrUpdateOwnerForm.html
index a34a39c..ca22d9d 100644
--- a/src/main/resources/templates/owners/createOrUpdateOwnerForm.html
+++ b/src/main/resources/templates/owners/createOrUpdateOwnerForm.html
@@ -7,15 +7,15 @@
<form th:object="${owner}" class="form-horizontal" id="add-owner-form" method="post">
<div class="form-group has-feedback">
<input
- th:replace="~{fragments/inputField :: input ('First Name', 'firstName')}" />
+ th:replace="~{fragments/inputField :: input ('First Name', 'firstName', 'text')}" />
<input
- th:replace="~{fragments/inputField :: input ('Last Name', 'lastName')}" />
+ th:replace="~{fragments/inputField :: input ('Last Name', 'lastName', 'text')}" />
<input
- th:replace="~{fragments/inputField :: input ('Address', 'address')}" />
+ th:replace="~{fragments/inputField :: input ('Address', 'address', 'text')}" />
<input
- th:replace="~{fragments/inputField :: input ('City', 'city')}" />
+ th:replace="~{fragments/inputField :: input ('City', 'city', 'text')}" />
<input
- th:replace="~{fragments/inputField :: input ('Telephone', 'telephone')}" />
+ th:replace="~{fragments/inputField :: input ('Telephone', 'telephone', 'text')}" />
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
diff --git a/src/main/resources/templates/pets/createOrUpdatePetForm.html b/src/main/resources/templates/pets/createOrUpdatePetForm.html
index e4726e1..a0c182a 100644
--- a/src/main/resources/templates/pets/createOrUpdatePetForm.html
+++ b/src/main/resources/templates/pets/createOrUpdatePetForm.html
@@ -17,9 +17,9 @@
</div>
</div>
<input
- th:replace="~{fragments/inputField :: input ('Name', 'name')}" />
+ th:replace="~{fragments/inputField :: input ('Name', 'name', 'text')}" />
<input
- th:replace="~{fragments/inputField :: input ('Birth Date', 'birthDate')}" />
+ th:replace="~{fragments/inputField :: input ('Birth Date', 'birthDate', 'date')}" />
<input
th:replace="~{fragments/selectField :: select ('Type', 'type', ${types})}" />
</div>
diff --git a/src/main/resources/templates/pets/createOrUpdateVisitForm.html b/src/main/resources/templates/pets/createOrUpdateVisitForm.html
index 26a7137..4401d36 100644
--- a/src/main/resources/templates/pets/createOrUpdateVisitForm.html
+++ b/src/main/resources/templates/pets/createOrUpdateVisitForm.html
@@ -31,9 +31,9 @@
<form th:object="${visit}" class="form-horizontal" method="post">
<div class="form-group has-feedback">
<input
- th:replace="~{fragments/inputField :: input ('Date', 'date')}" />
+ th:replace="~{fragments/inputField :: input ('Date', 'date', 'date')}" />
<input
- th:replace="~{fragments/inputField :: input ('Description', 'description')}" />
+ th:replace="~{fragments/inputField :: input ('Description', 'description', 'text')}" />
</div>
<div class="form-group">
--
GitLab