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

(-)a/errors/400.pl (-2 / +5 lines)
Lines 27-38 my $query = CGI->new; Link Here
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';
(-)a/errors/401.pl (-2 / +5 lines)
Lines 26-37 my $query = CGI->new; Link Here
26
my $admin = C4::Context->preference('KohaAdminEmailAddress');
26
my $admin = C4::Context->preference('KohaAdminEmailAddress');
27
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
27
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
28
    {
28
    {
29
        template_name   => 'errors/401.tt',
29
        template_name   => 'errors/errorpage.tt',
30
        query           => $query,
30
        query           => $query,
31
        type            => 'intranet',
31
        type            => 'intranet',
32
        authnotrequired => 1,
32
        authnotrequired => 1,
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';
(-)a/errors/402.pl (-2 / +5 lines)
Lines 27-38 my $query = CGI->new; Link Here
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/402.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 => 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';
(-)a/errors/403.pl (-2 / +5 lines)
Lines 27-38 my $query = CGI->new; Link Here
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/403.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 => 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';
(-)a/errors/404.pl (-2 / +5 lines)
Lines 27-38 my $query = CGI->new; Link Here
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';
(-)a/errors/500.pl (-2 / +5 lines)
Lines 27-38 my $query = CGI->new; Link Here
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/500.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 => 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';
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tt (-29 lines)
Lines 1-29 Link Here
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' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tt (-30 lines)
Lines 1-30 Link Here
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' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tt (-29 lines)
Lines 1-29 Link Here
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' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tt (-29 lines)
Lines 1-29 Link Here
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' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tt (-29 lines)
Lines 1-29 Link Here
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' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tt (-8 / +8 lines)
Lines 1-21 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Error 404</title>
2
<title>Koha &rsaquo; Error [% errno %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
</head>
4
</head>
5
<body id="err_404" class="err">
5
<body id="err_[% errno %]" class="err">
6
6
7
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'header.inc' %]
8
[% INCLUDE 'cat-search.inc' %]
8
[% INCLUDE 'cat-search.inc' %]
9
9
10
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 404</div>
10
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error [% errno %]</div>
11
11
12
<div id="doc" class="yui-t7">
12
<div id="doc" class="yui-t7">
13
   
13
14
   <div id="bd">
14
   <div id="bd">
15
	<div id="yui-main">
15
        <div id="yui-main">
16
	<div class="yui-b"><div class="yui-g">
16
        <div class="yui-b"><div class="yui-g">
17
    <h1>An error has occurred!</h1>
17
    <h1>An error has occurred!</h1>
18
    <h3><em>Error 404</em></h3>
18
    <h2><em>Error [% errno %]</em></h2>
19
        <h3>This message may have been caused by any of the following reasons:</h3>
19
        <h3>This message may have been caused by any of the following reasons:</h3>
20
        <ul style="padding-bottom: 0.5em;">
20
        <ul style="padding-bottom: 0.5em;">
21
            <li>You made use of an external link to an item that is no longer available</li>
21
            <li>You made use of an external link to an item that is no longer available</li>
Lines 26-32 Link Here
26
        <h3>What's next?</h3>
26
        <h3>What's next?</h3>
27
        <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
27
        <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
28
            <li>Use top menu bar to navigate to another part of Koha.</li>
28
            <li>Use top menu bar to navigate to another part of Koha.</li>
29
            <li>To report a broken link or any other issue, please send an <a href="mailto:[% admin %]">email to the Koha Administrator</a></li>
29
            <li>To report a broken link or any other issue, please contact the Koha Administrator <a href="mailto:[% admin %]">Email</a></li>
30
    </ul>
30
    </ul>
31
</div>
31
</div>
32
32
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/404.tt (-55 lines)
Lines 1-54 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  An error has occurred</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% BLOCK cssinclude %][% END %]
5
</head>
6
<body id="error404" class="error">
7
[% INCLUDE 'masthead.inc' %]
8
9
    <div class="main">
10
        <ul class="breadcrumb">
11
            <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
12
            <li><a href="#">Error 404</a></li>
13
        </ul>
14
15
        <div class="container-fluid">
16
            <div class="row-fluid">
17
                [% IF ( OpacNav || OpacNavBottom ) %]
18
                    <div class="span2">
19
                        <div id="navigation">
20
                            [% INCLUDE 'navigation.inc' %]
21
                        </div>
22
                    </div>
23
                    <div class="span10">
24
                [% ELSE %]
25
                    <div class="span12">
26
                [% END %]
27
                    <div id="errormsg404">
28
                        <h3>Sorry, the requested page is not available</h3>
29
                        <p><em>Error 404</em></p>
30
                        <h3>This message can have following reasons</h3>
31
                        <ul>
32
                            <li>You made use of an external link to a catalog item that is no longer available</li>
33
                            <li>You followed an outdated link e.g. from a search engine or a bookmark</li>
34
                            <li>You tried to access a page that needs authentification</li>
35
                            <li>An internal link in our catalog home page is broken and the page does not exist</li>
36
                        </ul>
37
                        <h3>What's next?</h3>
38
                        <ul>
39
                            <li>You can search our catalog using the search form at the top of this page</li>
40
                            <li>You can navigate to the <a href="/cgi-bin/koha/opac-main.pl"><b>catalog main page</b></a></li>
41
                        </ul>
42
                        <h3>Report broken links</h3>
43
                        <ul>
44
                            <li>To report a broken link or any other issue please send an <a href="mailto:[% admin %]">email to the Koha Administrator</a></li>
45
                        </ul>
46
                    </div> <!-- / #errormsg404 -->
47
                </div> <!-- / .span10/12 -->
48
            </div> <!-- / .row-fluid -->
49
        </div> <!-- / .container-fluid -->
50
    </div> <!-- / .main -->
51
52
[% INCLUDE 'opac-bottom.inc' %]
53
[% BLOCK jsinclude %]
54
[% END %]
55
- 

Return to bug 15288