Bugzilla – Attachment 2363 Details for
Bug 4999
OPAC error pages have incorrect markup structure
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed fix
0001-Fix-for-Bug-4999-OPAC-error-pages-have-incorrect-mar.patch (text/plain), 10.71 KB, created by
Owen Leonard
on 2010-07-14 13:57:18 UTC
(
hide
)
Description:
Proposed fix
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2010-07-14 13:57:18 UTC
Size:
10.71 KB
patch
obsolete
>From 7fd9e65cf34a26e3ab509b87121b299604b0d544 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 14 Jul 2010 09:52:12 -0400 >Subject: [PATCH] Fix for Bug 4999, OPAC error pages have incorrect markup structure > >No strings have been harmed in the making of this patch. >--- > .../opac-tmpl/prog/en/modules/errors/400.tmpl | 31 ++++++++++--------- > .../opac-tmpl/prog/en/modules/errors/401.tmpl | 31 ++++++++++--------- > .../opac-tmpl/prog/en/modules/errors/402.tmpl | 31 ++++++++++--------- > .../opac-tmpl/prog/en/modules/errors/403.tmpl | 31 ++++++++++--------- > .../opac-tmpl/prog/en/modules/errors/404.tmpl | 31 ++++++++++--------- > .../opac-tmpl/prog/en/modules/errors/500.tmpl | 31 ++++++++++--------- > 6 files changed, 96 insertions(+), 90 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tmpl >index 49fd9e6..e7ec2f2 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tmpl >@@ -1,14 +1,14 @@ > <!-- 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> >+<body id="error400"> >+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF --> >+<div id="bd"> > <!--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"> >+<div id="yui-main"> >+<div class="yui-b"> >+<div class="yui-g"> > <h3>An Error has Occurred</h3> > <h4>Error 400</h4> > <ul> >@@ -17,13 +17,14 @@ > <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> >+</div> >+</div> >+<!-- TMPL_IF NAME="OpacNav" --> >+<div class="yui-b"> >+<div class="container"> >+<!--TMPL_INCLUDE NAME="navigation.inc" --> >+</div> >+</div><!-- /TMPL_IF --> >+</div> >+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" --> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tmpl >index 73ed72b..cd97560 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tmpl >@@ -1,14 +1,14 @@ > <!-- 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> >+<body id="error401"> >+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF --> >+<div id="bd"> > <!--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"> >+<div id="yui-main"> >+<div class="yui-b"> >+<div class="yui-g"> > <h3>An Error has Occurred</h3> > <h4>Error 401</h4> > <ul> >@@ -18,13 +18,14 @@ > <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> >+</div> >+</div> >+<!-- TMPL_IF NAME="OpacNav" --> >+<div class="yui-b"> >+<div class="container"> >+<!--TMPL_INCLUDE NAME="navigation.inc" --> >+</div> >+</div><!-- /TMPL_IF --> >+</div> >+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" --> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tmpl >index 13eb795..0035266 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tmpl >@@ -1,14 +1,14 @@ > <!-- 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> >+<body id="error402"> >+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF --> >+<div id="bd"> > <!--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"> >+<div id="yui-main"> >+<div class="yui-b"> >+<div class="yui-g"> > <h3>An Error has Occurred</h3> > <h4>Error 402</h4> > <ul> >@@ -17,13 +17,14 @@ > <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> >+</div> >+</div> >+<!-- TMPL_IF NAME="OpacNav" --> >+<div class="yui-b"> >+<div class="container"> >+<!--TMPL_INCLUDE NAME="navigation.inc" --> >+</div> >+</div><!-- /TMPL_IF --> >+</div> >+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" --> >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 81b15da..f099511 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tmpl >@@ -1,14 +1,14 @@ > <!-- 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> >+<body id="error403"> >+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF --> >+<div id="bd"> > <!--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"> >+<div id="yui-main"> >+<div class="yui-b"> >+<div class="yui-g"> > <h3>An Error has Occurred</h3> > <h4>Error 403</h4> > <ul> >@@ -17,13 +17,14 @@ > <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> >+</div> >+</div> >+<!-- TMPL_IF NAME="OpacNav" --> >+<div class="yui-b"> >+<div class="container"> >+<!--TMPL_INCLUDE NAME="navigation.inc" --> >+</div> >+</div><!-- /TMPL_IF --> >+</div> >+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" --> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tmpl >index bb07e53..0f7472e 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tmpl >@@ -1,14 +1,14 @@ > <!-- 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> >+<body id="error404"> >+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF --> >+<div id="bd"> > <!--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"> >+<div id="yui-main"> >+<div class="yui-b"> >+<div class="yui-g"> > <h3>An Error has Occurred</h3> > <h4>Error 404</h4> > <ul> >@@ -17,13 +17,14 @@ > <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> >+</div> >+</div> >+<!-- TMPL_IF NAME="OpacNav" --> >+<div class="yui-b"> >+<div class="container"> >+<!--TMPL_INCLUDE NAME="navigation.inc" --> >+</div> >+</div><!-- /TMPL_IF --> >+</div> >+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" --> >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 f96e407..d45c5db 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tmpl >@@ -1,14 +1,14 @@ > <!-- 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> >+<body id="error500"> >+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF --> >+<div id="bd"> > <!--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"> >+<div id="yui-main"> >+<div class="yui-b"> >+<div class="yui-g"> > <h3>An Error has Occurred</h3> > <h4>Error 500</h4> > <ul> >@@ -17,13 +17,14 @@ > <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> >+</div> >+</div> >+<!-- TMPL_IF NAME="OpacNav" --> >+<div class="yui-b"> >+<div class="container"> >+<!--TMPL_INCLUDE NAME="navigation.inc" --> >+</div> >+</div><!-- /TMPL_IF --> >+</div> >+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" --> >-- >1.7.0.4 >
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 4999
: 2363