From ef7342df2832fec43fc7d890aa4bc8e61bb94ef2 Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 12 Oct 2009 14:51:14 +0000
Subject: [PATCH] backport changesets 13953, 14017: persist mechanism
 replacement for 1.9 xulrunners

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_0@14356 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../chrome/content/OpenILS/global_util.js          | 44 +++++++++++++
 .../chrome/content/circ/offline_checkin.xul        |  6 +-
 .../chrome/content/circ/offline_checkout.xul       |  8 +--
 .../chrome/content/circ/offline_in_house_use.xul   |  6 +-
 .../chrome/content/circ/offline_renew.xul          |  8 +--
 .../chrome/content/main/menu_frame.xul             |  4 +-
 .../chrome/content/util/list_clipboard.xul         |  4 +-
 .../xul/staff_client/server/cat/copy_buckets.xul   |  2 +-
 .../staff_client/server/cat/copy_buckets_quick.xul |  2 +-
 .../xul/staff_client/server/cat/copy_editor.xul    |  4 +-
 .../xul/staff_client/server/cat/copy_summary.xul   |  4 +-
 Open-ILS/xul/staff_client/server/cat/marcedit.xul  | 10 +--
 .../xul/staff_client/server/cat/record_buckets.xul |  2 +-
 .../server/cat/record_buckets_overlay.xul          |  2 +-
 .../server/cat/record_buckets_quick.xul            |  2 +-
 .../xul/staff_client/server/cat/spine_labels.xul   | 76 +++++++++++-----------
 .../xul/staff_client/server/cat/volume_editor.xul  |  4 +-
 Open-ILS/xul/staff_client/server/cat/z3950.xul     | 14 ++--
 Open-ILS/xul/staff_client/server/circ/checkin.xul  |  2 +-
 .../staff_client/server/circ/checkin_overlay.xul   |  8 +--
 Open-ILS/xul/staff_client/server/circ/checkout.xul |  2 +-
 .../staff_client/server/circ/checkout_overlay.xul  |  4 +-
 .../xul/staff_client/server/circ/copy_details.xul  |  4 +-
 .../xul/staff_client/server/circ/copy_status.xul   |  2 +-
 .../server/circ/copy_status_overlay.xul            |  4 +-
 .../xul/staff_client/server/circ/in_house_use.xul  |  6 +-
 .../staff_client/server/patron/bill_history.xul    | 10 +--
 Open-ILS/xul/staff_client/server/patron/bills.xul  |  2 +-
 .../staff_client/server/patron/bills_overlay.xul   |  4 +-
 .../xul/staff_client/server/patron/display.xul     |  2 +-
 .../staff_client/server/patron/display_horiz.xul   |  2 +-
 .../server/patron/display_horiz_overlay.xul        | 10 +--
 .../staff_client/server/patron/display_overlay.xul | 10 +--
 .../staff_client/server/patron/hold_notices.xul    | 10 +--
 Open-ILS/xul/staff_client/server/patron/holds.xul  |  2 +-
 .../staff_client/server/patron/holds_overlay.xul   |  4 +-
 .../xul/staff_client/server/patron/summary.xul     |  2 +-
 .../server/patron/summary_overlay_horiz.xul        |  2 +-
 38 files changed, 169 insertions(+), 125 deletions(-)

diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js b/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
index f3cbb4ded8..042e8d2a6b 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
@@ -35,6 +35,50 @@
 		}
 	}
 
+    function persist_helper() {
+        try {
+            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+            var prefs = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces['nsIPrefBranch']);
+            var nodes = document.getElementsByAttribute('oils_persist','*');
+            for (var i = 0; i < nodes.length; i++) {
+                var base_key = 'oils_persist_' + String(location.hostname + location.pathname + '_' + nodes[i].getAttribute('id')).replace('/','_','g') + '_';
+                var attribute_list = nodes[i].getAttribute('oils_persist').split(' ');
+                for (var j = 0; j < attribute_list.length; j++) {
+                    var key = base_key + attribute_list[j];
+                    var value = prefs.prefHasUserValue(key) ? prefs.getCharPref(key) : null;
+                    dump('persist_helper: retrieving key = ' + key + ' value = ' + value + ' for ' + nodes[i].nodeName + '\n');
+                    if (value) nodes[i].setAttribute( attribute_list[j], value );
+                }
+                if (nodes[i].nodeName == 'checkbox' && attribute_list.indexOf('checked') > -1) {
+                    var evt = document.createEvent("Events");
+                    evt.initEvent( 'command', true, true );
+                    nodes[i].dispatchEvent(evt);
+                    nodes[i].addEventListener(
+                        'command',
+                        function(bk) {
+                            return function(ev) {
+                                try {
+                                    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                                    var key = bk + 'checked';
+                                    var value = ev.target.checked;
+                                    ev.target.setAttribute( 'checked', value );
+                                    prefs.setCharPref( key, value );
+                                    dump('persist_helper: setting key = ' +  key + ' value = ' + value + ' for checkbox\n');
+                                } catch(E) {
+                                    alert('Error in persist_helper(), checkbox command event listener: ' + E);
+                                }
+                            };
+                        }(base_key), 
+                        false
+                    );
+                }
+                // TODO: Need to add event listeners for window resizing, splitter repositioning, grippy state, etc.
+            }
+        } catch(E) {
+            alert('Error in persist_helper(): ' + E);
+        }
+    }
+
 	function getKeys(o) {
 		var keys = [];
 		for (var k in o) keys.push(k);
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul
index d19616d0b4..8fa3bc47bb 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul
@@ -16,7 +16,7 @@
 <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_offline.xul"?>
 
 <window id="offline_checkin_win" sizemode="maximized"
-	onload="try { my_init(); } catch(E) { alert(E); }"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -50,7 +50,7 @@
 				<hbox>
 					<spacer flex="1"/>
 					<description>&common.check_barcode.description;</description>
-					<checkbox id="strict_i_barcode" persist="checked"/>
+					<checkbox id="strict_i_barcode" oils_persist="checked"/>
 				</hbox>
 				<hbox>
 					<label value="&common.step3.label;" style="font-weight: bold"/>
@@ -63,7 +63,7 @@
 				<hbox>
 					<spacer flex="1"/>
 					<description>&staff.circ.offline.print.description;</description>
-					<checkbox id="print_receipt" persist="checked"/>
+					<checkbox id="print_receipt" oils_persist="checked"/>
 				</hbox>
 				<hbox>
 					<spacer flex="1"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul
index b4d23df128..2744d4bfc4 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul
@@ -16,7 +16,7 @@
 <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_offline.xul"?>
 
 <window id="offline_checkout_win" sizemode="maximized"
-	onload="try { my_init(); } catch(E) { alert(E); }"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -50,7 +50,7 @@
 				<hbox>
 					<spacer flex="1"/>
 					<description>&common.check_barcode.description;</description>
-					<checkbox id="strict_p_barcode" persist="checked"/>
+					<checkbox id="strict_p_barcode" oils_persist="checked"/>
 				</hbox>
 				<hbox>
 					<label value="&common.step3.label;" style="font-weight: bold" accesskey="&common.step3.accesskey;" control="duedate"/>
@@ -87,7 +87,7 @@
 				<hbox>
 					<spacer flex="1"/>
 					<description>&common.check_barcode.description;</description>
-					<checkbox id="strict_i_barcode" persist="checked"/>
+					<checkbox id="strict_i_barcode" oils_persist="checked"/>
 				</hbox>
 				<hbox>
 					<label value="&common.step5.label;" style="font-weight: bold"/>
@@ -100,7 +100,7 @@
 				<hbox>
 					<spacer flex="1"/>
 					<description>&staff.circ.offline.print.description;</description>
-					<checkbox id="print_receipt" persist="checked"/>
+					<checkbox id="print_receipt" oils_persist="checked"/>
 				</hbox>
 				<hbox>
 					<spacer flex="1"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.xul
index 91ec999cfd..e635c4123e 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.xul
@@ -16,7 +16,7 @@
 <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_offline.xul"?>
 
 <window id="offline_checkout_win" sizemode="maximized"
-	onload="try { my_init(); } catch(E) { alert(E); }"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -59,7 +59,7 @@
 				<hbox>
 					<spacer flex="1"/>
 					<description>&common.check_barcode.description;</description>
-					<checkbox id="strict_i_barcode" persist="checked"/>
+					<checkbox id="strict_i_barcode" oils_persist="checked"/>
 				</hbox>
 				<hbox>
 					<label value="&common.step4.label;" style="font-weight: bold"/>
@@ -72,7 +72,7 @@
 				<hbox>
 					<spacer flex="1"/>
 					<description>&staff.circ.offline.print.description;</description>
-					<checkbox id="print_receipt" persist="checked"/>
+					<checkbox id="print_receipt" oils_persist="checked"/>
 				</hbox>
 				<hbox>
 					<spacer flex="1"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.xul
index 44332d4d7d..00400096e0 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.xul
@@ -16,7 +16,7 @@
 <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_offline.xul"?>
 
 <window id="offline_checkout_win" sizemode="maximized"
-	onload="try { my_init(); } catch(E) { alert(E); }"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -50,7 +50,7 @@
 				<hbox>
 					<spacer flex="1"/>
 					<description>&common.check_barcode.description;</description>
-					<checkbox id="strict_p_barcode" persist="checked"/>
+					<checkbox id="strict_p_barcode" oils_persist="checked"/>
 				</hbox>
 				<hbox>
 					<label value="&common.step3.label;" style="font-weight: bold" accesskey="&common.step3.accesskey;" control="duedate"/>
@@ -83,7 +83,7 @@
 				<hbox>
 					<spacer flex="1"/>
 					<description>&common.check_barcode.description;</description>
-					<checkbox id="strict_i_barcode" persist="checked"/>
+					<checkbox id="strict_i_barcode" oils_persist="checked"/>
 				</hbox>
 				<hbox>
 					<label value="&common.step5.label;" style="font-weight: bold"/>
@@ -96,7 +96,7 @@
 				<hbox>
 					<spacer flex="1"/>
 					<description>&staff.circ.offline.print.description;</description>
-					<checkbox id="print_receipt" persist="checked"/>
+					<checkbox id="print_receipt" oils_persist="checked"/>
 				</hbox>
 				<hbox>
 					<spacer flex="1"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame.xul
index dec20ef844..ad5cee151b 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame.xul
@@ -28,9 +28,9 @@
 -->
 
 <window id="menu_frame_win"
-	onload="try { my_init(); } catch(E) { alert(E); }"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
 	orient="vertical" width="800" height="500"
-	sizemode="maximized" persist="width height" title="&staff.main.menu.title;"
+	sizemode="maximized" oils_persist="width height" title="&staff.main.menu.title;"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/list_clipboard.xul b/Open-ILS/xul/staff_client/chrome/content/util/list_clipboard.xul
index 1aab020ea9..630953cdb9 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/list_clipboard.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/util/list_clipboard.xul
@@ -19,8 +19,8 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="util_list_clipboard_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	width="300" height="300" persist="width height"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+	width="300" height="300" oils_persist="width height"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul b/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul
index a73453dee3..555edcb016 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul
@@ -21,7 +21,7 @@
 <?xul-overlay href="/xul/server/cat/copy_buckets_overlay.xul"?>
 
 <window id="copy_buckets_win" title="&staff.cat.copy_buckets.window_title;"
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }" height="600" width="800" persist="height,width"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" height="600" width="800" oils_persist="height width"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_buckets_quick.xul b/Open-ILS/xul/staff_client/server/cat/copy_buckets_quick.xul
index 568c0453b2..50d4717237 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_buckets_quick.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_buckets_quick.xul
@@ -23,7 +23,7 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="copy_buckets_win" title="&staff.cat.copy_buckets_quick.title;"
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }" persist="height,width"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" oils_persist="height width"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_editor.xul b/Open-ILS/xul/staff_client/server/cat/copy_editor.xul
index 866ca333e0..4725605488 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_editor.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_editor.xul
@@ -19,8 +19,8 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_copy_editor_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	width="800" height="580" persist="width height"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+	width="800" height="580" oils_persist="width height"
 	title="&staff.cat.copy_editor.window.label;"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_summary.xul b/Open-ILS/xul/staff_client/server/cat/copy_summary.xul
index 5b538dfabf..eafeb249a3 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_summary.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_summary.xul
@@ -22,7 +22,7 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_copy_summary_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
 	xmlns:html="http://www.w3.org/1999/xhtml"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
@@ -186,7 +186,7 @@
 
 	<groupbox id="groupbox" flex="1" style="overflow: none; min-height: 80;">
 		<caption label="&staff.cat.copy_summary.label;" id="caption"/>
-		<deck id="item_deck" persist="selectedIndex">
+		<deck id="item_deck" oils_persist="selectedIndex">
 			<tree id="item_summary_list" enableColumnDrag="true" flex="1"/>
 			<grid>
 				<columns>
diff --git a/Open-ILS/xul/staff_client/server/cat/marcedit.xul b/Open-ILS/xul/staff_client/server/cat/marcedit.xul
index 22536e0969..f755b038fd 100644
--- a/Open-ILS/xul/staff_client/server/cat/marcedit.xul
+++ b/Open-ILS/xul/staff_client/server/cat/marcedit.xul
@@ -11,7 +11,7 @@
 
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xhtml="http://www.w3.org/1999/xhtml" onload="try { my_init(); font_helper(); } catch(E) { alert(E); }">
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xhtml="http://www.w3.org/1999/xhtml" onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }">
 
 <scripts id="openils_util_scripts"/>
 <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
@@ -24,11 +24,11 @@
 <groupbox flex="0">
 	<caption label="&staff.cat.marcedit.options.label;"/>
 	<hbox flex="1">
-		<checkbox persist="checked" accesskey="&staff.cat.marcedit.stackSubfields.accesskey;" label="&staff.cat.marcedit.stackSubfields.label;" oncommand="stackSubfields(this);" checked="false" id="stackSubfields"/>
-        <checkbox persist="checked" accesskey="&staff.cat.marcedit.fastItemAdd.accesskey;" label="&staff.cat.marcedit.fastItemAdd.label;" oncommand="fastItemAdd_toggle(this);" checked="false" id="fastItemAdd_checkbox"/>
+		<checkbox oils_persist="checked" accesskey="&staff.cat.marcedit.stackSubfields.accesskey;" label="&staff.cat.marcedit.stackSubfields.label;" oncommand="stackSubfields(this);" checked="false" id="stackSubfields"/>
+        <checkbox oils_persist="checked" accesskey="&staff.cat.marcedit.fastItemAdd.accesskey;" label="&staff.cat.marcedit.fastItemAdd.label;" oncommand="fastItemAdd_toggle(this);" checked="false" id="fastItemAdd_checkbox"/>
         <hbox id="fastItemAdd_textboxes">
             <label control="fastItemAdd_callnumber" accesskey="&staff.cat.marcedit.fastItemAdd_callnumber.accesskey;" value="&staff.cat.marcedit.fastItemAdd_callnumber.label;" />
-            <textbox context="clipboard" id="fastItemAdd_callnumber" persist="value" onchange="this.setAttribute('value',this.value);"/>
+            <textbox context="clipboard" id="fastItemAdd_callnumber" oils_persist="value" onchange="this.setAttribute('value',this.value);"/>
             <label control="fastItemAdd_barcode" accesskey="&staff.cat.marcedit.fastItemAdd_barcode.accesskey;" value="&staff.cat.marcedit.fastItemAdd_barcode.label;" />
             <textbox context="clipboard" id="fastItemAdd_barcode"/>
         </hbox>
@@ -61,7 +61,7 @@
 				<label id="recordTypeLabel" context="recordTypeMenu"/>
 			</caption>
 			<vbox flex="0">
-				<grid flex="0" id="leaderGrid" type="BKS" hidden="false" persist="hidden">
+				<grid flex="0" id="leaderGrid" type="BKS" hidden="false" oils_persist="hidden">
 					<columns>
 						<column flex="1"/>
 						<column flex="1"/>
diff --git a/Open-ILS/xul/staff_client/server/cat/record_buckets.xul b/Open-ILS/xul/staff_client/server/cat/record_buckets.xul
index 5a06e2de98..4efb76f507 100644
--- a/Open-ILS/xul/staff_client/server/cat/record_buckets.xul
+++ b/Open-ILS/xul/staff_client/server/cat/record_buckets.xul
@@ -21,7 +21,7 @@
 <?xul-overlay href="/xul/server/cat/record_buckets_overlay.xul"?>
 
 <window id="record_buckets_win" title="&staff.cat.record_buckets.title;"
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }" height="300" width="300" persist="height,width"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" height="300" width="300" oils_persist="height width"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
diff --git a/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul b/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul
index 25354eb4d9..ca6b8ff214 100644
--- a/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul
@@ -17,7 +17,7 @@
 </box>
 
 <vbox id="cmvb1" flex="1">
-    <tabbox id="record_buckets_tabbox" flex="1" persist="selectedIndex">
+    <tabbox id="record_buckets_tabbox" flex="1" oils_persist="selectedIndex">
         <tabs>
             <tab id="record_query_tab" label="&staff.cat.record_buckets_overlay.record_query_tab.label;"
 									accesskey="&staff.cat.record_buckets_overlay.record_query_tab.accesskey;"/>
diff --git a/Open-ILS/xul/staff_client/server/cat/record_buckets_quick.xul b/Open-ILS/xul/staff_client/server/cat/record_buckets_quick.xul
index 509c27da35..10ec0a09e6 100644
--- a/Open-ILS/xul/staff_client/server/cat/record_buckets_quick.xul
+++ b/Open-ILS/xul/staff_client/server/cat/record_buckets_quick.xul
@@ -20,7 +20,7 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="record_buckets_win" title="&staff.cat.record_buckets_quick.add_to_bucket.title;"
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }" persist="height,width"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" oils_persist="height width"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
diff --git a/Open-ILS/xul/staff_client/server/cat/spine_labels.xul b/Open-ILS/xul/staff_client/server/cat/spine_labels.xul
index c0a2c4c0ce..884185ad23 100644
--- a/Open-ILS/xul/staff_client/server/cat/spine_labels.xul
+++ b/Open-ILS/xul/staff_client/server/cat/spine_labels.xul
@@ -20,7 +20,7 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="spine_labels_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -50,112 +50,112 @@
 
 			<hbox>
 				<label value="&staff.cat.spine_labels.font_size.label;" control="pt"/>
-				<textbox id="pt" value="10" onchange="this.setAttribute('value',this.value)" persist="value" context="clipboard"/>
+				<textbox id="pt" value="10" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/>
 			</hbox>
 			<grid><columns><column/><column/><column/><column/></columns><rows>
 				<row> <label class="header" value="&staff.cat.spine_labels.spine_label.label;"/><spacer/> </row>
-				<row> <label value="&staff.cat.spine_labels.spine_label.left_margin.label;" control="lm"/><textbox id="lm" value="0" onchange="this.setAttribute('value',this.value)" persist="value" context="clipboard"/> </row>
-				<row> <label value="&staff.cat.spine_labels.spine_label.label_width.label;" control="lw"/><textbox id="lw" value="8" onchange="this.setAttribute('value',this.value)" persist="value" context="clipboard"/> </row>
-				<row> <label value="&staff.cat.spine_labels.spine_label.label_length.label;" control="ll"/><textbox id="ll" value="9" onchange="this.setAttribute('value',this.value)" persist="value" context="clipboard"/> </row>
-				<row> <label class="header" value="&staff.cat.spine_labels.pocket_label.label;"/><checkbox id="pl" checked="false" persist="checked" label="Enabled"/> </row>
-				<row> <label value="&staff.cat.spine_labels.pocket_label.middle_margin.label;" control="mm"/><textbox id="mm" value="2" onchange="this.setAttribute('value',this.value)" persist="value" context="clipboard"/> </row>
-				<row> <label value="&staff.cat.spine_labels.pocket_label.label_width.label;" control="plw"/><textbox id="plw" value="28" onchange="this.setAttribute('value',this.value)" persist="value" context="clipboard"/> </row>
-				<row> <label value="&staff.cat.spine_labels.pocket_label.label_length.label;" control="pll"/><textbox id="pll" value="9" onchange="this.setAttribute('value',this.value)" persist="value" context="clipboard"/> </row>
+				<row> <label value="&staff.cat.spine_labels.spine_label.left_margin.label;" control="lm"/><textbox id="lm" value="0" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
+				<row> <label value="&staff.cat.spine_labels.spine_label.label_width.label;" control="lw"/><textbox id="lw" value="8" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
+				<row> <label value="&staff.cat.spine_labels.spine_label.label_length.label;" control="ll"/><textbox id="ll" value="9" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
+				<row> <label class="header" value="&staff.cat.spine_labels.pocket_label.label;"/><checkbox id="pl" checked="false" oils_persist="checked" label="Enabled"/> </row>
+				<row> <label value="&staff.cat.spine_labels.pocket_label.middle_margin.label;" control="mm"/><textbox id="mm" value="2" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
+				<row> <label value="&staff.cat.spine_labels.pocket_label.label_width.label;" control="plw"/><textbox id="plw" value="28" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
+				<row> <label value="&staff.cat.spine_labels.pocket_label.label_length.label;" control="pll"/><textbox id="pll" value="9" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
 				<row>
-					<checkbox id="title" checked="true" persist="checked" label="&staff.cat.spine_labels.pocket_label.title.label;"/>
+					<checkbox id="title" checked="true" oils_persist="checked" label="&staff.cat.spine_labels.pocket_label.title.label;"/>
 					<hbox>
 						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="title_line" value="4" persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+						<textbox id="title_line" value="4" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
 					</hbox>
 				</row>
 				<row>
-					<checkbox id="title_r" checked="true" persist="checked" label="&staff.cat.spine_labels.pocket_label.include_title.label;"/>
+					<checkbox id="title_r" checked="true" oils_persist="checked" label="&staff.cat.spine_labels.pocket_label.include_title.label;"/>
 					<hbox>
 						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="title_r_line" value="5" persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+						<textbox id="title_r_line" value="5" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
 					</hbox>
 				</row>
-				<row> <spacer/><checkbox id="title_r_indent" checked="true" persist="checked" label="&staff.cat.spine_labels.indent_title.label;"/> </row>
+				<row> <spacer/><checkbox id="title_r_indent" checked="true" oils_persist="checked" label="&staff.cat.spine_labels.indent_title.label;"/> </row>
 				<row>
-					<checkbox id="author" checked="true" persist="checked" label="Include Author"/>
+					<checkbox id="author" checked="true" oils_persist="checked" label="Include Author"/>
 					<hbox>
 						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="author_line" value="3" persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+						<textbox id="author_line" value="3" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
 					</hbox>
 				</row>
 				<row>
-					<checkbox id="call_number" checked="true" persist="checked" label="&staff.cat.spine_labels.inc_call_number.label;"/>
+					<checkbox id="call_number" checked="true" oils_persist="checked" label="&staff.cat.spine_labels.inc_call_number.label;"/>
 					<hbox>
 						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="call_number_line" value="2" persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+						<textbox id="call_number_line" value="2" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
 					</hbox>
 				</row>
 				<row>
-					<checkbox id="owning_lib_shortname" checked="false" persist="checked" label="&staff.cat.spine_labels.inc_owning_library_policy_code.label;"/>
+					<checkbox id="owning_lib_shortname" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.inc_owning_library_policy_code.label;"/>
 					<hbox>
 						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="owning_lib_shortname_line" value="" persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+						<textbox id="owning_lib_shortname_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
 					</hbox>
 				</row>
 				<row>
-					<checkbox id="owning_lib" checked="false" persist="checked" label="&staff.cat.spine_labels.inc_owning_library.label;"/>
+					<checkbox id="owning_lib" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.inc_owning_library.label;"/>
 					<hbox>
 						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="owning_lib_line" value="" persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+						<textbox id="owning_lib_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
 					</hbox>
 				</row>
 				<row>
-					<checkbox id="shelving_location" checked="false" persist="checked" label="&staff.cat.spine_labels.inc_shelving_location.label;"/>
+					<checkbox id="shelving_location" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.inc_shelving_location.label;"/>
 					<hbox>
 						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="shelving_location_line" value="" persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+						<textbox id="shelving_location_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
 				</hbox>
 				</row>
 				<row>
-					<checkbox id="barcode" checked="true" persist="checked" label="&staff.cat.spine_labels.inc_item_barcode.label;"/>
+					<checkbox id="barcode" checked="true" oils_persist="checked" label="&staff.cat.spine_labels.inc_item_barcode.label;"/>
 					<hbox>
 						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="barcode_line" value="1" persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+						<textbox id="barcode_line" value="1" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
 					</hbox>
 				</row>
 				<row>
 					<hbox>
-						<checkbox id="custom1" checked="false" persist="checked" label="&staff.cat.spine_labels.custom.label;"/>
-						<textbox id="custom1_tb" value="%price%" persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+						<checkbox id="custom1" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.custom.label;"/>
+						<textbox id="custom1_tb" value="%price%" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
 					</hbox>
 					<hbox>
 						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="custom1_line" value="" persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+						<textbox id="custom1_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
 					</hbox>
 				</row>
 				<row>
 					<hbox>
-						<checkbox id="custom2" checked="false" persist="checked" label="&staff.cat.spine_labels.custom.label;"/>
-						<textbox id="custom2_tb" value="%deposit_amount%" persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+						<checkbox id="custom2" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.custom.label;"/>
+						<textbox id="custom2_tb" value="%deposit_amount%" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
 					</hbox>
 					<hbox>
 							<label value="&staff.cat.spine_labels.on_line.label;"/>
-							<textbox id="custom2_line" value="" persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+							<textbox id="custom2_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
 					</hbox>
 				</row>
 				<row>
 					<hbox>
-						<checkbox id="custom3" checked="false" persist="checked" label="&staff.cat.spine_labels.custom.label;"/>
-						<textbox id="custom3_tb" value="%alert_message%" persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+						<checkbox id="custom3" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.custom.label;"/>
+						<textbox id="custom3_tb" value="%alert_message%" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
 					</hbox>
 					<hbox>
 						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="custom3_line" value="" persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+						<textbox id="custom3_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
 					</hbox>
 				</row>
 				<row>
 					<hbox>
-						<checkbox id="custom4" checked="false" persist="checked" label="&staff.cat.spine_labels.custom.label;"/>
-						<textbox id="custom4_tb" value="Don't sell me on eBay" persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+						<checkbox id="custom4" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.custom.label;"/>
+						<textbox id="custom4_tb" value="Don't sell me on eBay" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
 					</hbox>
 					<hbox>
 						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="custom4_line" value="" persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+						<textbox id="custom4_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
 					</hbox>
 				</row>
 			</rows></grid>
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_editor.xul b/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
index a7aff26bab..cbed04bb04 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
@@ -19,8 +19,8 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_volume_editor_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	title="&staff.cat.volume_editor.title;" height="400" width="300" persist="height,width"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+	title="&staff.cat.volume_editor.title;" height="400" width="300" oils_persist="height width"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
diff --git a/Open-ILS/xul/staff_client/server/cat/z3950.xul b/Open-ILS/xul/staff_client/server/cat/z3950.xul
index 6c037fce6d..dfc1259bb8 100644
--- a/Open-ILS/xul/staff_client/server/cat/z3950.xul
+++ b/Open-ILS/xul/staff_client/server/cat/z3950.xul
@@ -20,7 +20,7 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_z3950_win2" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
 	xmlns:html="http://www.w3.org/1999/xhtml"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
@@ -92,8 +92,8 @@
 
 	<groupbox flex="1">
 		<caption label="&staff.cat.z3950.marc_import.label;"/>
-            <hbox id="top_pane" persist="height" flex="1">
-                <groupbox id="x_splitter1" persist="width" flex="1">
+            <hbox id="top_pane" oils_persist="height" flex="1">
+                <groupbox id="x_splitter1" oils_persist="width" flex="1">
                     <caption label="&staff.cat.z3950.query.label;"/>
                     <vbox>
                         <spacer flex="1"/>
@@ -132,8 +132,8 @@
                         <button id="search" label="&staff.cat.z3950.search.label;" accesskey="&staff.cat.z3950.search.accesskey;" disabled="true"/>
                     </hbox>
                 </groupbox>
-                <splitter id="x_splitter" collapse="after" persist="state hidden"><grippy id="splitter_grippy1"/></splitter>
-                <groupbox id="x_splitter2" persist="width" flex="1">
+                <splitter id="x_splitter" collapse="after" oils_persist="state hidden"><grippy id="splitter_grippy1"/></splitter>
+                <groupbox id="x_splitter2" oils_persist="width" flex="1">
                     <caption label="&staff.cat.z3950.service_credentials.label;"/>
                     <grid flex="1">
                         <columns>
@@ -160,8 +160,8 @@
                     </hbox>
                 </groupbox>
             </hbox>
-            <splitter id="z_splitter" collapse="before" persist="state hidden"><grippy id="splitter_grippy2"/></splitter>
-            <groupbox id="z_splitter2" persist="height" flex="1">
+            <splitter id="z_splitter" collapse="before" oils_persist="state hidden"><grippy id="splitter_grippy2"/></splitter>
+            <groupbox id="z_splitter2" oils_persist="height" flex="1">
                 <caption label="&staff.cat.z3950.results_caption.label;"/>
                 <hbox>
                     <hbox id="result_message" />
diff --git a/Open-ILS/xul/staff_client/server/circ/checkin.xul b/Open-ILS/xul/staff_client/server/circ/checkin.xul
index 2a374e9305..a59d9916ba 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkin.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkin.xul
@@ -21,7 +21,7 @@
 <?xul-overlay href="/xul/server/circ/checkin_overlay.xul"?>
 
 <window id="checkin_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
diff --git a/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul b/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
index f471946755..9eb53d58b8 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
@@ -119,11 +119,11 @@
 		label="&staff.checkin.print_receipt.label;" 
 		command="cmd_checkin_print"
 		accesskey="&staff.checkin.print_receipt.accesskey;"/>
-	<checkbox id="trim_list" label="&staff.circ.checkin_overlay.trim_list.label;" checked="true" persist="checked"/> 
-	<checkbox id="strict_barcode" label="&staff.circ.checkin_overlay.strict_barcode.label;" checked="false" persist="checked"/> 
-	<checkbox id="do_not_alert_on_precat" label="&staff.circ.checkin_overlay.do_not_alert_on_precat.label;" persist="checked"/> 
+	<checkbox id="trim_list" label="&staff.circ.checkin_overlay.trim_list.label;" checked="true" oils_persist="checked"/> 
+	<checkbox id="strict_barcode" label="&staff.circ.checkin_overlay.strict_barcode.label;" checked="false" oils_persist="checked"/> 
+	<checkbox id="do_not_alert_on_precat" label="&staff.circ.checkin_overlay.do_not_alert_on_precat.label;" oils_persist="checked"/> 
 	<spacer id="pcii3s" flex="1"/>
-	<checkbox id="checkin_auto" label="&staff.circ.checkin_overlay.checkin_auto.label;" accesskey="&staff.circ.checkin_overlay.checkin_auto.accesskey;" persist="checked"/> 
+	<checkbox id="checkin_auto" label="&staff.circ.checkin_overlay.checkin_auto.label;" accesskey="&staff.circ.checkin_overlay.checkin_auto.accesskey;" oils_persist="checked"/> 
 </hbox>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.xul b/Open-ILS/xul/staff_client/server/circ/checkout.xul
index c620adb090..3f7ceafcf1 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkout.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.xul
@@ -21,7 +21,7 @@
 <?xul-overlay href="/xul/server/circ/checkout_overlay.xul"?>
 
 <window id="checkout_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
diff --git a/Open-ILS/xul/staff_client/server/circ/checkout_overlay.xul b/Open-ILS/xul/staff_client/server/circ/checkout_overlay.xul
index 2d7052e41e..449e86648d 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkout_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkout_overlay.xul
@@ -63,9 +63,9 @@
 		accesskey="&staff.circ.checkout_overlay.export.accesskey;"/>
 	<button id="clip_button" disabled="true" command="sel_clip" label="&staff.circ.checkout_overlay.sel_clip.label;" />
 	<button id="save_col_btn" command="save_columns" label="&staff.circ.checkout_overlay.save_columns.label;" />
-	<checkbox id="strict_barcode" label="&staff.circ.checkout_overlay.strict_barcode.label;" checked="false" persist="checked"/> 
+	<checkbox id="strict_barcode" label="&staff.circ.checkout_overlay.strict_barcode.label;" checked="false" oils_persist="checked"/> 
 	<spacer id="pcii3s" flex="1"/>
-	<checkbox id="checkout_auto" persist="checked"
+	<checkbox id="checkout_auto" oils_persist="checked"
 		label="&staff.patron_display.checkout.auto_print.label;" 
 		accesskey_old="&staff.patron_display.checkout.auto_print.accesskey;"/> 
 	<button id="checkout_done" 
diff --git a/Open-ILS/xul/staff_client/server/circ/copy_details.xul b/Open-ILS/xul/staff_client/server/circ/copy_details.xul
index 39237f6277..e91133f36b 100644
--- a/Open-ILS/xul/staff_client/server/circ/copy_details.xul
+++ b/Open-ILS/xul/staff_client/server/circ/copy_details.xul
@@ -20,8 +20,8 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="circ_copy_details_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	width="800" height="600" persist="width height"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+	width="800" height="600" oils_persist="width height"
 	xmlns:html="http://www.w3.org/1999/xhtml"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
diff --git a/Open-ILS/xul/staff_client/server/circ/copy_status.xul b/Open-ILS/xul/staff_client/server/circ/copy_status.xul
index 5c83e70172..147da120d4 100644
--- a/Open-ILS/xul/staff_client/server/circ/copy_status.xul
+++ b/Open-ILS/xul/staff_client/server/circ/copy_status.xul
@@ -21,7 +21,7 @@
 <?xul-overlay href="/xul/server/circ/copy_status_overlay.xul"?>
 
 <window id="copy_status_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
diff --git a/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul b/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul
index 185674f666..333f7255cc 100644
--- a/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul
@@ -169,8 +169,8 @@
     <hbox id="list_actions"/>
 
 	<button id="copy_status_print" label="&staff.circ.copy_status_overlay.copy_status_print.label;" command="cmd_copy_status_print" accesskey="&staff.circ.copy_status_overlay.copy_status_print.accesskey;"/>
-    <checkbox id="trim_list" label="&staff.circ.copy_status_overlay.trim_list.label;" checked="true" persist="checked" oncommand="try{this.setAttribute('checked',this.checked);}catch(E){alert(E);}" />
-	<checkbox id="strict_barcode" label="&staff.circ.copy_status_overlay.strict_barcode.label;" checked="false" persist="checked" oncommand="try{this.setAttribute('checked',this.checked);}catch(E){alert(E);}" /> 
+    <checkbox id="trim_list" label="&staff.circ.copy_status_overlay.trim_list.label;" checked="true" oils_persist="checked" oncommand="try{this.setAttribute('checked',this.checked);}catch(E){alert(E);}" />
+	<checkbox id="strict_barcode" label="&staff.circ.copy_status_overlay.strict_barcode.label;" checked="false" oils_persist="checked" oncommand="try{this.setAttribute('checked',this.checked);}catch(E){alert(E);}" /> 
 	<spacer flex="1"/>
 </hbox>
 
diff --git a/Open-ILS/xul/staff_client/server/circ/in_house_use.xul b/Open-ILS/xul/staff_client/server/circ/in_house_use.xul
index 81fa3a56ca..63cdd63c0c 100644
--- a/Open-ILS/xul/staff_client/server/circ/in_house_use.xul
+++ b/Open-ILS/xul/staff_client/server/circ/in_house_use.xul
@@ -20,7 +20,7 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="in_house_use_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -121,8 +121,8 @@
 			label="&staff.circ.in_house_use.print.label;" 
 			command="cmd_in_house_use_print"
 			accesskey=""/>
-		<checkbox id="trim_list" label="&staff.circ.in_house_use.trim_list.label;" checked="true" persist="checked"/> 
-		<checkbox id="strict_barcode" label="&staff.circ.in_house_use.strict_barcode.label;" checked="false" persist="checked"/> 
+		<checkbox id="trim_list" label="&staff.circ.in_house_use.trim_list.label;" checked="true" oils_persist="checked"/> 
+		<checkbox id="strict_barcode" label="&staff.circ.in_house_use.strict_barcode.label;" checked="false" oils_persist="checked"/> 
 		<spacer id="pcii3s" flex="1"/>
 	</hbox>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_history.xul b/Open-ILS/xul/staff_client/server/patron/bill_history.xul
index 3a28a76295..69ba61d18c 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_history.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_history.xul
@@ -21,8 +21,8 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 <?xul-overlay href="/xul/server/patron/bill_summary_overlay.xul"?>
 
-<window id="bill_history_win" width="700" height="550" persist="sizemode width height"
-	onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
+<window id="bill_history_win" width="700" height="550" oils_persist="sizemode width height"
+	onload="try{ my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -348,20 +348,20 @@
 	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
 	<vbox flex="1" class="my_overflow">
-        <vbox id="v1" persist="height" flex="1">
+        <vbox id="v1" oils_persist="height" flex="1">
     		<label id="patron_name" class="patronNameLarge"/>
     		<groupbox orient="vertical" id="summary" hidden="true" flex="1"/>
         </vbox>
 
 	    <splitter><grippy/></splitter>
 
-        <vbox id="v2" persist="height" flex="1">
+        <vbox id="v2" oils_persist="height" flex="1">
        		<iframe id="copy_summary" hidden="true"/>
         </vbox>
 
 		<splitter><grippy/></splitter>
 
-        <vbox id="v3" persist="height" flex="3">
+        <vbox id="v3" oils_persist="height" flex="3">
             <groupbox orient="vertical" flex="1">
                 <caption id="caption" label="&staff.patron.bill_history.caption.label;"/>
                 <tree id="bill_tree" flex="1" enableColumnDrag="true" seltype="single"/>
diff --git a/Open-ILS/xul/staff_client/server/patron/bills.xul b/Open-ILS/xul/staff_client/server/patron/bills.xul
index e1f6ef9f97..a151a0cdf3 100644
--- a/Open-ILS/xul/staff_client/server/patron/bills.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bills.xul
@@ -21,7 +21,7 @@
 <?xul-overlay href="/xul/server/patron/bills_overlay.xul"?>
 
 <window id="bills_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
diff --git a/Open-ILS/xul/staff_client/server/patron/bills_overlay.xul b/Open-ILS/xul/staff_client/server/patron/bills_overlay.xul
index 8187ff97c7..a73a687629 100644
--- a/Open-ILS/xul/staff_client/server/patron/bills_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bills_overlay.xul
@@ -109,8 +109,8 @@
 		<button id="bill_wizard" label="&staff.patron.bills_overlay.bill_patron.label;" accesskey="&staff.patron.bills_overlay.bill_patron.accesskey;" command="cmd_bill_wizard"/>
 		<button id="bill_history" label="&staff.patron.bills_overlay.history.label;" accesskey="&staff.patron.bills_overlay.history.accesskey;" command="cmd_bill_history"/>
 		<spacer flex="2"/>
-		<checkbox id="annotate_payment" label="&staff.patron.bills_overlay.annotate_payment.label;" persist="checked" checked="false" />
-		<checkbox id="auto_print" label="&staff.patron.bills_overlay.auto_print.label;" persist="checked" checked="true" />
+		<checkbox id="annotate_payment" label="&staff.patron.bills_overlay.annotate_payment.label;" oils_persist="checked" checked="false" />
+		<checkbox id="auto_print" label="&staff.patron.bills_overlay.auto_print.label;" oils_persist="checked" checked="true" />
 		<button class="hide_patron_credit" hidden="true" disabled="true" id="change_to_credit" label="&staff.patron.bills_overlay.convert_change_to_credit.label;" command="cmd_change_to_credit"/>
 		<button id="bill_apply_payment" label="&staff.patron.bills_overlay.apply_payment.label;" accesskey="&staff.patron.bills_overlay.apply_payment.accesskey;" command="cmd_bill_apply_payment"/>
 	</hbox>
diff --git a/Open-ILS/xul/staff_client/server/patron/display.xul b/Open-ILS/xul/staff_client/server/patron/display.xul
index 0f6afe897f..aa768f92a4 100644
--- a/Open-ILS/xul/staff_client/server/patron/display.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display.xul
@@ -21,7 +21,7 @@
 <?xul-overlay href="/xul/server/patron/display_overlay.xul"?>
 
 <window id="patron_display_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
diff --git a/Open-ILS/xul/staff_client/server/patron/display_horiz.xul b/Open-ILS/xul/staff_client/server/patron/display_horiz.xul
index 393625049b..115b8df711 100644
--- a/Open-ILS/xul/staff_client/server/patron/display_horiz.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display_horiz.xul
@@ -21,7 +21,7 @@
 <?xul-overlay href="/xul/server/patron/display_horiz_overlay.xul"?>
 
 <window id="patron_display_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
diff --git a/Open-ILS/xul/staff_client/server/patron/display_horiz_overlay.xul b/Open-ILS/xul/staff_client/server/patron/display_horiz_overlay.xul
index 13bd810fe3..2997df287f 100644
--- a/Open-ILS/xul/staff_client/server/patron/display_horiz_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display_horiz_overlay.xul
@@ -32,12 +32,12 @@
 		<label class="hideme invalid_address_indicator" value="&staff.patron.display_overlay.invalid_address.value;"/>
 	</hbox>
 	<vbox id="PatronNotNavBar" flex="1" class="my_bg">
-        <hbox id="left_deck_vbox" flex="1" persist="height"> 
-            <deck id="patron_left_deck" persist="height"/>
+        <hbox id="left_deck_vbox" flex="1" oils_persist="height"> 
+            <deck id="patron_left_deck" oils_persist="height"/>
         </hbox>
-        <splitter id="deck_splitter" collapse="before" persist="state hidden"><grippy id="splitter_grippy"/></splitter>
-        <hbox id="right_deck_vbox" flex="8" persist="height">
-            <deck id="patron_right_deck" persist="height"/>
+        <splitter id="deck_splitter" collapse="before" oils_persist="state hidden"><grippy id="splitter_grippy"/></splitter>
+        <hbox id="right_deck_vbox" flex="8" oils_persist="height">
+            <deck id="patron_right_deck" oils_persist="height"/>
         </hbox>
 	</vbox>
 </vbox>
diff --git a/Open-ILS/xul/staff_client/server/patron/display_overlay.xul b/Open-ILS/xul/staff_client/server/patron/display_overlay.xul
index 1c81e5705b..cf49f55a8e 100644
--- a/Open-ILS/xul/staff_client/server/patron/display_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display_overlay.xul
@@ -32,12 +32,12 @@
 		<label class="hideme invalid_address_indicator" value="&staff.patron.display_overlay.invalid_address.value;"/>
 	</hbox>
 	<hbox id="PatronNotNavBar" flex="1" class="my_bg">
-        <vbox id="left_deck_vbox" flex="1" persist="width"> 
-            <deck id="patron_left_deck" persist="width"/>
+        <vbox id="left_deck_vbox" flex="1" oils_persist="width"> 
+            <deck id="patron_left_deck" oils_persist="width"/>
         </vbox>
-        <splitter id="deck_splitter" collapse="before" persist="state hidden"><grippy id="splitter_grippy"/></splitter>
-        <vbox id="right_deck_vbox" flex="3" persist="width">
-            <deck id="patron_right_deck" persist="width"/>
+        <splitter id="deck_splitter" collapse="before" oils_persist="state hidden"><grippy id="splitter_grippy"/></splitter>
+        <vbox id="right_deck_vbox" flex="3" oils_persist="width">
+            <deck id="patron_right_deck" oils_persist="width"/>
         </vbox>
 	</hbox>
 </vbox>
diff --git a/Open-ILS/xul/staff_client/server/patron/hold_notices.xul b/Open-ILS/xul/staff_client/server/patron/hold_notices.xul
index e115e937f2..a39f6bfd40 100644
--- a/Open-ILS/xul/staff_client/server/patron/hold_notices.xul
+++ b/Open-ILS/xul/staff_client/server/patron/hold_notices.xul
@@ -19,8 +19,8 @@
 <!-- OVERLAYS -->
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
-<window id="hold_notices_win" width="700" height="550" persist="sizemode width height"
-	onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }" title="&staff.patron.hold_notices.title;"
+<window id="hold_notices_win" width="700" height="550" oils_persist="sizemode width height"
+	onload="try{ my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" title="&staff.patron.hold_notices.title;"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -240,14 +240,14 @@
 		</groupbox>
 	</stack>
 
-    <vbox id="v1" flex="1" persist="height">
+    <vbox id="v1" flex="1" oils_persist="height">
         <label id="patron_name" class="patronNameLarge"/>
         <vbox id="bib_brief_box" flex="1"/>
     </vbox>
 
     <splitter><grippy/></splitter>
 
-    <vbox id="v2" flex="1" persist="height">
+    <vbox id="v2" flex="1" oils_persist="height">
         <vbox flex="1">
             <tree id="holds_list" flex="1" enableColumnDrag="true" style=""/>
         </vbox>
@@ -260,7 +260,7 @@
 
     <splitter><grippy/></splitter>
 
-	<vbox persist="height" flex="9" class="my_overflow" id="notifications_panel">
+	<vbox oils_persist="height" flex="9" class="my_overflow" id="notifications_panel">
 	</vbox>
 
 
diff --git a/Open-ILS/xul/staff_client/server/patron/holds.xul b/Open-ILS/xul/staff_client/server/patron/holds.xul
index 65f3e241ed..ab830c0054 100644
--- a/Open-ILS/xul/staff_client/server/patron/holds.xul
+++ b/Open-ILS/xul/staff_client/server/patron/holds.xul
@@ -21,7 +21,7 @@
 <?xul-overlay href="/xul/server/patron/holds_overlay.xul"?>
 
 <window id="holds_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
diff --git a/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul b/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul
index efe978e111..64032b5ecb 100644
--- a/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul
@@ -58,8 +58,8 @@
 
 <hbox id="holds_top_ui" flex="1">
     <button id="place_hold_btn" hidden="true" label="&staff.patron.holds_overlay.place_hold.label;" accesskey="&staff.patron.holds_overlay.place_hold.accesskey;" command="cmd_search_opac" />
-    <checkbox id="lib_filter_checkbox" persist="checked" checked="true" hidden="true" label="&staff.patron.holds_overlay.lib_filter_checkbox.label;"/>
-    <menulist id="lib_type_menu" hidden="true" persist="value">
+    <checkbox id="lib_filter_checkbox" oils_persist="checked" checked="true" hidden="true" label="&staff.patron.holds_overlay.lib_filter_checkbox.label;"/>
+    <menulist id="lib_type_menu" hidden="true" oils_persist="value">
         <menupopup>
             <menuitem id="pickup_lib" value="pickup_lib" label="&staff.patron.holds_overlay.pickup_lib.label;"/>
             <menuitem id="request_lib" value="request_lib" label="&staff.patron.holds_overlay.request_lib.label;"/>
diff --git a/Open-ILS/xul/staff_client/server/patron/summary.xul b/Open-ILS/xul/staff_client/server/patron/summary.xul
index 48ba1207c4..1aa10444d8 100644
--- a/Open-ILS/xul/staff_client/server/patron/summary.xul
+++ b/Open-ILS/xul/staff_client/server/patron/summary.xul
@@ -21,7 +21,7 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="patron_summary_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }" onunload="try { observer.unregister(); } catch(E) { alert(E); }"
+	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" onunload="try { observer.unregister(); } catch(E) { alert(E); }"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
diff --git a/Open-ILS/xul/staff_client/server/patron/summary_overlay_horiz.xul b/Open-ILS/xul/staff_client/server/patron/summary_overlay_horiz.xul
index ab8c851e88..6db5608000 100644
--- a/Open-ILS/xul/staff_client/server/patron/summary_overlay_horiz.xul
+++ b/Open-ILS/xul/staff_client/server/patron/summary_overlay_horiz.xul
@@ -27,7 +27,7 @@
                 <rows>
                     <row>
                         <label id="PatronSummaryContact_date_of_birth_label" click_to_hide_dob="true" class="text_left dob label click_link" value="&staff.patron_display.date_of_birth.label;"/>
-                        <label id="patron_date_of_birth" class="dob value" hide_value="true" persist="hide_value"/><!-- FIXME: persist doesn't work for this -->
+                        <label id="patron_date_of_birth" class="dob value" hide_value="true" oils_persist="hide_value"/><!-- FIXME: persist doesn't work for this -->
                     </row>
                     <row>
                         <label id="PatronSummaryContact_library_card_label" class="text_left card label"
-- 
2.11.0