[open-ils-commits] r11033 - in branches/rel_1_4/Open-ILS/xul/staff_client/server: main skin
svn at svn.open-ils.org
svn at svn.open-ils.org
Mon Nov 3 12:08:17 EST 2008
Author: phasefx
Date: 2008-11-03 12:08:15 -0500 (Mon, 03 Nov 2008)
New Revision: 11033
Modified:
branches/rel_1_4/Open-ILS/xul/staff_client/server/main/data.xul
branches/rel_1_4/Open-ILS/xul/staff_client/server/main/gen_offline_widgets.xul
branches/rel_1_4/Open-ILS/xul/staff_client/server/main/ws_info.xul
branches/rel_1_4/Open-ILS/xul/staff_client/server/skin/global.css
Log:
backporting tweaks to support xulrunner 1.9
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/main/data.xul
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/main/data.xul 2008-11-03 17:07:58 UTC (rev 11032)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/main/data.xul 2008-11-03 17:08:15 UTC (rev 11033)
@@ -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._debug_stash();
+ g.data.stash('list','hash','tree','temp');
- document.getElementById('iframe').setAttribute(
- 'src',
- urls.XUL_OFFLINE_GENERATE_WIDGETS
- );
+ g.data._debug_stash();
- document.getElementById('caption').setAttribute('label', document.getElementById('commonStrings').getString('staff.main.data.loaded'));
+ document.getElementById('iframe').setAttribute(
+ 'src',
+ urls.XUL_OFFLINE_GENERATE_WIDGETS
+ );
- xulG.window.open(urls.XUL_MENU_FRAME
- + '?server='+window.escape(xulG.url),
- 'main'+xulG.window.window_name_increment(),'chrome,resizable'
- );
+ 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'
+ );
+
+ } catch(E) {
+ alert(E);
+ }
}
g.data.init();
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/main/gen_offline_widgets.xul
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/main/gen_offline_widgets.xul 2008-11-03 17:07:58 UTC (rev 11032)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/main/gen_offline_widgets.xul 2008-11-03 17:08:15 UTC (rev 11033)
@@ -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;
}
}
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/main/ws_info.xul
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/main/ws_info.xul 2008-11-03 17:07:58 UTC (rev 11032)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/main/ws_info.xul 2008-11-03 17:08:15 UTC (rev 11033)
@@ -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;
Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/skin/global.css
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/skin/global.css 2008-11-03 17:07:58 UTC (rev 11032)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/skin/global.css 2008-11-03 17:08:15 UTC (rev 11033)
@@ -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; }
*/
More information about the open-ils-commits
mailing list