Corrected the routine name to output_html_with_http_headers. Changed the correct error number in some templates. --- errors/400.pl | 2 +- errors/401.pl | 2 +- errors/402.pl | 2 +- errors/403.pl | 2 +- errors/404.pl | 2 +- errors/500.pl | 3 +- .../opac-tmpl/prog/en/modules/errors/402.tmpl | 29 ++++++++++++++++++++ .../opac-tmpl/prog/en/modules/errors/403.tmpl | 2 +- .../opac-tmpl/prog/en/modules/errors/500.tmpl | 2 +- opac/errors/400.pl | 2 +- opac/errors/401.pl | 2 +- opac/errors/402.pl | 2 +- opac/errors/403.pl | 2 +- opac/errors/404.pl | 2 +- opac/errors/500.pl | 2 +- 15 files changed, 44 insertions(+), 14 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tmpl
diff --git a/errors/400.pl b/errors/400.pl index b04b7fd..58363bf 100755 --- a/errors/400.pl +++ b/errors/400.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '400 Bad Request'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '400 Bad Request'; diff --git a/errors/401.pl b/errors/401.pl index 3ea459a..665f1d8 100755 --- a/errors/401.pl +++ b/errors/401.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '401 Unauthorized'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '401 Unauthorized'; diff --git a/errors/402.pl b/errors/402.pl index 4bfe7ce..b94d0bd 100755 --- a/errors/402.pl +++ b/errors/402.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '402 Payment Required'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '402 Payment Required'; diff --git a/errors/403.pl b/errors/403.pl index 4058ce9..b08ae39 100755 --- a/errors/403.pl +++ b/errors/403.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '403 Forbidden'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '403 Forbidden'; diff --git a/errors/404.pl b/errors/404.pl index 418723f..806ad2c 100755 --- a/errors/404.pl +++ b/errors/404.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '404 Not Found'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '404 Not Found'; diff --git a/errors/500.pl b/errors/500.pl index 6f570a2..56270e1 100755 --- a/errors/500.pl +++ b/errors/500.pl @@ -34,4 +34,5 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '500 Internal Server Error'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '500 Internal Server Error'; + diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tmpl new file mode 100644 index 0000000..b55e429 --- /dev/null +++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tmpl @@ -0,0 +1,29 @@ +<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog › An Error Has Occurred +<!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> +</head> +<body> +<!--TMPL_INCLUDE NAME="masthead.inc" --> +<!--TMPL_INCLUDE NAME="navigation.inc" --> + +<div id="doc3" class="yui-t1"> + <div id="bd"> + <div id="yui-main"> + <div class="yui-b"><div class="yui-g"> + <h3>An Error has Occurred</h3> + <h4>Error 402</h4> + <ul> + <li>This error means that payment is required to see this page.</li> + <li>To report this error, you can + <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li> + <li>Use top menu bar to navigate to another part of Koha.</li> + </ul> + </div> + </div> + </div> + </div> +</div> + +<!-- <div id="main"> --> +<!-- </div> --> +</body> +</html> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tmpl index d8fc6b2..81b15da 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tmpl @@ -10,7 +10,7 @@ <div id="yui-main"> <div class="yui-b"><div class="yui-g"> <h3>An Error has Occurred</h3> - <h4>Error 404</h4> + <h4>Error 403</h4> <ul> <li>This error means that you are forbidden for some reason to see this page.</li> <li>To report this error, you can diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tmpl index 27121ff..f96e407 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tmpl @@ -10,7 +10,7 @@ <div id="yui-main"> <div class="yui-b"><div class="yui-g"> <h3>An Error has Occurred</h3> - <h4>Error 404</h4> + <h4>Error 500</h4> <ul> <li>An error occurred while try to process your request.</li> <li>To report this error, you can diff --git a/opac/errors/400.pl b/opac/errors/400.pl index a0d9413..8c9bbb0 100755 --- a/opac/errors/400.pl +++ b/opac/errors/400.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '400 Bad Request'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '400 Bad Request'; diff --git a/opac/errors/401.pl b/opac/errors/401.pl index 216b643..08b69dc 100755 --- a/opac/errors/401.pl +++ b/opac/errors/401.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '401 Unauthorized'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '401 Unauthorized'; diff --git a/opac/errors/402.pl b/opac/errors/402.pl index b84ccca..507424b 100755 --- a/opac/errors/402.pl +++ b/opac/errors/402.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '402 Payment Required'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '402 Payment Required'; diff --git a/opac/errors/403.pl b/opac/errors/403.pl index ba21cd6..52b21c5 100755 --- a/opac/errors/403.pl +++ b/opac/errors/403.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '403 Forbidden'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '403 Forbidden'; diff --git a/opac/errors/404.pl b/opac/errors/404.pl index 0c5408c..c299f02 100755 --- a/opac/errors/404.pl +++ b/opac/errors/404.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_html_with_http_headers $query, $cookie, $template->output; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '404 Not Found'; diff --git a/opac/errors/500.pl b/opac/errors/500.pl index fb0350e..2b082db 100755 --- a/opac/errors/500.pl +++ b/opac/errors/500.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '500 Internal Server Error'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '500 Internal Server Error'; -- 1.6.0.6 _______________________________________________ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches