[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/includes do... [rel_2_2]

Owen Leonard oleonard at athenscounty.lib.oh.us
Thu Mar 9 00:07:05 CET 2006


CVSROOT:	/sources/koha
Module name:	koha
Branch: 	rel_2_2
Changes by:	Owen Leonard <oleonard at savannah.gnu.org>	06/03/08 23:07:05

Modified files:
	koha-tmpl/intranet-tmpl/npl/en/includes: doc-head-circ-close.inc 
	                                         doc-head-close-addbiblio.inc 
	                                         doc-head-close.inc 
Added files:
	koha-tmpl/intranet-tmpl/npl/en/includes: common.js.inc 

Log message:
	Moving some common javascript stuff into an include file. Adding verify_images function to handle missing patron images in circulation and moremember

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc.diff?only_with_tag=rel_2_2&tr1=1.2.2.5&tr2=1.2.2.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc.diff?only_with_tag=rel_2_2&tr1=1.1.2.7&tr2=1.1.2.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc.diff?only_with_tag=rel_2_2&tr1=1.1.2.6&tr2=1.1.2.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/common.js.inc?only_with_tag=rel_2_2&rev=1.1.2.1

Patches:
Index: koha/koha-tmpl/intranet-tmpl/npl/en/includes/common.js.inc
diff -u /dev/null koha/koha-tmpl/intranet-tmpl/npl/en/includes/common.js.inc:1.1.2.1
--- /dev/null	Wed Mar  8 23:07:05 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/includes/common.js.inc	Wed Mar  8 23:07:05 2006
@@ -0,0 +1,52 @@
+<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 openWindow(targeturl, windowname) {
+	newwin =
+	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
+}
+ 
+ 	var newwin;
+	
+	// Open the popup window if it doesn't already exist and give it focus.
+	function PopWin(targeturl, windowname) {
+	
+		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
+	  newwin.focus();
+	}
+	
+  // Set the value of the form field to the passed value and optionally shift
+	// focus and close the popup.
+	function FillForm(val,formname,formfield) {
+	
+		document.forms[formname].elements[formfield].value = val;
+
+		// Uncomment below to shift focus after clicking link in popup.
+		document.forms[formname].elements[formfield].focus();
+		
+		// Uncomment below to close popup after clicking link.
+		newwin.close();
+	}
+
+// http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html
+function verify_images() {
+    for (var i = 0; i < document.images.length; i++) {
+        img = document.images[i];
+        if ((img.src.indexOf('images') >= 0)) {
+			w = img.width;
+            h = img.height;
+     if ((w == 0) && (h == 0) || ((img.complete != null) && (!img.complete))) {
+               img.src = '<!-- TMPL_VAR NAME='themelang' -->/images/patron-blank.png';
+			}
+        }
+    }
+}
+
+function mainfocus() {
+		if(document.forms['mainform']){
+			document.forms['mainform'].elements[0].focus();
+		}
+	}
+</script>
\ No newline at end of file
Index: koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc
diff -u koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc:1.2.2.5 koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc:1.2.2.6
--- koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc:1.2.2.5	Fri Mar  3 16:27:19 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc	Wed Mar  8 23:07:05 2006
@@ -5,40 +5,7 @@
 <!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);<!-- /TMPL_IF -->
 	        <!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
 </style>
-<script language="JavaScript" type="text/javascript">
-<!-- Hide from old browsers
-function Help() {
-	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
-}
-function openWindow(targeturl, windowname) {
-	newwin =
-	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
-}
- 
- 	var newwin;
-	
-	// Open the popup window if it doesn't already exist and give it focus.
-	function PopWin(targeturl, windowname) {
-	
-		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
-	  newwin.focus();
-	}
-	
-  // Set the value of the form field to the passed value and optionally shift
-	// focus and close the popup.
-	function FillForm(val,formname,formfield) {
-	
-		document.forms[formname].elements[formfield].value = val;
-
-		// Uncomment below to shift focus after clicking link in popup.
-		document.forms[formname].elements[formfield].focus();
-		
-		// Uncomment below to close popup after clicking link.
-		newwin.close();
-	}
- 
-// end hiding -->
-</script>
+<!-- TMPL_INCLUDE NAME="common.js.inc" -->
 </head>
 
-<body onload="document.forms['mainform'].elements[0].focus();">
+<body onload="verify_images(); mainfocus(); ">
Index: koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc
diff -u koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc:1.1.2.7 koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc:1.1.2.8
--- koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc:1.1.2.7	Fri Mar  3 16:27:19 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc	Wed Mar  8 23:07:05 2006
@@ -6,40 +6,7 @@
 	<!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
         @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/marc-editor.css);
 </style>
-<script language="JavaScript" type="text/javascript">
-<!-- Hide from old browsers
-function Help() {
-        newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
-}
-function openWindow(targeturl, windowname) {
-        newwin =
-        window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
-}
-
-        var newwin;
-
-        // Open the popup window if it doesn't already exist and give it focus.
-        function PopWin(targeturl, windowname) {
-
-                if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
-          newwin.focus();
-        }
-
-  // Set the value of the form field to the passed value and optionally shift
-        // focus and close the popup.
-        function FillForm(val,formname,formfield) {
-
-                document.forms[formname].elements[formfield].value = val;
-
-                // Uncomment below to shift focus after clicking link in popup.
-                document.forms[formname].elements[formfield].focus();
-
-                // Uncomment below to close popup after clicking link.
-                newwin.close();
-        }
-
-// end hiding -->
-</script>
+<!-- TMPL_INCLUDE NAME="common.js.inc" -->
 </head>
 
 <body onload="loading();">
Index: koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc
diff -u koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc:1.1.2.6 koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc:1.1.2.7
--- koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc:1.1.2.6	Fri Mar  3 16:27:19 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc	Wed Mar  8 23:07:05 2006
@@ -5,39 +5,10 @@
 	<!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
 </style>
+<!-- TMPL_INCLUDE NAME="common.js.inc" -->
 <script language="JavaScript" type="text/javascript">
 <!-- Hide from old browsers
-function Help() {
-	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
-}
 
-function openWindow(targeturl, windowname) {
-	newwin =
-	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
-}
- 
- 	var newwin;
-	
-	// Open the popup window if it doesn't already exist and give it focus.
-	function PopWin(targeturl, windowname) {
-	
-		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
-	  newwin.focus();
-	}
-	
-  // Set the value of the form field to the passed value and optionally shift
-	// focus and close the popup.
-	function FillForm(val,formname,formfield) {
-	
-		document.forms[formname].elements[formfield].value = val;
-
-		// Uncomment below to shift focus after clicking link in popup.
-		document.forms[formname].elements[formfield].focus();
-		
-		// Uncomment below to close popup after clicking link.
-		newwin.close();
-	}
-	
 	function CheckAll() {
 		count = document.mainform.elements.length;
 	    for (i=0; i < count; i++) {





More information about the Koha-cvs mailing list