HWPV-184: new navigation & header for audit section (#642)

ministryofjustice · Jun 6, 2024 · 5db4209 · 5db4209
1 parent db86bcf
commit 5db4209
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 63 deletions.
diff --git a/app/views/audit/audit.html b/app/views/audit/audit.html
@@ -1,11 +1,12 @@
-{% extends "includes/layout.html" %}
-{% block page_title %}
+{% extends "includes/layout_new.html" %}
+
+{% block pageTitle %}
 {% if serviceName %} {{ serviceName }} {% endif %}
 {% endblock %}
+
+{% set activeMainNav = 'audit' %}
+
 {% block content %}
-<div class="govuk-width-container">
-  <a href="#" id="backBtn" class="govuk-back-link">Back</a>
-  <main class="govuk-main-wrapper">
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-two-thirds">
         <h1 class="govuk-heading-xl">Audit reports</h1>
@@ -82,6 +83,4 @@ <h2 class="govuk-heading-l">Completed reports</h2>
         {% endif %}
       </div>
     </div>
-  </main>
-</div>
 {% endblock %}
diff --git a/app/views/audit/check-claim.html b/app/views/audit/check-claim.html
@@ -1,13 +1,15 @@
-{% extends "includes/layout.html" %}
+{% extends "includes/layout_new.html" %}
 {% from "govuk/components/radios/macro.njk" import govukRadios %}
 {% from "govuk/components/character-count/macro.njk" import govukCharacterCount %}
-{% block page_title %}
+
+{% block pageTitle %}
 {% if serviceName %} {{ serviceName }} {% endif %}
 {% endblock %}
+
+{% set activeMainNav = 'audit' %}
+
 {% block content %}
-<div class="govuk-width-container">
     <a href="#" id="backBtn" class="govuk-back-link">Back</a>
-    <main class="govuk-main-wrapper">
         <div class="govuk-grid-row">
             <div class="govuk-grid-column-two-thirds">
                 {% include "includes/validation-error-messages.html" %}
@@ -201,6 +203,4 @@ <h2 class="govuk-heading-l">Verification result</h2>
                 {% endif %}
             </div>
         </div>
-    </main>
-</div>
 {% endblock %}
diff --git a/app/views/audit/create-report-date.html b/app/views/audit/create-report-date.html
@@ -1,11 +1,13 @@
-{% extends "includes/layout.html" %}
-{% block page_title %}
+{% extends "includes/layout_new.html" %}
+
+{% block pageTitle %}
 {% if serviceName %} {{ serviceName }} {% endif %}
 {% endblock %}
+
+{% set activeMainNav = 'audit' %}
+
 {% block content %}
-<div class="govuk-width-container">
     <a href="#" id="backBtn" class="govuk-back-link">Back</a>
-    <main class="govuk-main-wrapper">
         <div class="govuk-grid-row">
             <div class="govuk-grid-column-two-thirds">
                 {% include "includes/validation-error-messages.html" %}
@@ -61,6 +63,4 @@ <h1 class="govuk-heading-xl">What is the start date and end date you would like
                 </form>
             </div>
         </div>
-    </main>
-</div>
 {% endblock %}
diff --git a/app/views/audit/create-report-percent.html b/app/views/audit/create-report-percent.html
@@ -1,11 +1,13 @@
-{% extends "includes/layout.html" %}
-{% block page_title %}
+{% extends "includes/layout_new.html" %}
+
+{% block pageTitle %}
 {% if serviceName %} {{ serviceName }} {% endif %}
 {% endblock %}
+
+{% set activeMainNav = 'audit' %}
+
 {% block content %}
-<div class="govuk-width-container">
-    <a href="#" id="backBtn" class="govuk-back-link">Back</a>
-    <main class="govuk-main-wrapper">
+     <a href="#" id="backBtn" class="govuk-back-link">Back</a>
         <div class="govuk-grid-row">
             <div class="govuk-grid-column-two-thirds">
                 {% include "includes/validation-error-messages.html" %}
@@ -45,6 +47,5 @@ <h1 class="govuk-heading-xl">What percentage of claims would you like to check?<
                 {% endif %}
             </div>
         </div>
-    </main>
 </div>
 {% endblock %}
diff --git a/app/views/audit/create-report.html b/app/views/audit/create-report.html
@@ -1,11 +1,13 @@
-{% extends "includes/layout.html" %}
-{% block page_title %}
+{% extends "includes/layout_new.html" %}
+
+{% block pageTitle %}
 {% if serviceName %} {{ serviceName }} {% endif %}
 {% endblock %}
+
+{% set activeMainNav = 'audit' %}
+
 {% block content %}
-<div class="govuk-width-container">
     <a href="#" id="backBtn" class="govuk-back-link">Back</a>
-    <main class="govuk-main-wrapper">
         <div class="govuk-grid-row">
             <div class="govuk-grid-column-two-thirds">
                 {% include "includes/validation-error-messages.html" %}
@@ -23,6 +25,4 @@ <h1 class="govuk-heading-xl">Create audit report</h1>
                 </form>
             </div>
         </div>
-    </main>
-</div>
 {% endblock %}
diff --git a/app/views/audit/delete-report-confirmation.html b/app/views/audit/delete-report-confirmation.html
@@ -1,9 +1,12 @@
-{% extends "includes/layout.html" %}
-{% block page_title %}
+{% extends "includes/layout_new.html" %}
+
+{% block pageTitle %}
 {% if serviceName %} {{ serviceName }} {% endif %}
 {% endblock %}
+
+{% set activeMainNav = 'audit' %}
+
 {% block content %}
-<main id="content" role="main">
     <a href="#" id="backBtn" class="govuk-back-link">Back</a>
     <h1 class="govuk-heading-xl">Do you want to delete this audit report?</h1>
     {% include "includes/validation-error-messages.html" %}
@@ -34,5 +37,4 @@ <h1 class="govuk-heading-xl">Do you want to delete this audit report?</h1>
         <input type="submit" class="button" value="Continue">
     </form>
     </br>
-</main>
 {% endblock %}
diff --git a/app/views/audit/print-report.html b/app/views/audit/print-report.html
@@ -1,11 +1,13 @@
-{% extends "includes/layout.html" %}
-{% block page_title %}
+{% extends "includes/layout_new.html" %}
+
+{% block pageTitle %}
 {% if serviceName %} {{ serviceName }} {% endif %}
 {% endblock %}
+
+{% set activeMainNav = 'audit' %}
+
 {% block content %}
-<div class="govuk-width-container">
-    <a href="#" id="backBtn" class="govuk-back-link">Back</a>
-    <main class="govuk-main-wrapper">
+     <a href="#" id="backBtn" class="govuk-back-link">Back</a>
         <input type="submit" id="print" value="Print"/>
         <div id="print-report">
             <p class="govuk-hint">Audit report printed by {{ userName }} on {{ dateTime }}</p>
@@ -54,6 +56,4 @@ <h2 class="govuk-heading-l">Report results</h2>
                 {% endfor %}
             </table>
         </div>
-    </main>
-</div>
 {% endblock %}
diff --git a/app/views/audit/report-created.html b/app/views/audit/report-created.html
@@ -1,9 +1,12 @@
-{% extends "includes/layout.html" %}
-{% block page_title %}
+{% extends "includes/layout_new.html" %}
+
+{% block pageTitle %}
 {% if serviceName %} {{ serviceName }} {% endif %}
 {% endblock %}
+
+{% set activeMainNav = 'audit' %}
+
 {% block content %}
-<main id="content" role="main">
     <a href="#" id="backBtn" class="govuk-back-link">Back</a>
     <div class="govuk-width-container">
         <main class="govuk-main-wrapper govuk-main-wrapper--l" id="main-content" role="main">
@@ -21,6 +24,4 @@ <h1 class="govuk-panel__title">
 
 
     <a href="/audit/view-report/{{ reportId }}" class="button">View report</a>
-
-</main>
 {% endblock %}
diff --git a/app/views/audit/report-deleted.html b/app/views/audit/report-deleted.html
@@ -1,9 +1,12 @@
-{% extends "includes/layout.html" %}
-{% block page_title %}
+{% extends "includes/layout_new.html" %}
+
+{% block pageTitle %}
 {% if serviceName %} {{ serviceName }} {% endif %}
 {% endblock %}
+
+{% set activeMainNav = 'audit' %}
+
 {% block content %}
-<main id="content" role="main">
     <a href="#" id="backBtn" class="govuk-back-link">Back</a>
     <div class="govuk-width-container">
         <main class="govuk-main-wrapper govuk-main-wrapper--l" id="main-content" role="main">
@@ -21,6 +24,4 @@ <h1 class="govuk-panel__title">
 
 
     <a href="/audit" class="button">Go to Audits</a>
-
-</main>
 {% endblock %}
diff --git a/app/views/audit/report-saved.html b/app/views/audit/report-saved.html
@@ -1,12 +1,14 @@
-{% extends "includes/layout.html" %}
-{% block page_title %}
+{% extends "includes/layout_new.html" %}
+
+{% block pageTitle %}
 {% if serviceName %} {{ serviceName }} {% endif %}
 {% endblock %}
+
+{% set activeMainNav = 'audit' %}
+
 {% block content %}
-<main id="content" role="main">
     <a href="#" id="backBtn" class="govuk-back-link">Back</a>
     <h1 class="govuk-heading-xl">Audit report saved</h1>
     </br>
     <p class="govuk-body">Saved at location: {{ filePath }}</p>
-</main>
 {% endblock %}
diff --git a/app/views/audit/view-report.html b/app/views/audit/view-report.html
@@ -1,11 +1,13 @@
-{% extends "includes/layout.html" %}
-{% block page_title %}
+{% extends "includes/layout_new.html" %}
+
+{% block pageTitle %}
 {% if serviceName %} {{ serviceName }} {% endif %}
 {% endblock %}
+
+{% set activeMainNav = 'audit' %}
+
 {% block content %}
-<div class="govuk-width-container">
-    <a href="#" id="backBtn" class="govuk-back-link">Back</a>
-    <main class="govuk-main-wrapper">
+       <a href="#" id="backBtn" class="govuk-back-link">Back</a>
         <div class="govuk-grid-row">
             <div class="govuk-grid-column-two-thirds">
                 {% include "includes/validation-error-messages.html" %}
@@ -68,6 +70,4 @@ <h1 class="govuk-heading-xl">View  audit report</h1>
                 {% endif %}
             </div>
         </div>
-    </main>
-</div>
 {% endblock %}