@@ -, +, @@ better translatability - Apply patch - Trigger 404 error by calling a page that does not exist - Try to trigger other error pages and/or carefully review code changes in the *.pl files --- errors/400.pl | 7 +++-- errors/401.pl | 5 +++- errors/402.pl | 5 +++- errors/403.pl | 5 +++- errors/404.pl | 7 +++-- errors/500.pl | 5 +++- .../intranet-tmpl/prog/en/modules/errors/400.tt | 29 ------------------- .../intranet-tmpl/prog/en/modules/errors/401.tt | 30 -------------------- .../intranet-tmpl/prog/en/modules/errors/402.tt | 29 ------------------- .../intranet-tmpl/prog/en/modules/errors/403.tt | 29 ------------------- .../intranet-tmpl/prog/en/modules/errors/500.tt | 29 ------------------- .../en/modules/errors/{404.tt => errorpage.tt} | 16 +++++------ 12 files changed, 34 insertions(+), 162 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tt delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tt delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tt delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tt delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tt rename koha-tmpl/intranet-tmpl/prog/en/modules/errors/{404.tt => errorpage.tt} (77%) --- a/errors/400.pl +++ a/errors/400.pl @@ -27,12 +27,15 @@ my $query = CGI->new; my $admin = C4::Context->preference('KohaAdminEmailAddress'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { - template_name => 'errors/400.tt', + template_name => 'errors/errorpage.tt', query => $query, type => 'intranet', authnotrequired => 1, debug => 1, } ); -$template->param( admin => $admin ); +$template->param ( + admin => $admin, + errno => 400, +); output_with_http_headers $query, $cookie, $template->output, 'html', '400 Bad Request'; --- a/errors/401.pl +++ a/errors/401.pl @@ -33,5 +33,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( debug => 1, } ); -$template->param( admin => $admin ); +$template->param ( + admin => $admin, + errno => 401, +); output_with_http_headers $query, $cookie, $template->output, 'html', '401 Unauthorized'; --- a/errors/402.pl +++ a/errors/402.pl @@ -34,5 +34,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( debug => 1, } ); -$template->param( admin => $admin ); +$template->param ( + admin => $admin, + errno => 402, +); output_with_http_headers $query, $cookie, $template->output, 'html', '402 Payment Required'; --- a/errors/403.pl +++ a/errors/403.pl @@ -34,5 +34,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( debug => 1, } ); -$template->param( admin => $admin ); +$template->param ( + admin => $admin, + errno => 403, +); output_with_http_headers $query, $cookie, $template->output, 'html', '403 Forbidden'; --- a/errors/404.pl +++ a/errors/404.pl @@ -27,12 +27,15 @@ my $query = CGI->new; my $admin = C4::Context->preference('KohaAdminEmailAddress'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { - template_name => 'errors/404.tt', + template_name => 'errors/errorpage.tt', query => $query, type => 'intranet', authnotrequired => 1, debug => 1, } ); -$template->param( admin => $admin ); +$template->param ( + admin => $admin, + errno => 404, +); output_with_http_headers $query, $cookie, $template->output, 'html', '404 Not Found'; --- a/errors/500.pl +++ a/errors/500.pl @@ -34,5 +34,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( debug => 1, } ); -$template->param( admin => $admin ); +$template->param ( + admin => $admin, + errno => 500, +); output_with_http_headers $query, $cookie, $template->output, 'html', '500 Internal Server Error'; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tt @@ -1,29 +0,0 @@ -[% INCLUDE 'doc-head-open.inc' %] -