From b4ff8f24bde46e0467d17e157921c93d84e3761d Mon Sep 17 00:00:00 2001
From: tonnesen <tonnesen>
Date: Mon, 28 Oct 2002 22:12:16 +0000
Subject: [PATCH] Merging from rel-1-2 to trunk Removing HLT links from footers
 and fixing javascript form focusing bug that affects Internet Explorer
 browsers.

---
 .../default/en/includes/acquisitions-bottom.inc              | 5 ++---
 .../intranet-tmpl/default/en/includes/aquisitions-bottom.inc | 5 ++---
 koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc   | 5 ++---
 koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc      | 4 +++-
 .../intranet-tmpl/default/en/includes/circulation-bottom.inc | 5 ++---
 .../intranet-tmpl/default/en/includes/circulation-top.inc    | 4 +++-
 .../intranet-tmpl/default/en/includes/issues-bottom.inc      | 5 ++---
 .../intranet-tmpl/default/en/includes/members-bottom.inc     | 5 ++---
 .../intranet-tmpl/default/en/includes/reports-bottom.inc     | 5 ++---
 9 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc b/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc
index 44f1659b2b..e44af6e1eb 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc
@@ -16,9 +16,8 @@
 <A HREF="/cgi-bin/koha/members-home.pl">Members</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
 <A HREF="/reports/">Reports</a> ||
-<A HREF="/help/">Help</a> ||
-<A HREF="http://opac.katipo.co.nz">OPAC</a> ||
-<A HREF="http://www.library.org.nz">Library Website</a>
+<A HREF="/cgi-bin/koha/admin-home.pl">System Parameters</a> ||
+<A HREF="/help/">Help</a>
 </FONT>
 </CENTER>
 </BODY>
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/aquisitions-bottom.inc b/koha-tmpl/intranet-tmpl/default/en/includes/aquisitions-bottom.inc
index 98aba4d82a..93c47605ef 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/aquisitions-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/aquisitions-bottom.inc
@@ -16,9 +16,8 @@
 <A HREF="/members/">Members</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
 <A HREF="/reports/">Reports</a> ||
-<A HREF="/help/">Help</a> ||
-<A HREF="http://opac.katipo.co.nz">OPAC</a> ||
-<A HREF="http://www.library.org.nz">Library Website</a>
+<A HREF="/cgi-bin/koha/admin-home.pl">System Parameters</a> ||
+<A HREF="/help/">Help</a>
 </FONT>
 </CENTER>
 </BODY>
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc b/koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc
index a4c3e24428..80c4d3d97e 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc
@@ -16,9 +16,8 @@
 <A HREF="/cgi-bin/koha/members-home.pl">Members</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
 <A HREF="/cgi-bin/koha/reports-home.pl">Reports</a> ||
-<A HREF="/help/">Help</a> ||
-<A HREF="http://opac.library.org.nz">OPAC</a> ||
-<A HREF="http://www.library.org.nz">Library Website</a>
+<A HREF="/cgi-bin/koha/admin-home.pl">System Parameters</a> ||
+<A HREF="/help/">Help</a>
 </FONT>
 </CENTER>
 </BODY>
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
index 17b50b3f49..1659527c63 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
@@ -26,7 +26,9 @@ parent.location.href=(form.dest.options[myindex].value);
 
 function focusinput() {
     window.onerror=null;
-    document.forms[0].elements[0].focus();
+    if (document.forms[0]) {
+	document.forms[0].elements[0].focus();
+    }
 }
        
 if (document.images){
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc b/koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc
index 87df56da68..2cb63d5542 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc
@@ -14,9 +14,8 @@
 <A HREF="/cgi-bin/koha/members-home.pl">Members</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
 <A HREF="/cgi-bin/koha/reports-home.pl">Reports</a> ||
-<A HREF="/help/">Help</a> ||
-<A HREF="http://opac.library.org.nz">OPAC</a> ||
-<A HREF="http://www.library.org.nz">Library Website</a>
+<A HREF="/cgi-bin/koha/admin-home.pl">System Parameters</a> ||
+<A HREF="/help/">Help</a>
 </FONT>
 </CENTER>
 </BODY>
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc
index 0ca1dfd067..a424f6df80 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc
@@ -25,7 +25,9 @@ function leapto(form) {
 }
 function focusinput() {
     	window.onerror=null;
-    	document.forms[0].elements[0].focus();
+	if (document.forms[0]) {
+	    document.forms[0].elements[0].focus();
+	}
 }
 function messenger(url, x, y){
         window1=window.open(url,"window1","height"+x+",width="+y+",left=150,top=50,350,screenY=50");
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc b/koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc
index e2f06e4986..0352e7acfa 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc
@@ -15,9 +15,8 @@
 <A HREF="/cgi-bin/koha/members-home.pl">Members</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
 <A HREF="/cgi-bin/koha/reports-home.pl">Reports</a> ||
-<A HREF="/help/">Help</a> ||
-<A HREF="http://opac.katipo.co.nz">OPAC</a> ||
-<A HREF="http://www.library.org.nz">Library Website</a>
+<A HREF="/cgi-bin/koha/admin-home.pl">System Parameters</a> ||
+<A HREF="/help/">Help</a>
 </FONT>
 </CENTER>
 </BODY>
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc b/koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc
index 601a3c6035..1a11e03254 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc
@@ -14,9 +14,8 @@
 <A HREF="/cgi-bin/koha/members-home.pl">Members</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
 <A HREF="/cgi-bin/koha/reports-home.pl">Reports</a> ||
-<A HREF="/help/">Help</a> ||
-<A HREF="http://opac.katipo.co.nz">OPAC</a> ||
-<A HREF="http://www.library.org.nz">Library Website</a>
+<A HREF="/cgi-bin/koha/admin-home.pl">System Parameters</a> ||
+<A HREF="/help/">Help</a>
 </FONT>
 <CENTER>
 </BODY>
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc b/koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc
index 261b909fb2..80c4d3d97e 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc
@@ -16,9 +16,8 @@
 <A HREF="/cgi-bin/koha/members-home.pl">Members</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
 <A HREF="/cgi-bin/koha/reports-home.pl">Reports</a> ||
-<A HREF="/help/">Help</a> ||
-<A HREF="http://opac.katipo.co.nz">OPAC</a> ||
-<A HREF="http://www.library.org.nz">Library Website</a>
+<A HREF="/cgi-bin/koha/admin-home.pl">System Parameters</a> ||
+<A HREF="/help/">Help</a>
 </FONT>
 </CENTER>
 </BODY>
-- 
2.39.5