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

MTP-1980: Upgrade to govuk-frontend 5 and other dependencies #601

Merged
merged 5 commits into from
Jan 11, 2024
Merged

MTP-1980: Upgrade to govuk-frontend 5 and other dependencies #601

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c199687
Fix printing of credit batches
ushkarev Jan 11, 2024
1af1101
Update `mtp-common` which includes `govuk-frontend` 5
ushkarev Jan 11, 2024
4b4fc36
Ensure there is a `#main-content` element on login page with ‘masthead’
ushkarev Jan 10, 2024
77ffcc8
Improve style/layout compatibility with `govuk-frontend` changes
ushkarev Jan 11, 2024
798a920
Replace deprecated `pkg_resources` usage with `importlib.metadata`
ushkarev Jan 11, 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
Prev Previous commit
Next Next commit
Ensure there is a #main-content element on login page with ‘masthead’
  • Loading branch information
@ushkarev
ushkarev committed Jan 11, 2024
commit 4b4fc367be968f2c8b6852b7dc991af040e904b4
153 changes: 78 additions & 75 deletions mtp_cashbook/templates/mtp_auth/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,87 +7,90 @@
{% block page_title %}{% trans 'Sign in' %} – {{ block.super }}{% endblock %}

{% block main %}
<div class="mtp-masthead govuk-!-margin-bottom-9">
<div class="govuk-width-container">
<main id="main-content" role="main">

<div class="govuk-grid-row">
{% language_switch %}
</div>
<div class="mtp-masthead govuk-!-margin-bottom-9">
<div class="govuk-width-container">

<div class="govuk-grid-row govuk-!-margin-top-9 govuk-!-margin-bottom-6">
<header class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">
{% trans 'Process money in and out of your prison' %}
</h1>

<aside>
<p>
{% trans 'These tools will help you manage prisoner money' %}:
</p>
<ul class="govuk-list govuk-list--bullet">
<li>{% trans 'digital cashbook' %}</li>
<li>{% trans 'digital disbursements' %}</li>
</ul>
</aside>
</header>

<div class="govuk-grid-column-one-third">
<img alt="{% trans 'Digital cashbook' %}" src="{% static 'images/landing-cashbook.png' %}" srcset="{% static 'images/landing-cashbook@2x.png' %} 2x"/>
<div class="govuk-grid-row">
{% language_switch %}
</div>
</div>

<div class="govuk-grid-row govuk-!-margin-top-9 govuk-!-margin-bottom-6">
<header class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">
{% trans 'Process money in and out of your prison' %}
</h1>

<aside>
<p>
{% trans 'These tools will help you manage prisoner money' %}:
</p>
<ul class="govuk-list govuk-list--bullet">
<li>{% trans 'digital cashbook' %}</li>
<li>{% trans 'digital disbursements' %}</li>
</ul>
</aside>
</header>

<div class="govuk-grid-column-one-third">
<img alt="{% trans 'Digital cashbook' %}" src="{% static 'images/landing-cashbook.png' %}" srcset="{% static 'images/landing-cashbook@2x.png' %} 2x"/>
</div>
</div>

</div>
</div>
</div>

<div class="govuk-width-container govuk-!-margin-bottom-9">
{% notification_banners request 'cashbook_login' %}

<div class="govuk-grid-row">
<section class="govuk-grid-column-one-half">
<h2 class="govuk-heading-m">{% trans 'Need access?' %}</h2>
<p>
{% trans 'If you’re a business hub staff member in a public prison in England or Wales, you can request access to the digital cashbook.' %}
</p>
<p>
<a href="{% url 'sign-up' %}">
{% trans 'Request access' %}
</a>
</p>
<p>
{% blocktrans trimmed %}
Intelligence staff need to log into the <a href="{{ noms_ops_url }}">prisoner money intelligence tool</a> instead.
{% endblocktrans %}
</p>
</section>

<section class="govuk-grid-column-one-half">
<h2 class="govuk-heading-m">{% trans 'Sign in' %}</h2>

{% include 'govuk-frontend/components/error-summary.html' with form=form only %}

<form action="{{ app_path }}" method="post">
{% csrf_token %}
<input type="hidden" name="next" value="{{ next }}">

{% include 'mtp_common/forms/field.html' with field=form.username input_classes='govuk-input--width-10' only %}
{% include 'mtp_common/forms/field.html' with field=form.password input_classes='govuk-input--width-10' only %}

<button type="submit" class="govuk-button" data-module="govuk-button" name="signin">{% trans 'Sign in' %}</button>
</form>

<p><a href="{% url 'reset_password' %}">{% trans 'Forgotten your password?' %}</a></p>

</section>
</div>

<br />
<div class="govuk-width-container govuk-!-margin-bottom-9">
{% notification_banners request 'cashbook_login' %}

<div class="govuk-grid-row">
<section class="govuk-grid-column-one-half">
<h2 class="govuk-heading-m">{% trans 'Need access?' %}</h2>
<p>
{% trans 'If you’re a business hub staff member in a public prison in England or Wales, you can request access to the digital cashbook.' %}
</p>
<p>
<a href="{% url 'sign-up' %}">
{% trans 'Request access' %}
</a>
</p>
<p>
{% blocktrans trimmed %}
Intelligence staff need to log into the <a href="{{ noms_ops_url }}">prisoner money intelligence tool</a> instead.
{% endblocktrans %}
</p>
</section>

<section class="govuk-grid-column-one-half">
<h2 class="govuk-heading-m">{% trans 'Sign in' %}</h2>

{% include 'govuk-frontend/components/error-summary.html' with form=form only %}

<form action="{{ app_path }}" method="post">
{% csrf_token %}
<input type="hidden" name="next" value="{{ next }}">

{% include 'mtp_common/forms/field.html' with field=form.username input_classes='govuk-input--width-10' only %}
{% include 'mtp_common/forms/field.html' with field=form.password input_classes='govuk-input--width-10' only %}

<button type="submit" class="govuk-button" data-module="govuk-button" name="signin">{% trans 'Sign in' %}</button>
</form>

<p><a href="{% url 'reset_password' %}">{% trans 'Forgotten your password?' %}</a></p>

</section>
</div>

<br />

<p>
{% url 'faq' as faq_url %}
{% blocktrans trimmed %}
<a href="{{ faq_url }}">Get help</a> if you’re having difficulties requesting access or signing in.
{% endblocktrans %}
</p>
</div>
<p>
{% url 'faq' as faq_url %}
{% blocktrans trimmed %}
<a href="{{ faq_url }}">Get help</a> if you’re having difficulties requesting access or signing in.
{% endblocktrans %}
</p>
</div>

</main>
{% endblock %}