From 2b21bd88c692a75f306928386aceae6ce73d93eb Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 26 Jul 2005 21:59:11 +0000
Subject: [PATCH] stamp.  html on print, not on alert

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1511 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Evergreen/staff_client/Makefile                   |  4 ++--
 Evergreen/staff_client/application.ini            |  2 +-
 .../chrome/content/evergreen/circ/circ_utils.js   | 15 +++++++--------
 .../chrome/content/evergreen/util/win.js          |  1 +
 .../chrome/locale/en-US/evergreen/auth.dtd        |  4 ++--
 Evergreen/staff_client/install.rdf                |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Evergreen/staff_client/Makefile b/Evergreen/staff_client/Makefile
index 281e4a1fb1..30cdc27c63 100644
--- a/Evergreen/staff_client/Makefile
+++ b/Evergreen/staff_client/Makefile
@@ -1,7 +1,7 @@
 VERSION=0.0.9
 PACKAGE=Evergreen
-DESCRIPTION=Evergreen Staff Client almost-Alpha
-BUILD=2005072613
+DESCRIPTION=Evergreen Staff Client almost-almost-Alpha
+BUILD=2005072617
 
 ILS_DIR=${PWD}/../..
 
diff --git a/Evergreen/staff_client/application.ini b/Evergreen/staff_client/application.ini
index 4618bf302e..3c457358a5 100644
--- a/Evergreen/staff_client/application.ini
+++ b/Evergreen/staff_client/application.ini
@@ -14,7 +14,7 @@ Version=0.0.9
 ;
 ; This field specifies your application's build ID (timestamp).  This field is
 ; required.
-BuildID=2005072613
+BuildID=2005072617
 ;
 ; This field specifies a compact copyright notice for your application.  This
 ; field is optional.
diff --git a/Evergreen/staff_client/chrome/content/evergreen/circ/circ_utils.js b/Evergreen/staff_client/chrome/content/evergreen/circ/circ_utils.js
index 0abf4879bc..253a2780ea 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/circ/circ_utils.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/circ/circ_utils.js
@@ -175,10 +175,9 @@ function checkin_by_copy_barcode(barcode, backdate, f) {
 					break;
 					case '3': case 3: /* TRANSIT ELSEWHERE */
 						if (parseInt(check.route_to)) check.route_to = mw.G.org_tree_hash[ check.route_to ].shortname();
-						var msg = check.text + '<br />\r\n' + 'Barcode: ' + barcode + '  Title: ' + 
+						var msg = check.text + '\r\n' + 'Barcode: ' + barcode + '  Title: ' + 
 								check.record.title() + '  Author: ' + check.record.author() + 
-								'<br />\r\n' + 'Route To: ' + check.route_to +
-								'<br />\r\n';
+								'\r\n' + 'Route To: ' + check.route_to + '\r\n';
 						var pcheck = yns_alert(
 							msg,
 							'Alert',
@@ -188,16 +187,16 @@ function checkin_by_copy_barcode(barcode, backdate, f) {
 							"Check here to confirm this message"
 						); 
 						if (pcheck == 0) {
-							sPrint(msg);
+							sPrint( msg.match( /\n/g, '<br />\r\n'), true );
 						}
 
 					break;
 					case '4': case 4: /* transit for hold is complete */
 						if (parseInt(check.route_to)) check.route_to = mw.G.org_tree_hash[ check.route_to ].shortname();
-						var msg = check.text + '<br />\r\n' + 'Barcode: ' + barcode + '  Title: ' + 
+						var msg = check.text + '\r\n' + 'Barcode: ' + barcode + '  Title: ' + 
 								check.record.title() + '  Author: ' + check.record.author() + 
-								'<br />\r\n' + 'Route To: ' + check.route_to +
-								'<br />\r\n';
+								'\r\n' + 'Route To: ' + check.route_to +
+								'\r\n';
 						var pcheck = yns_alert(
 							msg,
 							'Alert',
@@ -207,7 +206,7 @@ function checkin_by_copy_barcode(barcode, backdate, f) {
 							"Check here to confirm this message"
 						); 
 						if (pcheck == 0) {
-							sPrint(msg);
+							sPrint( msg.match( /\n/g, '<br />\r\n'), true );
 						}
 
 					break;
diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/win.js b/Evergreen/staff_client/chrome/content/evergreen/util/win.js
index 9bacbb97e5..c2a25e2435 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/util/win.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/win.js
@@ -123,6 +123,7 @@ function SafeWindowOpen(url,title,features)
      blocked = PB.getBoolPref("dom.disable_open_during_load");
      if(blocked)
        PB.setBoolPref("dom.disable_open_during_load",false);
+
      w = window.open(url,title,features);
    }
    catch(e)
diff --git a/Evergreen/staff_client/chrome/locale/en-US/evergreen/auth.dtd b/Evergreen/staff_client/chrome/locale/en-US/evergreen/auth.dtd
index 6dd9430eb0..676bcda182 100644
--- a/Evergreen/staff_client/chrome/locale/en-US/evergreen/auth.dtd
+++ b/Evergreen/staff_client/chrome/locale/en-US/evergreen/auth.dtd
@@ -1,5 +1,5 @@
-<!ENTITY auth.title "Evergreen Staff Client almost-Alpha">
-<!ENTITY auth.version "Evergreen 0.0.9 2005072613">
+<!ENTITY auth.title "Evergreen Staff Client almost-almost-Alpha">
+<!ENTITY auth.version "Evergreen 0.0.9 2005072617">
 
 <!ENTITY auth.login_header "Login">
 <!ENTITY auth.name_prompt "Name:"><!ENTITY auth.name_prompt.key "N">
diff --git a/Evergreen/staff_client/install.rdf b/Evergreen/staff_client/install.rdf
index 13b2c46f41..c8f2355f9e 100755
--- a/Evergreen/staff_client/install.rdf
+++ b/Evergreen/staff_client/install.rdf
@@ -31,7 +31,7 @@
 	
 		<!-- Front End MetaData -->
 		<em:name>Evergreen</em:name>
-		<em:description>Evergreen Staff Client almost-Alpha</em:description>
+		<em:description>Evergreen Staff Client almost-almost-Alpha</em:description>
    	 
 		<em:homepageURL>http://open-ils.org/</em:homepageURL>
     
-- 
2.43.2