[Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/en authori... [rel_2_2]

[Owen Leonard]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Owen Leonard <address@hidden>   06/04/18 18:45:00

Modified files:
        koha-tmpl/intranet-tmpl/default/en/authorities: authorities.tmpl 
        koha-tmpl/intranet-tmpl/default/en/circ: circulation.tmpl 
        koha-tmpl/intranet-tmpl/default/en/includes: auth-search-top.inc 
                                                     auth-top.inc 
                                                     circulation-top.inc 

Log message:
        Minor javascript changes to fix Bug 585

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl.diff?only_with_tag=rel_2_2&tr1=1.6.2.6&tr2=1.6.2.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl.diff?only_with_tag=rel_2_2&tr1=1.35.2.10&tr2=1.35.2.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-search-top.inc.diff?only_with_tag=rel_2_2&tr1=1.2&tr2=1.2.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc.diff?only_with_tag=rel_2_2&tr1=1.7.2.1&tr2=1.7.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc.diff?only_with_tag=rel_2_2&tr1=1.30.2.1&tr2=1.30.2.2&r1=text&r2=text

Patches:
Index: koha/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl
diff -u 
koha/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:1.6.2.6 
koha/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:1.6.2.7
--- 
koha/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:1.6.2.6    
    Tue Oct 25 13:09:52 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl        
Tue Apr 18 18:45:00 2006
@@ -154,7 +154,7 @@
                alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" 
mandatory fields empty (see bold subfields)");
                alert(alertString2);
        } else {
-               document.forms[0].submit();
+               document.forms['f'].submit();
        }
 }
 function Dopop(link,i) {
@@ -182,8 +182,8 @@
 }
 
 function AddField(field) {
-       document.forms[0].op.value = "addfield";
-       document.forms[0].addfield_field.value=field;
+       document.forms['f'].op.value = "addfield";
+       document.forms['f'].addfield_field.value=field;
        document.f.submit();
 }
 
Index: koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:1.35.2.10 
koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:1.35.2.11
--- koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:1.35.2.10     
Thu Apr  6 15:39:58 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl       Tue Apr 
18 18:45:00 2006
@@ -65,7 +65,7 @@
                                <h2 class="circulation">
                                        Enter borrower card number or partial 
last name
                                </h2>
-                               <form method="post" 
action="/cgi-bin/koha/circ/circulation.pl">
+                               <form method="post" name="f" 
action="/cgi-bin/koha/circ/circulation.pl">
                                        <input name="findborrower">
                                        <input type="hidden" name="branch" 
value="<!-- TMPL_VAR NAME="branch" -->">
                                        <input type="hidden" name="printer" 
value="<!-- TMPL_VAR NAME="printer" -->">
@@ -81,7 +81,7 @@
 
 <!-- TMPL_IF NAME="borrowernumber" -->
        <div id="bloc25">
-       <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+       <form method="post" name="f" action="/cgi-bin/koha/circ/circulation.pl">
                <h2 class="circulation">Enter Book Barcode</h2>
                <p>Item Barcode:<input name="barcode" size="10"> <input 
type="submit" value="Issue" class="button circulation"></p>
                <p>
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-search-top.inc
diff -u /dev/null 
koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-search-top.inc:1.2.2.1
--- /dev/null   Tue Apr 18 18:45:00 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-search-top.inc        
Tue Apr 18 18:45:00 2006
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+<title>KOHA: INTRANET: Authorities</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+
+<script language="JavaScript">
+<!-- Hide from old browsers
+function openWindow(targeturl, windowname) {
+newwin =
+window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
+}
+// end hiding -->
+</script>
+
+<script language="JavaScript" type="text/javascript">
+function Help() {
+       newin=window.open("/cgi-bin/koha/help.pl","Koha 
Help",'width=600,height=600,toolbar=false,scrollbars=yes');
+}
+
+function addauthority() {
+       X = document.forms['f'].authtype.value;
+       
window.location="/cgi-bin/koha/authorities/authorities.pl?authtypecode="+X;
+}
+</script>
+
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" 
-->/includes/common-style.css">
+<style type="text/css">
+.authority {
+       background-color: #6b7cbe;
+       color:#FFFFFF;
+       text-decoration: normal;
+       font-weight: bold;
+       background-image:none;
+       }
+a.authority:hover {
+       background-color: #6b7cbe;
+       color: #FFFFFF;
+       text-decoration: normal;
+       font-weight: bold;
+       }
+</style>
+</head>
+
+<body>
+<!-- MENUS -->
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> 
[<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
+<!-- TMPL_ELSE -->
+    <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
+<!-- /TMPL_IF -->
\ No newline at end of file
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc
diff -u koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:1.7.2.1 
koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:1.7.2.2
--- koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:1.7.2.1       
Thu Jul 28 15:28:56 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc       Tue Apr 
18 18:45:00 2006
@@ -20,12 +20,12 @@
 }
 
 function addauthority() {
-       X = document.forms[0].authtype.value;
+       X = document.forms['f'].authtype.value;
        
window.location="/cgi-bin/koha/authorities/authorities.pl?authtypecode="+X;
 }
 function searchauthority() {
-       X = document.forms[0].authtype2.value;
-       Y = document.forms[0].value.value;
+       X = document.forms['f'].authtype2.value;
+       Y = document.forms['f'].value.value;
        
window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains";
 }
 </script>
Index: koha/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc
diff -u 
koha/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:1.30.2.1 
koha/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:1.30.2.2
--- 
koha/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:1.30.2.1   
    Thu Jul 28 15:28:56 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc        
Tue Apr 18 18:45:00 2006
@@ -12,7 +12,7 @@
 window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
 }
 function focusOnFirst (){
-document.forms[0].elements[0].focus();
+document.forms['f'].elements[0].focus();
 }
 // end hiding -->
 </script>
@@ -40,7 +40,7 @@
 </style>
 </head>
 
-<body onload="javascript:focusOnFirst()">
+<body onload="focusOnFirst()">
 
 <!-- TMPL_INCLUDE name="menus.inc" -->
 <!-- TMPL_IF NAME="loggedinusername" -->