From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 3 Nov 2008 17:08:15 +0000 (+0000)
Subject: backporting tweaks to support xulrunner 1.9
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=71282ba4226ec0f3c31f51fcd5a926e28e87ab4c;p=Evergreen.git

backporting tweaks to support xulrunner 1.9

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

diff --git a/Open-ILS/xul/staff_client/server/main/data.xul b/Open-ILS/xul/staff_client/server/main/data.xul
index b41ebf79c3..6303fe3b07 100644
--- a/Open-ILS/xul/staff_client/server/main/data.xul
+++ b/Open-ILS/xul/staff_client/server/main/data.xul
@@ -8,8 +8,10 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- PRESENTATION -->
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<!-- xulrunner 1.9 doesn't like this mixing of chrome and remote
 <?xml-stylesheet href="chrome://open_ils_staff_client/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://open_ils_staff_client/skin/auth.css" type="text/css"?>
+-->
 <!-- Load these just to cache them -->
 <?xml-stylesheet href="/xul/server/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="/xul/server/skin/cat.css" type="text/css"?>
@@ -40,7 +42,7 @@
 	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
 	<scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
 	<script>
 	<![CDATA[
 
@@ -186,22 +188,27 @@
 			g.data.stash('session');
 			g.data.on_complete = function () {
 
-				g.data.stash('list','hash','tree','temp');
+                try {
+
+                    g.data.stash('list','hash','tree','temp');
 
-				g.data._debug_stash();
+                    g.data._debug_stash();
 
-				document.getElementById('iframe').setAttribute(
-					'src',
-					urls.XUL_OFFLINE_GENERATE_WIDGETS	
-				);
+                    document.getElementById('iframe').setAttribute(
+                        'src',
+                        urls.XUL_OFFLINE_GENERATE_WIDGETS	
+                    );
 
-				document.getElementById('caption').setAttribute('label', document.getElementById('commonStrings').getString('staff.main.data.loaded'));
+                    document.getElementById('caption').setAttribute('label', document.getElementById('commonStrings').getString('staff.main.data.loaded'));
 
-				xulG.window.open(urls.XUL_MENU_FRAME
-					+ '?server='+window.escape(xulG.url),
-					'main'+xulG.window.window_name_increment(),'chrome,resizable'
-				);
+                    xulG.window.open(urls.XUL_MENU_FRAME
+                        + '?server='+window.escape(xulG.url),
+                        'main'+xulG.window.window_name_increment(),'chrome,resizable'
+                    );
 
+                } catch(E) {
+                    alert(E);
+                }
 			}
 
 			g.data.init();
diff --git a/Open-ILS/xul/staff_client/server/main/gen_offline_widgets.xul b/Open-ILS/xul/staff_client/server/main/gen_offline_widgets.xul
index 73858226d2..478b5160b0 100644
--- a/Open-ILS/xul/staff_client/server/main/gen_offline_widgets.xul
+++ b/Open-ILS/xul/staff_client/server/main/gen_offline_widgets.xul
@@ -8,8 +8,11 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- PRESENTATION -->
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<!--
 <?xml-stylesheet href="chrome://open_ils_staff_client/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://open_ils_staff_client/skin/auth.css" type="text/css"?>
+-->
+<?xml-stylesheet href="/xul/server/skin/global.css" type="text/css"?>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
@@ -31,7 +34,7 @@
 	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
 	<scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
 	<script>
 	<![CDATA[
 
@@ -88,7 +91,7 @@
 
 			save_object('print_list_templates',g.data.print_list_templates);
 
-			$('placeholder').setAttribute('value', $('commonStrings').getString('staff.main.gen_offline_widgets.synced'));
+			$('placeholder').setAttribute('value', document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.synced'));
 
 		}
 
@@ -191,7 +194,7 @@
 									[ b.owning_lib(), b.name() ]
 								);
 							} catch(E) {
-								alert($('commonStrings').getString('staff.main.gen_offline_widgets.noncat_sort.error') + E);
+								alert(document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.noncat_sort.error') + E);
 								return 0;
 							}
 						}
diff --git a/Open-ILS/xul/staff_client/server/main/ws_info.xul b/Open-ILS/xul/staff_client/server/main/ws_info.xul
index 141a275dd9..8d29cb5f51 100644
--- a/Open-ILS/xul/staff_client/server/main/ws_info.xul
+++ b/Open-ILS/xul/staff_client/server/main/ws_info.xul
@@ -8,8 +8,11 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- PRESENTATION -->
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<!--
 <?xml-stylesheet href="chrome://open_ils_staff_client/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://open_ils_staff_client/skin/auth.css" type="text/css"?>
+-->
+<?xml-stylesheet href="/xul/server/skin/global.css" type="text/css"?>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
@@ -33,7 +36,7 @@
 
 	<script type="text/javascript" src="/opac/common/js/OrgTree.js"/>
 	<script type="text/javascript" src="/opac/common/js/org_utils.js"/>
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
 	<script>
 	<![CDATA[
 
@@ -181,6 +184,8 @@
 	]]>
 	</script>
 
+    <messagecatalog id="commonStrings" src="/xul/server/locale/<!--#echo var='locale'-->/common.properties" />
+
 	<vbox flex="1" style="background: #993333">
 		<description>
 			&staff.main.ws_info.entry;
diff --git a/Open-ILS/xul/staff_client/server/skin/global.css b/Open-ILS/xul/staff_client/server/skin/global.css
index b4c21c011d..8a2f43efb4 100644
--- a/Open-ILS/xul/staff_client/server/skin/global.css
+++ b/Open-ILS/xul/staff_client/server/skin/global.css
@@ -1,6 +1,9 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); 
 @namespace html url("http://www.w3.org/TR/REC-html40"); 
 
+messagecatalog { -moz-binding: url('/xul/server/main/bindings.xml#messagecatalog'); }
+.shrinkable_groupbox { font-weight: bold; -moz-binding: url('/xul/server/main/bindings.xml#caption'); }
+
 /*
 * { font-size-adjust: .5; }
 */