From 86ea12f369e3d4776230ab3b958ab5b328c48c32 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 12 Feb 2025 07:03:51 +0100 Subject: [PATCH] Bug 38664: Revert changes to errorpage.tt This patch reverts the changes from bug 38718 made to errorpage.tt It fixes Auth/csrf.ts cypress test, but most important restores the correct UI on the error page when there is a CSRF error. This was caused by the STOP from blocking_errors, that is introduced by messages.inc included by main-container.inc --- .../prog/en/modules/errors/errorpage.tt | 49 +++++++++++-------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt index 9838845d688..1eea9364e6a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt @@ -24,25 +24,34 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% WRAPPER 'main-container.inc' %] -

An error has occurred!

-

[% tx("Error {error_number}", {error_number = errno }) | html %]

- [% IF ( csrf_error ) %] - [% INCLUDE 'blocking_errors.inc' blocking_error => csrf_error %] - [% ELSE %] -

This message may have been caused by any of the following reasons:

- - [% END %] -

What's next?

- -[% END %] +
+
+
+ [% INCLUDE 'messages.inc' %] + +

An error has occurred!

+

[% tx("Error {error_number}", {error_number = errno }) | html %]

+ [% IF ( csrf_error ) %] + [% INCLUDE 'blocking_errors.inc' blocking_error => csrf_error %] + [% ELSE %] +

This message may have been caused by any of the following reasons:

+
    +
  • You made use of an external link to an item that is no longer available
  • +
  • You followed an outdated link e.g. from a search engine or a bookmark
  • +
  • You tried to access a page that needs authentication
  • +
  • An internal link in the client is broken and the page does not exist
  • +
+ [% END %] +

What's next?

+
    +
  • Use top menu bar to navigate to another part of Koha.
  • +
  • To report a broken link or any other issue, please contact the Koha administrator. Send email
  • +
+
+ +
+ +
+ [% INCLUDE 'intranet-bottom.inc' %] -- 2.34.1