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 b41ebf7..6303fe3 100644 (file)
--- 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 7385822..478b516 100644 (file)
--- 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 141a275..8d29cb5 100644 (file)
--- 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 b4c21c0..8a2f43e 100644 (file)
--- 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; }
 */