stamp. html on print, not on alert

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1511 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Evergreen/staff_client/Makefile b/Evergreen/staff_client/Makefile
index 281e4a1..30cdc27 100644 (file)
--- 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 4618bf3..3c45735 100644 (file)
--- 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 0abf487..253a278 100644 (file)
--- 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 9bacbb9..c2a25e2 100644 (file)
--- 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 6dd9430..676bcda 100644 (file)
--- 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 13b2c46..c8f2355 100755 (executable)
--- 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>