Bugzilla – Attachment 177827 Details for
Bug 38664
Tidy the whole codebase
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 38664: Revert changes to errorpage.tt
Bug-38664-Revert-changes-to-errorpagett.patch (text/plain), 3.70 KB, created by
Jonathan Druart
on 2025-02-12 06:09:27 UTC
(
hide
)
Description:
Bug 38664: Revert changes to errorpage.tt
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2025-02-12 06:09:27 UTC
Size:
3.70 KB
patch
obsolete
>From 86ea12f369e3d4776230ab3b958ab5b328c48c32 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >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' %] >- <h1>An error has occurred!</h1> >- <h2><em>[% tx("Error {error_number}", {error_number = errno }) | html %]</em></h2> >- [% IF ( csrf_error ) %] >- [% INCLUDE 'blocking_errors.inc' blocking_error => csrf_error %] >- [% ELSE %] >- <h3>This message may have been caused by any of the following reasons:</h3> >- <ul style="padding-bottom: 0.5em;"> >- <li>You made use of an external link to an item that is no longer available</li> >- <li>You followed an outdated link e.g. from a search engine or a bookmark</li> >- <li>You tried to access a page that needs authentication</li> >- <li>An internal link in the client is broken and the page does not exist</li> >- </ul> >- [% END %] >- <h3>What's next?</h3> >- <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;"> >- <li>Use top menu bar to navigate to another part of Koha.</li> >- <li>To report a broken link or any other issue, please contact the Koha administrator. <a href="mailto:[% admin | uri %]">Send email</a></li> >- </ul> >-[% END %] >+<div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-md-8 offset-md-2"> >+ [% INCLUDE 'messages.inc' %] >+ >+ <h1>An error has occurred!</h1> >+ <h2><em>[% tx("Error {error_number}", {error_number = errno }) | html %]</em></h2> >+ [% IF ( csrf_error ) %] >+ [% INCLUDE 'blocking_errors.inc' blocking_error => csrf_error %] >+ [% ELSE %] >+ <h3>This message may have been caused by any of the following reasons:</h3> >+ <ul style="padding-bottom: 0.5em;"> >+ <li>You made use of an external link to an item that is no longer available</li> >+ <li>You followed an outdated link e.g. from a search engine or a bookmark</li> >+ <li>You tried to access a page that needs authentication</li> >+ <li>An internal link in the client is broken and the page does not exist</li> >+ </ul> >+ [% END %] >+ <h3>What's next?</h3> >+ <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;"> >+ <li>Use top menu bar to navigate to another part of Koha.</li> >+ <li>To report a broken link or any other issue, please contact the Koha administrator. <a href="mailto:[% admin | uri %]">Send email</a></li> >+ </ul> >+ </div> >+ <!-- /.col-md-8 --> >+ </div> >+ <!-- /.row --> >+</div> >+<!-- /.main.container-fluid --> > > [% INCLUDE 'intranet-bottom.inc' %] >-- >2.34.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 38664
:
175488
|
175664
|
177755
|
177796
|
177797
|
177798
|
177799
|
177800
|
177801
|
177802
|
177813
|
177825
|
177826
| 177827