Merge pull request #4177 from nationalarchives/TDRD-497-479-mailto-ht…

…ml-fixes Tdrd 497 479 mailto html fixes
nationalarchives · Sep 24, 2024 · fa08962 · fa08962
2 parents c2d4f6c + fdf516b
commit fa08962
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 36 deletions.
diff --git a/app/views/judgment/judgmentComplete.scala.html b/app/views/judgment/judgmentComplete.scala.html
@@ -31,7 +31,7 @@ <h2 class="govuk-heading-m">What happens next</h2>
 
                     <h2 class="govuk-heading-m">If this is an update to an existing judgment or decision</h2>
                     <p class="govuk-body">
-                        If this transfer was an update or revision, email <a href="mailto:@Messages("nationalArchives.judgmentsEmail")">@Messages("nationalArchives.judgmentsEmail")</a> and include the following:
+                        If this transfer was an update or revision, email <a href="mailto:@Messages("nationalArchives.judgmentsEmail")?subject=Ref: @reference">@Messages("nationalArchives.judgmentsEmail")</a> and include the following:
                     </p>
                     <ul class="govuk-list govuk-list--number">
                         <li>the neutral citation</li>

diff --git a/app/views/tna/metadataReviewAction.scala.html b/app/views/tna/metadataReviewAction.scala.html
@@ -47,43 +47,40 @@ <h1 class="govuk-heading-l govuk-!-margin-bottom-3">
                     </div>
                 </dl>
 
-                <h2 class="govuk-label-wrapper">
-                    <label class="govuk-label govuk-label--m" for="download-metadata">
-                        1. Download and review transfer metadata
-                    </label>
-                </h2>
+                <h2 class="govuk-heading-m">1. Download and review transfer metadata</h2>
 
                 @downloadMetadataLink(consignmentId, url = routes.DownloadMetadataController.downloadMetadataFile(consignmentId).url)
 
                 @if(isTransferAdvisor) {
-                    <h2 class="govuk-label-wrapper">
-                        <label class="govuk-label govuk-label--m">
-                            2. Set the status of this review
-                        </label>
-                    </h2>
+                    <div class="govuk-form-group">
+                        <h2 class="govuk-label-wrapper">
+                            <label class="govuk-label govuk-label--m" for="status">
+                                2. Set the status of this review
+                            </label>
+                        </h2>
 
-                    @form(routes.MetadataReviewActionController.submitReview(consignmentId, consignmentDetails.consignmentReference, userEmail), (Symbol("novalidate"), "")) {
-                        @CSRF.formField
-                        @inputDropdown(
-                            dropdownField.fieldId,
-                            dropdownField.fieldName,
-                            dropdownField.fieldDescription,
-                            dropdownField.options,
-                            dropdownField.selectedOption,
-                            dropdownField.multiValue,
-                            Map(
-                                Symbol("_dynamicForm") -> false,
-                            ),
-                            dropdownField.fieldErrors,
-                            "Select a status"
-                        )
+                        @form(routes.MetadataReviewActionController.submitReview(consignmentId, consignmentDetails.consignmentReference, userEmail), (Symbol("novalidate"), "")) {
+                            @CSRF.formField
+                            @inputDropdown(
+                                dropdownField.fieldId,
+                                dropdownField.fieldName,
+                                dropdownField.fieldDescription,
+                                dropdownField.options,
+                                dropdownField.selectedOption,
+                                dropdownField.multiValue,
+                                Map(
+                                    Symbol("_dynamicForm") -> false,
+                                ),
+                                dropdownField.fieldErrors,
+                                "Select a status"
+                            )
+                    </div>
 
-                        <div class="govuk-button-group">
-                            <button data-prevent-double-click="true" class="govuk-button" type="submit" data-module="govuk-button"
-                            role="button">
-                                Submit
-                            </button>
-                        </div>
+                    <div class="govuk-button-group">
+                         <button data-prevent-double-click="true" class="govuk-button" type="submit" data-module="govuk-button" role="button">
+                             Submit
+                         </button>
+                    </div>
                     }
                 }
             </div>

diff --git a/app/views/tna/metadataReviews.scala.html b/app/views/tna/metadataReviews.scala.html
@@ -7,7 +7,6 @@
 
       <span class="govuk-caption-l">Transfer Digital Records</span>
       <h1 class="govuk-heading-l">Metadata Reviews</h1>
-      <p class="govuk-body">These are transfers awaiting metadata review:</p>
 
       <table data-module="table-row-expander" class="govuk-table govuk-table--tdr-transfers govuk-!-margin-bottom-2">
         <thead class="govuk-table__head">
@@ -16,7 +15,9 @@ <h1 class="govuk-heading-l">Metadata Reviews</h1>
             <th scope="col" class="govuk-table__header">Status</th>
             <th scope="col" class="govuk-table__header">Department</th>
             <th scope="col" class="govuk-table__header">Series</th>
-            <th scope="col" class="govuk-table__header"></th>
+            <th scope="col" class="govuk-table__header">
+              <span class="govuk-visually-hidden">Actions</span>
+            </th>
           </tr>
         </thead>
         <tbody>

diff --git a/test/controllers/MetadataReviewControllerSpec.scala b/test/controllers/MetadataReviewControllerSpec.scala
@@ -80,8 +80,9 @@ class MetadataReviewControllerSpec extends FrontEndTestHelper {
     metadataReviewPageAsString must include("""<th scope="col" class="govuk-table__header">Status</th>""")
     metadataReviewPageAsString must include("""<th scope="col" class="govuk-table__header">Department</th>""")
     metadataReviewPageAsString must include("""<th scope="col" class="govuk-table__header">Series</th>""")
-    metadataReviewPageAsString must include("""<th scope="col" class="govuk-table__header"></th>""")
-    metadataReviewPageAsString must include(s"""These are transfers awaiting metadata review:""")
+    metadataReviewPageAsString must include(s"""<th scope="col" class="govuk-table__header">
+         |              <span class="govuk-visually-hidden">Actions</span>
+         |            </th>""".stripMargin)
     metadataReviewPageAsString must include(s"""<th scope="row" class="govuk-table__header">TDR-2024-TEST</th>""")
     metadataReviewPageAsString must include(s"""<strong class="tdr-tag tdr-tag--green">Requested</strong>""")
     metadataReviewPageAsString must include(s"""<td class="govuk-table__cell">TransferringBody</td>""")