Birth Certificate form changed to new standard

src/main/resources/templates/certificates/birthCertificate/form.html

@@ -28,10 +28,10 @@
             <p>Please Correct The Errors Below</p>
         </div>
 
-        <table style = "width:100%;">
+        <table style="width:100%;">
             <tr>
                 <td style="text-align: right;">
-                    <label for="id">Database Id &nbsp;<span style="color: rgb(255,0,0);">*</span></label>
+                    <label for="id"><span style="color: rgb(255,0,0);">*</span>Database Id :&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
                     <input class="form-control" id="id"
@@ -40,7 +40,7 @@
             </tr>
             <tr>
                 <td style="text-align: right;">
-                    <label for="certificateNumber">Certificate Number&nbsp;</label>
+                    <label for="certificateNumber">Certificate Number :&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
                     <input class="form-control" id="certificateNumber"
@@ -54,7 +54,7 @@
             </tr>
             <tr>
                 <td style="text-align: right;">
-                    <label for="certificateSource">Certificate Source&nbsp;</label>
+                    <label for="certificateSource">Certificate Source&nbsp;:&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
                     <div>
@@ -74,7 +74,7 @@
             </tr>
             <tr>
                 <td style="text-align: right;">
-                    <label for="certificateDate">Certificate Date (dd/mm/yyyy)&nbsp;</label>
+                    <label for="certificateDate">Certificate Date (dd/mm/yyyy) :&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
                     <input class="form-control" id="certificateDate"
@@ -86,9 +86,9 @@
                     </div>
                 </td>
             </tr>
-            <tr style = "border-bottom: 5px solid #ccc;">
+            <tr style="border-bottom: 5px solid #ccc;">
                 <td style="text-align: right;">
-                    <label for="certificateType">Certificate Type&nbsp;</label>
+                    <label for="certificateType">Certificate Type :&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
                     <div>
@@ -99,15 +99,15 @@
                                     th:value="${value}" th:text="${value.label}"></option>
                         </select>
                     </div>
-                <div th:if="${#fields.hasErrors('certificateType')}">
-                    <ul class="text-danger">
-                        <li th:each="err : ${#fields.errors('certificateType')}" th:text="${err}"/>
-                    </ul>
-                </div>
+                    <div th:if="${#fields.hasErrors('certificateType')}">
+                        <ul class="text-danger">
+                            <li th:each="err : ${#fields.errors('certificateType')}" th:text="${err}"/>
+                        </ul>
+                    </div>
             </tr>
             <tr>
                 <td style="text-align: right;">
-                    <label for="registrationAuthority">Registration Authority&nbsp;</label>
+                    <label for="registrationAuthority">Registration Authority :&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
                     <div>
@@ -128,12 +128,12 @@
             </tr>
             <tr>
                 <td style="text-align: right;">
-                    <label for="volume">Volume&nbsp;</label>
+                    <label for="volume">Volume :&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
                     <div>
                         <input class="volume" id="volume"
-                                th:field="*{volume}" type="text">
+                               th:field="*{volume}" type="text">
                         <div th:if="${#fields.hasErrors('volume')}">
                             <ul class="text-danger">
                                 <li th:each="err : ${#fields.errors('volume')}" th:text="${err}"/>
@@ -142,9 +142,9 @@
                     </div>
                 </td>
             </tr>
-            <tr style = "border-bottom: 5px solid #ccc;">
+            <tr style="border-bottom: 5px solid #ccc;">
                 <td style="text-align: right;">
-                    <label for="number">Number&nbsp;</label>
+                    <label for="number">Number :&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
                     <div>
@@ -160,7 +160,7 @@
             </tr>
             <tr>
                 <td style="text-align: right;">
-                    <label for="newBorn">NewBorn&nbsp;</label>
+                    <label for="newBorn">NewBorn :&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
                     <select id="newBorn" name="newBorn" th:field="*{newBorn}">
@@ -177,7 +177,7 @@
             </tr>
             <tr>
                 <td style="text-align: right;">
-                    <label for="sex">Sex&nbsp;</label>
+                    <label for="sex">Sex :&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
                     <select id="sex" style="width: 200px;" name="sex" th:field="*{sex}">
@@ -193,23 +193,23 @@
                 </td>
             </tr>
             <tr>
-            <td style="text-align: right;">
-                <label for="whenBorn">When Born (dd/mm/yyyy hh:mm)&nbsp;</label>
-            </td>
-            <td style="text-align: left;">
-                <div>
-                    <input class="whenBorn" id="whenBorn"
-                           th:field="*{whenBorn}" type="text">
-                    <div th:if="${#fields.hasErrors('whenBorn')}">
-                        <ul class="text-danger">
-                            <li th:each="err : ${#fields.errors('whenBorn')}" th:text="${err}"/>
-                        </ul>
+                <td style="text-align: right;">
+                    <label for="whenBorn">When Born (dd/mm/yyyy hh:mm) :&nbsp;</label>
+                </td>
+                <td style="text-align: left;">
+                    <div>
+                        <input class="whenBorn" id="whenBorn"
+                               th:field="*{whenBorn}" type="text">
+                        <div th:if="${#fields.hasErrors('whenBorn')}">
+                            <ul class="text-danger">
+                                <li th:each="err : ${#fields.errors('whenBorn')}" th:text="${err}"/>
+                            </ul>
+                        </div>
                     </div>
-                </div>
-            </td>
+                </td>
             <tr>
                 <td style="text-align: right; background-color: #C39BD3;">
-                    <label for="whereBorn">Where Born&nbsp;</label>
+                    <label for="whereBorn">Where Born :&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
                     <select id="whereBorn" name="whereBorn" th:field="*{whereBorn}">
@@ -225,24 +225,24 @@
                 </td>
             </tr>
             <tr>
-            <td style="text-align: right; background-color: #C39BD3;">
-                <label for="untrackedWhereBorn">Where Born&nbsp;(untracked)</label>
-            </td>
-            <td style="text-align: left;">
-                <div>
-                    <input class="untrackedWhereBorn" id="untrackedWhereBorn"
-                           th:field="*{untrackedWhereBorn}" type="text">
-                    <div th:if="${#fields.hasErrors('untrackedWhereBorn')}">
-                        <ul class="text-danger">
-                            <li th:each="err : ${#fields.errors('untrackedWhereBorn')}" th:text="${err}"/>
-                        </ul>
+                <td style="text-align: right; background-color: #C39BD3;">
+                    <label for="untrackedWhereBorn">Where Born (untracked) :&nbsp;</label>
+                </td>
+                <td style="text-align: left;">
+                    <div>
+                        <input class="untrackedWhereBorn" id="untrackedWhereBorn"
+                               th:field="*{untrackedWhereBorn}" type="text">
+                        <div th:if="${#fields.hasErrors('untrackedWhereBorn')}">
+                            <ul class="text-danger">
+                                <li th:each="err : ${#fields.errors('untrackedWhereBorn')}" th:text="${err}"/>
+                            </ul>
+                        </div>
                     </div>
-                </div>
-            </td>
+                </td>
             </tr>
             <tr>
                 <td style="text-align: right; background-color: #D6EEEE;">
-                    <label for="father">Father&nbsp;</label>
+                    <label for="father">Father :&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
                     <select id="father" name="father" th:field="*{father}">
@@ -259,7 +259,7 @@
             </tr>
             <tr>
                 <td style="text-align: right;  background-color: #D6EEEE;">
-                    <label for="untrackedFather">Father (untracked)&nbsp;</label>
+                    <label for="untrackedFather">Father (untracked) :&nbsp;</label>
                 </td>
                 <td style="text-align: left; ">
                     <div>
@@ -275,7 +275,7 @@
             </tr>
             <tr>
                 <td style="text-align: right;">
-                    <label for="fatherRank">Father's Rank&nbsp;</label>
+                    <label for="fatherRank">Father's Rank :&nbsp;</label>
                 </td>
                 <td style="text-align: left; ">
                     <div>
@@ -290,25 +290,25 @@
                 </td>
             </tr>
             <tr>
-            <td style="text-align: right;">
-                <label for="mother">Mother&nbsp;</label>
-            </td>
-            <td style="text-align: left;">
-                <select id="mother" name="mother" th:field="*{mother}">
-                    <option th:value="${''}" th:text="${''}"></option>
-                    <option th:each="person : ${people}"
-                            th:value="${person.id}" th:text="${person.toString()}"></option>
-                </select>
-                <div th:if="${#fields.hasErrors('mother')}">
-                    <ul class="text-danger">
-                        <li th:each="err : ${#fields.errors('mother')}" th:text="${err}"/>
-                    </ul>
-                </div>
-            </td>
-        </tr>
+                <td style="text-align: right;">
+                    <label for="mother">Mother :&nbsp;</label>
+                </td>
+                <td style="text-align: left;">
+                    <select id="mother" name="mother" th:field="*{mother}">
+                        <option th:value="${''}" th:text="${''}"></option>
+                        <option th:each="person : ${people}"
+                                th:value="${person.id}" th:text="${person.toString()}"></option>
+                    </select>
+                    <div th:if="${#fields.hasErrors('mother')}">
+                        <ul class="text-danger">
+                            <li th:each="err : ${#fields.errors('mother')}" th:text="${err}"/>
+                        </ul>
+                    </div>
+                </td>
+            </tr>
             <tr>
                 <td style="text-align: right; border-bottom: 5px solid #ccc;">
-                    <label for="dateAndPlaceOfMarriage">Date and Place Of Marriage&nbsp;</label>
+                    <label for="dateAndPlaceOfMarriage">Date and Place Of Marriage :&nbsp;</label>
                 </td>
                 <td style="text-align: left; ">
                     <div>
@@ -319,7 +319,7 @@
             </tr>
             <tr>
                 <td style="text-align: right; background-color: #FFC300">
-                    <label for="informant">Informant&nbsp;</label>
+                    <label for="informant">Informant :&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
                     <select id="informant" name="informant" th:field="*{informant}">
@@ -336,7 +336,7 @@
             </tr>
             <tr>
                 <td style="text-align: right;  background-color: #FFC300;">
-                    <label for="untrackedInformant">Informant (untracked)&nbsp;</label>
+                    <label for="untrackedInformant">Informant (untracked) :&nbsp;</label>
                 </td>
                 <td style="text-align: left; ">
                     <div>
@@ -350,9 +350,9 @@
                     </div>
                 </td>
             </tr>
-            <tr style = "border-bottom: 5px solid #ccc;">
+            <tr style="border-bottom: 5px solid #ccc;">
                 <td style="text-align: right;">
-                    <label for="informantQualification">Informant Qualification&nbsp;</label>
+                    <label for="informantQualification">Informant Qualification :&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
                     <div>
@@ -363,7 +363,7 @@
             </tr>
             <tr>
                 <td style="text-align: right;">
-                    <label for="whenRegistered">When Registered (dd/mm/yyyy)&nbsp;</label>
+                    <label for="whenRegistered">When Registered (dd/mm/yyyy)&nbsp;:&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
                     <div>
@@ -379,7 +379,7 @@
             </tr>
             <tr>
                 <td style="text-align: right;">
-                    <label for="whereRegistered">Where Registered&nbsp;</label>
+                    <label for="whereRegistered">Where Registered&nbsp;:&nbsp;</label>
                 </td>
                 <td style="text-align: left;">
                     <div>
@@ -388,9 +388,9 @@
                     </div>
                 </td>
             </tr>
-
-
-
+            <tr>
+                <td>&nbsp;</td>
+            </tr>
         </table>