Merging from rel-1-2 to trunk

Removing HLT links from footers and fixing javascript form focusing bug that
affects Internet Explorer browsers.

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 44f1659..e44af6e 100644 (file)
--- 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 98aba4d..93c4760 100644 (file)
--- 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 a4c3e24..80c4d3d 100644 (file)
--- 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 17b50b3..1659527 100644 (file)
--- 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);
 \r
 function focusinput() {\r
     window.onerror=null;\r
-    document.forms[0].elements[0].focus();\r
+    if (document.forms[0]) {\r
+       document.forms[0].elements[0].focus();\r
+    }\r
 }\r
        \r
 if (document.images){\r

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 87df56d..2cb63d5 100644 (file)
--- 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 0ca1dfd..a424f6d 100644 (file)
--- 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 e2f06e4..0352e7a 100644 (file)
--- 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 601a3c6..1a11e03 100644 (file)
--- 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 261b909..80c4d3d 100644 (file)
--- 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>