Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from
Jun 6, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f033f0
HWPV-184: new navigation & header for audit section
ashleygyngell Jun 5, 2024
85afb56
HWPV-184: updating width to match header
ashleygyngell Jun 5, 2024
745d70e
HWPV-184: small fix to ensure conditional macros are hidden
ashleygyngell Jun 6, 2024
3adbba8
Merge branch 'main' into batch-update-header-and-nav-part-2
ashleygyngell Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions app/views/audit/audit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -82,6 +83,4 @@ <h2 class="govuk-heading-l">Completed reports</h2>
{% endif %}
</div>
</div>
</main>
</div>
{% endblock %}
12 changes: 6 additions & 6 deletions app/views/audit/check-claim.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" %}
Expand Down Expand Up @@ -201,6 +203,4 @@ <h2 class="govuk-heading-l">Verification result</h2>
{% endif %}
</div>
</div>
</main>
</div>
{% endblock %}
12 changes: 6 additions & 6 deletions app/views/audit/create-report-date.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" %}
Expand Down Expand Up @@ -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 %}
13 changes: 7 additions & 6 deletions app/views/audit/create-report-percent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" %}
Expand Down Expand Up @@ -45,6 +47,5 @@ <h1 class="govuk-heading-xl">What percentage of claims would you like to check?<
{% endif %}
</div>
</div>
</main>
</div>
{% endblock %}
12 changes: 6 additions & 6 deletions app/views/audit/create-report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" %}
Expand All @@ -23,6 +25,4 @@ <h1 class="govuk-heading-xl">Create audit report</h1>
</form>
</div>
</div>
</main>
</div>
{% endblock %}
10 changes: 6 additions & 4 deletions app/views/audit/delete-report-confirmation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" %}
Expand Down Expand Up @@ -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 %}
14 changes: 7 additions & 7 deletions app/views/audit/print-report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -54,6 +56,4 @@ <h2 class="govuk-heading-l">Report results</h2>
{% endfor %}
</table>
</div>
</main>
</div>
{% endblock %}
11 changes: 6 additions & 5 deletions app/views/audit/report-created.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand All @@ -21,6 +24,4 @@ <h1 class="govuk-panel__title">


<a href="/audit/view-report/{{ reportId }}" class="button">View report</a>

</main>
{% endblock %}
11 changes: 6 additions & 5 deletions app/views/audit/report-deleted.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand All @@ -21,6 +24,4 @@ <h1 class="govuk-panel__title">


<a href="/audit" class="button">Go to Audits</a>

</main>
{% endblock %}
10 changes: 6 additions & 4 deletions app/views/audit/report-saved.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}
14 changes: 7 additions & 7 deletions app/views/audit/view-report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" %}
Expand Down Expand Up @@ -68,6 +70,4 @@ <h1 class="govuk-heading-xl">View audit report</h1>
{% endif %}
</div>
</div>
</main>
</div>
{% endblock %}