projects / koha_fer / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5bd02c5)
Fix for Bug 4999, OPAC error pages have incorrect markup structure
authorOwen Leonard <oleonard@myacpl.org>
Wed, 14 Jul 2010 13:56:39 +0000 (09:56 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Fri, 16 Jul 2010 12:27:58 +0000 (08:27 -0400)
No strings have been harmed in the making of this patch.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tmpl patch | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tmpl patch | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tmpl patch | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tmpl patch | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tmpl patch | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tmpl patch | blob | history

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 (file)
--- 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 &rsaquo;  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 (file)
--- 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 &rsaquo;  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 (file)
--- 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 &rsaquo;  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 (file)
--- 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 &rsaquo;  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 (file)
--- 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 &rsaquo;  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 (file)
--- 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 &rsaquo;  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" -->
Unnamed repository; edit this file 'description' to name the repository.