Skip to content

Commit

Permalink
General bug fixes (#259)
Browse files Browse the repository at this point in the history
Fixing JS not loading.

Also fixing session expiry on Viewer.

Adding page title to session expiry
  • Loading branch information
chris-pettinga authored Nov 26, 2024
1 parent b78596b commit cde2646
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions django_app/core/templates/core/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,8 @@ <h2 class="govuk-visually-hidden">Support links</h2>
</div>
</div>
</div>
<script src="{% static 'core/javascript/jquery-3.7.1.js' %}" nonce="{{ request.csp_nonce }}></script>
<script type="module" src="{% static "core/javascript/govuk-frontend-5.3.0.min.js" %}" nonce="{{ request.csp_nonce }}></script>
<script src="{% static 'core/javascript/jquery-3.7.1.js' %}" nonce="{{ request.csp_nonce }}"></script>
<script type="module" src="{% static "core/javascript/govuk-frontend-5.3.0.min.js" %}" nonce="{{ request.csp_nonce }}"></script>
<script type="module" nonce="{{ request.csp_nonce }}">
import {initAll} from "{% static "core/javascript/govuk-frontend-5.3.0.min.js" %}"

Expand Down
2 changes: 2 additions & 0 deletions django_app/core/templates/core/session_expired.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

{% block back_button %}{% endblock back_button %}

{% block title %}Your report has been deleted{% endblock title %}

{% block column_content %}
<h1 class="govuk-heading-l">Your report has been deleted</h1>
<p class="govuk-body">We've deleted your report because you were inactive for {{ session_expiry_minutes }} minutes.</p>
Expand Down
2 changes: 1 addition & 1 deletion django_app/sanctions_regimes
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "core/base_form_step.html" %}
{% extends "core/base.html" %}
{% load crispy_forms_tags crispy_forms_gds %}
{% load get_end_user_url %}
{% block cookie_banner %}{% endblock cookie_banner %}
Expand All @@ -11,9 +11,9 @@
</div>
{% endblock download_link %}
{% endcomment %}
{% block form_content %}
{% block column_content %}
{% include "report_a_suspected_breach/partials/summary_report.html" %}
{% endblock form_content %}
{% endblock column_content %}


{% block extra_js %}
Expand All @@ -28,8 +28,6 @@
$(this).closest('.text_truncator').find('.truncated_text').removeClass('hidden');
$(this).closest('.text_truncator').find('.expanded_text').addClass('hidden');
})


})
</script>
{% endblock extra_js %}

0 comments on commit cde2646

Please sign in to comment.