Attachment #45354 for bug #15288

View | Details | Raw Unified | Return to bug 15288
Collapse All | Expand All

Lines 27-38 my $query = CGI->new; Link Here

(-)a/errors/400.pl (-2 / +5 lines)
27	my $admin = C4::Context->preference('KohaAdminEmailAddress');	27	my $admin = C4::Context->preference('KohaAdminEmailAddress');
28	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(	28	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
29	{	29	{
30	template_name => 'errors/400.tt',	30	template_name => 'errors/errorpage.tt',
31	query => $query,	31	query => $query,
32	type => 'intranet',	32	type => 'intranet',
33	authnotrequired => 1,	33	authnotrequired => 1,
34	debug => 1,	34	debug => 1,
35	}	35	}
36	);	36	);
37	$template->param( admin => $admin );	37	$template->param (
		38	admin => $admin,
		39	errno => 400,
		40	);
38	output_with_http_headers $query, $cookie, $template->output, 'html', '400 Bad Request';	41	output_with_http_headers $query, $cookie, $template->output, 'html', '400 Bad Request';

Lines 33-37 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/errors/401.pl (-1 / +4 lines)
33	debug => 1,	33	debug => 1,
34	}	34	}
35	);	35	);
36	$template->param( admin => $admin );	36	$template->param (
		37	admin => $admin,
		38	errno => 401,
		39	);
37	output_with_http_headers $query, $cookie, $template->output, 'html', '401 Unauthorized';	40	output_with_http_headers $query, $cookie, $template->output, 'html', '401 Unauthorized';

Lines 34-38 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/errors/402.pl (-1 / +4 lines)
34	debug => 1,	34	debug => 1,
35	}	35	}
36	);	36	);
37	$template->param( admin => $admin );	37	$template->param (
		38	admin => $admin,
		39	errno => 402,
		40	);
38	output_with_http_headers $query, $cookie, $template->output, 'html', '402 Payment Required';	41	output_with_http_headers $query, $cookie, $template->output, 'html', '402 Payment Required';

Lines 34-38 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/errors/403.pl (-1 / +4 lines)
34	debug => 1,	34	debug => 1,
35	}	35	}
36	);	36	);
37	$template->param( admin => $admin );	37	$template->param (
		38	admin => $admin,
		39	errno => 403,
		40	);
38	output_with_http_headers $query, $cookie, $template->output, 'html', '403 Forbidden';	41	output_with_http_headers $query, $cookie, $template->output, 'html', '403 Forbidden';

Lines 27-38 my $query = CGI->new; Link Here

(-)a/errors/404.pl (-2 / +5 lines)
27	my $admin = C4::Context->preference('KohaAdminEmailAddress');	27	my $admin = C4::Context->preference('KohaAdminEmailAddress');
28	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(	28	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
29	{	29	{
30	template_name => 'errors/404.tt',	30	template_name => 'errors/errorpage.tt',
31	query => $query,	31	query => $query,
32	type => 'intranet',	32	type => 'intranet',
33	authnotrequired => 1,	33	authnotrequired => 1,
34	debug => 1,	34	debug => 1,
35	}	35	}
36	);	36	);
37	$template->param( admin => $admin );	37	$template->param (
		38	admin => $admin,
		39	errno => 404,
		40	);
38	output_with_http_headers $query, $cookie, $template->output, 'html', '404 Not Found';	41	output_with_http_headers $query, $cookie, $template->output, 'html', '404 Not Found';

Lines 34-38 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/errors/500.pl (-1 / +4 lines)
34	debug => 1,	34	debug => 1,
35	}	35	}
36	);	36	);
37	$template->param( admin => $admin );	37	$template->param (
		38	admin => $admin,
		39	errno => 500,
		40	);
38	output_with_http_headers $query, $cookie, $template->output, 'html', '500 Internal Server Error';	41	output_with_http_headers $query, $cookie, $template->output, 'html', '500 Internal Server Error';




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Error</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="err_400" class="err">

[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 400</div>

<div id="doc" class="yui-t7">
   
   <div id="bd">
	<div id="yui-main">
	<div class="yui-b"><div class="yui-g">
    <h1>An error has occurred!</h1>
    <h2>Error 400</h2>
    <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
    <li>This error means that the link was broken and that the page doesn't exist</li>	
    <li>To report this error, you can <a href="mailto:[% admin %]">email the Koha administrator</a>.</li>
    <li>Use top menu bar to navigate to another part of Koha.</li>
    </ul>
</div>

</div>
</div>

[% INCLUDE 'intranet-bottom.inc' %]




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Error 401</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="err_401" class="err">

[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 401</div>

<div id="doc" class="yui-t7">
   
   <div id="bd">
	<div id="yui-main">
	<div class="yui-b"><div class="yui-g">
    <h1>An error has occurred!</h1>
    <h2>Error 401</h2>
    <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
        <li>This error means that you aren't authorized to view this page.</li>
        <li>Please <a href="/cgi-bin/koha/mainpage.pl">log in</a> and try again.
        <li>To report this error, you can <a href="mailto:[% admin %]">email the Koha administrator</a>.</li>
        <li>Use top menu bar to navigate to another part of Koha.</li>
    </ul>
</div>

</div>
</div>

[% INCLUDE 'intranet-bottom.inc' %]




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Error 402</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="err_402" class="err">

[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 402</div>

<div id="doc" class="yui-t7">
   
   <div id="bd">
	<div id="yui-main">
	<div class="yui-b"><div class="yui-g">
    <h1>An error has occurred!</h1>
    <h2>Error 402</h2>
    <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
        <li>This error means that the link was broken and that the page doesn't exist</li>	
        <li>To report this error, you can <a href="mailto:[% admin %]">email the Koha administrator</a>.</li>
        <li>Use top menu bar to navigate to another part of Koha.</li>
    </ul>
</div>

</div>
</div>

[% INCLUDE 'intranet-bottom.inc' %]




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Error 403</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="err_403" class="err">

[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 403</div>

<div id="doc" class="yui-t7">
   
   <div id="bd">
	<div id="yui-main">
	<div class="yui-b"><div class="yui-g">
    <h1>An error has occurred!</h1>
    <h2>Error 403</h2>
    <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
    <li>This error means that you are forbidden to view this page.</li>
    <li>To report this error, you can <a href="mailto:[% admin %]">email the Koha administrator</a>.</li>
    <li>Use top menu bar to navigate to another part of Koha.</li>
    </ul>
</div>

</div>
</div>

[% INCLUDE 'intranet-bottom.inc' %]




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Error 500</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="err_500" class="err">

[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 500</div>

<div id="doc" class="yui-t7">
   
   <div id="bd">
	<div id="yui-main">
	<div class="yui-b"><div class="yui-g">
    <h1>An error has occurred!</h1>
    <h2>Error 500</h2>
    <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
        <li>In Koha this typically means that the Koha team is working on new features</li>	
        <li>Wait while system maintenance is being done or <a href="mailto:[% admin %]">email the Koha administrator</a>.</li>
        <li>Use top menu bar to navigate to another part of Koha.</li>
    </ul>
</div>

</div>
</div>

[% INCLUDE 'intranet-bottom.inc' %]




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Error [% errno %]</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="err_[% errno %]" class="err">

[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error [% errno %]</div>

<div id="doc" class="yui-t7">

   <div id="bd">
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
    <h1>An error has occurred!</h1>
    <h2><em>Error [% errno %]</em></h2>
        <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>

        <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 %]">Email</a></li>
    </ul>
</div>

- 

Return to bug 15288

Lines 1-29 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tt (-29 lines)
1	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Error</title>
3	[% INCLUDE 'doc-head-close.inc' %]
4	</head>
5	<body id="err_400" class="err">
6
7	[% INCLUDE 'header.inc' %]
8	[% INCLUDE 'cat-search.inc' %]
9
10	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 400</div>
11
12	<div id="doc" class="yui-t7">
13
14	<div id="bd">
15	<div id="yui-main">
16	<div class="yui-b"><div class="yui-g">
17	<h1>An error has occurred!</h1>
18	<h2>Error 400</h2>
19	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
20	<li>This error means that the link was broken and that the page doesn't exist</li>
21	<li>To report this error, you can <a href="mailto:[% admin %]">email the Koha administrator</a>.</li>
22	<li>Use top menu bar to navigate to another part of Koha.</li>
23	</ul>
24	</div>
25
26	</div>
27	</div>
28
29	[% INCLUDE 'intranet-bottom.inc' %]

Lines 1-30 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tt (-30 lines)
1	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Error 401</title>
3	[% INCLUDE 'doc-head-close.inc' %]
4	</head>
5	<body id="err_401" class="err">
6
7	[% INCLUDE 'header.inc' %]
8	[% INCLUDE 'cat-search.inc' %]
9
10	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 401</div>
11
12	<div id="doc" class="yui-t7">
13
14	<div id="bd">
15	<div id="yui-main">
16	<div class="yui-b"><div class="yui-g">
17	<h1>An error has occurred!</h1>
18	<h2>Error 401</h2>
19	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
20	<li>This error means that you aren't authorized to view this page.</li>
21	<li>Please <a href="/cgi-bin/koha/mainpage.pl">log in</a> and try again.
22	<li>To report this error, you can <a href="mailto:[% admin %]">email the Koha administrator</a>.</li>
23	<li>Use top menu bar to navigate to another part of Koha.</li>
24	</ul>
25	</div>
26
27	</div>
28	</div>
29
30	[% INCLUDE 'intranet-bottom.inc' %]

Lines 1-29 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tt (-29 lines)
1	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Error 402</title>
3	[% INCLUDE 'doc-head-close.inc' %]
4	</head>
5	<body id="err_402" class="err">
6
7	[% INCLUDE 'header.inc' %]
8	[% INCLUDE 'cat-search.inc' %]
9
10	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 402</div>
11
12	<div id="doc" class="yui-t7">
13
14	<div id="bd">
15	<div id="yui-main">
16	<div class="yui-b"><div class="yui-g">
17	<h1>An error has occurred!</h1>
18	<h2>Error 402</h2>
19	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
20	<li>This error means that the link was broken and that the page doesn't exist</li>
21	<li>To report this error, you can <a href="mailto:[% admin %]">email the Koha administrator</a>.</li>
22	<li>Use top menu bar to navigate to another part of Koha.</li>
23	</ul>
24	</div>
25
26	</div>
27	</div>
28
29	[% INCLUDE 'intranet-bottom.inc' %]

Lines 1-29 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tt (-29 lines)
1	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Error 403</title>
3	[% INCLUDE 'doc-head-close.inc' %]
4	</head>
5	<body id="err_403" class="err">
6
7	[% INCLUDE 'header.inc' %]
8	[% INCLUDE 'cat-search.inc' %]
9
10	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 403</div>
11
12	<div id="doc" class="yui-t7">
13
14	<div id="bd">
15	<div id="yui-main">
16	<div class="yui-b"><div class="yui-g">
17	<h1>An error has occurred!</h1>
18	<h2>Error 403</h2>
19	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
20	<li>This error means that you are forbidden to view this page.</li>
21	<li>To report this error, you can <a href="mailto:[% admin %]">email the Koha administrator</a>.</li>
22	<li>Use top menu bar to navigate to another part of Koha.</li>
23	</ul>
24	</div>
25
26	</div>
27	</div>
28
29	[% INCLUDE 'intranet-bottom.inc' %]

Lines 1-29 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tt (-29 lines)
1	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Error 500</title>
3	[% INCLUDE 'doc-head-close.inc' %]
4	</head>
5	<body id="err_500" class="err">
6
7	[% INCLUDE 'header.inc' %]
8	[% INCLUDE 'cat-search.inc' %]
9
10	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 500</div>
11
12	<div id="doc" class="yui-t7">
13
14	<div id="bd">
15	<div id="yui-main">
16	<div class="yui-b"><div class="yui-g">
17	<h1>An error has occurred!</h1>
18	<h2>Error 500</h2>
19	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
20	<li>In Koha this typically means that the Koha team is working on new features</li>
21	<li>Wait while system maintenance is being done or <a href="mailto:[% admin %]">email the Koha administrator</a>.</li>
22	<li>Use top menu bar to navigate to another part of Koha.</li>
23	</ul>
24	</div>
25
26	</div>
27	</div>
28
29	[% INCLUDE 'intranet-bottom.inc' %]