From 4bd356f13f22194f846735af7b16e97e8f260333 Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 23 Oct 2009 16:44:22 +0000
Subject: [PATCH] Another monster patch.  Change each tab to 4 spaces in the
 staff client xul, html, and css files.

Did this to effect the change:

	find . -name '*.xul' -exec sed -i 's/\t/    /g' {} \;
	find . -name '*html' -exec sed -i 's/\t/    /g' {} \;
	find . -name '*.css' -exec sed -i 's/\t/    /g' {} \;

Statements like dump('\t\tFoo\n'); are unaffected.

I imagine we'll need to realign and reindent things as we encounter visual ugliness.



git-svn-id: svn://svn.open-ils.org/ILS/trunk@14578 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../chrome/content/OpenILS/util_overlay_chrome.xul |   34 +-
 .../content/OpenILS/util_overlay_offline.xul       |   18 +-
 .../chrome/content/admin/survey_overlay.xul        |  152 +-
 .../chrome/content/admin/survey_wizard.xul         |   92 +-
 .../xul/staff_client/chrome/content/cat/opac.xul   |   90 +-
 .../staff_client/chrome/content/circ/offline.xul   |  122 +-
 .../chrome/content/circ/offline_checkin.xul        |  122 +-
 .../chrome/content/circ/offline_checkout.xul       |  196 +-
 .../chrome/content/circ/offline_in_house_use.xul   |  138 +-
 .../chrome/content/circ/offline_register.xul       |  218 +--
 .../chrome/content/circ/offline_renew.xul          |  188 +-
 .../staff_client/chrome/content/main/about.html    |   12 +-
 .../xul/staff_client/chrome/content/main/main.xul  |  286 +--
 .../chrome/content/main/menu_frame.xul             |   92 +-
 .../chrome/content/main/menu_frame_menus.xul       |  446 ++---
 .../chrome/content/main/menu_frame_overlay.xul     |   74 +-
 .../chrome/content/main/simple_auth.xul            |  270 +--
 .../xul/staff_client/chrome/content/main/test.xul  |    6 +-
 .../staff_client/chrome/content/util/browser.xul   |  186 +-
 .../chrome/content/util/fancy_prompt.xul           |  236 +--
 .../staff_client/chrome/content/util/fm_view.xul   |  376 ++--
 .../chrome/content/util/list_clipboard.xul         |  162 +-
 .../staff_client/chrome/content/util/rbrowser.xul  |  188 +-
 Open-ILS/xul/staff_client/chrome/skin/global.css   |   12 +-
 .../xul/staff_client/external/dojo_template.xul    |   26 +-
 Open-ILS/xul/staff_client/external/template.xul    |  102 +-
 .../staff_client/server/OpenILS/util_overlay.xul   |   38 +-
 Open-ILS/xul/staff_client/server/admin/admin.css   |   34 +-
 .../staff_client/server/admin/cash_reports.xhtml   |  172 +-
 .../staff_client/server/admin/closed_dates.xhtml   |  448 ++---
 .../staff_client/server/admin/copy_locations.xhtml |  346 ++--
 .../staff_client/server/admin/font_settings.xul    |  308 +--
 .../staff_client/server/admin/hold_pull_list.xhtml |  162 +-
 .../server/admin/hold_pull_list_classic.xhtml      |   82 +-
 Open-ILS/xul/staff_client/server/admin/index.xhtml |  154 +-
 .../staff_client/server/admin/non_cat_types.xhtml  |  304 +--
 .../server/admin/offline_manage_xacts.xul          |  140 +-
 .../server/admin/org_unit_settings.xhtml           |    6 +-
 .../server/admin/printer_settings.html             |   46 +-
 .../server/admin/stat_cat_editor.xhtml             |  478 ++---
 .../xul/staff_client/server/admin/transit_list.xul |  260 +--
 .../staff_client/server/admin/upload_xacts.xhtml   |   56 +-
 .../xul/staff_client/server/admin/work_log.xul     |   22 +-
 Open-ILS/xul/staff_client/server/cat/bib_brief.xul |   24 +-
 .../staff_client/server/cat/bib_brief_overlay.xul  |    6 +-
 .../xul/staff_client/server/cat/copy_browser.xul   |  320 ++--
 .../xul/staff_client/server/cat/copy_buckets.xul   |  122 +-
 .../server/cat/copy_buckets_overlay.xul            |   98 +-
 .../staff_client/server/cat/copy_buckets_quick.xul |  298 +--
 .../xul/staff_client/server/cat/copy_editor.xul    |  122 +-
 .../xul/staff_client/server/cat/copy_notes.xul     |  384 ++--
 .../xul/staff_client/server/cat/copy_summary.xul   |  432 ++---
 Open-ILS/xul/staff_client/server/cat/marc_new.xul  |  252 +--
 .../xul/staff_client/server/cat/marc_view.html     |   38 +-
 Open-ILS/xul/staff_client/server/cat/marc_view.xul |   94 +-
 Open-ILS/xul/staff_client/server/cat/marcedit.css  |   54 +-
 Open-ILS/xul/staff_client/server/cat/marcedit.xul  |  358 ++--
 .../xul/staff_client/server/cat/record_buckets.xul |  174 +-
 .../server/cat/record_buckets_overlay.xul          |  118 +-
 .../server/cat/record_buckets_quick.xul            |  288 +--
 .../xul/staff_client/server/cat/spine_labels.xul   |  274 +--
 .../xul/staff_client/server/cat/volume_buckets.xul |   74 +-
 .../server/cat/volume_copy_creator.xul             |   74 +-
 .../xul/staff_client/server/cat/volume_editor.xul  |  152 +-
 Open-ILS/xul/staff_client/server/cat/z3950.xul     |  124 +-
 .../server/circ/alternate_copy_summary.xul         |   20 +-
 .../server/circ/backdate_post_checkin.xul          |   22 +-
 Open-ILS/xul/staff_client/server/circ/checkin.xul  |  158 +-
 .../staff_client/server/circ/checkin_overlay.xul   |  182 +-
 Open-ILS/xul/staff_client/server/circ/checkout.xul |  142 +-
 .../staff_client/server/circ/checkout_overlay.xul  |   92 +-
 .../xul/staff_client/server/circ/circ_brief.xul    |  258 +--
 .../xul/staff_client/server/circ/circ_summary.xul  |  230 +--
 .../xul/staff_client/server/circ/copy_details.xul  |  386 ++--
 .../xul/staff_client/server/circ/copy_status.xul   |  216 +--
 .../server/circ/copy_status_overlay.xul            |  286 +--
 .../xul/staff_client/server/circ/in_house_use.xul  |  158 +-
 .../staff_client/server/circ/pre_cat_fields.xul    |  120 +-
 .../server/circ/print_list_template_editor.xul     |  202 +-
 Open-ILS/xul/staff_client/server/circ/renew.xul    |  120 +-
 .../xul/staff_client/server/circ/renew_overlay.xul |  170 +-
 Open-ILS/xul/staff_client/server/index.xhtml       |    6 +-
 Open-ILS/xul/staff_client/server/main/data.xul     |  334 ++--
 .../server/main/gen_offline_widgets.xul            |  406 ++--
 .../xul/staff_client/server/main/simple_auth.xul   |  274 +--
 .../server/main/verify_credentials.xul             |   36 +-
 Open-ILS/xul/staff_client/server/main/ws_info.xul  |  298 +--
 .../staff_client/server/patron/barcode_entry.xul   |  336 ++--
 Open-ILS/xul/staff_client/server/patron/bill2.xul  |   24 +-
 .../staff_client/server/patron/bill_cc_info.xul    |  170 +-
 .../staff_client/server/patron/bill_check_info.xul |  122 +-
 .../staff_client/server/patron/bill_details.xul    |   80 +-
 .../staff_client/server/patron/bill_history.xul    |   22 +-
 .../server/patron/bill_summary_overlay.xul         |  104 +-
 .../xul/staff_client/server/patron/bill_wizard.xul |   84 +-
 Open-ILS/xul/staff_client/server/patron/bills.xul  |  110 +-
 .../staff_client/server/patron/bills_overlay.xul   |  208 +-
 .../xul/staff_client/server/patron/display.xul     |  188 +-
 .../staff_client/server/patron/display_horiz.xul   |  188 +-
 .../server/patron/display_horiz_overlay.xul        |   60 +-
 .../staff_client/server/patron/display_overlay.xul |   60 +-
 .../server/patron/edit_standing_penalty.xul        |   22 +-
 .../xul/staff_client/server/patron/hold_cancel.xul |   22 +-
 .../staff_client/server/patron/hold_details.xul    |   42 +-
 Open-ILS/xul/staff_client/server/patron/holds.xul  |  104 +-
 .../staff_client/server/patron/holds_overlay.xul   |  130 +-
 .../xul/staff_client/server/patron/info_group.xul  |  856 ++++-----
 .../xul/staff_client/server/patron/info_notes.xul  |  460 ++---
 .../staff_client/server/patron/info_stat_cats.xul  |  352 ++--
 .../staff_client/server/patron/info_surveys.xul    |  332 ++--
 Open-ILS/xul/staff_client/server/patron/items.xul  |  174 +-
 .../staff_client/server/patron/items_overlay.xul   |  216 +--
 .../server/patron/new_standing_penalty.xul         |   22 +-
 .../xul/staff_client/server/patron/search_form.xul |  122 +-
 .../server/patron/search_form_horiz.xul            |  122 +-
 .../server/patron/search_form_horiz_overlay.xul    |  164 +-
 .../server/patron/search_form_overlay.xul          |  234 +--
 .../staff_client/server/patron/search_result.xul   |  112 +-
 .../server/patron/search_result_overlay.xul        |   26 +-
 .../server/patron/standing_penalties.xul           |   56 +-
 .../xul/staff_client/server/patron/summary.xul     |  158 +-
 .../staff_client/server/patron/summary_overlay.xul |  356 ++--
 .../server/patron/summary_overlay_horiz.xul        |  232 +--
 Open-ILS/xul/staff_client/server/patron/ue.xhtml   | 1992 ++++++++++----------
 .../staff_client/server/patron/user_buckets.xul    |   64 +-
 .../xul/staff_client/server/patron/user_edit.xhtml |  238 +--
 Open-ILS/xul/staff_client/server/skin/global.css   |   14 +-
 127 files changed, 11637 insertions(+), 11637 deletions(-)

diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
index 9995ad3af2..da812276ad 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
@@ -2,23 +2,23 @@
 <overlay id="openils_util_overlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<scripts id="openils_util_scripts">
-		<script>dump('starting openils_util_overlay\n');</script>
-		<script type="text/javascript" src="../main/constants.js" />
-		<script type="text/javascript" src="util/utils.js" />
-		<script type="text/javascript" src="util/CGI.js" />
-		<script type="text/javascript" src="util/md5.js" />
-		<script type="text/javascript" src="util/JSON_v1.js" />
-		<script type="text/javascript" src="util/fmall.js" />
-		<script type="text/javascript" src="util/fmgen.js" />
-		<script type="text/javascript" src="util/RemoteRequest.js" />
-		<script type='text/javascript' src='util/en-US/OrgTree.js' />
-		<script type="text/javascript" src="util/org_utils.js" />   
-		<script type="text/javascript" src="global_util.js" />   
-		<messagecatalog id="offlineStrings" src='chrome://open_ils_staff_client/locale/offline.properties'/>
-		<messagecatalog id="authStrings" src='chrome://open_ils_staff_client/locale/auth.properties'/>
-		<script>dump('finished openils_util_overlay\n');</script>
-	</scripts>
+    <scripts id="openils_util_scripts">
+        <script>dump('starting openils_util_overlay\n');</script>
+        <script type="text/javascript" src="../main/constants.js" />
+        <script type="text/javascript" src="util/utils.js" />
+        <script type="text/javascript" src="util/CGI.js" />
+        <script type="text/javascript" src="util/md5.js" />
+        <script type="text/javascript" src="util/JSON_v1.js" />
+        <script type="text/javascript" src="util/fmall.js" />
+        <script type="text/javascript" src="util/fmgen.js" />
+        <script type="text/javascript" src="util/RemoteRequest.js" />
+        <script type='text/javascript' src='util/en-US/OrgTree.js' />
+        <script type="text/javascript" src="util/org_utils.js" />   
+        <script type="text/javascript" src="global_util.js" />   
+        <messagecatalog id="offlineStrings" src='chrome://open_ils_staff_client/locale/offline.properties'/>
+        <messagecatalog id="authStrings" src='chrome://open_ils_staff_client/locale/auth.properties'/>
+        <script>dump('finished openils_util_overlay\n');</script>
+    </scripts>
 
 </overlay>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
index fd8f9a1b90..09061f5b43 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
@@ -4,15 +4,15 @@
 <overlay id="openils_util_overlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<script>dump('Loading OpenILS/util_overlay_offline.xul\n');</script>
-	<scripts id="openils_util_scripts">
-		<script type="text/javascript" src="../main/constants.js" />
-		<script type="text/javascript" src="util/utils.js" />
-		<script type="text/javascript" src="util/CGI.js" />
-		<script type="text/javascript" src="util/md5.js" />
-		<script type="text/javascript" src="util/JSON_v1.js" />
-	</scripts>
-	<script>dump('Loaded OpenILS/util_overlay_offline.xul\n');</script>
+    <script>dump('Loading OpenILS/util_overlay_offline.xul\n');</script>
+    <scripts id="openils_util_scripts">
+        <script type="text/javascript" src="../main/constants.js" />
+        <script type="text/javascript" src="util/utils.js" />
+        <script type="text/javascript" src="util/CGI.js" />
+        <script type="text/javascript" src="util/md5.js" />
+        <script type="text/javascript" src="util/JSON_v1.js" />
+    </scripts>
+    <script>dump('Loaded OpenILS/util_overlay_offline.xul\n');</script>
 
 </overlay>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/admin/survey_overlay.xul b/Open-ILS/xul/staff_client/chrome/content/admin/survey_overlay.xul
index 0ac3dca092..8afa457c54 100644
--- a/Open-ILS/xul/staff_client/chrome/content/admin/survey_overlay.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/admin/survey_overlay.xul
@@ -1,96 +1,96 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay SYSTEM "chrome://open_ils_staff_client/locale/lang.dtd">
 <overlay id="survey_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<script>dump('survey_overlay.xul loading\n');</script>
+    <script>dump('survey_overlay.xul loading\n');</script>
 
-	<wizardpage id="page1" 
-		description="&staff.survey.wizard.page1;" 
-		onpageadvanced="setDescription('page2','survey_name');"
-		onpageshow="document.getElementById('survey_name').focus();"
-	>
-		<grid id="page1_grid1"/>
-	</wizardpage>
+    <wizardpage id="page1" 
+        description="&staff.survey.wizard.page1;" 
+        onpageadvanced="setDescription('page2','survey_name');"
+        onpageshow="document.getElementById('survey_name').focus();"
+    >
+        <grid id="page1_grid1"/>
+    </wizardpage>
 
-	<grid id="page1_grid1">
-		<columns id="page1_grid1_columns">
-			<column id="page1_grid1_column1"/>
-			<column id="page1_grid1_column2"/>
-		</columns>
-		<rows id="page1_grid1_rows">
-			<row id="page1_grid1_row1">
-				<label id="page1_row1_label1" value="&staff.admin.survey.available.label;" class="wizard_label"/>
+    <grid id="page1_grid1">
+        <columns id="page1_grid1_columns">
+            <column id="page1_grid1_column1"/>
+            <column id="page1_grid1_column2"/>
+        </columns>
+        <rows id="page1_grid1_rows">
+            <row id="page1_grid1_row1">
+                <label id="page1_row1_label1" value="&staff.admin.survey.available.label;" class="wizard_label"/>
                 <hbox id="placeholder" />
-			</row>
+            </row>
 
-			<row id="page1_grid1_row2">
-				<label id="page1_row2_label1" value="&staff.admin.survey.name.label;" class="wizard_label"/>
-				<textbox id="survey_name" onchange="page1_check_advance();" onkeyup="page1_check_advance();" />
-			</row>
+            <row id="page1_grid1_row2">
+                <label id="page1_row2_label1" value="&staff.admin.survey.name.label;" class="wizard_label"/>
+                <textbox id="survey_name" onchange="page1_check_advance();" onkeyup="page1_check_advance();" />
+            </row>
 
-			<row id="page1_grid1_row3">
-				<label id="page1_row3_label1" value="&staff.admin.survey.description.label;" class="wizard_label"/>
-				<textbox id="survey_description" multiline="true" rows="4"/>
-			</row>
+            <row id="page1_grid1_row3">
+                <label id="page1_row3_label1" value="&staff.admin.survey.description.label;" class="wizard_label"/>
+                <textbox id="survey_description" multiline="true" rows="4"/>
+            </row>
 
-			<row>
-				<label id="page1_row1_label2" value="&staff.admin.survey.required.label;" class="wizard_label"/>
-				<checkbox id="required_checkbox"/>
-			</row>
-			
-			<row id="page1_grid1_row1c">
-				<label id="page1_row1c_label3" value="&staff.admin.survey.format.label;" class="wizard_label"/>
-				<checkbox id="poll_checkbox"/>
-			</row>
+            <row>
+                <label id="page1_row1_label2" value="&staff.admin.survey.required.label;" class="wizard_label"/>
+                <checkbox id="required_checkbox"/>
+            </row>
+            
+            <row id="page1_grid1_row1c">
+                <label id="page1_row1c_label3" value="&staff.admin.survey.format.label;" class="wizard_label"/>
+                <checkbox id="poll_checkbox"/>
+            </row>
 
 
-			<row id="page1_grid1_row1a">
-				<label id="page1_row1a_label3" value="&staff.admin.survey.opac_visible.label;" class="wizard_label"/>
-				<checkbox id="opac_checkbox"/>
-			</row>
+            <row id="page1_grid1_row1a">
+                <label id="page1_row1a_label3" value="&staff.admin.survey.opac_visible.label;" class="wizard_label"/>
+                <checkbox id="opac_checkbox"/>
+            </row>
 
-			<row id="page1_grid1_row1b">
-				<label id="page1_row1b_label3" value="&staff.admin.survey.staff_client.label;" class="wizard_label"/>
-				<checkbox id="patron_summary_checkbox"/>
-			</row>
-			<row id="page1_grid1_row1d">
-				<label id="page1_row2_label2" value="&staff.admin.survey.start.label;" class="wizard_label"/>
-				<textbox id="survey_start"/>
-			</row>
-			<row>
-				<label id="page1_row3_label2" value="&staff.admin.survey.end.label;" class="wizard_label"/>
-				<textbox id="survey_end"/>
-			</row>
-		</rows>
-	</grid>
+            <row id="page1_grid1_row1b">
+                <label id="page1_row1b_label3" value="&staff.admin.survey.staff_client.label;" class="wizard_label"/>
+                <checkbox id="patron_summary_checkbox"/>
+            </row>
+            <row id="page1_grid1_row1d">
+                <label id="page1_row2_label2" value="&staff.admin.survey.start.label;" class="wizard_label"/>
+                <textbox id="survey_start"/>
+            </row>
+            <row>
+                <label id="page1_row3_label2" value="&staff.admin.survey.end.label;" class="wizard_label"/>
+                <textbox id="survey_end"/>
+            </row>
+        </rows>
+    </grid>
 
-	<wizardpage id="page2" 
-		description="&staff.survey.wizard.page2;" 
-		onpageshow="document.getElementById('survey_add').canAdvance = false; document.getElementById('new_question').focus();"
-	>
-		<separator id="page2_separator1"/>
-		<grid id="page2_grid1"/>
-	</wizardpage>
+    <wizardpage id="page2" 
+        description="&staff.survey.wizard.page2;" 
+        onpageshow="document.getElementById('survey_add').canAdvance = false; document.getElementById('new_question').focus();"
+    >
+        <separator id="page2_separator1"/>
+        <grid id="page2_grid1"/>
+    </wizardpage>
 
-	<grid id='page2_grid1'>
-		<columns id="page2_grid1_columns">
-			<column id="page2_grid1_column1"/>
-			<column id="page2_grid1_column2" flex="1"/>
-			<column id="page2_grid1_column3"/>
-		</columns>
-		<rows id="page2_grid1_rows"/>
-	</grid>
+    <grid id='page2_grid1'>
+        <columns id="page2_grid1_columns">
+            <column id="page2_grid1_column1"/>
+            <column id="page2_grid1_column2" flex="1"/>
+            <column id="page2_grid1_column3"/>
+        </columns>
+        <rows id="page2_grid1_rows"/>
+    </grid>
 
 
-	<rows id="page2_grid1_rows">
-		<row id="page2_grid1_row1">
-			<label id="new_question_label" value="#1"/>
-			<textbox id="new_question" flex="1"/>
-			<button id="page2_button1" label="&staff.admin.survey.save_question.label;" accesskey="&staff.admin.survey.save_question.accesskey;" oncommand="add_question(event);"/>
-		</row>
-	</rows>
+    <rows id="page2_grid1_rows">
+        <row id="page2_grid1_row1">
+            <label id="new_question_label" value="#1"/>
+            <textbox id="new_question" flex="1"/>
+            <button id="page2_button1" label="&staff.admin.survey.save_question.label;" accesskey="&staff.admin.survey.save_question.accesskey;" oncommand="add_question(event);"/>
+        </row>
+    </rows>
 
-	<script>dump('survey_overlay.xul loaded\n');</script>
+    <script>dump('survey_overlay.xul loaded\n');</script>
 </overlay>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul b/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
index 11930178b8..95aacf8421 100644
--- a/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
@@ -2,65 +2,65 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://open_ils_staff_client/skin/global.css" type="text/css"?>
 
-	<!-- Overlays for this XUL file -->
-	<?xul-overlay href="chrome://open_ils_staff_client/content/admin/survey_overlay.xul"?>
-	<?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_chrome.xul"?>
+    <!-- Overlays for this XUL file -->
+    <?xul-overlay href="chrome://open_ils_staff_client/content/admin/survey_overlay.xul"?>
+    <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_chrome.xul"?>
 
 <!-- This DTD declaration needs to be fixed for Mozilla locales -->
 <!DOCTYPE wizard SYSTEM "chrome://open_ils_staff_client/locale/lang.dtd">
 <wizard id="survey_add" title="&staff.survey.wizard.title;" 
-	orient="vertical" style="overflow: auto" width="800" height="600"
-	onload="try{ my_init(); } catch(E) { alert(E); }"
-	onwizardfinish="save_survey();"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    orient="vertical" style="overflow: auto" width="800" height="600"
+    onload="try{ my_init(); } catch(E) { alert(E); }"
+    onwizardfinish="save_survey();"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script>dump('survey_wizard.xul loading\n');</script>
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
-	<scripts id="openils_util_scripts"/>
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <script>dump('survey_wizard.xul loading\n');</script>
+    <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
+    <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+    <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/admin/survey.js" />
-	<script type="text/javascript">
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		        if (typeof JSAN == 'undefined') { throw( document.getElementById("offlineStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('..');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for survey_wizard.xul');
+    <script type="text/javascript" src="chrome://open_ils_staff_client/content/admin/survey.js" />
+    <script type="text/javascript">
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( document.getElementById("offlineStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('..');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for survey_wizard.xul');
 
-				g.cgi = new CGI();
+                g.cgi = new CGI();
 
-				JSAN.use('OpenILS.data'); g.OpenILS = {};
-				g.OpenILS.data = new OpenILS.data(); g.OpenILS.data.init({'via':'stash'});
+                JSAN.use('OpenILS.data'); g.OpenILS = {};
+                g.OpenILS.data = new OpenILS.data(); g.OpenILS.data.init({'via':'stash'});
 
-				XML_HTTP_SERVER = g.OpenILS.data.server_unadorned;
+                XML_HTTP_SERVER = g.OpenILS.data.server_unadorned;
 
-				JSAN.use('util.network');
-				g.network = new util.network();
+                JSAN.use('util.network');
+                g.network = new util.network();
 
-				survey_init(); // legacy init
-				document.getElementById('survey_add').canAdvance = false; 
-	
-			} catch(E) {
-				var err_msg = document.getElementById("offlineStrings").getFormattedString('common.exception', ['survey_wizard.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-	]]>
-	</script>
+                survey_init(); // legacy init
+                document.getElementById('survey_add').canAdvance = false; 
+    
+            } catch(E) {
+                var err_msg = document.getElementById("offlineStrings").getFormattedString('common.exception', ['survey_wizard.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+    ]]>
+    </script>
 
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
-	<!-- Layout to be filled in by overlays and javascript -->
-	<wizardpage id="page1"/>
-	<wizardpage id="page2"/>
+    <!-- Layout to be filled in by overlays and javascript -->
+    <wizardpage id="page1"/>
+    <wizardpage id="page2"/>
 
-	<script>dump('survey_wizard.xul loaded\n');</script>
+    <script>dump('survey_wizard.xul loaded\n');</script>
 </wizard>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul b/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
index 46f7e8f676..14710e4bd1 100644
--- a/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
@@ -16,56 +16,56 @@
 <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_chrome.xul"?>
 
 <window id="opac_win"
-	onload="try { my_init(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    </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="chrome://open_ils_staff_client/content/cat/opac.js"/>
-	
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+    <script type="text/javascript" src="chrome://open_ils_staff_client/content/cat/opac.js"/>
+    
+    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
-	<vbox flex="1">
-		<deck id="top_pane"/>
-		<hbox id="nav" hidden="true">
-			<label id="record_pos"/>
-			<button id="record_start" accesskey="&staff.cat.opac.record_start.accesskey;" label="&staff.cat.opac.record_start.label;" oncommand="if (g.f_record_start) g.f_record_start();"/>
-			<button id="record_prev" accesskey="&staff.cat.opac.record_prev.accesskey;" label="&staff.cat.opac.record_prev.label;" oncommand="if (g.f_record_prev) g.f_record_prev();"/>
-			<button id="record_next" accesskey="&staff.cat.opac.record_next.accesskey;" label="&staff.cat.opac.record_next.label;" oncommand="if (g.f_record_next) g.f_record_next();"/>
-			<button id="record_end" accesskey="&staff.cat.opac.record_end.accesskey;" label="&staff.cat.opac.record_end.label;" oncommand="if (g.f_record_end) g.f_record_end();"/>
-			<spacer flex="1"/>
-			<menubar>
-				<menu label="&staff.cat.opac.menu.label;" accesskey="&staff.cat.opac.menu.accesskey;">
-				<menupopup>
-				<menuitem label="&staff.cat.opac.opac_view.label;" accesskey="" id="opac_view" oncommand="set_opac();"/>
-				<menuitem label="&staff.cat.opac.marc_view.label;" accesskey="&staff.cat.opac.marc_view.accesskey;" id="marc_view" oncommand="set_marc_view();"/>
-				<menuitem label="&staff.cat.opac.marc_edit.label;" accesskey="&staff.cat.opac.marc_edit.accesskey;" id="marc_edit" oncommand="set_marc_edit();"/>
-				<menuitem label="&staff.cat.opac.copy_browse.label;" accesskey="&staff.cat.opac.copy_browse.accesskey;" id="copy_browse" oncommand="set_copy_browser();"/>
-				<menuitem label="&staff.cat.opac.view_holds.label;" accesskey="&staff.cat.opac.view_holds.accesskey;" id="view_holds" oncommand="set_hold_browser();"/>
-				<menuseparator/>
-				<menuitem label="&staff.cat.opac.add_bucket.label;" accesskey="&staff.cat.opac.add_bucket.accesskey;" id="add_bucket" oncommand="add_to_bucket();"/>
-				<menuitem label="&staff.cat.opac.mark_for_overlay.label;" accesskey="&staff.cat.opac.mark_for_overlay.accesskey;" id="mark_for_overlay" oncommand="mark_for_overlay();"/>
-				<menuitem label="&staff.cat.opac.delete_record.label;" accesskey="&staff.cat.opac.delete_record.accesskey;" id="delete_record" oncommand="delete_record();"/>
-				<menuitem label="&staff.cat.opac.undelete_record.label;" accesskey="&staff.cat.opac.undelete_record.accesskey;" id="undelete_record" oncommand="undelete_record();"/>
-				<menuseparator/>
-				<menuitem label="&staff.cat.opac.bib_in_new_tab.label;" id="bib_in_new_tab" oncommand="bib_in_new_tab();"/>
-				<menuitem label="&staff.cat.opac.remove_me.label;" id="remove_me" oncommand="remove_me();"/>
-				<menuseparator/>
-				<menuitem label="&staff.cat.opac.default.label;" id="default" oncommand="set_default();"/>
-				<menuitem label="&staff.cat.opac.refresh_me.label;" id="refresh_me" oncommand="refresh_display(docid);"/>
-				</menupopup>
-				</menu>
-			</menubar>
-		</hbox>
-		<deck id="bottom_pane" flex="1"/>
-	</vbox>
+    <vbox flex="1">
+        <deck id="top_pane"/>
+        <hbox id="nav" hidden="true">
+            <label id="record_pos"/>
+            <button id="record_start" accesskey="&staff.cat.opac.record_start.accesskey;" label="&staff.cat.opac.record_start.label;" oncommand="if (g.f_record_start) g.f_record_start();"/>
+            <button id="record_prev" accesskey="&staff.cat.opac.record_prev.accesskey;" label="&staff.cat.opac.record_prev.label;" oncommand="if (g.f_record_prev) g.f_record_prev();"/>
+            <button id="record_next" accesskey="&staff.cat.opac.record_next.accesskey;" label="&staff.cat.opac.record_next.label;" oncommand="if (g.f_record_next) g.f_record_next();"/>
+            <button id="record_end" accesskey="&staff.cat.opac.record_end.accesskey;" label="&staff.cat.opac.record_end.label;" oncommand="if (g.f_record_end) g.f_record_end();"/>
+            <spacer flex="1"/>
+            <menubar>
+                <menu label="&staff.cat.opac.menu.label;" accesskey="&staff.cat.opac.menu.accesskey;">
+                <menupopup>
+                <menuitem label="&staff.cat.opac.opac_view.label;" accesskey="" id="opac_view" oncommand="set_opac();"/>
+                <menuitem label="&staff.cat.opac.marc_view.label;" accesskey="&staff.cat.opac.marc_view.accesskey;" id="marc_view" oncommand="set_marc_view();"/>
+                <menuitem label="&staff.cat.opac.marc_edit.label;" accesskey="&staff.cat.opac.marc_edit.accesskey;" id="marc_edit" oncommand="set_marc_edit();"/>
+                <menuitem label="&staff.cat.opac.copy_browse.label;" accesskey="&staff.cat.opac.copy_browse.accesskey;" id="copy_browse" oncommand="set_copy_browser();"/>
+                <menuitem label="&staff.cat.opac.view_holds.label;" accesskey="&staff.cat.opac.view_holds.accesskey;" id="view_holds" oncommand="set_hold_browser();"/>
+                <menuseparator/>
+                <menuitem label="&staff.cat.opac.add_bucket.label;" accesskey="&staff.cat.opac.add_bucket.accesskey;" id="add_bucket" oncommand="add_to_bucket();"/>
+                <menuitem label="&staff.cat.opac.mark_for_overlay.label;" accesskey="&staff.cat.opac.mark_for_overlay.accesskey;" id="mark_for_overlay" oncommand="mark_for_overlay();"/>
+                <menuitem label="&staff.cat.opac.delete_record.label;" accesskey="&staff.cat.opac.delete_record.accesskey;" id="delete_record" oncommand="delete_record();"/>
+                <menuitem label="&staff.cat.opac.undelete_record.label;" accesskey="&staff.cat.opac.undelete_record.accesskey;" id="undelete_record" oncommand="undelete_record();"/>
+                <menuseparator/>
+                <menuitem label="&staff.cat.opac.bib_in_new_tab.label;" id="bib_in_new_tab" oncommand="bib_in_new_tab();"/>
+                <menuitem label="&staff.cat.opac.remove_me.label;" id="remove_me" oncommand="remove_me();"/>
+                <menuseparator/>
+                <menuitem label="&staff.cat.opac.default.label;" id="default" oncommand="set_default();"/>
+                <menuitem label="&staff.cat.opac.refresh_me.label;" id="refresh_me" oncommand="refresh_display(docid);"/>
+                </menupopup>
+                </menu>
+            </menubar>
+        </hbox>
+        <deck id="bottom_pane" flex="1"/>
+    </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul
index e9d899247f..294b7c5089 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul
@@ -16,85 +16,85 @@
 <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_offline.xul"?>
 
 <window id="offline_win" sizemode="maximized"
-	onload="try { my_init(); } catch(E) { alert(E); }"
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); } catch(E) { alert(E); }"
+    xmlns:html="http://www.w3.org/1999/xhtml"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        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>
-	<![CDATA[
-		var offlineStrings;
+    <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        var offlineStrings;
 
-		function my_init() {
-			try {
-				offlineStrings = document.getElementById('offlineStrings');
+        function my_init() {
+            try {
+                offlineStrings = document.getElementById('offlineStrings');
 
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		                if (typeof JSAN == 'undefined') { throw(offlineStrings.getString('common.jsan.missing')); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('..');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for offline.xul');
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                        if (typeof JSAN == 'undefined') { throw(offlineStrings.getString('common.jsan.missing')); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('..');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for offline.xul');
 
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name(offlineStrings.getString('circ.standalone')); } catch(E) { alert(E); }
-				}
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+                    try { window.xulG.set_tab_name(offlineStrings.getString('circ.standalone')); } catch(E) { alert(E); }
+                }
 
-				g.cgi = new CGI();
+                g.cgi = new CGI();
 
-				JSAN.use('circ.offline'); g.offline = new circ.offline();
+                JSAN.use('circ.offline'); g.offline = new circ.offline();
 
-				g.offline.init();
+                g.offline.init();
 
 
-				JSAN.use('util.date');
-				
-				function update_clock() {
-					/* I18N to-do: enable localized date formats */
-					var today = util.date.formatted_date(new Date(),"%F %H:%M:%s");
-					document.getElementById('today').setAttribute('label',today);
-					setTimeout(update_clock,1);
-				}
+                JSAN.use('util.date');
+                
+                function update_clock() {
+                    /* I18N to-do: enable localized date formats */
+                    var today = util.date.formatted_date(new Date(),"%F %H:%M:%s");
+                    document.getElementById('today').setAttribute('label',today);
+                    setTimeout(update_clock,1);
+                }
 
-				update_clock();
+                update_clock();
 
-			} catch(E) {
-				var err_msg = offlineStrings.getFormattedString('common.exception', ["circ/offline.xul", E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
+            } catch(E) {
+                var err_msg = offlineStrings.getFormattedString('common.exception', ["circ/offline.xul", E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
 
-	]]>
-	</script>
+    ]]>
+    </script>
 
     <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
-	<groupbox flex="1" class="my_overflow">
-		<caption label="&staff.circ.offline.main.label;"/>
-		<hbox id="nav">
-			<button id="today" onclick="alert('&common.unimplemented;');" tooltiptext="&staff.circ.offline.server_time.tooltiptext;"/>
-			<spacer flex="1"/>
-			<button id="cmd_checkout" label="&staff.circ.offline.cmd_checkout.label;" accesskey="&staff.circ.offline.cmd_checkout.accesskey;"/>
-			<button id="cmd_renew" label="&staff.circ.offline.cmd_renew.label;" accesskey="&staff.circ.offline.cmd_renew.accesskey;"/>
-			<button id="cmd_in_house_use" label="&staff.circ.offline.cmd_in_house_use.label;" accesskey="&staff.circ.offline.cmd_in_house_use.accesskey;"/>
-			<button id="cmd_checkin" label="&staff.circ.offline.cmd_checkin.label;" accesskey="&staff.circ.offline.cmd_checkin.accesskey;"/>
-			<button id="cmd_register_patron" label="&staff.circ.offline.cmd_register_patron.label;" accesskey="&staff.circ.offline.cmd_register_patron.accesskey;"/>
-			<button id="cmd_print_last_receipt" label="&staff.circ.offline.cmd_print_last_receipt.label;" accesskey="&staff.circ.offline.cmd_print_last_receipt.accesskey;"/>
-			<button id="cmd_exit" label="&staff.circ.offline.cmd_exit.label;" accesskey="&staff.circ.offline.cmd_exit.accesskey;"/>
-		</hbox>
-		<deck id="main" style="border: solid thin red; background-color: #FFAAAA;" flex="1">
-			<vbox flex="1">
-			</vbox>
-		</deck>
-	</groupbox>
+    <groupbox flex="1" class="my_overflow">
+        <caption label="&staff.circ.offline.main.label;"/>
+        <hbox id="nav">
+            <button id="today" onclick="alert('&common.unimplemented;');" tooltiptext="&staff.circ.offline.server_time.tooltiptext;"/>
+            <spacer flex="1"/>
+            <button id="cmd_checkout" label="&staff.circ.offline.cmd_checkout.label;" accesskey="&staff.circ.offline.cmd_checkout.accesskey;"/>
+            <button id="cmd_renew" label="&staff.circ.offline.cmd_renew.label;" accesskey="&staff.circ.offline.cmd_renew.accesskey;"/>
+            <button id="cmd_in_house_use" label="&staff.circ.offline.cmd_in_house_use.label;" accesskey="&staff.circ.offline.cmd_in_house_use.accesskey;"/>
+            <button id="cmd_checkin" label="&staff.circ.offline.cmd_checkin.label;" accesskey="&staff.circ.offline.cmd_checkin.accesskey;"/>
+            <button id="cmd_register_patron" label="&staff.circ.offline.cmd_register_patron.label;" accesskey="&staff.circ.offline.cmd_register_patron.accesskey;"/>
+            <button id="cmd_print_last_receipt" label="&staff.circ.offline.cmd_print_last_receipt.label;" accesskey="&staff.circ.offline.cmd_print_last_receipt.accesskey;"/>
+            <button id="cmd_exit" label="&staff.circ.offline.cmd_exit.label;" accesskey="&staff.circ.offline.cmd_exit.accesskey;"/>
+        </hbox>
+        <deck id="main" style="border: solid thin red; background-color: #FFAAAA;" flex="1">
+            <vbox flex="1">
+            </vbox>
+        </deck>
+    </groupbox>
 
 </window>
 
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 8fa3bc47bb..c6a824217a 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,73 +16,73 @@
 <?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(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        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="offline_checkin.js"/>
+    <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+    <script type="text/javascript" src="offline_checkin.js"/>
 
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
-	<groupbox flex="1">
-		<caption label="&staff.circ.offline_checkin.main.label;"/>
-		<hbox flex="1">
-			<vbox flex="1">
-				<hbox>
- 					<label value="&common.step1.label;" style="font-weight: bold" />
- 					<description>&common.check_date.description;</description>
-				</hbox>
-				<hbox>
- 					<label value="&common.step2.label;" style="font-weight: bold" accesskey="&common.step2.accesskey;" control="i_barcode"/>
- 					<description>&common.enter_barcode.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<hbox><textbox id="i_barcode"/><button id="enter" label="&staff.circ.offline_checkin.step2a.label;" accesskey="&staff.circ.offline_checkin.step2a.accesskey;"/></hbox>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&common.check_barcode.description;</description>
-					<checkbox id="strict_i_barcode" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<label value="&common.step3.label;" style="font-weight: bold"/>
-					<description>&staff.circ.offline_checkin.step3.description;</description>
-				</hbox>
-				<hbox>
-					<label value="&common.step4.label;" style="font-weight: bold"/>
-					<description>&staff.circ.offline.finish.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&staff.circ.offline.print.description;</description>
-					<checkbox id="print_receipt" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<button id="cancel" label="&common.cancel;" oncommand="g.list.clear()"/>
-					<button id="submit" label="&common.save_transactions.label;" accesskey="&common.save_transactions.accesskey;" />
-				</hbox>
-			</vbox>
-			<splitter>
-				<grippy />
-			</splitter>
-			<vbox flex="2">
-				<tree id="checkin_list" flex="1" enableColumnDrag="true"/>
-				<hbox id="checkin_bottom_ui">
-					<spacer flex="1"/>
-					<button id="delete" label="&common.delete_transactions.label;" oncommand="alert('&common.unimplemented;');"/>
-				</hbox>
-			</vbox>
-		</hbox>
-	</groupbox>
+    <groupbox flex="1">
+        <caption label="&staff.circ.offline_checkin.main.label;"/>
+        <hbox flex="1">
+            <vbox flex="1">
+                <hbox>
+                     <label value="&common.step1.label;" style="font-weight: bold" />
+                     <description>&common.check_date.description;</description>
+                </hbox>
+                <hbox>
+                     <label value="&common.step2.label;" style="font-weight: bold" accesskey="&common.step2.accesskey;" control="i_barcode"/>
+                     <description>&common.enter_barcode.description;</description>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <hbox><textbox id="i_barcode"/><button id="enter" label="&staff.circ.offline_checkin.step2a.label;" accesskey="&staff.circ.offline_checkin.step2a.accesskey;"/></hbox>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <description>&common.check_barcode.description;</description>
+                    <checkbox id="strict_i_barcode" oils_persist="checked"/>
+                </hbox>
+                <hbox>
+                    <label value="&common.step3.label;" style="font-weight: bold"/>
+                    <description>&staff.circ.offline_checkin.step3.description;</description>
+                </hbox>
+                <hbox>
+                    <label value="&common.step4.label;" style="font-weight: bold"/>
+                    <description>&staff.circ.offline.finish.description;</description>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <description>&staff.circ.offline.print.description;</description>
+                    <checkbox id="print_receipt" oils_persist="checked"/>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <button id="cancel" label="&common.cancel;" oncommand="g.list.clear()"/>
+                    <button id="submit" label="&common.save_transactions.label;" accesskey="&common.save_transactions.accesskey;" />
+                </hbox>
+            </vbox>
+            <splitter>
+                <grippy />
+            </splitter>
+            <vbox flex="2">
+                <tree id="checkin_list" flex="1" enableColumnDrag="true"/>
+                <hbox id="checkin_bottom_ui">
+                    <spacer flex="1"/>
+                    <button id="delete" label="&common.delete_transactions.label;" oncommand="alert('&common.unimplemented;');"/>
+                </hbox>
+            </vbox>
+        </hbox>
+    </groupbox>
 
 </window>
 
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 2744d4bfc4..2fa3309aa3 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,110 +16,110 @@
 <?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(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        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="offline_checkout.js"/>
+    <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+    <script type="text/javascript" src="offline_checkout.js"/>
 
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
-	<groupbox flex="1">
-		<caption label="&staff.circ.offline_checkout.main.label;"/>
-		<hbox flex="1">
-			<vbox flex="1">
-				<hbox>
- 					<label value="&common.step1.label;" style="font-weight: bold" />
- 					<description>&common.check_date.description;</description>
-				</hbox>
-				<hbox>
- 					<label value="&common.step2.label;" style="font-weight: bold" accesskey="&common.step2.accesskey;" control="p_barcode"/>
-					<description>&staff.circ.offline_checkout.step2.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<textbox id="p_barcode"/>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&common.check_barcode.description;</description>
-					<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"/>
-					<description>&common.due_date.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<textbox id="duedate" style="font-family: monospace;"/>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<menulist id="duedate_menu">
-						<menupopup>
-							<menuitem label="&common.date_helper;" value="0"/>
-							<menuitem label="&common.date_helper.3_days;" value="3"/>
-							<menuitem label="&common.date_helper.7_days;" value="7"/>
-							<menuitem label="&common.date_helper.14_days;" value="14"/>
-							<menuitem label="&common.date_helper.30_days;" value="30"/>
-						</menupopup>
-					</menulist>
-				</hbox>
-				<hbox>
-					<label value="&common.step4.label;" style="font-weight: bold" accesskey="&common.step4.accesskey;" control="i_barcode"/>
-					<description>&common.enter_barcode.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<hbox><textbox id="i_barcode"/><button id="enter" label="&common.enter.label;" accesskey="&common.enter.accesskey;"/></hbox>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<hbox id="x_noncat_type"/>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&common.check_barcode.description;</description>
-					<checkbox id="strict_i_barcode" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<label value="&common.step5.label;" style="font-weight: bold"/>
-					<description>&staff.circ.offline_checkout.step5.description;</description>
-				</hbox>
-				<hbox>
-					<label value="&common.step6.label;" style="font-weight: bold"/>
-					<description>&staff.circ.offline.finish.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&staff.circ.offline.print.description;</description>
-					<checkbox id="print_receipt" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<button id="cancel" label="&common.cancel;" />
-					<button id="submit" label="&common.save_transactions.label;" accesskey="&common.save_transactions.accesskey;" />
-				</hbox>
-			</vbox>
-			<splitter>
-				<grippy />
-			</splitter>
-			<vbox flex="2">
-				<tree id="checkout_list" flex="1" enableColumnDrag="true"/>
-				<hbox id="checkout_bottom_ui">
-					<spacer flex="1"/>
-					<button id="delete" label="&common.delete_transactions.label;" oncommand="alert('&common.unimplemented;');"/>
-				</hbox>
-			</vbox>
-		</hbox>
-	</groupbox>
+    <groupbox flex="1">
+        <caption label="&staff.circ.offline_checkout.main.label;"/>
+        <hbox flex="1">
+            <vbox flex="1">
+                <hbox>
+                     <label value="&common.step1.label;" style="font-weight: bold" />
+                     <description>&common.check_date.description;</description>
+                </hbox>
+                <hbox>
+                     <label value="&common.step2.label;" style="font-weight: bold" accesskey="&common.step2.accesskey;" control="p_barcode"/>
+                    <description>&staff.circ.offline_checkout.step2.description;</description>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <textbox id="p_barcode"/>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <description>&common.check_barcode.description;</description>
+                    <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"/>
+                    <description>&common.due_date.description;</description>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <textbox id="duedate" style="font-family: monospace;"/>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <menulist id="duedate_menu">
+                        <menupopup>
+                            <menuitem label="&common.date_helper;" value="0"/>
+                            <menuitem label="&common.date_helper.3_days;" value="3"/>
+                            <menuitem label="&common.date_helper.7_days;" value="7"/>
+                            <menuitem label="&common.date_helper.14_days;" value="14"/>
+                            <menuitem label="&common.date_helper.30_days;" value="30"/>
+                        </menupopup>
+                    </menulist>
+                </hbox>
+                <hbox>
+                    <label value="&common.step4.label;" style="font-weight: bold" accesskey="&common.step4.accesskey;" control="i_barcode"/>
+                    <description>&common.enter_barcode.description;</description>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <hbox><textbox id="i_barcode"/><button id="enter" label="&common.enter.label;" accesskey="&common.enter.accesskey;"/></hbox>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <hbox id="x_noncat_type"/>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <description>&common.check_barcode.description;</description>
+                    <checkbox id="strict_i_barcode" oils_persist="checked"/>
+                </hbox>
+                <hbox>
+                    <label value="&common.step5.label;" style="font-weight: bold"/>
+                    <description>&staff.circ.offline_checkout.step5.description;</description>
+                </hbox>
+                <hbox>
+                    <label value="&common.step6.label;" style="font-weight: bold"/>
+                    <description>&staff.circ.offline.finish.description;</description>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <description>&staff.circ.offline.print.description;</description>
+                    <checkbox id="print_receipt" oils_persist="checked"/>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <button id="cancel" label="&common.cancel;" />
+                    <button id="submit" label="&common.save_transactions.label;" accesskey="&common.save_transactions.accesskey;" />
+                </hbox>
+            </vbox>
+            <splitter>
+                <grippy />
+            </splitter>
+            <vbox flex="2">
+                <tree id="checkout_list" flex="1" enableColumnDrag="true"/>
+                <hbox id="checkout_bottom_ui">
+                    <spacer flex="1"/>
+                    <button id="delete" label="&common.delete_transactions.label;" oncommand="alert('&common.unimplemented;');"/>
+                </hbox>
+            </vbox>
+        </hbox>
+    </groupbox>
 
 </window>
 
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 e635c4123e..697a576243 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,82 +16,82 @@
 <?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(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        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="offline_in_house_use.js"/>
+    <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+    <script type="text/javascript" src="offline_in_house_use.js"/>
 
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
-	<groupbox flex="1">
-		<caption label="&staff.circ.offline_in_house_use.main.label;"/>
-		<hbox flex="1">
-			<vbox flex="1">
-				<hbox>
-					<label value="&common.step1.label;" style="font-weight: bold" />
-					<description>&common.check_date.description;</description>
-				</hbox>
-				<hbox>
-					<label value="&common.step2.label;" style="font-weight: bold" accesskey="&common.step2.accesskey;" control="count"/>
-					<description>&staff.circ.offline_in_house_use.uses.label;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<textbox id="count" value="1"/>
-				</hbox>
+    <groupbox flex="1">
+        <caption label="&staff.circ.offline_in_house_use.main.label;"/>
+        <hbox flex="1">
+            <vbox flex="1">
+                <hbox>
+                    <label value="&common.step1.label;" style="font-weight: bold" />
+                    <description>&common.check_date.description;</description>
+                </hbox>
+                <hbox>
+                    <label value="&common.step2.label;" style="font-weight: bold" accesskey="&common.step2.accesskey;" control="count"/>
+                    <description>&staff.circ.offline_in_house_use.uses.label;</description>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <textbox id="count" value="1"/>
+                </hbox>
 
-				<hbox>
-					<label value="&common.step3.label;" style="font-weight: bold" accesskey="&common.step3.accesskey;" control="i_barcode"/>
-					<description>&common.enter_barcode.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<hbox><textbox id="i_barcode"/><button id="enter" label="&common.enter.label;" accesskey="&common.enter.accesskey;"/></hbox>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&common.check_barcode.description;</description>
-					<checkbox id="strict_i_barcode" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<label value="&common.step4.label;" style="font-weight: bold"/>
-					<description>&staff.circ.offline_in_house_use.step4.description;</description>
-				</hbox>
-				<hbox>
-					<label value="&common.step5.label;" style="font-weight: bold"/>
-					<description>&staff.circ.offline.finish.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&staff.circ.offline.print.description;</description>
-					<checkbox id="print_receipt" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<button id="cancel" label="&common.cancel;" oncommand="g.list.clear()"/>
-					<button id="submit" label="&common.save_transactions.label;" accesskey="&common.save_transactions.accesskey;" />
-				</hbox>
-			</vbox>
-			<splitter>
-				<grippy />
-			</splitter>
-			<vbox flex="2">
-				<tree id="checkout_list" flex="1" enableColumnDrag="true"/>
-				<hbox id="checkout_bottom_ui">
-					<spacer flex="1"/>
-					<button id="delete" label="&common.delete_transactions.label;" oncommand="alert('&common.unimplemented;');"/>
-				</hbox>
-			</vbox>
-		</hbox>
-	</groupbox>
+                <hbox>
+                    <label value="&common.step3.label;" style="font-weight: bold" accesskey="&common.step3.accesskey;" control="i_barcode"/>
+                    <description>&common.enter_barcode.description;</description>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <hbox><textbox id="i_barcode"/><button id="enter" label="&common.enter.label;" accesskey="&common.enter.accesskey;"/></hbox>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <description>&common.check_barcode.description;</description>
+                    <checkbox id="strict_i_barcode" oils_persist="checked"/>
+                </hbox>
+                <hbox>
+                    <label value="&common.step4.label;" style="font-weight: bold"/>
+                    <description>&staff.circ.offline_in_house_use.step4.description;</description>
+                </hbox>
+                <hbox>
+                    <label value="&common.step5.label;" style="font-weight: bold"/>
+                    <description>&staff.circ.offline.finish.description;</description>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <description>&staff.circ.offline.print.description;</description>
+                    <checkbox id="print_receipt" oils_persist="checked"/>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <button id="cancel" label="&common.cancel;" oncommand="g.list.clear()"/>
+                    <button id="submit" label="&common.save_transactions.label;" accesskey="&common.save_transactions.accesskey;" />
+                </hbox>
+            </vbox>
+            <splitter>
+                <grippy />
+            </splitter>
+            <vbox flex="2">
+                <tree id="checkout_list" flex="1" enableColumnDrag="true"/>
+                <hbox id="checkout_bottom_ui">
+                    <spacer flex="1"/>
+                    <button id="delete" label="&common.delete_transactions.label;" oncommand="alert('&common.unimplemented;');"/>
+                </hbox>
+            </vbox>
+        </hbox>
+    </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_register.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline_register.xul
index e6d9fdc600..a7e174549b 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_register.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_register.xul
@@ -16,121 +16,121 @@
 <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_offline.xul"?>
 
 <window id="offline_register_win" sizemode="maximized"
-	onload="try { my_init(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        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="offline_register.js"/>
+    <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+    <script type="text/javascript" src="offline_register.js"/>
 
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
-	<groupbox flex="1">
-		<caption label="&staff.circ.offline_register.main.label;"/>
-		<grid>
-			<columns><column/><column/></columns>
-			<rows>
-				<row>
-					<label value="&staff.circ.offline_register.x_home_ou.label;"/>
-					<hbox id="x_home_ou"/>
-				</row>
-				<row>
-					<label value="&staff.circ.offline_register.x_profile.label;"/>
-					<hbox id="x_profile"/>
-				</row>
-				<row>
-					<label value=" "/>
-				</row>
-			</rows>
-		</grid>
-		<hbox flex="1">
-			<vbox flex="1">
-				<grid>
-					<columns><column/><column/></columns>
-					<rows>
-						<row>
-							<label value="&staff.circ.offline_register.barcode.label;"/>
-							<textbox id="barcode"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.passwd.label;"/>
-							<textbox id="passwd"/>
-						</row>
-						<row><label value=" "/></row>
-						<row>
-							<label value="&staff.circ.offline_register.family_name.label;"/>
-							<textbox id="family_name"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.first_given_name.label;"/>
-							<textbox id="first_given_name"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.dob.label;"/>
-							<textbox id="dob" style="font-family: monospace;"/>
-						</row>
-						<row><label value=" "/></row>
-						<row>
-							<label value="&staff.circ.offline_register.x_ident_type.label;"/>
-							<hbox id="x_ident_type"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.ident_value.label;"/>
-							<textbox id="ident_value"/>
-						</row>
-					</rows>
-				</grid>
-			</vbox>
-			<splitter><grippy/></splitter>
-			<vbox flex="1">
-				<grid>
-					<columns><column/><column/></columns>
-					<rows>
-						<row>
-							<label value="&staff.circ.offline_register.billing_address.label;"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.street1.label;"/>
-							<textbox id="street1"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.street2.label;"/>
-							<textbox id="street2"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.city.label;"/>
-							<textbox id="city"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.state.label;"/>
-							<textbox id="state" value="&staff.circ.offline_register.state.default_value;"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.post_code.label;"/>
-							<textbox id="post_code"/>
-						</row>
-						<row hidden="true">
-							<label value="&staff.circ.offline_register.country.label;"/>
-							<textbox id="country" value="&staff.circ.offline_register.country.default_value;"/>
-						</row>
-						<row><label value=" "/></row>
-					</rows>
-				</grid>
-				<vbox id="x_surveys" flex="1"/>
-			</vbox>
-		</hbox>
-		<hbox>
-			<spacer flex="1"/>
-			<button id="cancel" label="&common.cancel;" />
-			<button id="submit" label="&staff.circ.offline_register.submit.label;" accesskey="&staff.circ.offline_register.submit.accesskey;" />
-		</hbox>
-	</groupbox>
+    <groupbox flex="1">
+        <caption label="&staff.circ.offline_register.main.label;"/>
+        <grid>
+            <columns><column/><column/></columns>
+            <rows>
+                <row>
+                    <label value="&staff.circ.offline_register.x_home_ou.label;"/>
+                    <hbox id="x_home_ou"/>
+                </row>
+                <row>
+                    <label value="&staff.circ.offline_register.x_profile.label;"/>
+                    <hbox id="x_profile"/>
+                </row>
+                <row>
+                    <label value=" "/>
+                </row>
+            </rows>
+        </grid>
+        <hbox flex="1">
+            <vbox flex="1">
+                <grid>
+                    <columns><column/><column/></columns>
+                    <rows>
+                        <row>
+                            <label value="&staff.circ.offline_register.barcode.label;"/>
+                            <textbox id="barcode"/>
+                        </row>
+                        <row>
+                            <label value="&staff.circ.offline_register.passwd.label;"/>
+                            <textbox id="passwd"/>
+                        </row>
+                        <row><label value=" "/></row>
+                        <row>
+                            <label value="&staff.circ.offline_register.family_name.label;"/>
+                            <textbox id="family_name"/>
+                        </row>
+                        <row>
+                            <label value="&staff.circ.offline_register.first_given_name.label;"/>
+                            <textbox id="first_given_name"/>
+                        </row>
+                        <row>
+                            <label value="&staff.circ.offline_register.dob.label;"/>
+                            <textbox id="dob" style="font-family: monospace;"/>
+                        </row>
+                        <row><label value=" "/></row>
+                        <row>
+                            <label value="&staff.circ.offline_register.x_ident_type.label;"/>
+                            <hbox id="x_ident_type"/>
+                        </row>
+                        <row>
+                            <label value="&staff.circ.offline_register.ident_value.label;"/>
+                            <textbox id="ident_value"/>
+                        </row>
+                    </rows>
+                </grid>
+            </vbox>
+            <splitter><grippy/></splitter>
+            <vbox flex="1">
+                <grid>
+                    <columns><column/><column/></columns>
+                    <rows>
+                        <row>
+                            <label value="&staff.circ.offline_register.billing_address.label;"/>
+                        </row>
+                        <row>
+                            <label value="&staff.circ.offline_register.street1.label;"/>
+                            <textbox id="street1"/>
+                        </row>
+                        <row>
+                            <label value="&staff.circ.offline_register.street2.label;"/>
+                            <textbox id="street2"/>
+                        </row>
+                        <row>
+                            <label value="&staff.circ.offline_register.city.label;"/>
+                            <textbox id="city"/>
+                        </row>
+                        <row>
+                            <label value="&staff.circ.offline_register.state.label;"/>
+                            <textbox id="state" value="&staff.circ.offline_register.state.default_value;"/>
+                        </row>
+                        <row>
+                            <label value="&staff.circ.offline_register.post_code.label;"/>
+                            <textbox id="post_code"/>
+                        </row>
+                        <row hidden="true">
+                            <label value="&staff.circ.offline_register.country.label;"/>
+                            <textbox id="country" value="&staff.circ.offline_register.country.default_value;"/>
+                        </row>
+                        <row><label value=" "/></row>
+                    </rows>
+                </grid>
+                <vbox id="x_surveys" flex="1"/>
+            </vbox>
+        </hbox>
+        <hbox>
+            <spacer flex="1"/>
+            <button id="cancel" label="&common.cancel;" />
+            <button id="submit" label="&staff.circ.offline_register.submit.label;" accesskey="&staff.circ.offline_register.submit.accesskey;" />
+        </hbox>
+    </groupbox>
 
 </window>
 
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 00400096e0..7c839c10b8 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,106 +16,106 @@
 <?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(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        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="offline_renew.js"/>
+    <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+    <script type="text/javascript" src="offline_renew.js"/>
 
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
-	<groupbox flex="1">
-		<caption label="&staff.circ.offline_renew.main.label;"/>
-		<hbox flex="1">
-			<vbox flex="1">
-				<hbox>
-					<label value="&common.step1.label;" style="font-weight: bold" />
-					<description>&common.check_date.description;</description>
-				</hbox>
-				<hbox>
-					<label value="&common.step2.label;" style="font-weight: bold" accesskey="&common.step2.accesskey;" control="p_barcode"/>
-					<description>&staff.circ.offline_renew.p_barcode.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<textbox id="p_barcode" />
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&common.check_barcode.description;</description>
-					<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"/>
-					<description>&common.due_date.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<textbox id="duedate" style="font-family: monospace;"/>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<menulist id="duedate_menu">
-						<menupopup>
-							<menuitem label="&common.date_helper;" value="0"/>
-							<menuitem label="&common.date_helper.3_days;" value="3"/>
-							<menuitem label="&common.date_helper.7_days;" value="7"/>
-							<menuitem label="&common.date_helper.14_days;" value="14"/>
-							<menuitem label="&common.date_helper.30_days;" value="30"/>
-						</menupopup>
-					</menulist>
-				</hbox>
-				<hbox>
-					<label value="&common.step4.label;" style="font-weight: bold" accesskey="&common.step4.accesskey;" control="i_barcode"/>
-					<description>&common.enter_barcode.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<hbox><textbox id="i_barcode"/><button id="enter" label="&common.enter.label;" accesskey="&common.enter.accesskey;"/></hbox>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&common.check_barcode.description;</description>
-					<checkbox id="strict_i_barcode" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<label value="&common.step5.label;" style="font-weight: bold"/>
-					<description>&staff.circ.offline_renew.step5.label;</description>
-				</hbox>
-				<hbox>
-					<label value="&common.step6.label;" style="font-weight: bold"/>
-					<description>&staff.circ.offline.finish.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&staff.circ.offline.print.description;</description>
-					<checkbox id="print_receipt" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<button id="cancel" label="&common.cancel;" />
-					<button id="submit" label="&common.save_transactions.label;" accesskey="&common.save_transactions.accesskey;" />
-				</hbox>
-			</vbox>
-			<splitter>
-				<grippy />
-			</splitter>
-			<vbox flex="2">
-				<tree id="checkout_list" flex="1" enableColumnDrag="true"/>
-				<hbox id="checkout_bottom_ui">
-					<spacer flex="1"/>
-					<button id="delete" label="&common.delete_transactions.label;" oncommand="alert('&common.unimplemented;');"/>
-				</hbox>
-			</vbox>
-		</hbox>
-	</groupbox>
+    <groupbox flex="1">
+        <caption label="&staff.circ.offline_renew.main.label;"/>
+        <hbox flex="1">
+            <vbox flex="1">
+                <hbox>
+                    <label value="&common.step1.label;" style="font-weight: bold" />
+                    <description>&common.check_date.description;</description>
+                </hbox>
+                <hbox>
+                    <label value="&common.step2.label;" style="font-weight: bold" accesskey="&common.step2.accesskey;" control="p_barcode"/>
+                    <description>&staff.circ.offline_renew.p_barcode.description;</description>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <textbox id="p_barcode" />
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <description>&common.check_barcode.description;</description>
+                    <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"/>
+                    <description>&common.due_date.description;</description>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <textbox id="duedate" style="font-family: monospace;"/>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <menulist id="duedate_menu">
+                        <menupopup>
+                            <menuitem label="&common.date_helper;" value="0"/>
+                            <menuitem label="&common.date_helper.3_days;" value="3"/>
+                            <menuitem label="&common.date_helper.7_days;" value="7"/>
+                            <menuitem label="&common.date_helper.14_days;" value="14"/>
+                            <menuitem label="&common.date_helper.30_days;" value="30"/>
+                        </menupopup>
+                    </menulist>
+                </hbox>
+                <hbox>
+                    <label value="&common.step4.label;" style="font-weight: bold" accesskey="&common.step4.accesskey;" control="i_barcode"/>
+                    <description>&common.enter_barcode.description;</description>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <hbox><textbox id="i_barcode"/><button id="enter" label="&common.enter.label;" accesskey="&common.enter.accesskey;"/></hbox>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <description>&common.check_barcode.description;</description>
+                    <checkbox id="strict_i_barcode" oils_persist="checked"/>
+                </hbox>
+                <hbox>
+                    <label value="&common.step5.label;" style="font-weight: bold"/>
+                    <description>&staff.circ.offline_renew.step5.label;</description>
+                </hbox>
+                <hbox>
+                    <label value="&common.step6.label;" style="font-weight: bold"/>
+                    <description>&staff.circ.offline.finish.description;</description>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <description>&staff.circ.offline.print.description;</description>
+                    <checkbox id="print_receipt" oils_persist="checked"/>
+                </hbox>
+                <hbox>
+                    <spacer flex="1"/>
+                    <button id="cancel" label="&common.cancel;" />
+                    <button id="submit" label="&common.save_transactions.label;" accesskey="&common.save_transactions.accesskey;" />
+                </hbox>
+            </vbox>
+            <splitter>
+                <grippy />
+            </splitter>
+            <vbox flex="2">
+                <tree id="checkout_list" flex="1" enableColumnDrag="true"/>
+                <hbox id="checkout_bottom_ui">
+                    <spacer flex="1"/>
+                    <button id="delete" label="&common.delete_transactions.label;" oncommand="alert('&common.unimplemented;');"/>
+                </hbox>
+            </vbox>
+        </hbox>
+    </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html
index b79c13a718..25779f6fc6 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/about.html
+++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html
@@ -43,14 +43,14 @@ Our deepest thanks to everyone in the Evergreen community who contributes docume
 <blockquote>
 <pre>
 GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+               Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
      59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -100,7 +100,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+            GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -299,7 +299,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -321,9 +321,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+             END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+        How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.xul b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
index c7f0ea367d..2e5428154a 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
@@ -19,170 +19,170 @@
 -->
 
 <window id="main_win" 
-	onload="try { main_init(); } catch(E) { alert(E); }"
-	onunload="try { G.auth.logoff(); } catch(E) { alert(E); }"
-	title="&staff.auth.title;"
-	width="640" height="480"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var G;</script>
-	<script>dump('Loading main/main.xul\n');</script>
-	<scripts id="openils_util_scripts">
-		<script type="text/javascript" src="constants.js" />
-		<script type="text/javascript" src="../OpenILS/util/utils.js" />
-		<script type="text/javascript" src="../OpenILS/util/CGI.js" />
-		<script type="text/javascript" src="../OpenILS/util/md5.js" />
-		<script type="text/javascript" src="../OpenILS/util/JSON_v1.js" />
-		<!--
-		<script type="text/javascript" src="../OpenILS/util/fmall.js" />
-		<script type="text/javascript" src="../OpenILS/util/fmgen.js" />
-		-->
-		<script type="text/javascript" src="../OpenILS/util/RemoteRequest.js" />
-		<!--
-		<script type="text/javascript" src="../OpenILS/util/OrgTree.js" />
-		-->
-		<script type="text/javascript" src="../OpenILS/util/org_utils.js" />   
-	</scripts>
-	<script>dump('Loaded main/main.xul\n');</script>
-
-
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/main.js"/>
-	<script>
-		dump("lang.version = &lang.version;" + '\n');
-	</script>
+    onload="try { main_init(); } catch(E) { alert(E); }"
+    onunload="try { G.auth.logoff(); } catch(E) { alert(E); }"
+    title="&staff.auth.title;"
+    width="640" height="480"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var G;</script>
+    <script>dump('Loading main/main.xul\n');</script>
+    <scripts id="openils_util_scripts">
+        <script type="text/javascript" src="constants.js" />
+        <script type="text/javascript" src="../OpenILS/util/utils.js" />
+        <script type="text/javascript" src="../OpenILS/util/CGI.js" />
+        <script type="text/javascript" src="../OpenILS/util/md5.js" />
+        <script type="text/javascript" src="../OpenILS/util/JSON_v1.js" />
+        <!--
+        <script type="text/javascript" src="../OpenILS/util/fmall.js" />
+        <script type="text/javascript" src="../OpenILS/util/fmgen.js" />
+        -->
+        <script type="text/javascript" src="../OpenILS/util/RemoteRequest.js" />
+        <!--
+        <script type="text/javascript" src="../OpenILS/util/OrgTree.js" />
+        -->
+        <script type="text/javascript" src="../OpenILS/util/org_utils.js" />   
+    </scripts>
+    <script>dump('Loaded main/main.xul\n');</script>
+
+
+    <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+    <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/main.js"/>
+    <script>
+        dump("lang.version = &lang.version;" + '\n');
+    </script>
 
     <script type="text/javascript" src="chrome://venkman/content/venkman-overlay.js"/>
     <script type="application/x-javascript" src="chrome://inspector/content/hooks.js"/>
     <script type="application/x-javascript" src="chrome://chromelist/content/overlay/ChromeListOverlay.js" />
 
-	<messagecatalog id="authStrings" src="chrome://open_ils_staff_client/locale/auth.properties"/>
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
-
-	<commandset id="auth_cmds">
-		<command id="cmd_login" />
-		<command id="cmd_logoff"/>
-		<command id="cmd_override" />
-		<command id="cmd_close_window"/>
-		<command id="cmd_standalone"/>
-		<command id="cmd_standalone_export"/>
-		<command id="cmd_standalone_import"/>
-		<command id="cmd_js_console"/>
-		<command id="cmd_debugger"/>
-		<command id="cmd_inspector"/>
-		<command id="cmd_chrome_list"/>
-		<command id="cmd_js_shell"/>
-		<command id="cmd_clear_cache"/>
-		<command id="cmd_test_server"/>
-		<command id="cmd_ssl_exception" hidden="true"/>
-	</commandset>
-
-	<keyset id="auth_keys">
-		<key id="auth-login-key" modifiers="accel" key="S" command="cmd_login"/>
-		<key id="auth-logoff-key" modifiers="accel" key="L" command="cmd_logoff"/>
-		<key id="auth-close-key" modifiers="accel" key="Q" command="cmd_close_window"/>
-	</keyset>
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- CONTENT -->
-	<deck id="main_deck" flex="1">
-	<groupbox id="main_groupbox" flex="1" style="overflow: auto;">
-		<caption id="main_caption" label="&staff.main.auth.caption;"/>
-		<hbox>
-			<button id="about_btn" label="&staff.auth.about_btn.label;" accesskey="&staff.auth.about_btn.accesskey;" />
-
-			<button id="new_window_btn" label="&staff.auth.new_window_btn.label;" accesskey="&staff.auth.new_window_btn.accesskey;" />
+    <messagecatalog id="authStrings" src="chrome://open_ils_staff_client/locale/auth.properties"/>
+    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+
+    <commandset id="auth_cmds">
+        <command id="cmd_login" />
+        <command id="cmd_logoff"/>
+        <command id="cmd_override" />
+        <command id="cmd_close_window"/>
+        <command id="cmd_standalone"/>
+        <command id="cmd_standalone_export"/>
+        <command id="cmd_standalone_import"/>
+        <command id="cmd_js_console"/>
+        <command id="cmd_debugger"/>
+        <command id="cmd_inspector"/>
+        <command id="cmd_chrome_list"/>
+        <command id="cmd_js_shell"/>
+        <command id="cmd_clear_cache"/>
+        <command id="cmd_test_server"/>
+        <command id="cmd_ssl_exception" hidden="true"/>
+    </commandset>
+
+    <keyset id="auth_keys">
+        <key id="auth-login-key" modifiers="accel" key="S" command="cmd_login"/>
+        <key id="auth-logoff-key" modifiers="accel" key="L" command="cmd_logoff"/>
+        <key id="auth-close-key" modifiers="accel" key="Q" command="cmd_close_window"/>
+    </keyset>
+
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- CONTENT -->
+    <deck id="main_deck" flex="1">
+    <groupbox id="main_groupbox" flex="1" style="overflow: auto;">
+        <caption id="main_caption" label="&staff.main.auth.caption;"/>
+        <hbox>
+            <button id="about_btn" label="&staff.auth.about_btn.label;" accesskey="&staff.auth.about_btn.accesskey;" />
+
+            <button id="new_window_btn" label="&staff.auth.new_window_btn.label;" accesskey="&staff.auth.new_window_btn.accesskey;" />
 
             <label value="&staff.auth.locale.label;" accesskey="&staff.auth.locale.accesskey;" control="locale_menu"/>
             <menulist id="locale_menu">
                 <menupopup id="locale_menupopup">
                 </menupopup>
             </menulist>
-			<button id="apply_locale_btn" label="&staff.auth.apply_locale_btn.label;" accesskey="&staff.auth.apply_locale_btn.accesskey;" />
-		</hbox>
-		<label value=" "/>
+            <button id="apply_locale_btn" label="&staff.auth.apply_locale_btn.label;" accesskey="&staff.auth.apply_locale_btn.accesskey;" />
+        </hbox>
+        <label value=" "/>
 
 <grid flex="1">
-	<columns><column flex="1"/><column flex="1"/></columns>
-	<rows flex="1">
+    <columns><column flex="1"/><column flex="1"/></columns>
+    <rows flex="1">
 <row flex="1">
-		<groupbox flex="1">
-			<caption label="&staff.main.auth.server;"/>
-			<grid>
-				<columns><column /><column /></columns>
-				<rows>
-					<row>
-						<label value="&staff.main.auth.hostname;" control="server_prompt" accesskey="&staff.main.auth.hostname.accesskey;"/>
-						<vbox>
-							<menulist editable="true" id="server_prompt" flex="1">
+        <groupbox flex="1">
+            <caption label="&staff.main.auth.server;"/>
+            <grid>
+                <columns><column /><column /></columns>
+                <rows>
+                    <row>
+                        <label value="&staff.main.auth.hostname;" control="server_prompt" accesskey="&staff.main.auth.hostname.accesskey;"/>
+                        <vbox>
+                            <menulist editable="true" id="server_prompt" flex="1">
                                 <menupopup id="server_menu" />
                             </menulist>
                             <hbox>
-							    <button label="&staff.main.auth.retest;" id="retest" accesskey="&staff.main.auth.retest.accesskey;" command="cmd_test_server"/>
-							    <button label="&staff.main.auth.add_ssl_exception;" id="ssl_exception" command="cmd_ssl_exception"/>
+                                <button label="&staff.main.auth.retest;" id="retest" accesskey="&staff.main.auth.retest.accesskey;" command="cmd_test_server"/>
+                                <button label="&staff.main.auth.add_ssl_exception;" id="ssl_exception" command="cmd_ssl_exception"/>
                             </hbox>
-						</vbox>
-					</row>
-					<row>
-						<label value="&staff.main.auth.status;"/>
-						<label id="status" />
-					</row>
-					<row>
-						<label value="&staff.main.auth.version;"/>
-						<label id="version" />
-					</row>
-				</rows>
-			</grid>
-		</groupbox>
-
-		<groupbox flex="1">
-			<caption label="&staff.main.auth.workstation;"/>
-			<deck id="ws_deck" flex="1">
-			</deck>
-		</groupbox>
+                        </vbox>
+                    </row>
+                    <row>
+                        <label value="&staff.main.auth.status;"/>
+                        <label id="status" />
+                    </row>
+                    <row>
+                        <label value="&staff.main.auth.version;"/>
+                        <label id="version" />
+                    </row>
+                </rows>
+            </grid>
+        </groupbox>
+
+        <groupbox flex="1">
+            <caption label="&staff.main.auth.workstation;"/>
+            <deck id="ws_deck" flex="1">
+            </deck>
+        </groupbox>
 
 </row>
 <row flex="1">
-		<groupbox flex="1">
-			<caption label="&staff.main.authentication.caption;"/>
-			<grid>
-				<columns> <column /> <column /> </columns>
-				<rows>
-					<row> <label value="&common.username;" control="name_prompt" accesskey="&common.username.accesskey;"/> <textbox id="name_prompt" value=""/>
-					</row>
-					<row>
-						<label value="&common.password;" control="password_prompt" accesskey="&common.password.accesskey;"/>
-						<textbox id="password_prompt" value="" type="password"/>
-					</row>
-					<row>
-						<spacer />
-						<hbox>
-							<button id="submit_button" label="&common.login;" accesskey="&common.login.accesskey;" command="cmd_login" />
-							<button label="&staff.auth.logoff_prompt;" accesskey="&staff.auth.logoff_prompt.accesskey;" command="cmd_logoff" />
-						</hbox>
-					</row>
-				</rows>
-			</grid>
-		</groupbox>
-
-		<groupbox flex="1">
-			<caption label="&staff.main.auth.offline.caption;"/>
-			<hbox><button label="&staff.main.auth.offline.interface;" accesskey="&staff.main.auth.offline.interface.accesskey;" command="cmd_standalone"/></hbox>
-			<hbox><button label="&staff.main.auth.offline.export;" command="cmd_standalone_export"/></hbox>
-			<hbox><button label="&staff.main.auth.offline.import;" command="cmd_standalone_import"/></hbox>
-		</groupbox>
+        <groupbox flex="1">
+            <caption label="&staff.main.authentication.caption;"/>
+            <grid>
+                <columns> <column /> <column /> </columns>
+                <rows>
+                    <row> <label value="&common.username;" control="name_prompt" accesskey="&common.username.accesskey;"/> <textbox id="name_prompt" value=""/>
+                    </row>
+                    <row>
+                        <label value="&common.password;" control="password_prompt" accesskey="&common.password.accesskey;"/>
+                        <textbox id="password_prompt" value="" type="password"/>
+                    </row>
+                    <row>
+                        <spacer />
+                        <hbox>
+                            <button id="submit_button" label="&common.login;" accesskey="&common.login.accesskey;" command="cmd_login" />
+                            <button label="&staff.auth.logoff_prompt;" accesskey="&staff.auth.logoff_prompt.accesskey;" command="cmd_logoff" />
+                        </hbox>
+                    </row>
+                </rows>
+            </grid>
+        </groupbox>
+
+        <groupbox flex="1">
+            <caption label="&staff.main.auth.offline.caption;"/>
+            <hbox><button label="&staff.main.auth.offline.interface;" accesskey="&staff.main.auth.offline.interface.accesskey;" command="cmd_standalone"/></hbox>
+            <hbox><button label="&staff.main.auth.offline.export;" command="cmd_standalone_export"/></hbox>
+            <hbox><button label="&staff.main.auth.offline.import;" command="cmd_standalone_import"/></hbox>
+        </groupbox>
 </row>
 </rows>
 </grid>
-		<vbox id="progress_space">
-			<progressmeter id="progress_bar" mode="normal" value="0" hidden="true"/>
-		</vbox>
-		<button label="&staff.auth.quit_prompt;" accesskey="&staff.auth.quit_prompt.accesskey;" command="cmd_close_window"/>
-		<groupbox id="debug_gb" flex="1" hidden="true">
-			<caption label="&staff.main.auth.debug.caption;"/>
+        <vbox id="progress_space">
+            <progressmeter id="progress_bar" mode="normal" value="0" hidden="true"/>
+        </vbox>
+        <button label="&staff.auth.quit_prompt;" accesskey="&staff.auth.quit_prompt.accesskey;" command="cmd_close_window"/>
+        <groupbox id="debug_gb" flex="1" hidden="true">
+            <caption label="&staff.main.auth.debug.caption;"/>
             <hbox>
                 <arrowscrollbox orient="horizontal" flex="1">
                     <button label="&staff.main.auth.debug.javascript;" accesskey="&staff.main.auth.debug.javascript.accesskey;" command="cmd_js_console"/>
@@ -193,10 +193,10 @@
                     <button label="&staff.main.auth.debug.clear;" accesskey="&staff.main.auth.debug.clear.accesskey;" command="cmd_clear_cache"/>
                 </arrowscrollbox>
             </hbox>
-		</groupbox>
+        </groupbox>
 
-	</groupbox>
-	</deck>
+    </groupbox>
+    </deck>
 
 </window>
 
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 ad5cee151b..24b2845e56 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,68 +28,68 @@
 -->
 
 <window id="menu_frame_win"
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	orient="vertical" width="800" height="500"
-	sizemode="maximized" oils_persist="width height" title="&staff.main.menu.title;"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    orient="vertical" width="800" height="500"
+    sizemode="maximized" oils_persist="width height" title="&staff.main.menu.title;"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="JSAN.js"/>
-	<script type="text/javascript" src="constants.js"/>
-	<script type="text/javascript" src="../OpenILS/util/fmall.js"/>
-	<script type="text/javascript">
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw(document.getElementById('offlineStrings').getString('common.jsan.missing')); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				/*
-				JSAN.addRepository('/xul/server/');
-				*/
-				JSAN.addRepository('..');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for menu_frame.xul');
+    <script type="text/javascript" src="JSAN.js"/>
+    <script type="text/javascript" src="constants.js"/>
+    <script type="text/javascript" src="../OpenILS/util/fmall.js"/>
+    <script type="text/javascript">
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw(document.getElementById('offlineStrings').getString('common.jsan.missing')); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                /*
+                JSAN.addRepository('/xul/server/');
+                */
+                JSAN.addRepository('..');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for menu_frame.xul');
 
-				g.cgi = new CGI();
+                g.cgi = new CGI();
 
-				JSAN.use('main.menu'); g.menu = new main.menu();
-				g.menu.init( { 
-					'server' : g.cgi.param('server'),
-				} );
+                JSAN.use('main.menu'); g.menu = new main.menu();
+                g.menu.init( { 
+                    'server' : g.cgi.param('server'),
+                } );
 
-				JSAN.use('util.window'); g.window = new util.window();
+                JSAN.use('util.window'); g.window = new util.window();
 
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-				XML_HTTP_SERVER = g.data.server_unadorned;
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+                XML_HTTP_SERVER = g.data.server_unadorned;
 
-				document.title = g.window.appshell_name_increment() + ': ' + g.data.list.au[0].usrname() + '@' + g.data.ws_name + '.' + g.data.server_unadorned;
+                document.title = g.window.appshell_name_increment() + ': ' + g.data.list.au[0].usrname() + '@' + g.data.ws_name + '.' + g.data.server_unadorned;
 
-			} catch(E) {
-				var err_msg = document.getElementById("offlineStrings").getFormattedString("common.exception", ["menu_frame.xul", E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-	]]>
-	</script>
+            } catch(E) {
+                var err_msg = document.getElementById("offlineStrings").getFormattedString("common.exception", ["menu_frame.xul", E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+    ]]>
+    </script>
 
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties" />	
+    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties" />    
 
-	<commandset id="universal_cmds" />
+    <commandset id="universal_cmds" />
 
-	<keyset id="menu_frame_keys" />
+    <keyset id="menu_frame_keys" />
 
-	<popupset id="universal_popupset" />
+    <popupset id="universal_popupset" />
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- CONTENT -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- CONTENT -->
 
-	<box id="menu_frame_main" class="my_overflow"/>
+    <box id="menu_frame_main" class="my_overflow"/>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
index 1537b36c69..5bc1c730a0 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
@@ -1,85 +1,85 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay SYSTEM "chrome://open_ils_staff_client/locale/lang.dtd">
 <overlay id="menu_frame_menus" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading menu_frame_menus.xul\n');</script>
 
 <commandset id="universal_cmds">
-	<command id="cmd_forward"/>
-	<command id="cmd_back"/>
-	<command id="cmd_close_window" key="close-window-key" />
-	<command id="cmd_new_window" key="new-window-key" />
-	<command id="cmd_new_tab" key="new-tab-key" />
-	<command id="cmd_close_tab" key="close-tab-key" />
-	<command id="cmd_close_all_tabs" key="close-all-tabs-key" />
-	<command id="cmd_shutdown" />
+    <command id="cmd_forward"/>
+    <command id="cmd_back"/>
+    <command id="cmd_close_window" key="close-window-key" />
+    <command id="cmd_new_window" key="new-window-key" />
+    <command id="cmd_new_tab" key="new-tab-key" />
+    <command id="cmd_close_tab" key="close-tab-key" />
+    <command id="cmd_close_all_tabs" key="close-all-tabs-key" />
+    <command id="cmd_shutdown" />
 
-	<command id="cmd_edit_copy_buckets" />
-	<command id="cmd_edit_volume_buckets" />
-	<command id="cmd_edit_record_buckets" />
-	<command id="cmd_edit_user_buckets" />
+    <command id="cmd_edit_copy_buckets" />
+    <command id="cmd_edit_volume_buckets" />
+    <command id="cmd_edit_record_buckets" />
+    <command id="cmd_edit_user_buckets" />
 
-	<command id="cmd_cat_main" key="cat-main-key" />
-	<command id="cmd_create_marc" />
-	<command id="cmd_circ_checkout" key="circ-checkout-key" />
-	<command id="cmd_patron_search" key="patron-search-key" />
-	<command id="cmd_circ_checkin" key="circ-checkin-key" />
-	<command id="cmd_circ_renew" key="circ-renew-key" />
-	<command id="cmd_circ_hold_capture" key="circ-hold-capture-key" />
-	<command id="cmd_circ_hold_pull_list" />
-	<command id="cmd_browse_holds" />
-	<command id="cmd_browse_holds_shelf" />
-	<command id="cmd_in_house_use" key="circ-in-house-use" />
-	<command id="cmd_copy_status" key="copy-status-key" />
-	<command id="cmd_search_opac" key="search-opac-key" />
-	<command id="cmd_public_opac" />
-	<command id="cmd_search_tcn" />
-	<command id="cmd_search_bib_id" />
-	<command id="cmd_patron_register" key="patron-register-key" />
-	<command id="cmd_standalone" />
-	<command id="cmd_survey_wizard" />
-	<command id="cmd_stat_cat_edit" />
-	<command id="cmd_non_cat_type_edit" />
-	<command id="cmd_copy_location_edit" />
-	<command id="cmd_print_list_template_edit" />
-	<command id="cmd_z39_50_import" />
-	<command id="cmd_create_new_marc_book" />
-	<command id="cmd_replace_barcode" />
-	<command id="cmd_reprint" />
-	<command id="cmd_retrieve_last_patron" />
-	<command id="cmd_retrieve_last_record" />
-	<command id="cmd_verify_credentials" />
+    <command id="cmd_cat_main" key="cat-main-key" />
+    <command id="cmd_create_marc" />
+    <command id="cmd_circ_checkout" key="circ-checkout-key" />
+    <command id="cmd_patron_search" key="patron-search-key" />
+    <command id="cmd_circ_checkin" key="circ-checkin-key" />
+    <command id="cmd_circ_renew" key="circ-renew-key" />
+    <command id="cmd_circ_hold_capture" key="circ-hold-capture-key" />
+    <command id="cmd_circ_hold_pull_list" />
+    <command id="cmd_browse_holds" />
+    <command id="cmd_browse_holds_shelf" />
+    <command id="cmd_in_house_use" key="circ-in-house-use" />
+    <command id="cmd_copy_status" key="copy-status-key" />
+    <command id="cmd_search_opac" key="search-opac-key" />
+    <command id="cmd_public_opac" />
+    <command id="cmd_search_tcn" />
+    <command id="cmd_search_bib_id" />
+    <command id="cmd_patron_register" key="patron-register-key" />
+    <command id="cmd_standalone" />
+    <command id="cmd_survey_wizard" />
+    <command id="cmd_stat_cat_edit" />
+    <command id="cmd_non_cat_type_edit" />
+    <command id="cmd_copy_location_edit" />
+    <command id="cmd_print_list_template_edit" />
+    <command id="cmd_z39_50_import" />
+    <command id="cmd_create_new_marc_book" />
+    <command id="cmd_replace_barcode" />
+    <command id="cmd_reprint" />
+    <command id="cmd_retrieve_last_patron" />
+    <command id="cmd_retrieve_last_record" />
+    <command id="cmd_verify_credentials" />
 
-	<command id="cmd_change_session" />
-	<command id="cmd_manage_offline_xacts" />
-	<command id="cmd_download_patrons" />
-	<command id="cmd_local_admin" />
-	<command id="cmd_toggle_buttonbar" />
+    <command id="cmd_change_session" />
+    <command id="cmd_manage_offline_xacts" />
+    <command id="cmd_download_patrons" />
+    <command id="cmd_local_admin" />
+    <command id="cmd_toggle_buttonbar" />
 
-	<command id="cmd_extension_manager"/>
-	<command id="cmd_theme_manager"/>
-	<command id="cmd_about_config"/>
+    <command id="cmd_extension_manager"/>
+    <command id="cmd_theme_manager"/>
+    <command id="cmd_about_config"/>
 
-	<command id="cmd_adv_user_edit" />
-	<command id="cmd_console" />
-	<command id="cmd_shell" />
-	<command id="cmd_xuleditor" />
-	<command id="cmd_fieldmapper" />
-	<command id="cmd_test_html" />
-	<command id="cmd_test_xul" />
-	<command id="cmd_clear_cache" />
-	<command id="cmd_restore_all_tabs" />
+    <command id="cmd_adv_user_edit" />
+    <command id="cmd_console" />
+    <command id="cmd_shell" />
+    <command id="cmd_xuleditor" />
+    <command id="cmd_fieldmapper" />
+    <command id="cmd_test_html" />
+    <command id="cmd_test_xul" />
+    <command id="cmd_clear_cache" />
+    <command id="cmd_restore_all_tabs" />
 
-	<command id="cmd_test" />
-	<command id="cmd_broken" disabled="true" />
-	<command id="cmd_open_vandelay" />
+    <command id="cmd_test" />
+    <command id="cmd_broken" disabled="true" />
+    <command id="cmd_open_vandelay" />
     
-	<command id="cmd_acq_view_picklist" />
-	<command id="cmd_acq_upload" />
-	<command id="cmd_acq_view_po" />
-	<command id="cmd_acq_bib_search" />
-	<command id="cmd_acq_new_brief_record" />
+    <command id="cmd_acq_view_picklist" />
+    <command id="cmd_acq_upload" />
+    <command id="cmd_acq_view_po" />
+    <command id="cmd_acq_bib_search" />
+    <command id="cmd_acq_new_brief_record" />
     <command id="cmd_acq_view_fund" />
     <command id="cmd_acq_view_funding_source" />
     <command id="cmd_acq_view_provider" />
@@ -124,168 +124,168 @@
 
 <!-- Accelerator Keys (Accessor Keys are in DTD's) -->
 <keyset id="menu_frame_keys">
-	<key id="new-window-key" modifiers="accel" key="N" command="cmd_new_window"/>
-	<key id="new-tab-key" modifiers="accel" key="T" command="cmd_new_tab"/>
-	<key id="open-key" modifiers="accel" key="O" command=""/>
-	<key id="save-key" modifiers="accel" key="S" command=""/>
-	<key id="close-tab-key" modifiers="accel" key="W" command="cmd_close_tab"/>
-	<key id="close-all-tabs-key" modifiers="accel,shift" key="W" command="cmd_close_all_tabs"/>
-	<key id="close-window-key" modifiers="accel" key="Q" command="cmd_close_window"/>
-	<key id="circ-checkout-key" keycode="VK_F1" command="cmd_circ_checkout"/>
-	<key id="circ-checkin-key" keycode="VK_F2" command="cmd_circ_checkin"/>
-	<key id="circ-renew-key" keycode="VK_F2" modifiers="control" command="cmd_circ_renew"/>
-	<key id="reprint-receipt-key" keycode="VK_F9" command="cmd_reprint"/>
-	<key id="search-opac-key" keycode="VK_F3" command="cmd_search_opac"/>
-	<key id="search-tcn-key" keycode="VK_F3" modifiers="shift" command="cmd_search_tcn"/>
-	<key id="patron-search-key" keycode="VK_F4" command="cmd_patron_search"/>
-	<key id="copy-status-key" keycode="VK_F5" command="cmd_copy_status"/>
-	<key id="circ-in-house-use-key" keycode="VK_F6" command="cmd_in_house_use"/>
-	<key id="circ-hold-capture-key" keycode="VK_F2" modifiers="shift" command="cmd_circ_hold_capture"/>
-	<key id="patron-register-key" keycode="VK_F1" modifiers="shift" command="cmd_patron_register"/>
-	<key id="retrieve_last_patron_key" keycode="VK_F8" command="cmd_retrieve_last_patron"/>
-	<key id="retrieve_last_record_key" keycode="VK_F8" modifiers="shift" command="cmd_retrieve_last_record"/>
+    <key id="new-window-key" modifiers="accel" key="N" command="cmd_new_window"/>
+    <key id="new-tab-key" modifiers="accel" key="T" command="cmd_new_tab"/>
+    <key id="open-key" modifiers="accel" key="O" command=""/>
+    <key id="save-key" modifiers="accel" key="S" command=""/>
+    <key id="close-tab-key" modifiers="accel" key="W" command="cmd_close_tab"/>
+    <key id="close-all-tabs-key" modifiers="accel,shift" key="W" command="cmd_close_all_tabs"/>
+    <key id="close-window-key" modifiers="accel" key="Q" command="cmd_close_window"/>
+    <key id="circ-checkout-key" keycode="VK_F1" command="cmd_circ_checkout"/>
+    <key id="circ-checkin-key" keycode="VK_F2" command="cmd_circ_checkin"/>
+    <key id="circ-renew-key" keycode="VK_F2" modifiers="control" command="cmd_circ_renew"/>
+    <key id="reprint-receipt-key" keycode="VK_F9" command="cmd_reprint"/>
+    <key id="search-opac-key" keycode="VK_F3" command="cmd_search_opac"/>
+    <key id="search-tcn-key" keycode="VK_F3" modifiers="shift" command="cmd_search_tcn"/>
+    <key id="patron-search-key" keycode="VK_F4" command="cmd_patron_search"/>
+    <key id="copy-status-key" keycode="VK_F5" command="cmd_copy_status"/>
+    <key id="circ-in-house-use-key" keycode="VK_F6" command="cmd_in_house_use"/>
+    <key id="circ-hold-capture-key" keycode="VK_F2" modifiers="shift" command="cmd_circ_hold_capture"/>
+    <key id="patron-register-key" keycode="VK_F1" modifiers="shift" command="cmd_patron_register"/>
+    <key id="retrieve_last_patron_key" keycode="VK_F8" command="cmd_retrieve_last_patron"/>
+    <key id="retrieve_last_record_key" keycode="VK_F8" modifiers="shift" command="cmd_retrieve_last_record"/>
 </keyset>
 
 <!-- The File menu on the main menu -->
 <menu id="main.menu.file" label="&staff.main.menu.file.label;" accesskey="&staff.main.menu.file.accesskey;" >
-	<menupopup id="main.menu.file.popup">
-		<menuitem label="&staff.main.menu.file.new.label;" accesskey="&staff.main.menu.file.new.accesskey;" key="new-window-key" command="cmd_new_window"/>
-		<menuitem label="&staff.main.menu.file.new_tab.label;" accesskey="&staff.main.menu.file.new_tab.accesskey;" key="new-tab-key" command="cmd_new_tab"/>
-		<menuseparator />
-		<menuitem label="&staff.main.menu.file.close_tab.label;" accesskey="&staff.main.menu.file.close_tab.accesskey;" oldaccesskey="&staff.main.menu.file.close_tab.key;" key="close-tab-key" command="cmd_close_tab"/>
-		<menuitem label="&staff.main.menu.tabs.close;" accesskey="&staff.main.menu.tabs.close.accesskey;" key="close-all-tabs-key" command="cmd_close_all_tabs"/>
-		<menuitem label="&staff.main.menu.file.close.label;" accesskey="&staff.main.menu.file.close.accesskey;" oldaccesskey="&staff.main.menu.file.close.key;" key="close-window-key" command="cmd_close_window"/>
-		<menuseparator />
-		<menuitem label="&staff.main.menu.quit;" accesskey="&staff.main.menu.quit.accesskey;" command="cmd_shutdown"/>
-	</menupopup>
+    <menupopup id="main.menu.file.popup">
+        <menuitem label="&staff.main.menu.file.new.label;" accesskey="&staff.main.menu.file.new.accesskey;" key="new-window-key" command="cmd_new_window"/>
+        <menuitem label="&staff.main.menu.file.new_tab.label;" accesskey="&staff.main.menu.file.new_tab.accesskey;" key="new-tab-key" command="cmd_new_tab"/>
+        <menuseparator />
+        <menuitem label="&staff.main.menu.file.close_tab.label;" accesskey="&staff.main.menu.file.close_tab.accesskey;" oldaccesskey="&staff.main.menu.file.close_tab.key;" key="close-tab-key" command="cmd_close_tab"/>
+        <menuitem label="&staff.main.menu.tabs.close;" accesskey="&staff.main.menu.tabs.close.accesskey;" key="close-all-tabs-key" command="cmd_close_all_tabs"/>
+        <menuitem label="&staff.main.menu.file.close.label;" accesskey="&staff.main.menu.file.close.accesskey;" oldaccesskey="&staff.main.menu.file.close.key;" key="close-window-key" command="cmd_close_window"/>
+        <menuseparator />
+        <menuitem label="&staff.main.menu.quit;" accesskey="&staff.main.menu.quit.accesskey;" command="cmd_shutdown"/>
+    </menupopup>
 </menu>
 
 <!-- The Edit menu on the main menu -->
 <menu id="main.menu.edit" label="&staff.main.menu.edit.label;" accesskey="&staff.main.menu.edit.accesskey;">
-	<menupopup id="main.menu.edit.popup">
-		<menuitem label="&staff.main.menu.edit.buckets.copies;" command="cmd_edit_copy_buckets" accesskey="&staff.main.menu.edit.buckets.copies.accesskey;"/>
+    <menupopup id="main.menu.edit.popup">
+        <menuitem label="&staff.main.menu.edit.buckets.copies;" command="cmd_edit_copy_buckets" accesskey="&staff.main.menu.edit.buckets.copies.accesskey;"/>
         <!--
-		<menuitem label="&staff.main.menu.edit.buckets.volumes;" command="cmd_edit_volume_buckets" accesskey="&staff.main.menu.edit.buckets.volumes.accesskey;"/>
+        <menuitem label="&staff.main.menu.edit.buckets.volumes;" command="cmd_edit_volume_buckets" accesskey="&staff.main.menu.edit.buckets.volumes.accesskey;"/>
         -->
-		<menuitem label="&staff.main.menu.edit.buckets.records;" command="cmd_edit_record_buckets" accesskey="&staff.main.menu.edit.buckets.records.accesskey;"/>
+        <menuitem label="&staff.main.menu.edit.buckets.records;" command="cmd_edit_record_buckets" accesskey="&staff.main.menu.edit.buckets.records.accesskey;"/>
         <!--
-		<menuitem label="&staff.main.menu.edit.buckets.users;" command="cmd_edit_user_buckets" accesskey="&staff.main.menu.edit.buckets.users.accesskey;"/>
+        <menuitem label="&staff.main.menu.edit.buckets.users;" command="cmd_edit_user_buckets" accesskey="&staff.main.menu.edit.buckets.users.accesskey;"/>
         -->
-		<menuseparator />
-		<menuitem label="&staff.main.menu.replace_barcode.label;" command="cmd_replace_barcode"/>
-	</menupopup>
+        <menuseparator />
+        <menuitem label="&staff.main.menu.replace_barcode.label;" command="cmd_replace_barcode"/>
+    </menupopup>
 </menu>
 
 <!-- The Circulation menu on the main menu -->
 <menu id="main.menu.circ" label="&staff.main.menu.circ.label;" accesskey="&staff.main.menu.circ.accesskey;">
-	<menupopup id="main.menu.circ.popup">
-		<menuitem label="&staff.main.menu.circ.checkout.label;" accesskey="&staff.main.menu.circ.checkout.accesskey;" key="circ-checkout-key" command="cmd_circ_checkout"/>
-		<menuitem label="&staff.main.menu.circ.checkin.label;" accesskey="&staff.main.menu.circ.checkin.accesskey;" key="circ-checkin-key" command="cmd_circ_checkin"/>
-		<menuitem label="&staff.main.menu.circ.renew.label;" accesskey="&staff.main.menu.circ.renew.accesskey;" key="circ-renew-key" command="cmd_circ_renew"/>
-		<menuitem label="&staff.main.menu.circ.patron_registration.label;" accesskey="&staff.main.menu.circ.patron_registration.accesskey;" key="patron-register-key" command="cmd_patron_register"/>
-		<menuitem label="&staff.main.menu.circ.patron_retrieve.label;" accesskey="&staff.main.menu.circ.patron_retrieve.accesskey;" command="cmd_retrieve_last_patron" key="retrieve_last_patron_key"/>
-		<menuseparator />
-		<menuitem label="&staff.main.menu.circ.hold_capture.label;" accesskey="&staff.main.menu.circ.hold_capture.accesskey;" key="circ-hold-capture-key" command="cmd_circ_hold_capture"/>
-		<menuitem label="&staff.main.menu.circ.hold_pull.label;" accesskey="&staff.main.menu.circ.hold_pull.accesskey;" command="cmd_circ_hold_pull_list"/>
-		<menuitem label="&staff.main.menu.circ.hold_browse.label;" command="cmd_browse_holds_shelf" accesskey="&staff.main.menu.circ.hold_browse.accesskey;"/>
-		<menuitem label="&staff.main.menu.circ.place_hold.label;" accesskey="&staff.main.menu.circ.place_hold.accesskey;" key="search-opac-key" command="cmd_search_opac"/>
-		<menuseparator />
-		<menuitem label="&staff.main.menu.circ.barcode.show_item;" accesskey="&staff.main.menu.circ.barcode.show_item.accesskey;" key="copy-status-key" command="cmd_copy_status"/>
-		<menuitem label="&staff.main.menu.circ.barcode.retrieve_patron;" accesskey="&staff.main.menu.circ.barcode.retrieve_patron.accesskey;" key="circ-checkout-key" command="cmd_circ_checkout"/>
-		<menuitem label="&staff.main.menu.circ.verify_credentials;" accesskey="&staff.main.menu.circ.verify_credentials.accesskey;" command="cmd_verify_credentials"/>
-		<menuitem label="&staff.main.menu.replace_barcode.label;" command="cmd_replace_barcode"/>
-		<menuitem label="&staff.main.menu.circ.in_house.label;" accesskey="&staff.main.menu.circ.in_house.accesskey;" key="circ-in-house-use-key" command="cmd_in_house_use"/>
-		<menuseparator />
-		<menuitem label="&staff.main.menu.circ.reprint.label;" accesskey="&staff.main.menu.circ.reprint.accesskey;" key="reprint-receipt-key" command="cmd_reprint"/>
-		<menuitem label="&staff.main.menu.circ.offline.label;" command="cmd_standalone" accesskey="&staff.main.menu.circ.offline.accesskey;"/>
-	</menupopup>
+    <menupopup id="main.menu.circ.popup">
+        <menuitem label="&staff.main.menu.circ.checkout.label;" accesskey="&staff.main.menu.circ.checkout.accesskey;" key="circ-checkout-key" command="cmd_circ_checkout"/>
+        <menuitem label="&staff.main.menu.circ.checkin.label;" accesskey="&staff.main.menu.circ.checkin.accesskey;" key="circ-checkin-key" command="cmd_circ_checkin"/>
+        <menuitem label="&staff.main.menu.circ.renew.label;" accesskey="&staff.main.menu.circ.renew.accesskey;" key="circ-renew-key" command="cmd_circ_renew"/>
+        <menuitem label="&staff.main.menu.circ.patron_registration.label;" accesskey="&staff.main.menu.circ.patron_registration.accesskey;" key="patron-register-key" command="cmd_patron_register"/>
+        <menuitem label="&staff.main.menu.circ.patron_retrieve.label;" accesskey="&staff.main.menu.circ.patron_retrieve.accesskey;" command="cmd_retrieve_last_patron" key="retrieve_last_patron_key"/>
+        <menuseparator />
+        <menuitem label="&staff.main.menu.circ.hold_capture.label;" accesskey="&staff.main.menu.circ.hold_capture.accesskey;" key="circ-hold-capture-key" command="cmd_circ_hold_capture"/>
+        <menuitem label="&staff.main.menu.circ.hold_pull.label;" accesskey="&staff.main.menu.circ.hold_pull.accesskey;" command="cmd_circ_hold_pull_list"/>
+        <menuitem label="&staff.main.menu.circ.hold_browse.label;" command="cmd_browse_holds_shelf" accesskey="&staff.main.menu.circ.hold_browse.accesskey;"/>
+        <menuitem label="&staff.main.menu.circ.place_hold.label;" accesskey="&staff.main.menu.circ.place_hold.accesskey;" key="search-opac-key" command="cmd_search_opac"/>
+        <menuseparator />
+        <menuitem label="&staff.main.menu.circ.barcode.show_item;" accesskey="&staff.main.menu.circ.barcode.show_item.accesskey;" key="copy-status-key" command="cmd_copy_status"/>
+        <menuitem label="&staff.main.menu.circ.barcode.retrieve_patron;" accesskey="&staff.main.menu.circ.barcode.retrieve_patron.accesskey;" key="circ-checkout-key" command="cmd_circ_checkout"/>
+        <menuitem label="&staff.main.menu.circ.verify_credentials;" accesskey="&staff.main.menu.circ.verify_credentials.accesskey;" command="cmd_verify_credentials"/>
+        <menuitem label="&staff.main.menu.replace_barcode.label;" command="cmd_replace_barcode"/>
+        <menuitem label="&staff.main.menu.circ.in_house.label;" accesskey="&staff.main.menu.circ.in_house.accesskey;" key="circ-in-house-use-key" command="cmd_in_house_use"/>
+        <menuseparator />
+        <menuitem label="&staff.main.menu.circ.reprint.label;" accesskey="&staff.main.menu.circ.reprint.accesskey;" key="reprint-receipt-key" command="cmd_reprint"/>
+        <menuitem label="&staff.main.menu.circ.offline.label;" command="cmd_standalone" accesskey="&staff.main.menu.circ.offline.accesskey;"/>
+    </menupopup>
 </menu>
 
 <!-- The Cataloging menu on the main menu -->
 <menu id="main.menu.cat" label="&staff.main.menu.cat.label;" accesskey="&staff.main.menu.cat.accesskey;">
-	<menupopup id="main.menu.cat.popup">
-		<menuitem label="&staff.main.menu.cat.bib_search.label;" accesskey="&staff.main.menu.cat.bib_search.accesskey;" key="search-opac-key" command="cmd_search_opac"/>
-		<menuitem label="&staff.main.menu.cat.search_tcn.label;" accesskey="&staff.main.menu.cat.search_tcn.accesskey;" key="search-tcn-key" command="cmd_search_tcn" />
-		<menuitem label="&staff.main.menu.cat.search_bib_id.label;" accesskey="&staff.main.menu.cat.search_bib_id.accesskey;" key="search-bib-id-key" command="cmd_search_bib_id" />
-		<menuitem label="&staff.main.menu.cat.copy_status.label;" accesskey="&staff.main.menu.cat.copy_status.accesskey;" key="copy-status-key" command="cmd_copy_status"/>
-		<menuseparator />
-		<!--
-		<menuitem disabled="true" label="&staff.main.menu.cat.dedup.label;" accesskey="&staff.main.menu.cat.dedup.accesskey;" command="cmd_broken"/>
-		-->
-		<menuitem label="&staff.main.menu.cat.edit_copy_buckets.label;" command="cmd_edit_copy_buckets" accesskey="&staff.main.menu.cat.edit_copy_buckets.accesskey;"/>
+    <menupopup id="main.menu.cat.popup">
+        <menuitem label="&staff.main.menu.cat.bib_search.label;" accesskey="&staff.main.menu.cat.bib_search.accesskey;" key="search-opac-key" command="cmd_search_opac"/>
+        <menuitem label="&staff.main.menu.cat.search_tcn.label;" accesskey="&staff.main.menu.cat.search_tcn.accesskey;" key="search-tcn-key" command="cmd_search_tcn" />
+        <menuitem label="&staff.main.menu.cat.search_bib_id.label;" accesskey="&staff.main.menu.cat.search_bib_id.accesskey;" key="search-bib-id-key" command="cmd_search_bib_id" />
+        <menuitem label="&staff.main.menu.cat.copy_status.label;" accesskey="&staff.main.menu.cat.copy_status.accesskey;" key="copy-status-key" command="cmd_copy_status"/>
+        <menuseparator />
         <!--
-		<menuitem label="&staff.main.menu.cat.edit_volume_buckets.label;" command="cmd_edit_volume_buckets" accesskey="&staff.main.menu.cat.edit_volume_buckets.accesskey;"/>
+        <menuitem disabled="true" label="&staff.main.menu.cat.dedup.label;" accesskey="&staff.main.menu.cat.dedup.accesskey;" command="cmd_broken"/>
         -->
-		<menuitem label="&staff.main.menu.cat.edit_record_buckets.label;" command="cmd_edit_record_buckets" accesskey="&staff.main.menu.cat.edit_record_buckets.accesskey;"/>
-		<menuseparator />
-		<menuitem label="&staff.main.menu.cat.create_marc.label;" accesskey="&staff.main.menu.cat.create_marc.accesskey;" command="cmd_create_marc"/>
-		<menuitem label="&staff.main.menu.cat.z39_50_import.label;" accesskey="&staff.main.menu.cat.z39_50_import.accesskey;" command="cmd_z39_50_import"/>
-		<menuitem label="&staff.main.menu.cat.vandelay.label;" command="cmd_open_vandelay"/>
-		<menuseparator />
-		<menuitem label="&staff.main.menu.replace_barcode.label;" command="cmd_replace_barcode"/>
-		<menuitem label="&staff.main.menu.cat.retrieve_last_record.label;" accesskey="&staff.main.menu.cat.retrieve_last_record.accesskey;" command="cmd_retrieve_last_record" key="retrieve_last_record_key"/>
-	</menupopup>
+        <menuitem label="&staff.main.menu.cat.edit_copy_buckets.label;" command="cmd_edit_copy_buckets" accesskey="&staff.main.menu.cat.edit_copy_buckets.accesskey;"/>
+        <!--
+        <menuitem label="&staff.main.menu.cat.edit_volume_buckets.label;" command="cmd_edit_volume_buckets" accesskey="&staff.main.menu.cat.edit_volume_buckets.accesskey;"/>
+        -->
+        <menuitem label="&staff.main.menu.cat.edit_record_buckets.label;" command="cmd_edit_record_buckets" accesskey="&staff.main.menu.cat.edit_record_buckets.accesskey;"/>
+        <menuseparator />
+        <menuitem label="&staff.main.menu.cat.create_marc.label;" accesskey="&staff.main.menu.cat.create_marc.accesskey;" command="cmd_create_marc"/>
+        <menuitem label="&staff.main.menu.cat.z39_50_import.label;" accesskey="&staff.main.menu.cat.z39_50_import.accesskey;" command="cmd_z39_50_import"/>
+        <menuitem label="&staff.main.menu.cat.vandelay.label;" command="cmd_open_vandelay"/>
+        <menuseparator />
+        <menuitem label="&staff.main.menu.replace_barcode.label;" command="cmd_replace_barcode"/>
+        <menuitem label="&staff.main.menu.cat.retrieve_last_record.label;" accesskey="&staff.main.menu.cat.retrieve_last_record.accesskey;" command="cmd_retrieve_last_record" key="retrieve_last_record_key"/>
+    </menupopup>
 </menu>
 
 
 <!-- The Acquisitions menu on the main menu -->
 <menu id="main.menu.acq" label="&staff.main.menu.acq.label;">
-	<menupopup id="main.menu.acq.popup">
-		<menuitem label="&staff.main.menu.acq.picklist.label;" command="cmd_acq_view_picklist"/>
-		<menuitem label="&staff.main.menu.acq.bib_search.label;" command="cmd_acq_bib_search"/>
-		<menuitem label="&staff.main.menu.acq.upload.label;" command="cmd_acq_upload"/>
-		<menuitem label="&staff.main.menu.acq.brief_record.label;" command="cmd_acq_new_brief_record"/>
-		<menuseparator />
-		<menuitem label="&staff.main.menu.acq.po.label;" command="cmd_acq_view_po" />
-		<menuseparator />
-		<menuitem label="&staff.main.menu.acq.fund.label;" command="cmd_acq_view_fund" />
-		<menuitem label="&staff.main.menu.acq.funding_source.label;" command="cmd_acq_view_funding_source" />
-		<menuitem label="&staff.main.menu.acq.provider.label;" command="cmd_acq_view_provider" />
-		<menuitem label="&staff.main.menu.acq.currency_type.label;" command="cmd_acq_view_currency_type" />
-		<menuitem label="&staff.main.menu.acq.exchange_rate.label;" command="cmd_acq_view_exchange_rate" />
-		<menuitem label="&staff.main.menu.acq.distrib_formula.label;" command="cmd_acq_view_distrib_formula" />
+    <menupopup id="main.menu.acq.popup">
+        <menuitem label="&staff.main.menu.acq.picklist.label;" command="cmd_acq_view_picklist"/>
+        <menuitem label="&staff.main.menu.acq.bib_search.label;" command="cmd_acq_bib_search"/>
+        <menuitem label="&staff.main.menu.acq.upload.label;" command="cmd_acq_upload"/>
+        <menuitem label="&staff.main.menu.acq.brief_record.label;" command="cmd_acq_new_brief_record"/>
+        <menuseparator />
+        <menuitem label="&staff.main.menu.acq.po.label;" command="cmd_acq_view_po" />
+        <menuseparator />
+        <menuitem label="&staff.main.menu.acq.fund.label;" command="cmd_acq_view_fund" />
+        <menuitem label="&staff.main.menu.acq.funding_source.label;" command="cmd_acq_view_funding_source" />
+        <menuitem label="&staff.main.menu.acq.provider.label;" command="cmd_acq_view_provider" />
+        <menuitem label="&staff.main.menu.acq.currency_type.label;" command="cmd_acq_view_currency_type" />
+        <menuitem label="&staff.main.menu.acq.exchange_rate.label;" command="cmd_acq_view_exchange_rate" />
+        <menuitem label="&staff.main.menu.acq.distrib_formula.label;" command="cmd_acq_view_distrib_formula" />
     </menupopup>
 </menu>
 
 
 <!-- The Search menu on the main menu -->
 <menu id="main.menu.search" label="&staff.main.menu.search.label;" accesskey="&staff.main.menu.search.accesskey;">
-	<menupopup id="main.menu.search.popup">
-		<menuitem label="&staff.main.menu.search.patrons.label;" accesskey="&staff.main.menu.search.patrons.accesskey;" key="patron-search-key" command="cmd_patron_search" />
-		<menuitem label="&staff.main.menu.search.catalog.label;" accesskey="&staff.main.menu.search.catalog.accesskey;" key="search-opac-key" command="cmd_search_opac" />
-		<menuitem label="&staff.main.menu.search.record.label;" accesskey="&staff.main.menu.search.record.accesskey;" key="search-tcn-key" command="cmd_search_tcn" />
-		<menuitem label="&staff.main.menu.search.record_via_id.label;" accesskey="&staff.main.menu.search.record_via_id.accesskey;" key="search-bib-id-key" command="cmd_search_bib_id" />
-		<menuitem label="&staff.main.menu.search.copies.label;" accesskey="&staff.main.menu.search.copies.accesskey;" key="copy-status-key" command="cmd_copy_status"/>
-		<menuitem label="&staff.main.menu.search.patrons_barcode.label;" accesskey="&staff.main.menu.search.patrons_barcode.accesskey;" key="circ-checkout-key" command="cmd_circ_checkout"/>
-	</menupopup>
+    <menupopup id="main.menu.search.popup">
+        <menuitem label="&staff.main.menu.search.patrons.label;" accesskey="&staff.main.menu.search.patrons.accesskey;" key="patron-search-key" command="cmd_patron_search" />
+        <menuitem label="&staff.main.menu.search.catalog.label;" accesskey="&staff.main.menu.search.catalog.accesskey;" key="search-opac-key" command="cmd_search_opac" />
+        <menuitem label="&staff.main.menu.search.record.label;" accesskey="&staff.main.menu.search.record.accesskey;" key="search-tcn-key" command="cmd_search_tcn" />
+        <menuitem label="&staff.main.menu.search.record_via_id.label;" accesskey="&staff.main.menu.search.record_via_id.accesskey;" key="search-bib-id-key" command="cmd_search_bib_id" />
+        <menuitem label="&staff.main.menu.search.copies.label;" accesskey="&staff.main.menu.search.copies.accesskey;" key="copy-status-key" command="cmd_copy_status"/>
+        <menuitem label="&staff.main.menu.search.patrons_barcode.label;" accesskey="&staff.main.menu.search.patrons_barcode.accesskey;" key="circ-checkout-key" command="cmd_circ_checkout"/>
+    </menupopup>
 </menu>
 
 <!-- The Help menu on the main menu -->
 <menu id="main.menu.help" label="&staff.main.menu.help.label;" accesskey="&staff.main.menu.help.accesskey;">
-	<menupopup id="main.menu.help.popup">
-		<menuitem label="stub" />
-	</menupopup>
+    <menupopup id="main.menu.help.popup">
+        <menuitem label="stub" />
+    </menupopup>
 </menu>
 
 <!-- The Help menu on the main menu -->
 <menu id="main.menu.admin" label="&staff.main.menu.admin.label;" accesskey="&staff.main.menu.admin.accesskey;" old_accesskey="&staff.main.menu.admin.key;">
-	<menupopup id="main.menu.admin.popup">
-		<menuitem id="oc_menuitem" label="&staff.main.menu.admin.change_session.label;" label_orig="&staff.main.menu.admin.change_session.label;" 
-			accesskey="O" command="cmd_change_session"/>
-		<menuitem label="&staff.main.menu.admin.offline_xacts.label;" accesskey="&staff.main.menu.admin.offline_xacts.accesskey;" command="cmd_manage_offline_xacts"/>
-		<menuitem label="&staff.main.menu.admin.download_patrons.label;" accesskey="&staff.main.menu.admin.download_patrons.accesskey;" command="cmd_download_patrons"/>
-		<menuseparator />
+    <menupopup id="main.menu.admin.popup">
+        <menuitem id="oc_menuitem" label="&staff.main.menu.admin.change_session.label;" label_orig="&staff.main.menu.admin.change_session.label;" 
+            accesskey="O" command="cmd_change_session"/>
+        <menuitem label="&staff.main.menu.admin.offline_xacts.label;" accesskey="&staff.main.menu.admin.offline_xacts.accesskey;" command="cmd_manage_offline_xacts"/>
+        <menuitem label="&staff.main.menu.admin.download_patrons.label;" accesskey="&staff.main.menu.admin.download_patrons.accesskey;" command="cmd_download_patrons"/>
+        <menuseparator />
 
-		<menu id="main.menu.admin.local" label="&staff.main.menu.admin.local_admin.label;">
-			<menupopup id="main.menu.admin.local.popup">
-		        <menuitem label="&staff.main.menu.admin.template_edit.label;" accesskey="&staff.main.menu.admin.template_edit.accesskey;" command="cmd_print_list_template_edit"/>
-				<menuitem label="&staff.server.admin.index.fonts_and_sounds;" command="cmd_local_admin_fonts_and_sounds"/>
-				<menuitem label="&staff.server.admin.index.printer;" command="cmd_local_admin_printer"/>
-				<menuitem label="&staff.server.admin.index.closed_dates;" command="cmd_local_admin_closed_dates"/>
-				<menuitem label="&staff.server.admin.index.copy_locations;" command="cmd_local_admin_copy_locations"/>
-				<menuitem label="&staff.server.admin.index.library_settings;" command="cmd_local_admin_lib_settings"/>
-				<menuitem label="&staff.server.admin.index.non_cataloged_types;" command="cmd_local_admin_non_cat_types"/>
-				<menuitem label="&staff.server.admin.index.statistical_categories;" command="cmd_local_admin_stat_cats"/>
+        <menu id="main.menu.admin.local" label="&staff.main.menu.admin.local_admin.label;">
+            <menupopup id="main.menu.admin.local.popup">
+                <menuitem label="&staff.main.menu.admin.template_edit.label;" accesskey="&staff.main.menu.admin.template_edit.accesskey;" command="cmd_print_list_template_edit"/>
+                <menuitem label="&staff.server.admin.index.fonts_and_sounds;" command="cmd_local_admin_fonts_and_sounds"/>
+                <menuitem label="&staff.server.admin.index.printer;" command="cmd_local_admin_printer"/>
+                <menuitem label="&staff.server.admin.index.closed_dates;" command="cmd_local_admin_closed_dates"/>
+                <menuitem label="&staff.server.admin.index.copy_locations;" command="cmd_local_admin_copy_locations"/>
+                <menuitem label="&staff.server.admin.index.library_settings;" command="cmd_local_admin_lib_settings"/>
+                <menuitem label="&staff.server.admin.index.non_cataloged_types;" command="cmd_local_admin_non_cat_types"/>
+                <menuitem label="&staff.server.admin.index.statistical_categories;" command="cmd_local_admin_stat_cats"/>
                 <menuitem label="&staff.main.menu.admin.local_admin.conify.standing_penalty.label;" command="cmd_local_admin_standing_penalty"/>
                 <menuitem label="&staff.main.menu.admin.local_admin.conify.grp_penalty_threshold.label;" command="cmd_local_admin_grp_penalty_threshold"/>
                 <menuitem label="&staff.main.menu.admin.local_admin.conify.idl_field_doc.label;" command="cmd_local_admin_idl_field_doc"/>
@@ -299,8 +299,8 @@
                 <menuitem label="&staff.main.menu.admin.local_admin.work_log.label;" accesskey="&staff.main.menu.admin.local_admin.work_log.accesskey;" command="cmd_local_admin_work_log"/>
             </menupopup>
         </menu>
-		<menu id="main.menu.admin.server" label="&staff.main.menu.admin.server_admin.label;">
-			<menupopup id="main.menu.admin.server.popup">
+        <menu id="main.menu.admin.server" label="&staff.main.menu.admin.server_admin.label;">
+            <menupopup id="main.menu.admin.server.popup">
                 <menuitem label="&staff.main.menu.admin.server_admin.conify.org_unit_type.label;" command="cmd_server_admin_org_type"/>
                 <menuitem label="&staff.main.menu.admin.server_admin.conify.org_unit.label;" command="cmd_server_admin_org_unit"/>
                 <menuitem label="&staff.main.menu.admin.server_admin.conify.grp_tree.label;" command="cmd_server_admin_grp_tree"/>
@@ -314,41 +314,41 @@
             </menupopup>
         </menu>
 
-		<menuseparator />
-		<menuitem label="&staff.main.menu.admin.user_edit.label;" accesskey="&staff.main.menu.admin.user_edit.accesskey;" command="cmd_adv_user_edit"/>
-		<menuitem label="&staff.main.menu.admin.toggle_buttonbar.label;" accesskey="&staff.main.menu.admin.toggle_buttonbar.accesskey;" command="cmd_toggle_buttonbar"/>
-		<menuseparator />
-		<menu id="main.menu.admin.sub" accesskey="&staff.main.menu.admin.developer.accesskey;" label="&staff.main.menu.admin.developer.label;">
-			<menupopup id="main.menu.admin.sub.popup">
-				<menuitem label="&staff.main.menu.admin.stat_cat_edit.label;" accesskey="&staff.main.menu.admin.stat_cat_edit.accesskey;" command="cmd_stat_cat_edit"/>
-				<menuitem label="&staff.main.menu.admin.non_cat_type_edit.label;" accesskey="&staff.main.menu.admin.non_cat_type_edit.accesskey;" command="cmd_non_cat_type_edit"/>
-				<menuitem label="&staff.main.menu.admin.copy_location_edit.label;" accesskey="&staff.main.menu.admin.copy_location_edit.accesskey;" command="cmd_copy_location_edit"/>
-				<menuitem label="&staff.main.menu.admin.browse_holds.label;" command="cmd_browse_holds" accesskey="&staff.main.menu.admin.browse_holds.accesskey;"/>
-		        <menuitem label="&staff.main.menu.admin.local_admin.label;" accesskey="&staff.main.menu.admin.local_admin.accesskey;" command="cmd_local_admin"/>
-		        <menuitem label="&staff.main.menu.admin.survey_wizard.label;" accesskey="&staff.main.menu.admin.survey_wizard.accesskey;" command="cmd_survey_wizard"/>
-				<menuseparator />
-				<menuitem label="&staff.main.menu.admin.public_opac.label;" command="cmd_public_opac" accesskey="&staff.main.menu.admin.public_opac.accesskey;"/>
-				<menuitem label="&staff.main.menu.admin.cmd_test.label;" old_accesskey="T" command="cmd_test"/>
-				<menuitem label="&staff.main.menu.admin.xuleditor.label;" accesskey="&staff.main.menu.admin.xuleditor.accesskey;" command="cmd_xuleditor"/>
-				<menuitem label="&staff.main.menu.admin.fieldmapper.label;" accesskey="&staff.main.menu.admin.fieldmapper.accesskey;" command="cmd_fieldmapper"/>
-				<menuitem label="&staff.main.menu.admin.cmd_console.label;" accesskey="&staff.main.menu.admin.cmd_console.accesskey;" command="cmd_console"/>
-				<menuitem label="&staff.main.menu.admin.cmd_shell.label;" accesskey="&staff.main.menu.admin.cmd_shell.accesskey;" command="cmd_shell"/>
-				<menuitem label="&staff.main.menu.admin.cmd_chrome_shell.label;" accesskey="&staff.main.menu.admin.cmd_chrome_shell.accesskey;" 
+        <menuseparator />
+        <menuitem label="&staff.main.menu.admin.user_edit.label;" accesskey="&staff.main.menu.admin.user_edit.accesskey;" command="cmd_adv_user_edit"/>
+        <menuitem label="&staff.main.menu.admin.toggle_buttonbar.label;" accesskey="&staff.main.menu.admin.toggle_buttonbar.accesskey;" command="cmd_toggle_buttonbar"/>
+        <menuseparator />
+        <menu id="main.menu.admin.sub" accesskey="&staff.main.menu.admin.developer.accesskey;" label="&staff.main.menu.admin.developer.label;">
+            <menupopup id="main.menu.admin.sub.popup">
+                <menuitem label="&staff.main.menu.admin.stat_cat_edit.label;" accesskey="&staff.main.menu.admin.stat_cat_edit.accesskey;" command="cmd_stat_cat_edit"/>
+                <menuitem label="&staff.main.menu.admin.non_cat_type_edit.label;" accesskey="&staff.main.menu.admin.non_cat_type_edit.accesskey;" command="cmd_non_cat_type_edit"/>
+                <menuitem label="&staff.main.menu.admin.copy_location_edit.label;" accesskey="&staff.main.menu.admin.copy_location_edit.accesskey;" command="cmd_copy_location_edit"/>
+                <menuitem label="&staff.main.menu.admin.browse_holds.label;" command="cmd_browse_holds" accesskey="&staff.main.menu.admin.browse_holds.accesskey;"/>
+                <menuitem label="&staff.main.menu.admin.local_admin.label;" accesskey="&staff.main.menu.admin.local_admin.accesskey;" command="cmd_local_admin"/>
+                <menuitem label="&staff.main.menu.admin.survey_wizard.label;" accesskey="&staff.main.menu.admin.survey_wizard.accesskey;" command="cmd_survey_wizard"/>
+                <menuseparator />
+                <menuitem label="&staff.main.menu.admin.public_opac.label;" command="cmd_public_opac" accesskey="&staff.main.menu.admin.public_opac.accesskey;"/>
+                <menuitem label="&staff.main.menu.admin.cmd_test.label;" old_accesskey="T" command="cmd_test"/>
+                <menuitem label="&staff.main.menu.admin.xuleditor.label;" accesskey="&staff.main.menu.admin.xuleditor.accesskey;" command="cmd_xuleditor"/>
+                <menuitem label="&staff.main.menu.admin.fieldmapper.label;" accesskey="&staff.main.menu.admin.fieldmapper.accesskey;" command="cmd_fieldmapper"/>
+                <menuitem label="&staff.main.menu.admin.cmd_console.label;" accesskey="&staff.main.menu.admin.cmd_console.accesskey;" command="cmd_console"/>
+                <menuitem label="&staff.main.menu.admin.cmd_shell.label;" accesskey="&staff.main.menu.admin.cmd_shell.accesskey;" command="cmd_shell"/>
+                <menuitem label="&staff.main.menu.admin.cmd_chrome_shell.label;" accesskey="&staff.main.menu.admin.cmd_chrome_shell.accesskey;" 
                     oncommand="try{xulG.window.win.start_js_shell();}catch(E){alert(E);}"/>
-				<menuitem label="server/main/test.html" accesskey="1" command="cmd_test_html"/>
-				<menuitem label="server/main/test.xul" accesskey="2" command="cmd_test_xul"/>
-				<menuitem label="&staff.main.menu.admin.clear_cache.label;" accesskey="&staff.main.menu.admin.clear_cache.accesskey;" command="cmd_clear_cache"/>
-				<menuitem label="&staff.main.menu.admin.restore_all_tabs.label;" command="cmd_restore_all_tabs"/>
-				<menuitem label="&staff.main.menu.admin.extension_manager.label;" command="cmd_extension_manager"/>
-				<menuitem label="&staff.main.menu.admin.theme_manager.label;" command="cmd_theme_manager"/>
-				<menuitem label="&staff.main.menu.admin.about_config.label;" command="cmd_about_config"/>
-				<menuitem label="&staff.main.menu.admin.venkman.label;" oncommand="try{xulG.window.win.start_debugger();}catch(E){alert(E);}"/>
-				<menuitem label="&staff.main.auth.debug.inspector;" oncommand="try{xulG.window.win.start_inspector();}catch(E){alert(E);}"/>
-				<menuitem label="&staff.main.auth.debug.chrome_list;" oncommand="try{xulG.window.win.start_chrome_list();}catch(E){alert(E);}"/>
+                <menuitem label="server/main/test.html" accesskey="1" command="cmd_test_html"/>
+                <menuitem label="server/main/test.xul" accesskey="2" command="cmd_test_xul"/>
+                <menuitem label="&staff.main.menu.admin.clear_cache.label;" accesskey="&staff.main.menu.admin.clear_cache.accesskey;" command="cmd_clear_cache"/>
+                <menuitem label="&staff.main.menu.admin.restore_all_tabs.label;" command="cmd_restore_all_tabs"/>
+                <menuitem label="&staff.main.menu.admin.extension_manager.label;" command="cmd_extension_manager"/>
+                <menuitem label="&staff.main.menu.admin.theme_manager.label;" command="cmd_theme_manager"/>
+                <menuitem label="&staff.main.menu.admin.about_config.label;" command="cmd_about_config"/>
+                <menuitem label="&staff.main.menu.admin.venkman.label;" oncommand="try{xulG.window.win.start_debugger();}catch(E){alert(E);}"/>
+                <menuitem label="&staff.main.auth.debug.inspector;" oncommand="try{xulG.window.win.start_inspector();}catch(E){alert(E);}"/>
+                <menuitem label="&staff.main.auth.debug.chrome_list;" oncommand="try{xulG.window.win.start_chrome_list();}catch(E){alert(E);}"/>
                 <menuitem label="&staff.main.menu.admin.ping;" oncommand="try{netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');JSAN.use('util.network'); var n = new util.network(); alert(n.ping());}catch(E){alert(E);}"/>
-			</menupopup>
-		</menu>
-	</menupopup>
+            </menupopup>
+        </menu>
+    </menupopup>
 </menu>
 
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
index 43248cd10b..0358de29cf 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
@@ -5,7 +5,7 @@
 <?xul-overlay href="/xul/server/main/menu_frame_menus.xul"?>
 -->
 <overlay id="menu_frame_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading menu_frame_overlay.xul\n');</script>
 
@@ -14,31 +14,31 @@
 
 <!-- The top level widget for the staff client -->
 <box id="menu_frame_main" flex="1" orient="vertical">
-	<toolbox id="main_toolbox"/>
-	<tabbox id="main_tabbox" flex="1" eventnode="window" handleCtrlTab="true">
-		<tabs id="main_tabs" closebutton="true" onclosetab="g.menu.close_tab()">
-			<tab id="tab_1" accesskey="&staff.chrome.menu_frame_overlay.tab1.accesskey;" label="&staff.chrome.menu_frame_overlay.tab1.label;" hidden="true" />
-			<tab id="tab_2" accesskey="&staff.chrome.menu_frame_overlay.tab2.accesskey;" label="&staff.chrome.menu_frame_overlay.tab2.label;" hidden="true" />
-			<tab id="tab_3" accesskey="&staff.chrome.menu_frame_overlay.tab3.accesskey;" label="&staff.chrome.menu_frame_overlay.tab3.label;" hidden="true" />
-			<tab id="tab_4" accesskey="&staff.chrome.menu_frame_overlay.tab4.accesskey;" label="&staff.chrome.menu_frame_overlay.tab4.label;" hidden="true" />
-			<tab id="tab_5" accesskey="&staff.chrome.menu_frame_overlay.tab5.accesskey;" label="&staff.chrome.menu_frame_overlay.tab5.label;" hidden="true" />
-			<tab id="tab_6" accesskey="&staff.chrome.menu_frame_overlay.tab6.accesskey;" label="&staff.chrome.menu_frame_overlay.tab6.label;" hidden="true" />
-			<tab id="tab_7" accesskey="&staff.chrome.menu_frame_overlay.tab7.accesskey;" label="&staff.chrome.menu_frame_overlay.tab7.label;" hidden="true" />
-			<tab id="tab_8" accesskey="&staff.chrome.menu_frame_overlay.tab8.accesskey;" label="&staff.chrome.menu_frame_overlay.tab8.label;" hidden="true" />
-			<tab id="tab_9" accesskey="&staff.chrome.menu_frame_overlay.tab9.accesskey;" label="&staff.chrome.menu_frame_overlay.tab9.label;" hidden="true" />
-		</tabs>
-		<tabpanels id="main_panels" flex="1">
-			<tabpanel id="panel_1"><label value="panel_1"/></tabpanel>
-			<tabpanel id="panel_2"><label value="panel_2"/></tabpanel>
-			<tabpanel id="panel_3"><label value="panel_3"/></tabpanel>
-			<tabpanel id="panel_4"><label value="panel_4"/></tabpanel>
-			<tabpanel id="panel_5"><label value="panel_5"/></tabpanel>
-			<tabpanel id="panel_6"><label value="panel_6"/></tabpanel>
-			<tabpanel id="panel_7"><label value="panel_7"/></tabpanel>
-			<tabpanel id="panel_8"><label value="panel_8"/></tabpanel>
-			<tabpanel id="panel_9"><label value="panel_9"/></tabpanel>
-		</tabpanels>
-	</tabbox>
+    <toolbox id="main_toolbox"/>
+    <tabbox id="main_tabbox" flex="1" eventnode="window" handleCtrlTab="true">
+        <tabs id="main_tabs" closebutton="true" onclosetab="g.menu.close_tab()">
+            <tab id="tab_1" accesskey="&staff.chrome.menu_frame_overlay.tab1.accesskey;" label="&staff.chrome.menu_frame_overlay.tab1.label;" hidden="true" />
+            <tab id="tab_2" accesskey="&staff.chrome.menu_frame_overlay.tab2.accesskey;" label="&staff.chrome.menu_frame_overlay.tab2.label;" hidden="true" />
+            <tab id="tab_3" accesskey="&staff.chrome.menu_frame_overlay.tab3.accesskey;" label="&staff.chrome.menu_frame_overlay.tab3.label;" hidden="true" />
+            <tab id="tab_4" accesskey="&staff.chrome.menu_frame_overlay.tab4.accesskey;" label="&staff.chrome.menu_frame_overlay.tab4.label;" hidden="true" />
+            <tab id="tab_5" accesskey="&staff.chrome.menu_frame_overlay.tab5.accesskey;" label="&staff.chrome.menu_frame_overlay.tab5.label;" hidden="true" />
+            <tab id="tab_6" accesskey="&staff.chrome.menu_frame_overlay.tab6.accesskey;" label="&staff.chrome.menu_frame_overlay.tab6.label;" hidden="true" />
+            <tab id="tab_7" accesskey="&staff.chrome.menu_frame_overlay.tab7.accesskey;" label="&staff.chrome.menu_frame_overlay.tab7.label;" hidden="true" />
+            <tab id="tab_8" accesskey="&staff.chrome.menu_frame_overlay.tab8.accesskey;" label="&staff.chrome.menu_frame_overlay.tab8.label;" hidden="true" />
+            <tab id="tab_9" accesskey="&staff.chrome.menu_frame_overlay.tab9.accesskey;" label="&staff.chrome.menu_frame_overlay.tab9.label;" hidden="true" />
+        </tabs>
+        <tabpanels id="main_panels" flex="1">
+            <tabpanel id="panel_1"><label value="panel_1"/></tabpanel>
+            <tabpanel id="panel_2"><label value="panel_2"/></tabpanel>
+            <tabpanel id="panel_3"><label value="panel_3"/></tabpanel>
+            <tabpanel id="panel_4"><label value="panel_4"/></tabpanel>
+            <tabpanel id="panel_5"><label value="panel_5"/></tabpanel>
+            <tabpanel id="panel_6"><label value="panel_6"/></tabpanel>
+            <tabpanel id="panel_7"><label value="panel_7"/></tabpanel>
+            <tabpanel id="panel_8"><label value="panel_8"/></tabpanel>
+            <tabpanel id="panel_9"><label value="panel_9"/></tabpanel>
+        </tabpanels>
+    </tabbox>
     <statusbar>
         <statusbarpanel />
         <spacer flex="1" />
@@ -65,19 +65,19 @@
 
 <!-- The main top level menubar -->
 <toolbox id="main_toolbox">
-	<menubar id="main_menubar">
-		<menu id="main.menu.file" />
-		<menu id="main.menu.edit" />
-		<menu id="main.menu.search" />
-		<menu id="main.menu.circ" />
-		<menu id="main.menu.cat" />
-		<menu id="main.menu.acq" />
-		<spacer flex="1" />
-		<menu id="main.menu.admin" />
+    <menubar id="main_menubar">
+        <menu id="main.menu.file" />
+        <menu id="main.menu.edit" />
+        <menu id="main.menu.search" />
+        <menu id="main.menu.circ" />
+        <menu id="main.menu.cat" />
+        <menu id="main.menu.acq" />
+        <spacer flex="1" />
+        <menu id="main.menu.admin" />
         <!--
-		<menu id="main.menu.help" />
+        <menu id="main.menu.help" />
         -->
-	</menubar>
+    </menubar>
     <toolbar id="main_toolbar" hidden="true">
         <toolbarbutton id="tb_checkout" 
             command="cmd_circ_checkout" 
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul b/Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul
index 0157eeda70..c21e34b7ad 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul
@@ -20,144 +20,144 @@
 <?xul-overlay href="chrome://open_ils_staff_client/OpenILS/content/util_overlay_chrome.xul"?>
 
 <window id="simple_auth_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { 
-					throw( offlineStrings.getString('common.jsan.missing'));
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('..');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for simple_auth.xul');
-
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-				g.data.temporary_session = ''; g.data.stash('temporary_session');
-
-				$('server').value = g.data.server_unadorned;
-
-				addCSSClass(document.documentElement,xul_param('login_type',{'modal_xulG':true}))
-
-				if (xul_param('desc_brief',{'modal_xulG':true})) {
-					$('desc').hidden = false;
-					$('desc_brief').appendChild( document.createTextNode( xul_param('desc_brief',{'modal_xulG':true}) ) );
-				}
-				if (xul_param('desc_full',{'modal_xulG':true})) {
-					$('desc').hidden = false;
-					$('desc_full').appendChild( document.createTextNode( xul_param('desc_full',{'modal_xulG':true}) ) );
-				}
-
-				$('username').focus();
-
-				$('username').addEventListener('keypress',handle_keypress,false);
-				$('password').addEventListener('keypress',handle_keypress,false);
-
-			} catch(E) {
-				var err_msg =  offlineStrings.getFormattedString('common.exception', ['simple_auth.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function $(id) { return document.getElementById(id); }
-
-		function handle_keypress(ev) {
-			if ( (! ev.keyCode) || (ev.keyCode != 13) ) return;
-			switch(ev.target) {
-				case $('username') : $('password').focus(); break;
-				case $('password') : authorize(); break;
-				default: break;
-			}
-		}
-
-		function authorize() {
-			try {
-				JSAN.use('auth.session');
-				g.session = new auth.session(
-					{
-						'name_prompt' : $('username'),
-						'password_prompt' : $('password'),
-						'server_prompt' : $('server'),
-					},
-					xul_param('login_type',{'modal_xulG':true}) || 'temp'
-				);
-				g.session.on_init = function() { 
-					try {
-						JSAN.use('util.network'); var n = new util.network();
-						var staff = n.simple_request('FM_AU_RETRIEVE_VIA_SESSION',[ g.session.key ]);
-						g.data.temporary_session = {  // old way because of local chrome still out there
-							'key' : g.session.key, 
-							'authtime' : g.session.authtime, 
-							'usr' : js2JSON(staff)
-						}
-						g.data.stash('temporary_session');
-						var my_xulG = { // new way, to minimize the use of global spaces
-							'temporary_session' : g.data.temporary_session
-						};
-						update_modal_xulG(my_xulG);
-						window.close();
-					} catch(E) {
-						g.error.standard_unexpected_error_alert('simple_auth.session.on_init',E);
-					}
-				}
-				g.session.on_init_error = function() { 
-					$('password').value = '';
-					$('username').focus();
-					$('username').select();
-				 }
-				g.session.init();
-			} catch(E) {
-				alert(E);
-			}
-		}
-
-	]]>
-	</script>
-
-	<commandset id="simple_auth_cmds">
-		<command id="cmd_broken" />
-	</commandset>
-
-	<vbox id="simple_auth_main" flex="1">
-	<groupbox id="desc" hidden="true">
-		<caption label="&staff.main.simple_auth.exception.label;"/>
-		<description id="desc_brief" style="color: red"/>
-		<description id="desc_full"/>
-	</groupbox>
-	<groupbox>
-		<caption label="&staff.main.simple_auth.authorization.label;"/>
-		<grid>
-			<columns><column /><column /></columns>
-			<rows>
-				<row>
-					<label value="&common.username.label;" control="username" accesskey="&common.username.accesskey;"/>
-					<textbox id="username" />
-				</row>
-				<row>
-					<label value="&staff.auth.password_prompt;" control="password" accesskey="&staff.auth.password_prompt.accesskey;"/>
-					<textbox id="password" type="password"/>
-				</row>
-				<row>
-					<button label="&common.cancel;" accesskey="&common.cancel.accesskey;" oncommand="window.close()"/>
-					<button label="&staff.main.simple_auth.authorize.label;" accesskey="&staff.main.simple_auth.authorize.accesskey;" oncommand="authorize()"/>
-				</row>
-			</rows>
-		</grid>
-		<label id="server" hidden="true"/>
-	</groupbox>
-	<spacer flex="1"/>
-	</vbox>
+    <script>
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { 
+                    throw( offlineStrings.getString('common.jsan.missing'));
+                }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('..');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for simple_auth.xul');
+
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+                g.data.temporary_session = ''; g.data.stash('temporary_session');
+
+                $('server').value = g.data.server_unadorned;
+
+                addCSSClass(document.documentElement,xul_param('login_type',{'modal_xulG':true}))
+
+                if (xul_param('desc_brief',{'modal_xulG':true})) {
+                    $('desc').hidden = false;
+                    $('desc_brief').appendChild( document.createTextNode( xul_param('desc_brief',{'modal_xulG':true}) ) );
+                }
+                if (xul_param('desc_full',{'modal_xulG':true})) {
+                    $('desc').hidden = false;
+                    $('desc_full').appendChild( document.createTextNode( xul_param('desc_full',{'modal_xulG':true}) ) );
+                }
+
+                $('username').focus();
+
+                $('username').addEventListener('keypress',handle_keypress,false);
+                $('password').addEventListener('keypress',handle_keypress,false);
+
+            } catch(E) {
+                var err_msg =  offlineStrings.getFormattedString('common.exception', ['simple_auth.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function $(id) { return document.getElementById(id); }
+
+        function handle_keypress(ev) {
+            if ( (! ev.keyCode) || (ev.keyCode != 13) ) return;
+            switch(ev.target) {
+                case $('username') : $('password').focus(); break;
+                case $('password') : authorize(); break;
+                default: break;
+            }
+        }
+
+        function authorize() {
+            try {
+                JSAN.use('auth.session');
+                g.session = new auth.session(
+                    {
+                        'name_prompt' : $('username'),
+                        'password_prompt' : $('password'),
+                        'server_prompt' : $('server'),
+                    },
+                    xul_param('login_type',{'modal_xulG':true}) || 'temp'
+                );
+                g.session.on_init = function() { 
+                    try {
+                        JSAN.use('util.network'); var n = new util.network();
+                        var staff = n.simple_request('FM_AU_RETRIEVE_VIA_SESSION',[ g.session.key ]);
+                        g.data.temporary_session = {  // old way because of local chrome still out there
+                            'key' : g.session.key, 
+                            'authtime' : g.session.authtime, 
+                            'usr' : js2JSON(staff)
+                        }
+                        g.data.stash('temporary_session');
+                        var my_xulG = { // new way, to minimize the use of global spaces
+                            'temporary_session' : g.data.temporary_session
+                        };
+                        update_modal_xulG(my_xulG);
+                        window.close();
+                    } catch(E) {
+                        g.error.standard_unexpected_error_alert('simple_auth.session.on_init',E);
+                    }
+                }
+                g.session.on_init_error = function() { 
+                    $('password').value = '';
+                    $('username').focus();
+                    $('username').select();
+                 }
+                g.session.init();
+            } catch(E) {
+                alert(E);
+            }
+        }
+
+    ]]>
+    </script>
+
+    <commandset id="simple_auth_cmds">
+        <command id="cmd_broken" />
+    </commandset>
+
+    <vbox id="simple_auth_main" flex="1">
+    <groupbox id="desc" hidden="true">
+        <caption label="&staff.main.simple_auth.exception.label;"/>
+        <description id="desc_brief" style="color: red"/>
+        <description id="desc_full"/>
+    </groupbox>
+    <groupbox>
+        <caption label="&staff.main.simple_auth.authorization.label;"/>
+        <grid>
+            <columns><column /><column /></columns>
+            <rows>
+                <row>
+                    <label value="&common.username.label;" control="username" accesskey="&common.username.accesskey;"/>
+                    <textbox id="username" />
+                </row>
+                <row>
+                    <label value="&staff.auth.password_prompt;" control="password" accesskey="&staff.auth.password_prompt.accesskey;"/>
+                    <textbox id="password" type="password"/>
+                </row>
+                <row>
+                    <button label="&common.cancel;" accesskey="&common.cancel.accesskey;" oncommand="window.close()"/>
+                    <button label="&staff.main.simple_auth.authorize.label;" accesskey="&staff.main.simple_auth.authorize.accesskey;" oncommand="authorize()"/>
+                </row>
+            </rows>
+        </grid>
+        <label id="server" hidden="true"/>
+    </groupbox>
+    <spacer flex="1"/>
+    </vbox>
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/test.xul b/Open-ILS/xul/staff_client/chrome/content/main/test.xul
index d5e925447e..ff5744245c 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/test.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/test.xul
@@ -9,16 +9,16 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- OVERLAYS -->
 
 <window id="example_template_win" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<label value="&staff.main.test.example_template.label;" />
+    <label value="&staff.main.test.example_template.label;" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/browser.xul b/Open-ILS/xul/staff_client/chrome/content/util/browser.xul
index 9e33902bf2..c0479294a3 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/browser.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/util/browser.xul
@@ -16,103 +16,103 @@
 <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_chrome.xul"?>
 
 <window id="util_browser_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		                if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('..');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for util_browser.xul');
-
-				JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-				XML_HTTP_SERVER = data.server_unadorned;
-
-				var name = xul_param('tab_name') || xul_param('name') || null;
-				var url; try { url = xul_param('url'); } catch(E) { dump(E + '\n'); };
-				if (!url) url = urls.browser;
-
-				JSAN.use('util.browser'); g.browser = new util.browser();
-
-				var push_xulG = true;
-				if (xul_param('no_xulG')) push_xulG = false;
-
-				var alt_print = false;
-				if (xul_param('alternate_print')) alt_print = true;
-
-				var p =	{ 
-					'url' : url,
-					'push_xulG' : push_xulG,
-					'alt_print' : alt_print,
-					'debug_label' : 'debug',
-				};
-				if (typeof window.xulG == 'object' && typeof window.xulG.passthru_content_params == 'object') {
-					p.passthru_content_params = window.xulG.passthru_content_params;
-				}
-				if (typeof window.xulG == 'object' && typeof window.xulG.on_url_load == 'function') {
-					p.on_url_load = window.xulG.on_url_load;
-				}
-
-				g.browser.init( p );
-
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					if (name) try { window.xulG.set_tab_name(name); } catch(E) { alert(E); }
-				}
-				if (xul_param('show_nav_buttons')) {
-					document.getElementById('back').hidden = false;
-					document.getElementById('forward').hidden = false;
-				}
-				if (xul_param('show_print_button')) {
-					document.getElementById('browser_print').hidden = false;
-				}
-
-				if (xul_param('title')) {
-					try { document.title = xul_param('title'); } catch(E) {}
-					try { window.title = xul_param('title'); } catch(E) {}
-				}
-
-			} catch(E) {
-				var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
-					"system administrator or software developer the following:\n" + E + '\n';
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-	]]>
-	</script>
-
-	<commandset id="util_browser_cmds">
-		<command id="cmd_broken" />
-		<command id="cmd_print" />
-		<command id="cmd_back" />
-		<command id="cmd_forward" />
-	</commandset>
-
-	<vbox flex="1">
-		<hbox>
-			<button id="back" label="Go Back" command="cmd_back" accesskey="b" disabled="true" hidden="true"/>
-			<button id="forward" label="Go Forward" command="cmd_forward" accesskey="d" disabled="true" hidden="true"/>
-			<spacer flex="1"/>
-			<label id="debug" value="Debug" disabled="true" onclick="var m = (this.getAttribute('tooltiptext')+'\n'); dump(m); alert(m);"/>
-			<button id="browser_print" label="Print Page" command="cmd_print" hidden="true"/>
-		</hbox>
-		<browser id="browser_browser" flex="1" type="content"/>
-	</vbox>
+    <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                        if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('..');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for util_browser.xul');
+
+                JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+                XML_HTTP_SERVER = data.server_unadorned;
+
+                var name = xul_param('tab_name') || xul_param('name') || null;
+                var url; try { url = xul_param('url'); } catch(E) { dump(E + '\n'); };
+                if (!url) url = urls.browser;
+
+                JSAN.use('util.browser'); g.browser = new util.browser();
+
+                var push_xulG = true;
+                if (xul_param('no_xulG')) push_xulG = false;
+
+                var alt_print = false;
+                if (xul_param('alternate_print')) alt_print = true;
+
+                var p =    { 
+                    'url' : url,
+                    'push_xulG' : push_xulG,
+                    'alt_print' : alt_print,
+                    'debug_label' : 'debug',
+                };
+                if (typeof window.xulG == 'object' && typeof window.xulG.passthru_content_params == 'object') {
+                    p.passthru_content_params = window.xulG.passthru_content_params;
+                }
+                if (typeof window.xulG == 'object' && typeof window.xulG.on_url_load == 'function') {
+                    p.on_url_load = window.xulG.on_url_load;
+                }
+
+                g.browser.init( p );
+
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+                    if (name) try { window.xulG.set_tab_name(name); } catch(E) { alert(E); }
+                }
+                if (xul_param('show_nav_buttons')) {
+                    document.getElementById('back').hidden = false;
+                    document.getElementById('forward').hidden = false;
+                }
+                if (xul_param('show_print_button')) {
+                    document.getElementById('browser_print').hidden = false;
+                }
+
+                if (xul_param('title')) {
+                    try { document.title = xul_param('title'); } catch(E) {}
+                    try { window.title = xul_param('title'); } catch(E) {}
+                }
+
+            } catch(E) {
+                var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
+                    "system administrator or software developer the following:\n" + E + '\n';
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+    ]]>
+    </script>
+
+    <commandset id="util_browser_cmds">
+        <command id="cmd_broken" />
+        <command id="cmd_print" />
+        <command id="cmd_back" />
+        <command id="cmd_forward" />
+    </commandset>
+
+    <vbox flex="1">
+        <hbox>
+            <button id="back" label="Go Back" command="cmd_back" accesskey="b" disabled="true" hidden="true"/>
+            <button id="forward" label="Go Forward" command="cmd_forward" accesskey="d" disabled="true" hidden="true"/>
+            <spacer flex="1"/>
+            <label id="debug" value="Debug" disabled="true" onclick="var m = (this.getAttribute('tooltiptext')+'\n'); dump(m); alert(m);"/>
+            <button id="browser_print" label="Print Page" command="cmd_print" hidden="true"/>
+        </hbox>
+        <browser id="browser_browser" flex="1" type="content"/>
+    </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/fancy_prompt.xul b/Open-ILS/xul/staff_client/chrome/content/util/fancy_prompt.xul
index 7eed903edc..0579d5b975 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/fancy_prompt.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/util/fancy_prompt.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/en-US/lang.dtd"-->
+    <!--#include virtual="/opac/locale/en-US/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,131 +19,131 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="fancy_prompt_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		var xulG = {};
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		                if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for fancy_prompt.xul');
-
-				//JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-				//g.data.fancy_prompt_data = ''; g.data.stash('fancy_prompt_data');
-				//g.data.fancy_prompt_data = {};
-
-				//var key = location.pathname + location.search + location.hash;
-				//if (typeof g.data.modal_xulG_stack != 'undefined' && typeof g.data.modal_xulG_stack[key] != 'undefined') {
-				//	xulG = g.data.modal_xulG_stack[key][ g.data.modal_xulG_stack[key].length - 1 ];
-				//}
-
-				var top_xml = xul_param('top_xml',{'stash_name':xul_param('top_xml_in_stash',{'modal_xulG':true}),'modal_xulG':true});
-				if (top_xml) {
-					var parser = new DOMParser();
-					var doc = parser.parseFromString( top_xml, 'text/xml' );
-					var node = doc.documentElement;
-					if (node) document.getElementById('fancy_prompt_topbar').appendChild(node);
-				}
-
-				var my_xml = xul_param('xml',{'stash_name':xul_param('xml_in_stash',{'modal_xulG':true}),'modal_xulG':true});
-				if (my_xml) {
-					var parser = new DOMParser();
-					var doc = parser.parseFromString( my_xml, 'text/xml' );
-					var node = doc.documentElement;
-					if (node) document.getElementById('fancy_prompt_main').appendChild(node);
-				}
-
-				var bot_xml = xul_param('bottom_xml',{'stash_name':xul_param('bottom_xml_in_stash',{'modal_xulG':true}),'modal_xulG':true});;
-				if (bot_xml) {
-					var parser = new DOMParser();
-					var doc = parser.parseFromString( bot_xml, 'text/xml' );
-					var node = doc.documentElement;
-					if (node) document.getElementById('fancy_prompt_bottombar').appendChild(node);
-				}
-
-				var nl = document.getElementsByAttribute('name','fancy_submit');
-				for (var i = 0; i < nl.length; i++) {
-					nl[i].addEventListener('command',fancy_save,false);
-				}
-
-				var nl = document.getElementsByAttribute('name','fancy_cancel');
-				for (var i = 0; i < nl.length; i++) {
-					nl[i].addEventListener('command',function(ev) { window.close(); },false);
-				}
-
-				if (xul_param('title',{'modal_xulG':true})) {
-					try { window.title = xul_param('title',{'modal_xulG':true}); } catch(E) {}
-					try { document.title = xul_param('title',{'modal_xulG':true}); } catch(E) {}
-				}
-
-				if (xul_param('focus',{'modal_xulG':true})) {
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+
+        var xulG = {};
+
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                        if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for fancy_prompt.xul');
+
+                //JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+                //g.data.fancy_prompt_data = ''; g.data.stash('fancy_prompt_data');
+                //g.data.fancy_prompt_data = {};
+
+                //var key = location.pathname + location.search + location.hash;
+                //if (typeof g.data.modal_xulG_stack != 'undefined' && typeof g.data.modal_xulG_stack[key] != 'undefined') {
+                //    xulG = g.data.modal_xulG_stack[key][ g.data.modal_xulG_stack[key].length - 1 ];
+                //}
+
+                var top_xml = xul_param('top_xml',{'stash_name':xul_param('top_xml_in_stash',{'modal_xulG':true}),'modal_xulG':true});
+                if (top_xml) {
+                    var parser = new DOMParser();
+                    var doc = parser.parseFromString( top_xml, 'text/xml' );
+                    var node = doc.documentElement;
+                    if (node) document.getElementById('fancy_prompt_topbar').appendChild(node);
+                }
+
+                var my_xml = xul_param('xml',{'stash_name':xul_param('xml_in_stash',{'modal_xulG':true}),'modal_xulG':true});
+                if (my_xml) {
+                    var parser = new DOMParser();
+                    var doc = parser.parseFromString( my_xml, 'text/xml' );
+                    var node = doc.documentElement;
+                    if (node) document.getElementById('fancy_prompt_main').appendChild(node);
+                }
+
+                var bot_xml = xul_param('bottom_xml',{'stash_name':xul_param('bottom_xml_in_stash',{'modal_xulG':true}),'modal_xulG':true});;
+                if (bot_xml) {
+                    var parser = new DOMParser();
+                    var doc = parser.parseFromString( bot_xml, 'text/xml' );
+                    var node = doc.documentElement;
+                    if (node) document.getElementById('fancy_prompt_bottombar').appendChild(node);
+                }
+
+                var nl = document.getElementsByAttribute('name','fancy_submit');
+                for (var i = 0; i < nl.length; i++) {
+                    nl[i].addEventListener('command',fancy_save,false);
+                }
+
+                var nl = document.getElementsByAttribute('name','fancy_cancel');
+                for (var i = 0; i < nl.length; i++) {
+                    nl[i].addEventListener('command',function(ev) { window.close(); },false);
+                }
+
+                if (xul_param('title',{'modal_xulG':true})) {
+                    try { window.title = xul_param('title',{'modal_xulG':true}); } catch(E) {}
+                    try { document.title = xul_param('title',{'modal_xulG':true}); } catch(E) {}
+                }
+
+                if (xul_param('focus',{'modal_xulG':true})) {
                     var focus_element = document.getElementById(xul_param('focus',{'modal_xulG':true}));
                     if (focus_element) focus_element.focus();
                 }
 
-				JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-				xulG.fancy_status = 'incomplete';
-				var key = location.pathname + location.search + location.hash;
-				data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ] = xulG;
-				data.stash('modal_xulG_stack');
-
-			} catch(E) {
-				var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
-					"system administrator or software developer the following:\nfancy_prompt.xul\n" + E + '\n';
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function fancy_save(ev) {
-			try {
-				//if (ev.target.id) g.data.fancy_prompt_data[ ev.target.id ] = ev.target.value || ev.target.getAttribute('value');
-				//g.data.fancy_prompt_data[ 'fancy_submit' ] = ev.target.value || ev.target.getAttribute('value');
-				//var nl = document.getElementsByAttribute('name','fancy_data');
-				//for (var i = 0; i < nl.length; i++) {
-				//	g.data.fancy_prompt_data[ nl[i].id ] = nl[i].nodeName == 'checkbox' ? nl[i].checked : nl[i].value;
-				//}
-				//g.data.stash('fancy_prompt_data');
-	
-				JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-				if (ev.target.id) xulG[ ev.target.id ] = ev.target.value || ev.target.getAttribute('value');
-				xulG[ 'fancy_submit' ] = ev.target.value || ev.target.getAttribute('value');
-				var nl = document.getElementsByAttribute('name','fancy_data');
-					for (var i = 0; i < nl.length; i++) {
-					xulG[ nl[i].id ] = nl[i].nodeName == 'checkbox' ? nl[i].checked : nl[i].value;
-				}
-				xulG.fancy_status = 'complete';
-				var key = location.pathname + location.search + location.hash;
-				data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ] = xulG;
-				data.stash('modal_xulG_stack');
-	
-				window.close();
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('fancy_save',E); } catch(F) { alert('fancy_save ' + E + ' ' + F); }
-			}
-		}
-	]]>
-	</script>
-
-	<vbox id="fancy_prompt_topbar"/>
-	<vbox id="fancy_prompt_main" flex="1" style="overflow: auto"/>
-	<vbox id="fancy_prompt_bottombar"/>
+                JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+                xulG.fancy_status = 'incomplete';
+                var key = location.pathname + location.search + location.hash;
+                data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ] = xulG;
+                data.stash('modal_xulG_stack');
+
+            } catch(E) {
+                var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
+                    "system administrator or software developer the following:\nfancy_prompt.xul\n" + E + '\n';
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function fancy_save(ev) {
+            try {
+                //if (ev.target.id) g.data.fancy_prompt_data[ ev.target.id ] = ev.target.value || ev.target.getAttribute('value');
+                //g.data.fancy_prompt_data[ 'fancy_submit' ] = ev.target.value || ev.target.getAttribute('value');
+                //var nl = document.getElementsByAttribute('name','fancy_data');
+                //for (var i = 0; i < nl.length; i++) {
+                //    g.data.fancy_prompt_data[ nl[i].id ] = nl[i].nodeName == 'checkbox' ? nl[i].checked : nl[i].value;
+                //}
+                //g.data.stash('fancy_prompt_data');
+    
+                JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+                if (ev.target.id) xulG[ ev.target.id ] = ev.target.value || ev.target.getAttribute('value');
+                xulG[ 'fancy_submit' ] = ev.target.value || ev.target.getAttribute('value');
+                var nl = document.getElementsByAttribute('name','fancy_data');
+                    for (var i = 0; i < nl.length; i++) {
+                    xulG[ nl[i].id ] = nl[i].nodeName == 'checkbox' ? nl[i].checked : nl[i].value;
+                }
+                xulG.fancy_status = 'complete';
+                var key = location.pathname + location.search + location.hash;
+                data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ] = xulG;
+                data.stash('modal_xulG_stack');
+    
+                window.close();
+            } catch(E) {
+                try { g.error.standard_unexpected_error_alert('fancy_save',E); } catch(F) { alert('fancy_save ' + E + ' ' + F); }
+            }
+        }
+    ]]>
+    </script>
+
+    <vbox id="fancy_prompt_topbar"/>
+    <vbox id="fancy_prompt_main" flex="1" style="overflow: auto"/>
+    <vbox id="fancy_prompt_bottombar"/>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/fm_view.xul b/Open-ILS/xul/staff_client/chrome/content/util/fm_view.xul
index 0858796533..d53898bc47 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/fm_view.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/util/fm_view.xul
@@ -10,198 +10,198 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="fm_view_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { dump(E+'\n'); alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { dump(E+'\n'); alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
         <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="/xul/server/main/JSAN.js"/>
-
-	<script>
-	<![CDATA[
-		var tree;
-		var mw = {
-			'get_list_from_tree_selection' : function() {
-				var d = document; var tree_w;
-				if (arguments.length == 1) {
-					tree_w = arguments[0];
-				} else {
-					d = arguments[0];
-					tree_w = arguments[1];
-				}
-				var hitlist;
-				if (typeof(tree_w) != 'object') {
-					hitlist = d.getElementById(tree_w);
-				} else {
-					hitlist = tree_w;
-				}
-				var list = [];
-				var start = new Object();
-				var end = new Object();
-				var numRanges = hitlist.view.selection.getRangeCount();
-				for (var t=0; t<numRanges; t++){
-					hitlist.view.selection.getRangeAt(t,start,end);
-					for (var v=start.value; v<=end.value; v++){
-						var i = hitlist.contentView.getItemAtIndex(v);
-						list.push( i );
-					}
-				}
-				return list;
-			}
-		};
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		                if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.window'); g.window = new util.window();
-				JSAN.use('util.functional');
-				g.error.sdump('D_TRACE','my_init() for fm_view.xul');
-
-				var treechildren = window.document.getElementById('tc');
-				var fm = g.network.request('open-ils.actor','opensrf.open-ils.system.fieldmapper',[]);
-				var fma = []; var fmh = {} ; 
-				for (var i in fm) { fmh[ fm[i].hint ] = fm[i]; fma.push( [ fm[i].hint, i ] ); }
-				fma.sort();
-				for (var i = 0; i < fma.length; i++) {
-					var hint = fma[i][0]; var name = fma[i][1]; var o = fmh[ hint ];
-					var ti = window.document.createElement('treeitem');
-					treechildren.appendChild( ti );
-					ti.setAttribute( 'container', 'true' );
-					var tr = window.document.createElement('treerow');
-					ti.appendChild( tr );
-					var tc = window.document.createElement('treecell');
-					tr.appendChild( tc );
-					tc.setAttribute('label',hint);
-					tc = window.document.createElement('treecell');
-					tr.appendChild( tc );
-					tc.setAttribute('label', name );
-					var _treechildren = window.document.createElement( 'treechildren' );
-					ti.appendChild( _treechildren );
-					for (var j in o.fields) {
-						var _ti = window.document.createElement( 'treeitem' );
-						_treechildren.appendChild( _ti );
-						_ti.setAttribute('fm_class',hint);
-						_ti.setAttribute('fm_field',j);
-						_ti.setAttribute('fm_virtual',o.fields[j].virtual);
-						_ti.setAttribute('fm_position',o.fields[j].position);
-						var _tr = window.document.createElement( 'treerow' );
-						_ti.appendChild( _tr );
-						var _tc = window.document.createElement( 'treecell' );
-						_tr.appendChild( _tc );
-						_tc.setAttribute('label',j);
-						_tc = window.document.createElement( 'treecell' );
-						_tr.appendChild( _tc );
-						_tc.setAttribute('label','\t         Position: ' + o.fields[j].position + '  Virtual: ' + o.fields[j].virtual);
-					}
-				}
-				tree = window.document.getElementById('t');
-				tree.view.selection.select( 0 ); tree.focus();
-			} catch(E) {
-			}
-		}
-
-		function gen_cols() {
-			var data_url = 'data:application/vnd.mozilla.xul+xml,<?xml version="1.0"?><window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"><?xml-stylesheet href="chrome://global/skin" type="text/css"?><vbox flex="1"><textbox id="desc" multiline="true" flex="1"/></vbox></window>';
-			var w = g.window.SafeWindowOpen(data_url,'paged_tree cols','chrome,resizable,width=800,height=600');
-			var css = '<?xml-stylesheet href="data:text/css,#a{-moz-box-flex:1;}"?>';
-			var treeitems = mw.get_list_from_tree_selection( tree );
-			setTimeout(
-				function() {
-					var tb = w.document.getElementById('desc');
-					for (var i = 0; i < treeitems.length; i++) {
-						var hint = treeitems[i].getAttribute('fm_class');
-						var field = treeitems[i].getAttribute('fm_field');
-						var text = (
-							"{\n\t'id' : '" + field + "', 'label' : getString('" + hint + "_" + 
-							field + "_label'), 'flex' : 1,\n" + 
-							"\t'primary' : false, 'hidden' : false, 'fm_class' : '" + hint + 
-							"', 'fm_field_render' : '." + field + "()'\n},\n"
-						);
-						tb.value += text;
-					}
-					dump(tb.value + '\n');
-				}, 0
-			);
-		}
-
-		function gen_properties() {
-			var data_url = 'data:application/vnd.mozilla.xul+xml,<?xml version="1.0"?><window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"><?xml-stylesheet href="chrome://global/skin" type="text/css"?><vbox flex="1"><textbox id="desc" multiline="true" flex="1"/></vbox></window>';
-			var w = g.window.SafeWindowOpen(data_url,'paged_tree cols','chrome,resizable,width=800,height=600');
-			var css = '<?xml-stylesheet href="data:text/css,#a{-moz-box-flex:1;}"?>';
-			var treeitems = mw.get_list_from_tree_selection( tree );
-			setTimeout(
-				function() {
-					var tb = w.document.getElementById('desc');
-					for (var i = 0; i < treeitems.length; i++) {
-						var hint = treeitems[i].getAttribute('fm_class');
-						var field = treeitems[i].getAttribute('fm_field');
-						var pretty = util.functional.map_list(
-							field.split('_'),
-							function (s) {
-								return s.substr(0,1).toUpperCase() + s.substr(1);
-							}
-						).join(' ');
-						var text = (
-							hint + '_' + field + '_label=' + pretty + '\n'
-						);
-						tb.value += text;
-					}
-					dump(tb.value + '\n');
-				}, 0
-			);
-		}
-
-		function gen_wikitable() {
-			var data_url = 'data:application/vnd.mozilla.xul+xml,<?xml version="1.0"?><window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"><?xml-stylesheet href="chrome://global/skin" type="text/css"?><vbox flex="1"><textbox id="desc" multiline="true" flex="1"/></vbox></window>';
-			var w = g.window.SafeWindowOpen(data_url,'paged_tree cols','chrome,resizable,width=800,height=600');
-			var css = '<?xml-stylesheet href="data:text/css,#a{-moz-box-flex:1;}"?>';
-			var treeitems = mw.get_list_from_tree_selection( tree );
-			setTimeout(
-				function() {
-					var tb = w.document.getElementById('desc');
-					for (var i = 0; i < treeitems.length; i++) {
-						var hint = treeitems[i].getAttribute('fm_class');
-						var field = treeitems[i].getAttribute('fm_field');
-						var text = (
-							'|' + hint + '|' + field
-						);
-					
-						if (treeitems[i].getAttribute('fm_virtual') == '1') text += ' * ';
-						text +=	'|\n'
-						tb.value += text;
-					}
-					dump(tb.value + '\n');
-				}, 0
-			);
-		}
-
-
-	]]>
-	</script>
-
-	<vbox flex="1" class="my_overflow">
-		<groupbox orient="vertical" flex="1">
-			<caption label="Fieldmapper Class Viewer"/>
-			<hbox>
-				<button label="Generate paged_tree cols for selected fields" accesskey="G" oncommand="gen_cols();"/>
-				<button label="Generate string bundle properties for selected fields" accesskey="P" oncommand="gen_properties();"/>
-				<button label="Generate dokuwiki table for selected fields" accesskey="P" oncommand="gen_wikitable();"/>
-			</hbox>
-			<tree id="t" flex="1">
-				<treecols>
-					<treecol id="tcol1" label="opensrf.open-ils.system.fieldmapper" primary="true" flex="0"/>
-					<treecol id="tcol2" label="" flex="1"/>
-				</treecols>
-				<treechildren id="tc"/>
-			</tree>
-		</groupbox>
-	</vbox>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+
+    <script>
+    <![CDATA[
+        var tree;
+        var mw = {
+            'get_list_from_tree_selection' : function() {
+                var d = document; var tree_w;
+                if (arguments.length == 1) {
+                    tree_w = arguments[0];
+                } else {
+                    d = arguments[0];
+                    tree_w = arguments[1];
+                }
+                var hitlist;
+                if (typeof(tree_w) != 'object') {
+                    hitlist = d.getElementById(tree_w);
+                } else {
+                    hitlist = tree_w;
+                }
+                var list = [];
+                var start = new Object();
+                var end = new Object();
+                var numRanges = hitlist.view.selection.getRangeCount();
+                for (var t=0; t<numRanges; t++){
+                    hitlist.view.selection.getRangeAt(t,start,end);
+                    for (var v=start.value; v<=end.value; v++){
+                        var i = hitlist.contentView.getItemAtIndex(v);
+                        list.push( i );
+                    }
+                }
+                return list;
+            }
+        };
+
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                        if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                JSAN.use('util.network'); g.network = new util.network();
+                JSAN.use('util.window'); g.window = new util.window();
+                JSAN.use('util.functional');
+                g.error.sdump('D_TRACE','my_init() for fm_view.xul');
+
+                var treechildren = window.document.getElementById('tc');
+                var fm = g.network.request('open-ils.actor','opensrf.open-ils.system.fieldmapper',[]);
+                var fma = []; var fmh = {} ; 
+                for (var i in fm) { fmh[ fm[i].hint ] = fm[i]; fma.push( [ fm[i].hint, i ] ); }
+                fma.sort();
+                for (var i = 0; i < fma.length; i++) {
+                    var hint = fma[i][0]; var name = fma[i][1]; var o = fmh[ hint ];
+                    var ti = window.document.createElement('treeitem');
+                    treechildren.appendChild( ti );
+                    ti.setAttribute( 'container', 'true' );
+                    var tr = window.document.createElement('treerow');
+                    ti.appendChild( tr );
+                    var tc = window.document.createElement('treecell');
+                    tr.appendChild( tc );
+                    tc.setAttribute('label',hint);
+                    tc = window.document.createElement('treecell');
+                    tr.appendChild( tc );
+                    tc.setAttribute('label', name );
+                    var _treechildren = window.document.createElement( 'treechildren' );
+                    ti.appendChild( _treechildren );
+                    for (var j in o.fields) {
+                        var _ti = window.document.createElement( 'treeitem' );
+                        _treechildren.appendChild( _ti );
+                        _ti.setAttribute('fm_class',hint);
+                        _ti.setAttribute('fm_field',j);
+                        _ti.setAttribute('fm_virtual',o.fields[j].virtual);
+                        _ti.setAttribute('fm_position',o.fields[j].position);
+                        var _tr = window.document.createElement( 'treerow' );
+                        _ti.appendChild( _tr );
+                        var _tc = window.document.createElement( 'treecell' );
+                        _tr.appendChild( _tc );
+                        _tc.setAttribute('label',j);
+                        _tc = window.document.createElement( 'treecell' );
+                        _tr.appendChild( _tc );
+                        _tc.setAttribute('label','\t         Position: ' + o.fields[j].position + '  Virtual: ' + o.fields[j].virtual);
+                    }
+                }
+                tree = window.document.getElementById('t');
+                tree.view.selection.select( 0 ); tree.focus();
+            } catch(E) {
+            }
+        }
+
+        function gen_cols() {
+            var data_url = 'data:application/vnd.mozilla.xul+xml,<?xml version="1.0"?><window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"><?xml-stylesheet href="chrome://global/skin" type="text/css"?><vbox flex="1"><textbox id="desc" multiline="true" flex="1"/></vbox></window>';
+            var w = g.window.SafeWindowOpen(data_url,'paged_tree cols','chrome,resizable,width=800,height=600');
+            var css = '<?xml-stylesheet href="data:text/css,#a{-moz-box-flex:1;}"?>';
+            var treeitems = mw.get_list_from_tree_selection( tree );
+            setTimeout(
+                function() {
+                    var tb = w.document.getElementById('desc');
+                    for (var i = 0; i < treeitems.length; i++) {
+                        var hint = treeitems[i].getAttribute('fm_class');
+                        var field = treeitems[i].getAttribute('fm_field');
+                        var text = (
+                            "{\n\t'id' : '" + field + "', 'label' : getString('" + hint + "_" + 
+                            field + "_label'), 'flex' : 1,\n" + 
+                            "\t'primary' : false, 'hidden' : false, 'fm_class' : '" + hint + 
+                            "', 'fm_field_render' : '." + field + "()'\n},\n"
+                        );
+                        tb.value += text;
+                    }
+                    dump(tb.value + '\n');
+                }, 0
+            );
+        }
+
+        function gen_properties() {
+            var data_url = 'data:application/vnd.mozilla.xul+xml,<?xml version="1.0"?><window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"><?xml-stylesheet href="chrome://global/skin" type="text/css"?><vbox flex="1"><textbox id="desc" multiline="true" flex="1"/></vbox></window>';
+            var w = g.window.SafeWindowOpen(data_url,'paged_tree cols','chrome,resizable,width=800,height=600');
+            var css = '<?xml-stylesheet href="data:text/css,#a{-moz-box-flex:1;}"?>';
+            var treeitems = mw.get_list_from_tree_selection( tree );
+            setTimeout(
+                function() {
+                    var tb = w.document.getElementById('desc');
+                    for (var i = 0; i < treeitems.length; i++) {
+                        var hint = treeitems[i].getAttribute('fm_class');
+                        var field = treeitems[i].getAttribute('fm_field');
+                        var pretty = util.functional.map_list(
+                            field.split('_'),
+                            function (s) {
+                                return s.substr(0,1).toUpperCase() + s.substr(1);
+                            }
+                        ).join(' ');
+                        var text = (
+                            hint + '_' + field + '_label=' + pretty + '\n'
+                        );
+                        tb.value += text;
+                    }
+                    dump(tb.value + '\n');
+                }, 0
+            );
+        }
+
+        function gen_wikitable() {
+            var data_url = 'data:application/vnd.mozilla.xul+xml,<?xml version="1.0"?><window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"><?xml-stylesheet href="chrome://global/skin" type="text/css"?><vbox flex="1"><textbox id="desc" multiline="true" flex="1"/></vbox></window>';
+            var w = g.window.SafeWindowOpen(data_url,'paged_tree cols','chrome,resizable,width=800,height=600');
+            var css = '<?xml-stylesheet href="data:text/css,#a{-moz-box-flex:1;}"?>';
+            var treeitems = mw.get_list_from_tree_selection( tree );
+            setTimeout(
+                function() {
+                    var tb = w.document.getElementById('desc');
+                    for (var i = 0; i < treeitems.length; i++) {
+                        var hint = treeitems[i].getAttribute('fm_class');
+                        var field = treeitems[i].getAttribute('fm_field');
+                        var text = (
+                            '|' + hint + '|' + field
+                        );
+                    
+                        if (treeitems[i].getAttribute('fm_virtual') == '1') text += ' * ';
+                        text +=    '|\n'
+                        tb.value += text;
+                    }
+                    dump(tb.value + '\n');
+                }, 0
+            );
+        }
+
+
+    ]]>
+    </script>
+
+    <vbox flex="1" class="my_overflow">
+        <groupbox orient="vertical" flex="1">
+            <caption label="Fieldmapper Class Viewer"/>
+            <hbox>
+                <button label="Generate paged_tree cols for selected fields" accesskey="G" oncommand="gen_cols();"/>
+                <button label="Generate string bundle properties for selected fields" accesskey="P" oncommand="gen_properties();"/>
+                <button label="Generate dokuwiki table for selected fields" accesskey="P" oncommand="gen_wikitable();"/>
+            </hbox>
+            <tree id="t" flex="1">
+                <treecols>
+                    <treecol id="tcol1" label="opensrf.open-ils.system.fieldmapper" primary="true" flex="0"/>
+                    <treecol id="tcol2" label="" flex="1"/>
+                </treecols>
+                <treechildren id="tc"/>
+            </tree>
+        </groupbox>
+    </vbox>
 
 </window>
 
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 630953cdb9..45aa5953bf 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
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/en-US/lang.dtd"-->
+    <!--#include virtual="/opac/locale/en-US/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,90 +19,90 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="util_list_clipboard_win" 
-	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">
+    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">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function $(id) { return document.getElementById(id); }
-		function $c(n) { return document.createElement(n); }
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		                if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for util_list_clipboard.xul');
-
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
-				if (! g.data.list_clipboard ) {
-					window.close();
-				} else {
-					for (var i = 0; i < g.data.list_clipboard.length; i++) {
-						var data_row = g.data.list_clipboard[i];
-						make_grid(data_row);
-					}
-				}
-
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('util/list_clipboard.xul',E); } catch(F) { alert(E); }
-			}
-		}
-
-		function make_grid(data_row) {
-			try {
-				var vbox = $c('vbox'); vbox.setAttribute('flex','1'); $('area').appendChild(vbox);
-				var grid = $c('grid'); grid.setAttribute('flex','1'); grid.setAttribute('style','border: solid black');  vbox.appendChild(grid);
-				var columns = $c('columns'); grid.appendChild(columns);
-				var c1 = $c('column'); c1.setAttribute('flex','1'); columns.appendChild(c1);
-				var c2 = $c('column'); c2.setAttribute('flex','1'); columns.appendChild(c2);
-				var rows = $c('rows'); grid.appendChild(rows);
-				var data_row2 = [];
-				for (j in data_row) {
-					data_row2.push( { 'label' : j, 'value' : data_row[j] } );
-				}
-				data_row2.sort( function(a,b) { if ( a.label < b.label ) return -1; else return 1; } );
-				for (var j = 0; j < data_row2.length; j++) {
-					var label = data_row2[j].label;
-					var value = data_row2[j].value;
-					if (value == '???' || value == '' || value == 'undefined') continue;
-					var row = $c('row'); 
-					var l1 = $c('label'); l1.setAttribute('value',label); row.appendChild(l1);
-					var l2 = $c('label'); l2.setAttribute('value',value); 
-					l2.setAttribute('style','text-decoration: underline; color: blue; -moz-user-focus: normal'); 
-					l2.setAttribute('onfocus','this.setAttribute("class","clipboard_outline_me")');
-					l2.setAttribute('onblur','this.setAttribute("class","")');
-					l2.setAttribute('onclick','copy_to_clipboard(event); window.close();');
-					row.appendChild(l2);
-					rows.appendChild(row);
-					if (!g.focus) { g.focus = true; l2.focus(); }
-				}
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('util/list_clipboard.xul, make_grid',E); } catch(F) { alert(E); }
-			}
-		}
-
-	]]>
-	</script>
-
-	<description style="font-weight: bold">Choose the data to copy into the clipboard:</description>
-
-	<hbox id="area" flex="1" style="overflow: scroll">
-	</hbox>
-
-	<hbox><spacer flex="1"/><button label="Close" accesskey="C" oncommand="window.close()"/></hbox>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+
+        function $(id) { return document.getElementById(id); }
+        function $c(n) { return document.createElement(n); }
+
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                        if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for util_list_clipboard.xul');
+
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
+                if (! g.data.list_clipboard ) {
+                    window.close();
+                } else {
+                    for (var i = 0; i < g.data.list_clipboard.length; i++) {
+                        var data_row = g.data.list_clipboard[i];
+                        make_grid(data_row);
+                    }
+                }
+
+            } catch(E) {
+                try { g.error.standard_unexpected_error_alert('util/list_clipboard.xul',E); } catch(F) { alert(E); }
+            }
+        }
+
+        function make_grid(data_row) {
+            try {
+                var vbox = $c('vbox'); vbox.setAttribute('flex','1'); $('area').appendChild(vbox);
+                var grid = $c('grid'); grid.setAttribute('flex','1'); grid.setAttribute('style','border: solid black');  vbox.appendChild(grid);
+                var columns = $c('columns'); grid.appendChild(columns);
+                var c1 = $c('column'); c1.setAttribute('flex','1'); columns.appendChild(c1);
+                var c2 = $c('column'); c2.setAttribute('flex','1'); columns.appendChild(c2);
+                var rows = $c('rows'); grid.appendChild(rows);
+                var data_row2 = [];
+                for (j in data_row) {
+                    data_row2.push( { 'label' : j, 'value' : data_row[j] } );
+                }
+                data_row2.sort( function(a,b) { if ( a.label < b.label ) return -1; else return 1; } );
+                for (var j = 0; j < data_row2.length; j++) {
+                    var label = data_row2[j].label;
+                    var value = data_row2[j].value;
+                    if (value == '???' || value == '' || value == 'undefined') continue;
+                    var row = $c('row'); 
+                    var l1 = $c('label'); l1.setAttribute('value',label); row.appendChild(l1);
+                    var l2 = $c('label'); l2.setAttribute('value',value); 
+                    l2.setAttribute('style','text-decoration: underline; color: blue; -moz-user-focus: normal'); 
+                    l2.setAttribute('onfocus','this.setAttribute("class","clipboard_outline_me")');
+                    l2.setAttribute('onblur','this.setAttribute("class","")');
+                    l2.setAttribute('onclick','copy_to_clipboard(event); window.close();');
+                    row.appendChild(l2);
+                    rows.appendChild(row);
+                    if (!g.focus) { g.focus = true; l2.focus(); }
+                }
+            } catch(E) {
+                try { g.error.standard_unexpected_error_alert('util/list_clipboard.xul, make_grid',E); } catch(F) { alert(E); }
+            }
+        }
+
+    ]]>
+    </script>
+
+    <description style="font-weight: bold">Choose the data to copy into the clipboard:</description>
+
+    <hbox id="area" flex="1" style="overflow: scroll">
+    </hbox>
+
+    <hbox><spacer flex="1"/><button label="Close" accesskey="C" oncommand="window.close()"/></hbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/rbrowser.xul b/Open-ILS/xul/staff_client/chrome/content/util/rbrowser.xul
index 0062dde462..133336202d 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/rbrowser.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/util/rbrowser.xul
@@ -17,104 +17,104 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="util_browser_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		                if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for util_browser.xul');
-
-				var name = xul_param('tab_name') || xul_param('name') || null;
-				var url; try { url = xul_param('url'); } catch(E) { dump(E + '\n'); };
-				if (!url) url = urls.browser;
-
-				if (!g.browser) {
-					JSAN.use('util.browser'); g.browser = new util.browser();
-				}
-
-				var push_xulG = true;
-				if (xul_param('no_xulG')) push_xulG = false;
-
-				var alt_print = false;
-				if (xul_param('alternate_print')) alt_print = true;
-
-				var p = { 
-					'url' : url,
-					'push_xulG' : push_xulG,
-					'alt_print' : alt_print,
-				} 
-				if (typeof window.xulG == 'object' && typeof window.xulG.passthru_content_params == 'object') {
-					p.passthru_content_params = window.xulG.passthru_content_params;
-				}
-				if (typeof window.xulG == 'object' && typeof window.xulG.on_url_load == 'function') {
-					p.on_url_load = window.xulG.on_url_load;
-				}
-
-				g.browser.init( p );
-
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					if (name) try { window.xulG.set_tab_name(name); } catch(E) { alert(E); }
-				}
-				if (xul_param('show_nav_buttons')) {
-					document.getElementById('back').hidden = false;
-					document.getElementById('forward').hidden = false;
-				}
-				if (xul_param('show_print_button')) {
-					document.getElementById('browser_print').hidden = false;
-				}
-
-				if (xul_param('title')) {
-					try { document.title = xul_param('title'); } catch(E) {}
-					try { window.title = xul_param('title'); } catch(E) {}
-				}
-
-			} catch(E) {
-				var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
-					"system administrator or software developer the following:\n" + E + '\n';
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-	]]>
-	</script>
-
-	<commandset id="util_browser_cmds">
-		<command id="cmd_broken" />
-		<command id="cmd_print" />
-		<command id="cmd_back" />
-		<command id="cmd_forward" />
-	</commandset>
-
-	<vbox flex="1">
-		<hbox>
-			<button id="back" label="Go Back" command="cmd_back" accesskey="b" disabled="true" hidden="true"/>
-			<button id="forward" label="Go Forward" command="cmd_forward" accesskey="d" disabled="true" hidden="true"/>
-			<spacer flex="1"/>
-			<button id="browser_print" label="Print Page" oldcommand="cmd_print" hidden="true"
-				oncommand="netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); if (g.browser.alt_print) { JSAN.use('util.print'); var p = new util.print(); p.NSPrint(g.browser.get_content(),false,{}); } else { g.browser.get_content().print(); }"
-			/>
-
-		</hbox>
-		<browser id="browser_browser" flex="1" type="content"/>
-	</vbox>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                        if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for util_browser.xul');
+
+                var name = xul_param('tab_name') || xul_param('name') || null;
+                var url; try { url = xul_param('url'); } catch(E) { dump(E + '\n'); };
+                if (!url) url = urls.browser;
+
+                if (!g.browser) {
+                    JSAN.use('util.browser'); g.browser = new util.browser();
+                }
+
+                var push_xulG = true;
+                if (xul_param('no_xulG')) push_xulG = false;
+
+                var alt_print = false;
+                if (xul_param('alternate_print')) alt_print = true;
+
+                var p = { 
+                    'url' : url,
+                    'push_xulG' : push_xulG,
+                    'alt_print' : alt_print,
+                } 
+                if (typeof window.xulG == 'object' && typeof window.xulG.passthru_content_params == 'object') {
+                    p.passthru_content_params = window.xulG.passthru_content_params;
+                }
+                if (typeof window.xulG == 'object' && typeof window.xulG.on_url_load == 'function') {
+                    p.on_url_load = window.xulG.on_url_load;
+                }
+
+                g.browser.init( p );
+
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+                    if (name) try { window.xulG.set_tab_name(name); } catch(E) { alert(E); }
+                }
+                if (xul_param('show_nav_buttons')) {
+                    document.getElementById('back').hidden = false;
+                    document.getElementById('forward').hidden = false;
+                }
+                if (xul_param('show_print_button')) {
+                    document.getElementById('browser_print').hidden = false;
+                }
+
+                if (xul_param('title')) {
+                    try { document.title = xul_param('title'); } catch(E) {}
+                    try { window.title = xul_param('title'); } catch(E) {}
+                }
+
+            } catch(E) {
+                var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
+                    "system administrator or software developer the following:\n" + E + '\n';
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+    ]]>
+    </script>
+
+    <commandset id="util_browser_cmds">
+        <command id="cmd_broken" />
+        <command id="cmd_print" />
+        <command id="cmd_back" />
+        <command id="cmd_forward" />
+    </commandset>
+
+    <vbox flex="1">
+        <hbox>
+            <button id="back" label="Go Back" command="cmd_back" accesskey="b" disabled="true" hidden="true"/>
+            <button id="forward" label="Go Forward" command="cmd_forward" accesskey="d" disabled="true" hidden="true"/>
+            <spacer flex="1"/>
+            <button id="browser_print" label="Print Page" oldcommand="cmd_print" hidden="true"
+                oncommand="netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); if (g.browser.alt_print) { JSAN.use('util.print'); var p = new util.print(); p.NSPrint(g.browser.get_content(),false,{}); } else { g.browser.get_content().print(); }"
+            />
+
+        </hbox>
+        <browser id="browser_browser" flex="1" type="content"/>
+    </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/skin/global.css b/Open-ILS/xul/staff_client/chrome/skin/global.css
index 2972bc9e8c..cde1de2665 100644
--- a/Open-ILS/xul/staff_client/chrome/skin/global.css
+++ b/Open-ILS/xul/staff_client/chrome/skin/global.css
@@ -50,12 +50,12 @@ messagecatalog { -moz-binding: url('chrome://open_ils_staff_client/content/main/
 .fixed_textbox { }
 .marc_buttons_box description { font-weight: bold; }
 .marc { 
-	-moz-appearance: none;
-	font-family: monospace;
-	font-size: x-large;
-	border: none;
-	padding: 0px; 
-	margin: 0px; 
+    -moz-appearance: none;
+    font-family: monospace;
+    font-size: x-large;
+    border: none;
+    padding: 0px; 
+    margin: 0px; 
 }
 .marc:hover { background-color: #DDDDDD; }
 .invalid { background-color: #FF8888; }
diff --git a/Open-ILS/xul/staff_client/external/dojo_template.xul b/Open-ILS/xul/staff_client/external/dojo_template.xul
index f154820c5c..5d509247b7 100644
--- a/Open-ILS/xul/staff_client/external/dojo_template.xul
+++ b/Open-ILS/xul/staff_client/external/dojo_template.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -18,18 +18,18 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="main_test_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;
-	</script>
-	<scripts id="openils_util_scripts"/>
-
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="dojo_template.js"/>
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <script type="text/javascript">
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;
+    </script>
+    <scripts id="openils_util_scripts"/>
+
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="dojo_template.js"/>
 
     <label value="retrieving coust's with dojo and PermaCrud..."/>
 
diff --git a/Open-ILS/xul/staff_client/external/template.xul b/Open-ILS/xul/staff_client/external/template.xul
index 274b560b40..da3522376a 100644
--- a/Open-ILS/xul/staff_client/external/template.xul
+++ b/Open-ILS/xul/staff_client/external/template.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -18,56 +18,56 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="example_template_win" 
-	onload="try { my_init(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for example_template.xul');
-
-				g.cgi = new CGI();
-				var session = g.cgi.param('session');
-
-				JSAN.use('example.template'); g.template = new example.template();
-
-				g.template.init( 
-					{ 
-						'session' : session,
-					} 
-				);
-
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name('Template'); } catch(E) { alert(E); }
-				}
-
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('example/template.xul',E); } catch(F) { alert(E); }
-			}
-		}
-
-	]]>
-	</script>
-
-	<commandset id="example_template_cmds">
-		<command id="cmd_broken" />
-	</commandset>
-
-	<browser id="template_browser" flex="1"/>
+    onload="try { my_init(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <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="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for example_template.xul');
+
+                g.cgi = new CGI();
+                var session = g.cgi.param('session');
+
+                JSAN.use('example.template'); g.template = new example.template();
+
+                g.template.init( 
+                    { 
+                        'session' : session,
+                    } 
+                );
+
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+                    try { window.xulG.set_tab_name('Template'); } catch(E) { alert(E); }
+                }
+
+            } catch(E) {
+                try { g.error.standard_unexpected_error_alert('example/template.xul',E); } catch(F) { alert(E); }
+            }
+        }
+
+    ]]>
+    </script>
+
+    <commandset id="example_template_cmds">
+        <command id="cmd_broken" />
+    </commandset>
+
+    <browser id="template_browser" flex="1"/>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
index 0ab154de40..135088b26f 100644
--- a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
@@ -5,13 +5,13 @@
 <overlay id="openils_util_overlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<scripts id="openils_util_scripts">
-		<script>dump('starting openils_util_overlay in ' + location.href + '\n');</script>
-		<script>var djConfig = { 'baseUrl' : '/js/dojo/dojo/',parseOnLoad: true,isDebug:false };</script>
-		<script type="text/javascript" src="/js/dojo/dojo/dojo.js" />
-		<script>try { dojo.require('fieldmapper.AutoIDL'); } catch(E) { alert(E); }</script>
-		<script type="text/javascript" src="/xul/server/main/constants.js" />
-		<script type="text/javascript" src="/xul/server/OpenILS/data.js" />
+    <scripts id="openils_util_scripts">
+        <script>dump('starting openils_util_overlay in ' + location.href + '\n');</script>
+        <script>var djConfig = { 'baseUrl' : '/js/dojo/dojo/',parseOnLoad: true,isDebug:false };</script>
+        <script type="text/javascript" src="/js/dojo/dojo/dojo.js" />
+        <script>try { dojo.require('fieldmapper.AutoIDL'); } catch(E) { alert(E); }</script>
+        <script type="text/javascript" src="/xul/server/main/constants.js" />
+        <script type="text/javascript" src="/xul/server/OpenILS/data.js" />
         <script type="text/javascript" src="/xul/server/util/barcode.js" />
         <script type="text/javascript" src="/xul/server/util/browser.js" />
         <script type="text/javascript" src="/xul/server/util/clipboard.js" />
@@ -32,13 +32,13 @@
         <script type="text/javascript" src="/xul/server/util/text.js" />
         <script type="text/javascript" src="/xul/server/util/widgets.js" />
         <script type="text/javascript" src="/xul/server/util/window.js" />
-		<script type="text/javascript" src="/opac/common/js/utils.js" />
-		<script type="text/javascript" src="/opac/common/js/CGI.js" />
-		<script type="text/javascript" src="/opac/common/js/md5.js" />
-		<script type="text/javascript" src="/opac/common/js/RemoteRequest.js" />
-		<script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js' />
-		<script type="text/javascript" src="/opac/common/js/org_utils.js" />   
-		<script type="text/javascript" src="global_util.js" />   
+        <script type="text/javascript" src="/opac/common/js/utils.js" />
+        <script type="text/javascript" src="/opac/common/js/CGI.js" />
+        <script type="text/javascript" src="/opac/common/js/md5.js" />
+        <script type="text/javascript" src="/opac/common/js/RemoteRequest.js" />
+        <script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js' />
+        <script type="text/javascript" src="/opac/common/js/org_utils.js" />   
+        <script type="text/javascript" src="global_util.js" />   
         <menupopup id="clipboard">
             <menuitem label="&common.textbox.cut;" oncommand="util.clipboard.cut()" />
             <menuitem label="&common.textbox.copy;" oncommand="util.clipboard.copy()" />
@@ -46,11 +46,11 @@
             <menuitem label="&common.textbox.delete;" oncommand="document.popupNode.value = ''" />
             <menuitem label="&common.textbox.select_all;" oncommand="document.popupNode.select()" />
         </menupopup>
-		<messagecatalog id="commonStrings" src='/xul/server/locale/<!--#echo var="locale"-->/common.properties'/>
-		<messagecatalog id="offlineStrings" src='/xul/server/locale/<!--#echo var="locale"-->/offline.properties'/>
-		<messagecatalog id="authStrings" src='/xul/server/locale/<!--#echo var="locale"-->/auth.properties'/>
-		<script>dump('finished openils_util_overlay\n');</script>
-	</scripts>
+        <messagecatalog id="commonStrings" src='/xul/server/locale/<!--#echo var="locale"-->/common.properties'/>
+        <messagecatalog id="offlineStrings" src='/xul/server/locale/<!--#echo var="locale"-->/offline.properties'/>
+        <messagecatalog id="authStrings" src='/xul/server/locale/<!--#echo var="locale"-->/auth.properties'/>
+        <script>dump('finished openils_util_overlay\n');</script>
+    </scripts>
 
 </overlay>
 
diff --git a/Open-ILS/xul/staff_client/server/admin/admin.css b/Open-ILS/xul/staff_client/server/admin/admin.css
index a35af6aa74..abbf3971b9 100644
--- a/Open-ILS/xul/staff_client/server/admin/admin.css
+++ b/Open-ILS/xul/staff_client/server/admin/admin.css
@@ -28,28 +28,28 @@ input[type="text"]:disabled { color: #555555; }
 .tall { height:100%; }
 
 button {
-	color:#050;
-	font-family:'trebuchet ms',helvetica,sans-serif;
-	font-size:84%;
-	font-weight:bold;
-	background-color:#fed;
-	border:1px solid;
-	border-top-color:#696;
-	border-left-color:#696;
-	border-right-color:#363;
-	border-bottom-color:#363;
-	margin: 4px;
+    color:#050;
+    font-family:'trebuchet ms',helvetica,sans-serif;
+    font-size:84%;
+    font-weight:bold;
+    background-color:#fed;
+    border:1px solid;
+    border-top-color:#696;
+    border-left-color:#696;
+    border-right-color:#363;
+    border-bottom-color:#363;
+    margin: 4px;
 }
 
 button:disabled  { 
-	color: #808080; 
-	background: #E0E0E0; 
-	border: 1px solid #808080;
+    color: #808080; 
+    background: #E0E0E0; 
+    border: 1px solid #808080;
 }
 
 .cal_img {
-	cursor: pointer; 
-	border: 1px solid red; 
-	padding: 0px; margin: 0px; 
+    cursor: pointer; 
+    border: 1px solid red; 
+    padding: 0px; margin: 0px; 
 }
 .cal_img:hover { background: red ; }
diff --git a/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml b/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
index 51633b339a..0605b94bb6 100644
--- a/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
@@ -1,96 +1,96 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>&staff.server.admin.cash.title;</title>
-		<script language='javascript' src='/opac/common/js/utils.js'> </script>
-		<script language='javascript' src='/opac/common/js//config.js'> </script>
-		<script language='javascript' src='/opac/common/js/CGI.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookie.js'> </script>
-	
-		<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmall.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
-		<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
-		<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/init.js'> </script>
-		<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-		<script language='javascript' src='adminlib.js'> </script>
-		<script language='javascript' src='cash_reports.js'> </script>
-
-		<script language='javascript' src='/opac/common/js/sorttable.js'> </script>
-
-		<script language='javascript' src='/opac/common/js/fm_table.js'> </script>
-		<script language='javascript' src='/opac/common/js/fm_table_conf.js'> </script>
-
-		<link rel="stylesheet" type="text/css" media="all" 
-			href="/opac/common/js/jscalendar/calendar-brown.css" title="win2k-cold-1" />
-		<script type="text/javascript" src="/opac/common/js/jscalendar/calendar.js"></script>
-		<script type="text/javascript" src="/opac/common/js/jscalendar/lang/calendar-en.js"></script>
-		<script type="text/javascript" src="/opac/common/js/jscalendar/calendar-setup.js"></script>
-
-
-		<link type='text/css' rel='stylesheet' href='admin.css' />
-		<link type='text/css' rel='stylesheet' href="/opac/common/css/fm_table.css"/>
-	</head>
-
-	<body onload='crInit();'>
-
-		<div class='welcome_box'>
-			<span>&staff.server.admin.cash.welcome;</span><b><span id='user'/></b>
-		</div>
-
-		<center>
-
-			<span style='padding-left: 15px;'>&staff.server.admin.cash.start_date;</span>
-			<input type='text' id='cr_start' size='10' maxlength='10'> </input>
-			<button style='padding: 0px;' id='cr_start_trigger'>
-				<img src="/opac/common/js/jscalendar/img.gif" 
-					style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
-					title="&staff.server.admin.cash.date.select;"
-					onmouseover="this.style.background='red';" 
-					onmouseout="this.style.background=''" />
-			</button>
-
-			<span style='padding-left: 15px;'>&staff.server.admin.cash.end_date;</span>
-			<input type='text' id='cr_end' size='10' maxlength='10'> </input>
-			<button style='padding: 0px;' id='cr_end_trigger'>
-				<img src="/opac/common/js/jscalendar/img.gif" 
-					style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
-					title="&staff.server.admin.cash.date.select;"
-					onmouseover="this.style.background='red';" 
-					onmouseout="this.style.background=''" />
-			</button>
-
-			<div class='pad' style='padding-left: 10px; font-size: 8pt;'>&staff.server.admin.cash.date_format;</div>
-
-			<div>&staff.server.admin.cash.view; <select id='cr_orgs' style='width:auto;'/></div>
-			<div><button onclick='crDrawRange();'>&staff.server.admin.cash.submit;</button></div>
-
-
-			<div id='cr_desk_payments_div'>
-				<h2>&staff.server.admin.cash.desk;</h2>
-				<div id='cr_desk_payments'/>
-			</div>
-			
-			<br/><hr/><br/>
-
-			<div id='cr_user_payments_div'>
-				<h2>&staff.server.admin.cash.user;</h2>
-				<div id='cr_user_payments'/>
-			</div>
-
-		</center>
-	</body>
+    <head>
+        <title>&staff.server.admin.cash.title;</title>
+        <script language='javascript' src='/opac/common/js/utils.js'> </script>
+        <script language='javascript' src='/opac/common/js//config.js'> </script>
+        <script language='javascript' src='/opac/common/js/CGI.js'> </script>
+        <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
+    
+        <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
+        <script language='javascript' src='/opac/common/js/fmall.js'> </script>
+        <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
+        <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
+        <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
+        <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
+        <script language='javascript' src='/opac/common/js/org_utils.js'> </script>
+        <script language='javascript' src='/opac/common/js/init.js'> </script>
+        <script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
+        <script language='javascript' src='adminlib.js'> </script>
+        <script language='javascript' src='cash_reports.js'> </script>
+
+        <script language='javascript' src='/opac/common/js/sorttable.js'> </script>
+
+        <script language='javascript' src='/opac/common/js/fm_table.js'> </script>
+        <script language='javascript' src='/opac/common/js/fm_table_conf.js'> </script>
+
+        <link rel="stylesheet" type="text/css" media="all" 
+            href="/opac/common/js/jscalendar/calendar-brown.css" title="win2k-cold-1" />
+        <script type="text/javascript" src="/opac/common/js/jscalendar/calendar.js"></script>
+        <script type="text/javascript" src="/opac/common/js/jscalendar/lang/calendar-en.js"></script>
+        <script type="text/javascript" src="/opac/common/js/jscalendar/calendar-setup.js"></script>
+
+
+        <link type='text/css' rel='stylesheet' href='admin.css' />
+        <link type='text/css' rel='stylesheet' href="/opac/common/css/fm_table.css"/>
+    </head>
+
+    <body onload='crInit();'>
+
+        <div class='welcome_box'>
+            <span>&staff.server.admin.cash.welcome;</span><b><span id='user'/></b>
+        </div>
+
+        <center>
+
+            <span style='padding-left: 15px;'>&staff.server.admin.cash.start_date;</span>
+            <input type='text' id='cr_start' size='10' maxlength='10'> </input>
+            <button style='padding: 0px;' id='cr_start_trigger'>
+                <img src="/opac/common/js/jscalendar/img.gif" 
+                    style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
+                    title="&staff.server.admin.cash.date.select;"
+                    onmouseover="this.style.background='red';" 
+                    onmouseout="this.style.background=''" />
+            </button>
+
+            <span style='padding-left: 15px;'>&staff.server.admin.cash.end_date;</span>
+            <input type='text' id='cr_end' size='10' maxlength='10'> </input>
+            <button style='padding: 0px;' id='cr_end_trigger'>
+                <img src="/opac/common/js/jscalendar/img.gif" 
+                    style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
+                    title="&staff.server.admin.cash.date.select;"
+                    onmouseover="this.style.background='red';" 
+                    onmouseout="this.style.background=''" />
+            </button>
+
+            <div class='pad' style='padding-left: 10px; font-size: 8pt;'>&staff.server.admin.cash.date_format;</div>
+
+            <div>&staff.server.admin.cash.view; <select id='cr_orgs' style='width:auto;'/></div>
+            <div><button onclick='crDrawRange();'>&staff.server.admin.cash.submit;</button></div>
+
+
+            <div id='cr_desk_payments_div'>
+                <h2>&staff.server.admin.cash.desk;</h2>
+                <div id='cr_desk_payments'/>
+            </div>
+            
+            <br/><hr/><br/>
+
+            <div id='cr_user_payments_div'>
+                <h2>&staff.server.admin.cash.user;</h2>
+                <div id='cr_user_payments'/>
+            </div>
+
+        </center>
+    </body>
 </html>
 
 
diff --git a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
index 78a13390d4..af8ed45866 100644
--- a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
@@ -1,233 +1,233 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>&staff.server.admin.closed_dates.title;</title>
-		<script type='text/javascript' src='/opac/common/js/utils.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/config.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/CGI.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/JSON_v1.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/fmall.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/fmgen.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/Cookies.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/opac_utils.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/org_utils.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/init.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/Date.W3CDTF.js'> </script>
-		<script type='text/javascript' src='adminlib.js'> </script>
-		<script type='text/javascript' src='closed_dates.js'> </script>
-
-		<link rel="stylesheet" type="text/css" media="all" 
-			href="/opac/common/js/jscalendar/calendar-brown.css" title="win2k-cold-1" />
-		<script type="text/javascript" src="/opac/common/js/jscalendar/calendar.js"></script>
-		<script type="text/javascript" src="/opac/common/js/jscalendar/lang/calendar-en.js"></script>
-		<script type="text/javascript" src="/opac/common/js/jscalendar/calendar-setup.js"></script>
-
-		<link type='text/css' rel='stylesheet' href='admin.css'/>
-
-		<style type='text/css'>
-			span { padding: 6px; }
-			b { padding: 6px; }
-		</style>
-	</head>
-
-	<body onload='try{cdEditorInit();}catch(e){alert(js2JSON(e));}'>
-
-		<div class='welcome_box'>
-			<span>&staff.server.admin.closed_dates.welcome;</span><b><span id='cd_user'/></b>
-		</div>
-
-		<center>
-			<div class='title'>&staff.server.admin.closed_dates.editor.title;</div>
-
-			<br/>
-			&staff.server.admin.closed_dates.editor.for;<select id='cd_orgs'  style='width:auto;'/>
-			<br/><br/>
-
-			<table class='data_grid data_grid_center' style='width: 80%; padding: 8px;'>
-				<thead>
-					<tr>
-						<td>&staff.server.admin.closed_dates.editor.duration;</td>
-						<td>&staff.server.admin.closed_dates.editor.reason;</td>
-						<td>&staff.server.admin.closed_dates.editor.delete;</td>
-					</tr>
-				</thead>
-				<tbody id='cd_tbody'>
-
-					<tr id='cd_row'>
-						<td align='left'>
-							From
-							<b name='start_date'/> at <b name='start_time'/>
-							<span> through </span>
-							<b name='end_date'/> at <b name='end_time'/>
-						</td>
-						<td><div name='note'/></td>
-						<td><button name='delete'>delete</button></td>
-					</tr>
-
-					<tr id='cd_allday_row'>
-						<td align='left'>
-							All Day <b name='start_date'/>
-						</td>
-						<td><div name='note'/></td>
-						<td><button name='delete'>delete</button></td>
-					</tr>
-
-
-					<tr id='cd_allmultiday_row'>
-						<td align='left'>
-							Every Day From <b name='start_date'/> through <b name='end_date'/>
-						</td>
-						<td><div name='note'/></td>
-						<td><button name='delete'>&staff.server.admin.closed_dates.editor.allmultiday.delete;</button></td>
-					</tr>
-
-				</tbody>
-			</table>
-
-			<br/>
-			<div style='width: 80%'>
-				&staff.server.admin.closed_dates.editor.allmultiday.format;
-			</div>
-
-			<br/>
-		
-			<table class='data_grid data_grid_center' style='width: 80%; padding: 8px;'>
-				<tr>
-					<td width='100%' align='center' style='border: 1px solid #F0E0F0;'>
-						<button id='cd_new_allday' 
-							onclick="cdShowEditRow('cd_edit_allday_row');">&staff.server.admin.closed_dates.add.allday;</button>
-						<button id='cd_new_multiday' 
-							onclick="cdShowEditRow('cd_edit_allmultiday_row');">&staff.server.admin.closed_dates.add.multiday;</button>
-						<button id='cd_new' 
-							onclick="cdShowEditRow('cd_edit_row');">&staff.server.admin.closed_dates.add.detailed;</button>
-					</td>
-				</tr>
-			</table>
-		
-			<table class='data_grid data_grid_center' style='width: 80%; padding: 8px;'>
-				<tbody id='cd_edit_tbody'>
-		
-					<tr id='cd_edit_row' class='hide_me'>
-						<td>
-						<table class='data_grid data_grid_center' style='width: 100%;'>
-							<thead>
-								<tr>
-									<td>&staff.server.admin.closed_dates.date.start;</td>
-									<td>&staff.server.admin.closed_dates.time.start;</td>
-									<td>&staff.server.admin.closed_dates.date.end;</td>
-									<td>&staff.server.admin.closed_dates.time.end;</td>
-								</tr>
-							</thead>
-							<tbody>
-								<tr>
-									<td>
-										<input id='cd_edit_start_date' type='text' size='10' maxlength='10'/>
-										<img src="/opac/common/js/jscalendar/img.gif"  
-											id='cd_edit_start_date_img' class='cal_img'/>
-									</td>
-
-									<td>
-										<table width='100%'><tbody><tr><td>
-											<input id='cd_edit_start_time' type='text' size='5' maxlength='5'/>
-										</td>
-										<td>
-											<div style='font-size: 80%;'>&staff.server.admin.closed_dates.allday.label;</div>
-											<input type='checkbox' id='cd_edit_start_time_allday'
-												onclick='
-													var input = $("cd_edit_start_time");
-													input.disabled = !input.disabled;'/>
-										</td></tr></tbody></table>
-									</td>
-
-									<td>
-										<input id='cd_edit_end_date' type='text' size='10' maxlength='10'/>
-										<img src="/opac/common/js/jscalendar/img.gif"  
-											id='cd_edit_end_date_img' class='cal_img'/>
-									</td>
-
-									<td>
-										<table width='100%'><tbody><tr><td>
-											<input id='cd_edit_end_time' type='text' size='5' maxlength='5'/>
-										</td>
-										<td>
-											<div style='font-size: 80%;'>&staff.server.admin.closed_dates.allday.label;</div>
-											<input type='checkbox' id='cd_edit_end_time_allday'
-												onclick='
-													var input = $("cd_edit_end_time");
-													input.disabled = !input.disabled;'/>
-										</td></tr></tbody></table>
-									</td>
-
-								</tr>
-							</tbody>
-						</table>
-						</td>
-					</tr>
-		
-					<tr id='cd_edit_allday_row' class='hide_me'>
-						<td>	
-							<span> &staff.server.admin.closed_dates.allday.label; </span>
-							<input id='cd_edit_allday_start_date' type='text' size='10' maxlength='10'/>
-							<img src="/opac/common/js/jscalendar/img.gif"  
-								id='cd_edit_allday_start_date_img' class='cal_img'/>
-						</td>
-					</tr>
-		
-					<tr id='cd_edit_allmultiday_row' class='hide_me'>
-						<td>	
-
-							<span> All Day From </span>
-							<input id='cd_edit_allmultiday_start_date' type='text' size='10' maxlength='10'/>
-							<img src="/opac/common/js/jscalendar/img.gif"  
-								id='cd_edit_allmultiday_start_date_img' class='cal_img'/>
-
-							<span> Through</span>
-
-							<input id='cd_edit_allmultiday_end_date' type='text' size='10' maxlength='10'/>
-							<img src="/opac/common/js/jscalendar/img.gif"  
-								id='cd_edit_allmultiday_end_date_img' class='cal_img'/>
-						</td>
-					</tr>
-
-					<tr id='cd_edit_note_row' class='hide_me' valign='middle'>
-						<td>
-							<div>&staff.server.admin.closed_dates.editor.reason.label;</div>
-							<textarea style='border: 1px solid blue; background: #E0F0E0; margin: 5px;' 
-								id='cd_edit_note' wrap='soft' cols='40' rows='3'/>
-							<div id='cd_apply_all_div' class='hide_me'>
-								&staff.server.admin.closed_dates.apply_all; <input type='checkbox' id='cd_apply_all'/>
-							</div>
-						</td>
-					</tr>
-
-					<tr id='cd_edit_submit' class='hide_me'>
-						<td>
-							<button onclick='cdNew();'>&staff.server.admin.closed_dates.save;</button>
-							<button onclick='cdCancelEdit();'>&staff.server.admin.closed_dates.cancel;</button>
-						</td>
-					</tr>
-
-		
-				</tbody>
-			</table>
-
-			<span class='hide_me' id='cd_all_day'>&staff.server.admin.closed_dates.allday.label;</span>
-			<span class='hide_me' id='cd_confirm_delete'>&staff.server.admin.closed_dates.confirm_delete;</span>
-			<span class='hide_me' id='cd_invalid_date'>&staff.server.admin.closed_dates.date.invalid;</span>
-			<span class='hide_me' id='cd_invalid_time'>&staff.server.admin.closed_dates.time.invalid;</span>
-			<span class='hide_me' id='cd_update_success'>&staff.server.admin.closed_dates.success;</span>
-		
-		</center>
-	</body>
+    <head>
+        <title>&staff.server.admin.closed_dates.title;</title>
+        <script type='text/javascript' src='/opac/common/js/utils.js'> </script>
+        <script type='text/javascript' src='/opac/common/js/config.js'> </script>
+        <script type='text/javascript' src='/opac/common/js/CGI.js'> </script>
+        <script type='text/javascript' src='/opac/common/js/JSON_v1.js'> </script>
+        <script type='text/javascript' src='/opac/common/js/fmall.js'> </script>
+        <script type='text/javascript' src='/opac/common/js/fmgen.js'> </script>
+        <script type='text/javascript' src='/opac/common/js/Cookies.js'> </script>
+        <script type='text/javascript' src='/opac/common/js/opac_utils.js'> </script>
+        <script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
+        <script type='text/javascript' src='/opac/common/js/org_utils.js'> </script>
+        <script type='text/javascript' src='/opac/common/js/init.js'> </script>
+        <script type='text/javascript' src='/opac/common/js/RemoteRequest.js'> </script>
+        <script type='text/javascript' src='/opac/common/js/Date.W3CDTF.js'> </script>
+        <script type='text/javascript' src='adminlib.js'> </script>
+        <script type='text/javascript' src='closed_dates.js'> </script>
+
+        <link rel="stylesheet" type="text/css" media="all" 
+            href="/opac/common/js/jscalendar/calendar-brown.css" title="win2k-cold-1" />
+        <script type="text/javascript" src="/opac/common/js/jscalendar/calendar.js"></script>
+        <script type="text/javascript" src="/opac/common/js/jscalendar/lang/calendar-en.js"></script>
+        <script type="text/javascript" src="/opac/common/js/jscalendar/calendar-setup.js"></script>
+
+        <link type='text/css' rel='stylesheet' href='admin.css'/>
+
+        <style type='text/css'>
+            span { padding: 6px; }
+            b { padding: 6px; }
+        </style>
+    </head>
+
+    <body onload='try{cdEditorInit();}catch(e){alert(js2JSON(e));}'>
+
+        <div class='welcome_box'>
+            <span>&staff.server.admin.closed_dates.welcome;</span><b><span id='cd_user'/></b>
+        </div>
+
+        <center>
+            <div class='title'>&staff.server.admin.closed_dates.editor.title;</div>
+
+            <br/>
+            &staff.server.admin.closed_dates.editor.for;<select id='cd_orgs'  style='width:auto;'/>
+            <br/><br/>
+
+            <table class='data_grid data_grid_center' style='width: 80%; padding: 8px;'>
+                <thead>
+                    <tr>
+                        <td>&staff.server.admin.closed_dates.editor.duration;</td>
+                        <td>&staff.server.admin.closed_dates.editor.reason;</td>
+                        <td>&staff.server.admin.closed_dates.editor.delete;</td>
+                    </tr>
+                </thead>
+                <tbody id='cd_tbody'>
+
+                    <tr id='cd_row'>
+                        <td align='left'>
+                            From
+                            <b name='start_date'/> at <b name='start_time'/>
+                            <span> through </span>
+                            <b name='end_date'/> at <b name='end_time'/>
+                        </td>
+                        <td><div name='note'/></td>
+                        <td><button name='delete'>delete</button></td>
+                    </tr>
+
+                    <tr id='cd_allday_row'>
+                        <td align='left'>
+                            All Day <b name='start_date'/>
+                        </td>
+                        <td><div name='note'/></td>
+                        <td><button name='delete'>delete</button></td>
+                    </tr>
+
+
+                    <tr id='cd_allmultiday_row'>
+                        <td align='left'>
+                            Every Day From <b name='start_date'/> through <b name='end_date'/>
+                        </td>
+                        <td><div name='note'/></td>
+                        <td><button name='delete'>&staff.server.admin.closed_dates.editor.allmultiday.delete;</button></td>
+                    </tr>
+
+                </tbody>
+            </table>
+
+            <br/>
+            <div style='width: 80%'>
+                &staff.server.admin.closed_dates.editor.allmultiday.format;
+            </div>
+
+            <br/>
+        
+            <table class='data_grid data_grid_center' style='width: 80%; padding: 8px;'>
+                <tr>
+                    <td width='100%' align='center' style='border: 1px solid #F0E0F0;'>
+                        <button id='cd_new_allday' 
+                            onclick="cdShowEditRow('cd_edit_allday_row');">&staff.server.admin.closed_dates.add.allday;</button>
+                        <button id='cd_new_multiday' 
+                            onclick="cdShowEditRow('cd_edit_allmultiday_row');">&staff.server.admin.closed_dates.add.multiday;</button>
+                        <button id='cd_new' 
+                            onclick="cdShowEditRow('cd_edit_row');">&staff.server.admin.closed_dates.add.detailed;</button>
+                    </td>
+                </tr>
+            </table>
+        
+            <table class='data_grid data_grid_center' style='width: 80%; padding: 8px;'>
+                <tbody id='cd_edit_tbody'>
+        
+                    <tr id='cd_edit_row' class='hide_me'>
+                        <td>
+                        <table class='data_grid data_grid_center' style='width: 100%;'>
+                            <thead>
+                                <tr>
+                                    <td>&staff.server.admin.closed_dates.date.start;</td>
+                                    <td>&staff.server.admin.closed_dates.time.start;</td>
+                                    <td>&staff.server.admin.closed_dates.date.end;</td>
+                                    <td>&staff.server.admin.closed_dates.time.end;</td>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr>
+                                    <td>
+                                        <input id='cd_edit_start_date' type='text' size='10' maxlength='10'/>
+                                        <img src="/opac/common/js/jscalendar/img.gif"  
+                                            id='cd_edit_start_date_img' class='cal_img'/>
+                                    </td>
+
+                                    <td>
+                                        <table width='100%'><tbody><tr><td>
+                                            <input id='cd_edit_start_time' type='text' size='5' maxlength='5'/>
+                                        </td>
+                                        <td>
+                                            <div style='font-size: 80%;'>&staff.server.admin.closed_dates.allday.label;</div>
+                                            <input type='checkbox' id='cd_edit_start_time_allday'
+                                                onclick='
+                                                    var input = $("cd_edit_start_time");
+                                                    input.disabled = !input.disabled;'/>
+                                        </td></tr></tbody></table>
+                                    </td>
+
+                                    <td>
+                                        <input id='cd_edit_end_date' type='text' size='10' maxlength='10'/>
+                                        <img src="/opac/common/js/jscalendar/img.gif"  
+                                            id='cd_edit_end_date_img' class='cal_img'/>
+                                    </td>
+
+                                    <td>
+                                        <table width='100%'><tbody><tr><td>
+                                            <input id='cd_edit_end_time' type='text' size='5' maxlength='5'/>
+                                        </td>
+                                        <td>
+                                            <div style='font-size: 80%;'>&staff.server.admin.closed_dates.allday.label;</div>
+                                            <input type='checkbox' id='cd_edit_end_time_allday'
+                                                onclick='
+                                                    var input = $("cd_edit_end_time");
+                                                    input.disabled = !input.disabled;'/>
+                                        </td></tr></tbody></table>
+                                    </td>
+
+                                </tr>
+                            </tbody>
+                        </table>
+                        </td>
+                    </tr>
+        
+                    <tr id='cd_edit_allday_row' class='hide_me'>
+                        <td>    
+                            <span> &staff.server.admin.closed_dates.allday.label; </span>
+                            <input id='cd_edit_allday_start_date' type='text' size='10' maxlength='10'/>
+                            <img src="/opac/common/js/jscalendar/img.gif"  
+                                id='cd_edit_allday_start_date_img' class='cal_img'/>
+                        </td>
+                    </tr>
+        
+                    <tr id='cd_edit_allmultiday_row' class='hide_me'>
+                        <td>    
+
+                            <span> All Day From </span>
+                            <input id='cd_edit_allmultiday_start_date' type='text' size='10' maxlength='10'/>
+                            <img src="/opac/common/js/jscalendar/img.gif"  
+                                id='cd_edit_allmultiday_start_date_img' class='cal_img'/>
+
+                            <span> Through</span>
+
+                            <input id='cd_edit_allmultiday_end_date' type='text' size='10' maxlength='10'/>
+                            <img src="/opac/common/js/jscalendar/img.gif"  
+                                id='cd_edit_allmultiday_end_date_img' class='cal_img'/>
+                        </td>
+                    </tr>
+
+                    <tr id='cd_edit_note_row' class='hide_me' valign='middle'>
+                        <td>
+                            <div>&staff.server.admin.closed_dates.editor.reason.label;</div>
+                            <textarea style='border: 1px solid blue; background: #E0F0E0; margin: 5px;' 
+                                id='cd_edit_note' wrap='soft' cols='40' rows='3'/>
+                            <div id='cd_apply_all_div' class='hide_me'>
+                                &staff.server.admin.closed_dates.apply_all; <input type='checkbox' id='cd_apply_all'/>
+                            </div>
+                        </td>
+                    </tr>
+
+                    <tr id='cd_edit_submit' class='hide_me'>
+                        <td>
+                            <button onclick='cdNew();'>&staff.server.admin.closed_dates.save;</button>
+                            <button onclick='cdCancelEdit();'>&staff.server.admin.closed_dates.cancel;</button>
+                        </td>
+                    </tr>
+
+        
+                </tbody>
+            </table>
+
+            <span class='hide_me' id='cd_all_day'>&staff.server.admin.closed_dates.allday.label;</span>
+            <span class='hide_me' id='cd_confirm_delete'>&staff.server.admin.closed_dates.confirm_delete;</span>
+            <span class='hide_me' id='cd_invalid_date'>&staff.server.admin.closed_dates.date.invalid;</span>
+            <span class='hide_me' id='cd_invalid_time'>&staff.server.admin.closed_dates.time.invalid;</span>
+            <span class='hide_me' id='cd_update_success'>&staff.server.admin.closed_dates.success;</span>
+        
+        </center>
+    </body>
 </html>
 
diff --git a/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml b/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
index c6cb676c58..7be5e240a7 100644
--- a/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
@@ -1,201 +1,201 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>&staff.server.admin.copy_locations.title;</title>
-		<script language='javascript' src='/opac/common/js/utils.js'> </script>
-		<script language='javascript' src='/opac/common/js//config.js'> </script>
-		<script language='javascript' src='/opac/common/js/CGI.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookie.js'> </script>
-	
-		<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmall.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
-		<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
-		<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/init.js'> </script>
-		<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-		<script language='javascript' src='adminlib.js'> </script>
-		<script language='javascript' src='copy_locations.js'> </script>
+    <head>
+        <title>&staff.server.admin.copy_locations.title;</title>
+        <script language='javascript' src='/opac/common/js/utils.js'> </script>
+        <script language='javascript' src='/opac/common/js//config.js'> </script>
+        <script language='javascript' src='/opac/common/js/CGI.js'> </script>
+        <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
+    
+        <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
+        <script language='javascript' src='/opac/common/js/fmall.js'> </script>
+        <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
+        <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
+        <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
+        <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
+        <script language='javascript' src='/opac/common/js/org_utils.js'> </script>
+        <script language='javascript' src='/opac/common/js/init.js'> </script>
+        <script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
+        <script language='javascript' src='adminlib.js'> </script>
+        <script language='javascript' src='copy_locations.js'> </script>
 
-		<link type='text/css' rel='stylesheet' href='admin.css' />
-	</head>
+        <link type='text/css' rel='stylesheet' href='admin.css' />
+    </head>
 
-	<body onload='try{clEditorInit();}catch(e){alert(js2JSON(e));}'>
+    <body onload='try{clEditorInit();}catch(e){alert(js2JSON(e));}'>
 
-		<div class='welcome_box'>
-			<span>Welcome </span><b><span id='user'/></b>
-		</div>
+        <div class='welcome_box'>
+            <span>Welcome </span><b><span id='user'/></b>
+        </div>
 
-		<center>
-			<div class='title'>&staff.server.admin.copy_locations.editor;</div>
-			<br/>
+        <center>
+            <div class='title'>&staff.server.admin.copy_locations.editor;</div>
+            <br/>
 
-			<table class='data_grid data_grid_center' width='65%'>
-				<thead>
-					<tr><td colspan='4'>&staff.server.admin.copy_locations.editor.create;</td></tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td id='id'>&staff.server.admin.copy_locations.editor.name;</td>
-						<td>
-							<input id='cl_new_name' type='text' size='10'/>
-						</td>
-						<td>&staff.server.admin.copy_locations.editor.holdable.label;</td>
-						<td>
-							<span>&staff.server.admin.copy_locations.editor.yes;</span>
-							<input type='radio' name='cl_new_hold' id='cl_new_hold_yes'/>
-							<span>&staff.server.admin.copy_locations.editor.no;</span>
-							<input type='radio' name='cl_new_hold'  
-								id='cl_new_hold_no' checked='checked'> </input>
-						</td>
-					</tr>
+            <table class='data_grid data_grid_center' width='65%'>
+                <thead>
+                    <tr><td colspan='4'>&staff.server.admin.copy_locations.editor.create;</td></tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td id='id'>&staff.server.admin.copy_locations.editor.name;</td>
+                        <td>
+                            <input id='cl_new_name' type='text' size='10'/>
+                        </td>
+                        <td>&staff.server.admin.copy_locations.editor.holdable.label;</td>
+                        <td>
+                            <span>&staff.server.admin.copy_locations.editor.yes;</span>
+                            <input type='radio' name='cl_new_hold' id='cl_new_hold_yes'/>
+                            <span>&staff.server.admin.copy_locations.editor.no;</span>
+                            <input type='radio' name='cl_new_hold'  
+                                id='cl_new_hold_no' checked='checked'> </input>
+                        </td>
+                    </tr>
 
-					<tr>
-						<td>&staff.server.admin.copy_locations.editor.opac_visible.label;</td>
-						<td>
-							<span>&staff.server.admin.copy_locations.editor.yes;</span>
-							<input type='radio' name='cl_new_vis' id='cl_new_vis_yes' />
-							<span>&staff.server.admin.copy_locations.editor.no;</span>
-							<input type='radio' name='cl_new_vis'  id='cl_new_vis_no' checked='checked'> </input>
-						</td>
-						<td>&staff.server.admin.copy_locations.editor.circulate.label;</td>
-						<td>
-							<span>&staff.server.admin.copy_locations.editor.yes;</span>
-							<input type='radio' name='cl_new_circulate' id='cl_new_circulate_yes' />
-							<span>&staff.server.admin.copy_locations.editor.no;</span>
-							<input type='radio' name='cl_new_circulate'  
-								id='cl_new_circulate_no' checked='checked'> </input>
-						</td>
-					</tr>
-					<tr>
-						<td>&staff.server.admin.copy_locations.editor.hold_verify.label;</td>
-						<td>
-							<span>&staff.server.admin.copy_locations.editor.yes;</span>
-							<input type='radio' name='cl_new_hold_verify' id='cl_new_hold_verify_yes'/>
-							<span>&staff.server.admin.copy_locations.editor.no;</span>
-							<input type='radio' name='cl_new_hold_verify'  
-								id='cl_new_hold_verify_no' checked='checked'> </input>
-						</td>
-						<td>&staff.server.admin.copy_locations.editor.library;</td>
-						<td>
-							<select id='cl_new_owner' disabled='disabled' style='width:auto;'> </select>
-						</td>
-					</tr>
                     <tr>
-						<td colspan='4'><input id='sc_new_submit' type='submit' value='Create' disabled='disabled'/></td>
+                        <td>&staff.server.admin.copy_locations.editor.opac_visible.label;</td>
+                        <td>
+                            <span>&staff.server.admin.copy_locations.editor.yes;</span>
+                            <input type='radio' name='cl_new_vis' id='cl_new_vis_yes' />
+                            <span>&staff.server.admin.copy_locations.editor.no;</span>
+                            <input type='radio' name='cl_new_vis'  id='cl_new_vis_no' checked='checked'> </input>
+                        </td>
+                        <td>&staff.server.admin.copy_locations.editor.circulate.label;</td>
+                        <td>
+                            <span>&staff.server.admin.copy_locations.editor.yes;</span>
+                            <input type='radio' name='cl_new_circulate' id='cl_new_circulate_yes' />
+                            <span>&staff.server.admin.copy_locations.editor.no;</span>
+                            <input type='radio' name='cl_new_circulate'  
+                                id='cl_new_circulate_no' checked='checked'> </input>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>&staff.server.admin.copy_locations.editor.hold_verify.label;</td>
+                        <td>
+                            <span>&staff.server.admin.copy_locations.editor.yes;</span>
+                            <input type='radio' name='cl_new_hold_verify' id='cl_new_hold_verify_yes'/>
+                            <span>&staff.server.admin.copy_locations.editor.no;</span>
+                            <input type='radio' name='cl_new_hold_verify'  
+                                id='cl_new_hold_verify_no' checked='checked'> </input>
+                        </td>
+                        <td>&staff.server.admin.copy_locations.editor.library;</td>
+                        <td>
+                            <select id='cl_new_owner' disabled='disabled' style='width:auto;'> </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan='4'><input id='sc_new_submit' type='submit' value='Create' disabled='disabled'/></td>
                     </tr>
-				</tbody>
-			</table>
+                </tbody>
+            </table>
 
-			<br/><hr/><br/>
+            <br/><hr/><br/>
 
 
             &staff.server.admin.copy_locations.editor.library.filter; <select disabled='disabled' id='cl_org_filter' style='width:auto;'> </select>
             <br/><br/>
 
-			<table class='data_grid data_grid_center' style='width: 95%'>
-				<thead>
-					<tr>
-						<td width=''>&staff.server.admin.copy_locations.editor.name;</td>
-						<td width=''>&staff.server.admin.copy_locations.editor.library;</td>
-						<td width=''>&staff.server.admin.copy_locations.editor.holdable;</td>
-						<td width=''>&staff.server.admin.copy_locations.editor.hold_verify;</td>
-						<td width=''>&staff.server.admin.copy_locations.editor.opac_visible;</td>
-						<td width=''>&staff.server.admin.copy_locations.editor.circulate;</td>
-						<td width=''>&staff.server.admin.copy_locations.editor.edit;</td>
-						<td width=''>&staff.server.admin.copy_locations.editor.delete;</td>
-					</tr>
-				</thead>
-				<tbody id='cl_tbody'>
-					<tr id='cl_row'>
-						<td name='cl_name'> </td>
-						<td name='cl_owner'> </td>
-						<td name='cl_holdable'> </td>
-						<td name='cl_hold_verify'> </td>
-						<td name='cl_visible'> </td>
-						<td name='cl_circulate'> </td>
-						<td><input type='submit' value='Edit' name='cl_edit' disabled='disabled'> </input></td>
-						<td><input type='submit' value='Delete' name='cl_delete' disabled='disabled'> </input></td>
-					</tr>
-				</tbody>
-			</table>
-		 </center>
+            <table class='data_grid data_grid_center' style='width: 95%'>
+                <thead>
+                    <tr>
+                        <td width=''>&staff.server.admin.copy_locations.editor.name;</td>
+                        <td width=''>&staff.server.admin.copy_locations.editor.library;</td>
+                        <td width=''>&staff.server.admin.copy_locations.editor.holdable;</td>
+                        <td width=''>&staff.server.admin.copy_locations.editor.hold_verify;</td>
+                        <td width=''>&staff.server.admin.copy_locations.editor.opac_visible;</td>
+                        <td width=''>&staff.server.admin.copy_locations.editor.circulate;</td>
+                        <td width=''>&staff.server.admin.copy_locations.editor.edit;</td>
+                        <td width=''>&staff.server.admin.copy_locations.editor.delete;</td>
+                    </tr>
+                </thead>
+                <tbody id='cl_tbody'>
+                    <tr id='cl_row'>
+                        <td name='cl_name'> </td>
+                        <td name='cl_owner'> </td>
+                        <td name='cl_holdable'> </td>
+                        <td name='cl_hold_verify'> </td>
+                        <td name='cl_visible'> </td>
+                        <td name='cl_circulate'> </td>
+                        <td><input type='submit' value='Edit' name='cl_edit' disabled='disabled'> </input></td>
+                        <td><input type='submit' value='Delete' name='cl_delete' disabled='disabled'> </input></td>
+                    </tr>
+                </tbody>
+            </table>
+         </center>
 
-		 <div class='hide_me'>
+         <div class='hide_me'>
             <span id='true' style='color:green;'>&#x2713;</span>
             <span id='false' style='color:red;'>&#x2717;</span>
-			<span id='yes'>&staff.server.admin.copy_locations.editor.yes;</span>
-			<span id='no'>&staff.server.admin.copy_locations.editor.no;</span>
-			<span id='cl_hold_msg'>
-				&staff.server.admin.copy_locations.editor.help.holdable;
-			</span>
-			<span id='cl_delete_confirm'>
-				&staff.server.admin.copy_locations.editor.delete.confirm;
-			</span>
-			<table>
+            <span id='yes'>&staff.server.admin.copy_locations.editor.yes;</span>
+            <span id='no'>&staff.server.admin.copy_locations.editor.no;</span>
+            <span id='cl_hold_msg'>
+                &staff.server.admin.copy_locations.editor.help.holdable;
+            </span>
+            <span id='cl_delete_confirm'>
+                &staff.server.admin.copy_locations.editor.delete.confirm;
+            </span>
+            <table>
                 <tbody> 
                     <tr id='cl_edit' class='insert_row'>
-						<td><input name='cl_edit_name' type='text'> </input></td>
-						<td name='cl_edit_owner'></td>
-						<td>
-							<span>&staff.server.admin.copy_locations.editor.yes;</span>
-							<span name='cl_edit_holdable_yes'>
-								<input type='radio' name='cl_edit_holdable'/>
-							</span>
-							<span>&staff.server.admin.copy_locations.editor.no;</span>
-							<span name='cl_edit_holdable_no'>
-								<input type='radio' name='cl_edit_holdable'/>
-							</span>
-						</td>
-						<td>
-							<span>&staff.server.admin.copy_locations.editor.yes;</span>
-							<span name='cl_edit_hold_verify_yes'>
-								<input type='radio' name='cl_edit_hold_verify'/>
-							</span>
-							<span>&staff.server.admin.copy_locations.editor.no;</span>
-							<span name='cl_edit_hold_verify_no'>
-								<input type='radio' name='cl_edit_hold_verify'/>
-							</span>
-						</td>
-						<td>
-							<span>&staff.server.admin.copy_locations.editor.yes;</span>
-							<span name='cl_edit_visible_yes'>
-								<input type='radio' name='cl_edit_visible'/>
-							</span>
-							<span>&staff.server.admin.copy_locations.editor.no;</span>
-							<span name='cl_edit_visible_no'>
-								<input type='radio' name='cl_edit_visible'/>
-							</span>
-						</td>
-						<td>
-							<span>&staff.server.admin.copy_locations.editor.yes;</span>
-							<span name='cl_edit_circulate_yes'>
-								<input type='radio' name='cl_edit_circulate'/>
-							</span>
-							<span>&staff.server.admin.copy_locations.editor.no;</span>
-							<span name='cl_edit_circulate_no'>
-								<input type='radio' name='cl_edit_circulate'/>
-							</span>
-						</td>
-						<td><input type='submit' name='cl_edit_commit' value='&staff.server.admin.copy_locations.submit;'/></td>
-						<td><input type='submit' name='cl_edit_cancel' value='&staff.server.admin.copy_locations.cancel;'/></td>
-					</tr>
-				</tbody>
-			</table>
-		</div>
-	</body>
-	<span class='hide_me' id='cl_update_success'>
-		&staff.server.admin.copy_locations.update_success;
-	</span>
+                        <td><input name='cl_edit_name' type='text'> </input></td>
+                        <td name='cl_edit_owner'></td>
+                        <td>
+                            <span>&staff.server.admin.copy_locations.editor.yes;</span>
+                            <span name='cl_edit_holdable_yes'>
+                                <input type='radio' name='cl_edit_holdable'/>
+                            </span>
+                            <span>&staff.server.admin.copy_locations.editor.no;</span>
+                            <span name='cl_edit_holdable_no'>
+                                <input type='radio' name='cl_edit_holdable'/>
+                            </span>
+                        </td>
+                        <td>
+                            <span>&staff.server.admin.copy_locations.editor.yes;</span>
+                            <span name='cl_edit_hold_verify_yes'>
+                                <input type='radio' name='cl_edit_hold_verify'/>
+                            </span>
+                            <span>&staff.server.admin.copy_locations.editor.no;</span>
+                            <span name='cl_edit_hold_verify_no'>
+                                <input type='radio' name='cl_edit_hold_verify'/>
+                            </span>
+                        </td>
+                        <td>
+                            <span>&staff.server.admin.copy_locations.editor.yes;</span>
+                            <span name='cl_edit_visible_yes'>
+                                <input type='radio' name='cl_edit_visible'/>
+                            </span>
+                            <span>&staff.server.admin.copy_locations.editor.no;</span>
+                            <span name='cl_edit_visible_no'>
+                                <input type='radio' name='cl_edit_visible'/>
+                            </span>
+                        </td>
+                        <td>
+                            <span>&staff.server.admin.copy_locations.editor.yes;</span>
+                            <span name='cl_edit_circulate_yes'>
+                                <input type='radio' name='cl_edit_circulate'/>
+                            </span>
+                            <span>&staff.server.admin.copy_locations.editor.no;</span>
+                            <span name='cl_edit_circulate_no'>
+                                <input type='radio' name='cl_edit_circulate'/>
+                            </span>
+                        </td>
+                        <td><input type='submit' name='cl_edit_commit' value='&staff.server.admin.copy_locations.submit;'/></td>
+                        <td><input type='submit' name='cl_edit_cancel' value='&staff.server.admin.copy_locations.cancel;'/></td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </body>
+    <span class='hide_me' id='cl_update_success'>
+        &staff.server.admin.copy_locations.update_success;
+    </span>
 </html>
 
diff --git a/Open-ILS/xul/staff_client/server/admin/font_settings.xul b/Open-ILS/xul/staff_client/server/admin/font_settings.xul
index adfd7b7bd5..491bf4a3b8 100644
--- a/Open-ILS/xul/staff_client/server/admin/font_settings.xul
+++ b/Open-ILS/xul/staff_client/server/admin/font_settings.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -18,163 +18,163 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="font_settings_win" 
-	onload="try { my_init(); } catch(E) { alert(E); }" style="background: white;"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); } catch(E) { alert(E); }" style="background: white;"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
     <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
     <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for font_settings.xul');
-
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
-				document.getElementById('sound').checked = typeof g.data.no_sound == 'undefined' || g.data.no_sound == 'false' || g.data.no_sound == false ? false : true;
-
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('admin/font_settings.xul',E); } catch(F) { alert(E); }
-			}
-		}
-
-		function save() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-				JSAN.use('util.file'); var file = new util.file('global_font_adjust');
-				file.set_object(g.data.global_font_adjust);
-				file.close();
-				alert(document.getElementById("adminStrings").getString('staff.admin.font_settings.save'));
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('saving in admin/font_settings.xul',E); } catch(F) { alert(E); }
-			}
-		}
-
-		function adjust(my_class) {
-			var status_msg = {
-				'ALL_FONTS_SMALLER': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_SMALLER'),
-				'ALL_FONTS_DEFAULT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_DEFAULT'),
-				'ALL_FONTS_LARGER': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_LARGER'),
-				'ALL_FONTS_XX_SMALL': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_XX_SMALL'),
-				'ALL_FONTS_X_SMALL': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_X_SMALL'),
-				'ALL_FONTS_SMALL': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_SMALL'),
-				'ALL_FONTS_MEDIUM': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_MEDIUM'),
-				'ALL_FONTS_LARGE': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_LARGE'),
-				'ALL_FONTS_X_LARGE': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_X_LARGE'),
-				'ALL_FONTS_XX_LARGE': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_XX_LARGE'),
-				'ALL_FONTS_5PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_5PT'),
-				'ALL_FONTS_6PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_6PT'),
-				'ALL_FONTS_7PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_7PT'),
-				'ALL_FONTS_8PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_8PT'),
-				'ALL_FONTS_9PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_9PT'),
-				'ALL_FONTS_10PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_10PT'),
-				'ALL_FONTS_11PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_11PT'),
-				'ALL_FONTS_12PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_12PT'),
-				'ALL_FONTS_13PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_13PT'),
-				'ALL_FONTS_14PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_14PT'),
-				'ALL_FONTS_15PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_15PT'),
-				'ALL_FONTS_16PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_16PT'),
-				'ALL_FONTS_17PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_17PT'),
-				'ALL_FONTS_18PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_18PT')
-			};
-
-			try {
-				g.data.global_font_adjust = my_class; g.data.stash('global_font_adjust');
-				alert(status_msg[my_class]);
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('setting font in admin/font_settings.xul',E); } catch(F) { alert(E); }
-			}
-		}
-
-		function toggle_sound() {
-			try {
-				var bool = document.getElementById('sound').checked;
-				g.data.no_sound = bool; g.data.stash('no_sound');
-				if (bool) {
-					alert(document.getElementById("adminStrings").getString('staff.admin.font_settings.sound.disabled'));
-				} else {
-					alert(document.getElementById("adminStrings").getString('staff.admin.font_settings.sound.enabled'));
-				}
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('setting sound in admin/font_settings.xul',E); } catch(F) { alert(E); }
-			}
-		}
-
-		function save_sound() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-				JSAN.use('util.file'); var file = new util.file('no_sound');
-				file.write_content( 'truncate', String( document.getElementById('sound').checked ) );
-				file.close();
-				alert(document.getElementById("adminStrings").getString('staff.admin.font_settings.sound'));
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('saving in admin/font_settings.xul',E); } catch(F) { alert(E); }
-			}
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
-
-	<groupbox orient="vertical">
-		<caption label="&staff.server.admin.font.sound.caption;"/>
-		<hbox>
-			<checkbox id="sound" label="&staff.server.admin.font.sound.checkbox;" oncommand="toggle_sound();"/>
-			<button label="&staff.server.admin.save_disk;" oncommand="save_sound();"/>
-		</hbox>
-	</groupbox>
-
-	<groupbox>
-		<caption label="&staff.server.admin.font.global.caption;"/>
-		<hbox>
-			<vbox>
-				<button class="ALL_FONTS_SMALLER" label="&staff.server.admin.font.smaller;" oncommand="adjust('ALL_FONTS_SMALLER');"/>
-				<button class="ALL_FONTS_DEFAULT" label="&staff.server.admin.font.default;" oncommand="adjust('ALL_FONTS_DEFAULT');"/>
-				<button class="ALL_FONTS_LARGER" label="&staff.server.admin.font.larger;" oncommand="adjust('ALL_FONTS_LARGER');"/>
-			</vbox>
-			<vbox>
-				<button class="ALL_FONTS_XX_SMALL" label="&staff.server.admin.font.xxsmall;" oncommand="adjust('ALL_FONTS_XX_SMALL');"/>
-				<button class="ALL_FONTS_X_SMALL" label="&staff.server.admin.font.xsmall;" oncommand="adjust('ALL_FONTS_X_SMALL');"/>
-				<button class="ALL_FONTS_SMALL" label="&staff.server.admin.font.small;" oncommand="adjust('ALL_FONTS_SMALL');"/>
-				<button class="ALL_FONTS_MEDIUM" label="&staff.server.admin.font.medium;" oncommand="adjust('ALL_FONTS_MEDIUM');"/>
-				<button class="ALL_FONTS_LARGE" label="&staff.server.admin.font.large;" oncommand="adjust('ALL_FONTS_LARGE');"/>
-				<button class="ALL_FONTS_X_LARGE" label="&staff.server.admin.font.xlarge;" oncommand="adjust('ALL_FONTS_X_LARGE');"/>
-				<button class="ALL_FONTS_XX_LARGE" label="&staff.server.admin.font.xxlarge;" oncommand="adjust('ALL_FONTS_XX_LARGE');"/>
-			</vbox>
-			<vbox>
-				<button class="ALL_FONTS_5PT" label="&staff.server.admin.font.5pt;" oncommand="adjust('ALL_FONTS_5PT');"/>
-				<button class="ALL_FONTS_6PT" label="&staff.server.admin.font.6pt;" oncommand="adjust('ALL_FONTS_6PT');"/>
-				<button class="ALL_FONTS_7PT" label="&staff.server.admin.font.7pt;" oncommand="adjust('ALL_FONTS_7PT');"/>
-				<button class="ALL_FONTS_8PT" label="&staff.server.admin.font.8pt;" oncommand="adjust('ALL_FONTS_8PT');"/>
-				<button class="ALL_FONTS_9PT" label="&staff.server.admin.font.9pt;" oncommand="adjust('ALL_FONTS_9PT');"/>
-				<button class="ALL_FONTS_10PT" label="&staff.server.admin.font.10pt;" oncommand="adjust('ALL_FONTS_10PT');"/>
-				<button class="ALL_FONTS_11PT" label="&staff.server.admin.font.11pt;" oncommand="adjust('ALL_FONTS_11PT');"/>
-				<button class="ALL_FONTS_12PT" label="&staff.server.admin.font.12pt;" oncommand="adjust('ALL_FONTS_12PT');"/>
-				<button class="ALL_FONTS_13PT" label="&staff.server.admin.font.13pt;" oncommand="adjust('ALL_FONTS_13PT');"/>
-				<button class="ALL_FONTS_14PT" label="&staff.server.admin.font.14pt;" oncommand="adjust('ALL_FONTS_14PT');"/>
-				<button class="ALL_FONTS_15PT" label="&staff.server.admin.font.15pt;" oncommand="adjust('ALL_FONTS_15PT');"/>
-				<button class="ALL_FONTS_16PT" label="&staff.server.admin.font.16pt;" oncommand="adjust('ALL_FONTS_16PT');"/>
-				<button class="ALL_FONTS_17PT" label="&staff.server.admin.font.17pt;" oncommand="adjust('ALL_FONTS_17PT');"/>
-				<button class="ALL_FONTS_18PT" label="&staff.server.admin.font.18pt;" oncommand="adjust('ALL_FONTS_18PT');"/>
-			</vbox>
-			<vbox>
-				<button label="&staff.server.admin.font.restore;" flex="1" oncommand="adjust('ALL_FONTS_DEFAULT');"/>
-				<button label="&staff.server.admin.save_disk;" flex="1" oncommand="save();"/>
-			</vbox>
-		</hbox>
-	</groupbox>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
+
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for font_settings.xul');
+
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
+                document.getElementById('sound').checked = typeof g.data.no_sound == 'undefined' || g.data.no_sound == 'false' || g.data.no_sound == false ? false : true;
+
+            } catch(E) {
+                try { g.error.standard_unexpected_error_alert('admin/font_settings.xul',E); } catch(F) { alert(E); }
+            }
+        }
+
+        function save() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+                JSAN.use('util.file'); var file = new util.file('global_font_adjust');
+                file.set_object(g.data.global_font_adjust);
+                file.close();
+                alert(document.getElementById("adminStrings").getString('staff.admin.font_settings.save'));
+            } catch(E) {
+                try { g.error.standard_unexpected_error_alert('saving in admin/font_settings.xul',E); } catch(F) { alert(E); }
+            }
+        }
+
+        function adjust(my_class) {
+            var status_msg = {
+                'ALL_FONTS_SMALLER': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_SMALLER'),
+                'ALL_FONTS_DEFAULT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_DEFAULT'),
+                'ALL_FONTS_LARGER': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_LARGER'),
+                'ALL_FONTS_XX_SMALL': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_XX_SMALL'),
+                'ALL_FONTS_X_SMALL': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_X_SMALL'),
+                'ALL_FONTS_SMALL': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_SMALL'),
+                'ALL_FONTS_MEDIUM': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_MEDIUM'),
+                'ALL_FONTS_LARGE': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_LARGE'),
+                'ALL_FONTS_X_LARGE': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_X_LARGE'),
+                'ALL_FONTS_XX_LARGE': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_XX_LARGE'),
+                'ALL_FONTS_5PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_5PT'),
+                'ALL_FONTS_6PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_6PT'),
+                'ALL_FONTS_7PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_7PT'),
+                'ALL_FONTS_8PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_8PT'),
+                'ALL_FONTS_9PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_9PT'),
+                'ALL_FONTS_10PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_10PT'),
+                'ALL_FONTS_11PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_11PT'),
+                'ALL_FONTS_12PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_12PT'),
+                'ALL_FONTS_13PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_13PT'),
+                'ALL_FONTS_14PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_14PT'),
+                'ALL_FONTS_15PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_15PT'),
+                'ALL_FONTS_16PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_16PT'),
+                'ALL_FONTS_17PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_17PT'),
+                'ALL_FONTS_18PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_18PT')
+            };
+
+            try {
+                g.data.global_font_adjust = my_class; g.data.stash('global_font_adjust');
+                alert(status_msg[my_class]);
+            } catch(E) {
+                try { g.error.standard_unexpected_error_alert('setting font in admin/font_settings.xul',E); } catch(F) { alert(E); }
+            }
+        }
+
+        function toggle_sound() {
+            try {
+                var bool = document.getElementById('sound').checked;
+                g.data.no_sound = bool; g.data.stash('no_sound');
+                if (bool) {
+                    alert(document.getElementById("adminStrings").getString('staff.admin.font_settings.sound.disabled'));
+                } else {
+                    alert(document.getElementById("adminStrings").getString('staff.admin.font_settings.sound.enabled'));
+                }
+            } catch(E) {
+                try { g.error.standard_unexpected_error_alert('setting sound in admin/font_settings.xul',E); } catch(F) { alert(E); }
+            }
+        }
+
+        function save_sound() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+                JSAN.use('util.file'); var file = new util.file('no_sound');
+                file.write_content( 'truncate', String( document.getElementById('sound').checked ) );
+                file.close();
+                alert(document.getElementById("adminStrings").getString('staff.admin.font_settings.sound'));
+            } catch(E) {
+                try { g.error.standard_unexpected_error_alert('saving in admin/font_settings.xul',E); } catch(F) { alert(E); }
+            }
+        }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
+
+    <groupbox orient="vertical">
+        <caption label="&staff.server.admin.font.sound.caption;"/>
+        <hbox>
+            <checkbox id="sound" label="&staff.server.admin.font.sound.checkbox;" oncommand="toggle_sound();"/>
+            <button label="&staff.server.admin.save_disk;" oncommand="save_sound();"/>
+        </hbox>
+    </groupbox>
+
+    <groupbox>
+        <caption label="&staff.server.admin.font.global.caption;"/>
+        <hbox>
+            <vbox>
+                <button class="ALL_FONTS_SMALLER" label="&staff.server.admin.font.smaller;" oncommand="adjust('ALL_FONTS_SMALLER');"/>
+                <button class="ALL_FONTS_DEFAULT" label="&staff.server.admin.font.default;" oncommand="adjust('ALL_FONTS_DEFAULT');"/>
+                <button class="ALL_FONTS_LARGER" label="&staff.server.admin.font.larger;" oncommand="adjust('ALL_FONTS_LARGER');"/>
+            </vbox>
+            <vbox>
+                <button class="ALL_FONTS_XX_SMALL" label="&staff.server.admin.font.xxsmall;" oncommand="adjust('ALL_FONTS_XX_SMALL');"/>
+                <button class="ALL_FONTS_X_SMALL" label="&staff.server.admin.font.xsmall;" oncommand="adjust('ALL_FONTS_X_SMALL');"/>
+                <button class="ALL_FONTS_SMALL" label="&staff.server.admin.font.small;" oncommand="adjust('ALL_FONTS_SMALL');"/>
+                <button class="ALL_FONTS_MEDIUM" label="&staff.server.admin.font.medium;" oncommand="adjust('ALL_FONTS_MEDIUM');"/>
+                <button class="ALL_FONTS_LARGE" label="&staff.server.admin.font.large;" oncommand="adjust('ALL_FONTS_LARGE');"/>
+                <button class="ALL_FONTS_X_LARGE" label="&staff.server.admin.font.xlarge;" oncommand="adjust('ALL_FONTS_X_LARGE');"/>
+                <button class="ALL_FONTS_XX_LARGE" label="&staff.server.admin.font.xxlarge;" oncommand="adjust('ALL_FONTS_XX_LARGE');"/>
+            </vbox>
+            <vbox>
+                <button class="ALL_FONTS_5PT" label="&staff.server.admin.font.5pt;" oncommand="adjust('ALL_FONTS_5PT');"/>
+                <button class="ALL_FONTS_6PT" label="&staff.server.admin.font.6pt;" oncommand="adjust('ALL_FONTS_6PT');"/>
+                <button class="ALL_FONTS_7PT" label="&staff.server.admin.font.7pt;" oncommand="adjust('ALL_FONTS_7PT');"/>
+                <button class="ALL_FONTS_8PT" label="&staff.server.admin.font.8pt;" oncommand="adjust('ALL_FONTS_8PT');"/>
+                <button class="ALL_FONTS_9PT" label="&staff.server.admin.font.9pt;" oncommand="adjust('ALL_FONTS_9PT');"/>
+                <button class="ALL_FONTS_10PT" label="&staff.server.admin.font.10pt;" oncommand="adjust('ALL_FONTS_10PT');"/>
+                <button class="ALL_FONTS_11PT" label="&staff.server.admin.font.11pt;" oncommand="adjust('ALL_FONTS_11PT');"/>
+                <button class="ALL_FONTS_12PT" label="&staff.server.admin.font.12pt;" oncommand="adjust('ALL_FONTS_12PT');"/>
+                <button class="ALL_FONTS_13PT" label="&staff.server.admin.font.13pt;" oncommand="adjust('ALL_FONTS_13PT');"/>
+                <button class="ALL_FONTS_14PT" label="&staff.server.admin.font.14pt;" oncommand="adjust('ALL_FONTS_14PT');"/>
+                <button class="ALL_FONTS_15PT" label="&staff.server.admin.font.15pt;" oncommand="adjust('ALL_FONTS_15PT');"/>
+                <button class="ALL_FONTS_16PT" label="&staff.server.admin.font.16pt;" oncommand="adjust('ALL_FONTS_16PT');"/>
+                <button class="ALL_FONTS_17PT" label="&staff.server.admin.font.17pt;" oncommand="adjust('ALL_FONTS_17PT');"/>
+                <button class="ALL_FONTS_18PT" label="&staff.server.admin.font.18pt;" oncommand="adjust('ALL_FONTS_18PT');"/>
+            </vbox>
+            <vbox>
+                <button label="&staff.server.admin.font.restore;" flex="1" oncommand="adjust('ALL_FONTS_DEFAULT');"/>
+                <button label="&staff.server.admin.save_disk;" flex="1" oncommand="save();"/>
+            </vbox>
+        </hbox>
+    </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
index 78f81afc91..8e4a3e20a5 100644
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
@@ -1,96 +1,96 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
-	<!ENTITY nbsp " "> <!-- calendar needs this entity -->
+    "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!ENTITY nbsp " "> <!-- calendar needs this entity -->
 ]>
 
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>&staff.server.admin.hold_pull.title;</title>
-		<script language='javascript' src='/opac/common/js/utils.js'> </script>
-		<script language='javascript' src='/opac/common/js//config.js'> </script> 
-		<script language='javascript' src='/opac/common/js/CGI.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookie.js'> </script>
-	
-		<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmall.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
-		<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
-		<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/init.js'> </script>
-		<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-		<script language='javascript' src='/opac/common/js/sorttable.js'> </script>
-		<script language='javascript' src='adminlib.js'> </script>
-		<script language='javascript' src='hold_pull_list.js'> </script>
-		<link type='text/css' rel='stylesheet' href='admin.css'/>
+    <head>
+        <title>&staff.server.admin.hold_pull.title;</title>
+        <script language='javascript' src='/opac/common/js/utils.js'> </script>
+        <script language='javascript' src='/opac/common/js//config.js'> </script> 
+        <script language='javascript' src='/opac/common/js/CGI.js'> </script>
+        <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
+    
+        <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
+        <script language='javascript' src='/opac/common/js/fmall.js'> </script>
+        <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
+        <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
+        <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
+        <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
+        <script language='javascript' src='/opac/common/js/org_utils.js'> </script>
+        <script language='javascript' src='/opac/common/js/init.js'> </script>
+        <script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
+        <script language='javascript' src='/opac/common/js/sorttable.js'> </script>
+        <script language='javascript' src='adminlib.js'> </script>
+        <script language='javascript' src='hold_pull_list.js'> </script>
+        <link type='text/css' rel='stylesheet' href='admin.css'/>
   
-		<style type='text/css'>
-			a { color: black; text-decoration: none; }
-		</style>
-	</head>
+        <style type='text/css'>
+            a { color: black; text-decoration: none; }
+        </style>
+    </head>
 
-	<body onload='try{pullListInit();}catch(e){alert(js2JSON(e));}'>
+    <body onload='try{pullListInit();}catch(e){alert(js2JSON(e));}'>
 
-		<center>
-			<h2>&staff.server.admin.hold_pull.header;<span id='pl_org'/></h2>
+        <center>
+            <h2>&staff.server.admin.hold_pull.header;<span id='pl_org'/></h2>
 
-			<div style='position:absolute; top: 5px; right: 5px;'>
-				<span>&staff.server.admin.hold_pull.greeting;</span><b><span id='pl_user'/></b>
-			</div>
-		
-			<hr/><br/>
+            <div style='position:absolute; top: 5px; right: 5px;'>
+                <span>&staff.server.admin.hold_pull.greeting;</span><b><span id='pl_user'/></b>
+            </div>
+        
+            <hr/><br/>
 
-			<span>&staff.server.admin.hold_pull.sort.note;</span>
+            <span>&staff.server.admin.hold_pull.sort.note;</span>
 
-			<table width='100%' class='data_grid sortable' id='pl_table'>
-				<thead>
-					<tr>
-						<td>&staff.server.admin.hold_pull.title.label;</td>
-						<td>&staff.server.admin.hold_pull.author;</td>
-						<td>&staff.server.admin.hold_pull.copy_location;</td>
-						<td id='pl_callnumber'>&staff.server.admin.hold_pull.call_number;</td>
-						<td>&staff.server.admin.hold_pull.item_barcode;</td>
-						<td>&staff.server.admin.hold_pull.copy;</td>
-						<td>&staff.server.admin.hold_pull.format;</td>
-						<td>&staff.server.admin.hold_pull.patron_barcode;</td>
-						<td>&staff.server.admin.hold_pull.hold_date;</td>
-						<td>&staff.server.admin.hold_pull.hold_type;</td>
-					</tr>
-				</thead>
-				<tbody id='pull_list_tbody'>
-					<tr id='pull_list_row'>
-						<td name='title'/>
-						<td name='author'/>
-						<td name='copy_location'/>
-						<td name='call_number'/>
-						<td name='barcode'/>
-						<td name='copy_number'/>
-						<td>
-							<span name='format_at'		class='hide_me'>&staff.server.admin.hold_pull.book;</span>
-							<span name='format_at-d'	class='hide_me'>&staff.server.admin.hold_pull.large_book;</span>
-							<span name='format_i'		class='hide_me'>&staff.server.admin.hold_pull.audiobook;</span>
-							<span name='format_g'		class='hide_me'>&staff.server.admin.hold_pull.video;</span>
-							<span name='format_j'		class='hide_me'>&staff.server.admin.hold_pull.music;</span>
-							<span name='format_m'		class='hide_me'>&staff.server.admin.hold_pull.eresource;</span>
-						</td>
-						<td name='patron'/>
-						<td name='date'/>
-						<td>
-							<span name='copy_hold' class='hide_me'>&staff.server.admin.hold_pull.copy_hold;</span>
-							<span name='volume_hold' class='hide_me'>&staff.server.admin.hold_pull.volume_hold;</span>
-							<span name='title_hold' class='hide_me'>&staff.server.admin.hold_pull.title_hold;</span>
-							<span name='mr_hold' class='hide_me'>&staff.server.admin.hold_pull.metarecord_hold;</span>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-		</center>
-	</body>
+            <table width='100%' class='data_grid sortable' id='pl_table'>
+                <thead>
+                    <tr>
+                        <td>&staff.server.admin.hold_pull.title.label;</td>
+                        <td>&staff.server.admin.hold_pull.author;</td>
+                        <td>&staff.server.admin.hold_pull.copy_location;</td>
+                        <td id='pl_callnumber'>&staff.server.admin.hold_pull.call_number;</td>
+                        <td>&staff.server.admin.hold_pull.item_barcode;</td>
+                        <td>&staff.server.admin.hold_pull.copy;</td>
+                        <td>&staff.server.admin.hold_pull.format;</td>
+                        <td>&staff.server.admin.hold_pull.patron_barcode;</td>
+                        <td>&staff.server.admin.hold_pull.hold_date;</td>
+                        <td>&staff.server.admin.hold_pull.hold_type;</td>
+                    </tr>
+                </thead>
+                <tbody id='pull_list_tbody'>
+                    <tr id='pull_list_row'>
+                        <td name='title'/>
+                        <td name='author'/>
+                        <td name='copy_location'/>
+                        <td name='call_number'/>
+                        <td name='barcode'/>
+                        <td name='copy_number'/>
+                        <td>
+                            <span name='format_at'        class='hide_me'>&staff.server.admin.hold_pull.book;</span>
+                            <span name='format_at-d'    class='hide_me'>&staff.server.admin.hold_pull.large_book;</span>
+                            <span name='format_i'        class='hide_me'>&staff.server.admin.hold_pull.audiobook;</span>
+                            <span name='format_g'        class='hide_me'>&staff.server.admin.hold_pull.video;</span>
+                            <span name='format_j'        class='hide_me'>&staff.server.admin.hold_pull.music;</span>
+                            <span name='format_m'        class='hide_me'>&staff.server.admin.hold_pull.eresource;</span>
+                        </td>
+                        <td name='patron'/>
+                        <td name='date'/>
+                        <td>
+                            <span name='copy_hold' class='hide_me'>&staff.server.admin.hold_pull.copy_hold;</span>
+                            <span name='volume_hold' class='hide_me'>&staff.server.admin.hold_pull.volume_hold;</span>
+                            <span name='title_hold' class='hide_me'>&staff.server.admin.hold_pull.title_hold;</span>
+                            <span name='mr_hold' class='hide_me'>&staff.server.admin.hold_pull.metarecord_hold;</span>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </center>
+    </body>
 </html>
diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
index 3e76c1fde6..603b154777 100644
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
@@ -1,55 +1,55 @@
 <?xml version='1.0'?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!ENTITY nbsp " "> <!-- calendar needs this entity -->
+    "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+    <!ENTITY nbsp " "> <!-- calendar needs this entity -->
 ]>
 
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>Evergreen Holds Pull List</title>
-		<script language='javascript' src='/opac/common/js/utils.js'> </script>
-		<script language='javascript' src='/opac/common/js//config.js'> </script> 
-		<script language='javascript' src='/opac/common/js/CGI.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookie.js'> </script>
-	
-		<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmall.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
-		<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
-		<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/init.js'> </script>
-		<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-		<!--
-		<script language='javascript' src='/opac/common/js/sorttable.js'> </script>
-		-->
-		<script language='javascript' src='adminlib.js'> </script>
-		<script language='javascript' src='/xul/server/main/constants.js'> </script>
-		<script language='javascript' src='/xul/server/main/JSAN.js'> </script>
-		<script language='javascript' src='hold_pull_list_classic.js'> </script>
-		<link type='text/css' rel='stylesheet' href='admin.css'/>
+    <head>
+        <title>Evergreen Holds Pull List</title>
+        <script language='javascript' src='/opac/common/js/utils.js'> </script>
+        <script language='javascript' src='/opac/common/js//config.js'> </script> 
+        <script language='javascript' src='/opac/common/js/CGI.js'> </script>
+        <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
+    
+        <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
+        <script language='javascript' src='/opac/common/js/fmall.js'> </script>
+        <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
+        <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
+        <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
+        <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
+        <script language='javascript' src='/opac/common/js/org_utils.js'> </script>
+        <script language='javascript' src='/opac/common/js/init.js'> </script>
+        <script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
+        <!--
+        <script language='javascript' src='/opac/common/js/sorttable.js'> </script>
+        -->
+        <script language='javascript' src='adminlib.js'> </script>
+        <script language='javascript' src='/xul/server/main/constants.js'> </script>
+        <script language='javascript' src='/xul/server/main/JSAN.js'> </script>
+        <script language='javascript' src='hold_pull_list_classic.js'> </script>
+        <link type='text/css' rel='stylesheet' href='admin.css'/>
   
-		<style type='text/css'>
-			a { color: black; text-decoration: none; }
-		</style>
-	</head>
+        <style type='text/css'>
+            a { color: black; text-decoration: none; }
+        </style>
+    </head>
 
-	<body onload='try{pullListInit();}catch(e){alert(js2JSON(e));}'>
+    <body onload='try{pullListInit();}catch(e){alert(js2JSON(e));}'>
 
-		<center>
-			<h2>Evergreen Holds Pull List : <span id='pl_org'/></h2>
+        <center>
+            <h2>Evergreen Holds Pull List : <span id='pl_org'/></h2>
 
-			<div style='position:absolute; top: 5px; right: 5px;'>
-				<span>Welcome </span><b><span id='pl_user'/></b>
-			</div>
-			<hr/><br/>
-			<div id='inprogress'><blink><span>Retrieving and sorting pull list...</span></blink></div>
-		</center>
+            <div style='position:absolute; top: 5px; right: 5px;'>
+                <span>Welcome </span><b><span id='pl_user'/></b>
+            </div>
+            <hr/><br/>
+            <div id='inprogress'><blink><span>Retrieving and sorting pull list...</span></blink></div>
+        </center>
 <div id='pull_list_tbody' align="left" class='hide_me'>
 <pre id='pull_list_row'>
 <span name='call_number'/>
@@ -61,5 +61,5 @@
 <b>Pickup:</b> <span name='pickup'/>            <span name="age_protect_span" class='hide_me'><b>Hold Protection:</b> <span name="age_protect"/></span>
 </pre>
 </div>
-	</body>
+    </body>
 </html>
diff --git a/Open-ILS/xul/staff_client/server/admin/index.xhtml b/Open-ILS/xul/staff_client/server/admin/index.xhtml
index f2ecc05c1b..41c86f0019 100644
--- a/Open-ILS/xul/staff_client/server/admin/index.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/index.xhtml
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>&staff.server.admin.index.title;</title>
-		<script>
-			function _l(l,p) { 
+    <head>
+        <title>&staff.server.admin.index.title;</title>
+        <script>
+            function _l(l,p) { 
                 var url = l + location.search;
                 if (p) {
                     if (location.search) { url += '&amp;'; } else { url += '?'; }
@@ -20,74 +20,74 @@
                 location.href = url;
             }
             function getBuildId() { return location.href.match(/\/xul\/(.+?)\/server\//)[1]; }
-		</script>
-		<style type='text/css'>
-			body { background-color: white; }
-		</style>
-	</head>
-	<body>
-		<center>
-			<div style='height: 40px; margin-top: 20px; font-weight: bold; font-size: 14pt;'>
-				&staff.server.admin.index.title;
-			</div>
-			<img src='../skin/media/images/tools.png'/>
-			<style>
-				td { text-align: center; }
-			</style>
-			<br/> <br/>
-			<table width='100%'>
-				<thead>
-					<tr>
-						<th width='30%'>&staff.server.admin.index.workstation_configuration;</th>
-						<th width='30%'>&staff.server.admin.index.library_configuration;</th>
-						<th width='30%'>&staff.server.admin.index.maintenance_reports;</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr valign="top">
-						<td>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("font_settings.xul");'>&staff.server.admin.index.fonts_and_sounds;</a>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("printer_settings.html");'>&staff.server.admin.index.printer;</a>
-							</div>
-						</td><td>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("closed_dates.xhtml");'>&staff.server.admin.index.closed_dates;</a>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("copy_locations.xhtml");'>&staff.server.admin.index.copy_locations;</a>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("org_unit_settings.xhtml");'>&staff.server.admin.index.library_settings;</a>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("non_cat_types.xhtml");'>&staff.server.admin.index.non_cataloged_types;</a>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("stat_cat_editor.xhtml");'>&staff.server.admin.index.statistical_categories;</a>
-							</div>
-						</td><td>
-							<div style='padding: 8px;'>
-								<a href='javascript:window.xulG.new_tab("/xul/server/patron/holds.xul",{"tab_name":"&staff.server.admin.index.hold_pull_list;"},{});'>&staff.server.admin.index.hold_pull_list;</a> <span style="color: red">&staff.server.admin.index.testing;</span>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("hold_pull_list_classic.xhtml");'>&staff.server.admin.index.hold_pull_list_classic;</a> <span style="color: red">&staff.server.admin.index.testing;</span>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l( "/reports/oils_rpt.xhtml","build_id=" + getBuildId() );'>&staff.server.admin.index.reports;</a>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("cash_reports.xhtml");'>&staff.server.admin.index.cash_reports;</a>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:window.xulG.new_tab("/xul/server/admin/transit_list.xul",{"tab_name":"&staff.server.admin.index.transits;"},{});'>&staff.server.admin.index.transit_list;</a>
-							</div>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-		</center>
-	</body>
+        </script>
+        <style type='text/css'>
+            body { background-color: white; }
+        </style>
+    </head>
+    <body>
+        <center>
+            <div style='height: 40px; margin-top: 20px; font-weight: bold; font-size: 14pt;'>
+                &staff.server.admin.index.title;
+            </div>
+            <img src='../skin/media/images/tools.png'/>
+            <style>
+                td { text-align: center; }
+            </style>
+            <br/> <br/>
+            <table width='100%'>
+                <thead>
+                    <tr>
+                        <th width='30%'>&staff.server.admin.index.workstation_configuration;</th>
+                        <th width='30%'>&staff.server.admin.index.library_configuration;</th>
+                        <th width='30%'>&staff.server.admin.index.maintenance_reports;</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr valign="top">
+                        <td>
+                            <div style='padding: 8px;'>
+                                <a href='javascript:_l("font_settings.xul");'>&staff.server.admin.index.fonts_and_sounds;</a>
+                            </div>
+                            <div style='padding: 8px;'>
+                                <a href='javascript:_l("printer_settings.html");'>&staff.server.admin.index.printer;</a>
+                            </div>
+                        </td><td>
+                            <div style='padding: 8px;'>
+                                <a href='javascript:_l("closed_dates.xhtml");'>&staff.server.admin.index.closed_dates;</a>
+                            </div>
+                            <div style='padding: 8px;'>
+                                <a href='javascript:_l("copy_locations.xhtml");'>&staff.server.admin.index.copy_locations;</a>
+                            </div>
+                            <div style='padding: 8px;'>
+                                <a href='javascript:_l("org_unit_settings.xhtml");'>&staff.server.admin.index.library_settings;</a>
+                            </div>
+                            <div style='padding: 8px;'>
+                                <a href='javascript:_l("non_cat_types.xhtml");'>&staff.server.admin.index.non_cataloged_types;</a>
+                            </div>
+                            <div style='padding: 8px;'>
+                                <a href='javascript:_l("stat_cat_editor.xhtml");'>&staff.server.admin.index.statistical_categories;</a>
+                            </div>
+                        </td><td>
+                            <div style='padding: 8px;'>
+                                <a href='javascript:window.xulG.new_tab("/xul/server/patron/holds.xul",{"tab_name":"&staff.server.admin.index.hold_pull_list;"},{});'>&staff.server.admin.index.hold_pull_list;</a> <span style="color: red">&staff.server.admin.index.testing;</span>
+                            </div>
+                            <div style='padding: 8px;'>
+                                <a href='javascript:_l("hold_pull_list_classic.xhtml");'>&staff.server.admin.index.hold_pull_list_classic;</a> <span style="color: red">&staff.server.admin.index.testing;</span>
+                            </div>
+                            <div style='padding: 8px;'>
+                                <a href='javascript:_l( "/reports/oils_rpt.xhtml","build_id=" + getBuildId() );'>&staff.server.admin.index.reports;</a>
+                            </div>
+                            <div style='padding: 8px;'>
+                                <a href='javascript:_l("cash_reports.xhtml");'>&staff.server.admin.index.cash_reports;</a>
+                            </div>
+                            <div style='padding: 8px;'>
+                                <a href='javascript:window.xulG.new_tab("/xul/server/admin/transit_list.xul",{"tab_name":"&staff.server.admin.index.transits;"},{});'>&staff.server.admin.index.transit_list;</a>
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </center>
+    </body>
 </html>
diff --git a/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml b/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
index 15bf4c8b07..83f5857f88 100644
--- a/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
@@ -1,166 +1,166 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>&staff.server.admin.non_cat_types.title;</title>
-		<script language='javascript' src='/opac/common/js/utils.js'> </script>
-		<script language='javascript' src='/opac/common/js//config.js'> </script>
-		<script language='javascript' src='/opac/common/js/CGI.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookie.js'> </script>
-	
-		<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmall.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
-		<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
-		<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/init.js'> </script>
-		<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-		<script language='javascript' src='adminlib.js'> </script>
-		<script language='javascript' src='non_cat_types.js'> </script>
-
-		<link type='text/css' rel='stylesheet' href='admin.css'/>
-	</head>
-
-	<body onload='try{ncEditorInit();}catch(e){alert(js2JSON(e));}'>
-
-		<div class='welcome_box'>
-			<span>&staff.server.admin.non_cat_types.greeting;</span><b><span id='nc_user'/></b>
-		</div>
-
-		<center>
-			<div class='title'>&staff.server.admin.non_cat_types.editor.title;</div>
-
-			<br/>
-
-			<table class='data_grid data_grid_center' width='85%'>
-				<thead>
-					<tr><td colspan='5'>&staff.server.admin.non_cat_types.editor.header;</td></tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td><input id='nc_new_name'> </input></td>
-						<td>
-							<input id='nc_new_interval_count' type='text' size='3' maxlength='3' value='14'/>
-							<select id='nc_new_interval_type' style='width: 6em;'>
-								<option value='minutes'>&staff.server.admin.non_cat_types.editor.minutes;</option>
-								<option value='hours'>&staff.server.admin.non_cat_types.editor.hours;</option>
-								<option value='days' selected='selected'>&staff.server.admin.non_cat_types.editor.days;</option>
-								<option value='weeks'>&staff.server.admin.non_cat_types.editor.weeks;</option>
-								<option value='months'>&staff.server.admin.non_cat_types.editor.months;</option>
-							</select>
-						</td>
-						<td>&staff.server.admin.non_cat_types.in_house_circ;
-						    <input id='nc_new_inhouse' type='checkbox'/>
-						</td>
-						<td><select class='select_big' id='nc_new_owner' disabled='disabled'> </select></td>
-						<td><input id='nc_new_submit' type='submit' value='&staff.server.admin.non_cat_types.editor.create;' disabled='disabled'> </input></td>
-					</tr>
-				</tbody>
-			</table>
-
-			<br/> <hr/> <br/>
+    <head>
+        <title>&staff.server.admin.non_cat_types.title;</title>
+        <script language='javascript' src='/opac/common/js/utils.js'> </script>
+        <script language='javascript' src='/opac/common/js//config.js'> </script>
+        <script language='javascript' src='/opac/common/js/CGI.js'> </script>
+        <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
+    
+        <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
+        <script language='javascript' src='/opac/common/js/fmall.js'> </script>
+        <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
+        <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
+        <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
+        <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
+        <script language='javascript' src='/opac/common/js/org_utils.js'> </script>
+        <script language='javascript' src='/opac/common/js/init.js'> </script>
+        <script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
+        <script language='javascript' src='adminlib.js'> </script>
+        <script language='javascript' src='non_cat_types.js'> </script>
+
+        <link type='text/css' rel='stylesheet' href='admin.css'/>
+    </head>
+
+    <body onload='try{ncEditorInit();}catch(e){alert(js2JSON(e));}'>
+
+        <div class='welcome_box'>
+            <span>&staff.server.admin.non_cat_types.greeting;</span><b><span id='nc_user'/></b>
+        </div>
+
+        <center>
+            <div class='title'>&staff.server.admin.non_cat_types.editor.title;</div>
+
+            <br/>
+
+            <table class='data_grid data_grid_center' width='85%'>
+                <thead>
+                    <tr><td colspan='5'>&staff.server.admin.non_cat_types.editor.header;</td></tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td><input id='nc_new_name'> </input></td>
+                        <td>
+                            <input id='nc_new_interval_count' type='text' size='3' maxlength='3' value='14'/>
+                            <select id='nc_new_interval_type' style='width: 6em;'>
+                                <option value='minutes'>&staff.server.admin.non_cat_types.editor.minutes;</option>
+                                <option value='hours'>&staff.server.admin.non_cat_types.editor.hours;</option>
+                                <option value='days' selected='selected'>&staff.server.admin.non_cat_types.editor.days;</option>
+                                <option value='weeks'>&staff.server.admin.non_cat_types.editor.weeks;</option>
+                                <option value='months'>&staff.server.admin.non_cat_types.editor.months;</option>
+                            </select>
+                        </td>
+                        <td>&staff.server.admin.non_cat_types.in_house_circ;
+                            <input id='nc_new_inhouse' type='checkbox'/>
+                        </td>
+                        <td><select class='select_big' id='nc_new_owner' disabled='disabled'> </select></td>
+                        <td><input id='nc_new_submit' type='submit' value='&staff.server.admin.non_cat_types.editor.create;' disabled='disabled'> </input></td>
+                    </tr>
+                </tbody>
+            </table>
+
+            <br/> <hr/> <br/>
 
             &staff.server.admin.copy_locations.editor.library.filter; <select disabled='disabled' id='nc_org_filter'> </select>
             <br/><br/>
 
-			<table id='nc_table' class='data_grid' width='85%'>
-				<thead>
-					<tr>
-						<td>&staff.server.admin.non_cat_types.name;</td>
-						<td>&staff.server.admin.non_cat_types.owning_location;</td>
-						<td>&staff.server.admin.non_cat_types.duration;</td>
-						<td>&staff.server.admin.non_cat_types.in_house.circulate;</td>
-						<td>&staff.server.admin.non_cat_types.edit;</td>
-						<td>&staff.server.admin.non_cat_types.delete;</td>
-					</tr>
-				</thead>
-				<tbody id='nc_tbody'>
-					<tr id='nc_row_template'>
-						<td><b name='nc_name'> </b></td>
-						<td name='nc_owner'/>
-						<td>
-							<input name='nc_interval_count' type='text' size='3' maxlength='3' disabled='disabled'/>
-							<select name='nc_interval_type' style='width: 6em;' disabled='disabled'>
-								<option value='minutes'>&staff.server.admin.non_cat_types.editor.minutes;</option>
-								<option value='hours'>&staff.server.admin.non_cat_types.editor.hours;</option>
-								<option value='days'>&staff.server.admin.non_cat_types.editor.days;</option>
-								<option value='weeks'>&staff.server.admin.non_cat_types.editor.weeks;</option>
-								<option value='months'>&staff.server.admin.non_cat_types.editor.months;</option>
-							</select>
-						</td>
-						<td>
-							<input name='nc_inhouse' type='checkbox' disabled='disabled'/>
-						</td>
-						<td><input name='nc_edit' type='submit' value='&staff.server.admin.non_cat_types.edit;' disabled='disabled'/></td>
-						<td><input name='nc_delete' type='submit' value='&staff.server.admin.non_cat_types.delete;' disabled='disabled'/></td>
-					</tr>
-				</tbody>
-			</table>
-		</center>
-
-		<table class='hide_me'> <!-- repository for template rows -->
-			<tbody>
-				<tr id='nc_edit_row_template' class='insert_row' edit='1'>
-					<td align='center'>
-						<span class='padded'>
-							<input name='nc_edit_name' type='text'> </input>
-						</span>
-					</td>
-					<td name='nc_edit_owner'/>
-					<td>
-						<span>
-							<input name='nc_edit_interval_count' type='text' size='3' maxlength='3'/>
-							<select name='nc_edit_interval_type' style='width: 6em;'>
-								<option value='minutes'>&staff.server.admin.non_cat_types.editor.minutes;</option>
-								<option value='hours'>&staff.server.admin.non_cat_types.editor.hours;</option>
-								<option value='days'>&staff.server.admin.non_cat_types.editor.days;</option>
-								<option value='weeks'>&staff.server.admin.non_cat_types.editor.weeks;</option>
-								<option value='months'>&staff.server.admin.non_cat_types.editor.months;</option>
-							</select>
-						</span>
-					</td>
-
-					<td><input name='nc_edit_inhouse' type='checkbox'/></td>
-
-					<td>
-						<span class='padded'>
-							<input name='nc_edit_submit' type='submit' value='&staff.server.admin.non_cat_types.submit;'> </input>
-						</span>
-					</td>
-					<td>
-						<span class='padded'>
-							<input name='nc_edit_cancel' type='submit' value='&staff.server.admin.non_cat_types.cancel;'> </input>
-						</span>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-	</body>
-
-	<span class='hide_me' id='nc_delete_confirm'>
-		&staff.server.admin.non_cat_types.delete.confirm;
-	</span>
-
-	<span class='hide_me' id='cd_in_house_exp'>
-		&staff.server.admin.non_cat_types.in_house.help;
-	</span>
-
-	<span class='hide_me' id='nc_update_success'>
-		&staff.server.admin.non_cat_types.update.success;
-	</span>
-
-	<span class='hide_me' id='nc_type_exists'>
-		&staff.server.admin.non_cat_types.name_exists;
-	</span>
+            <table id='nc_table' class='data_grid' width='85%'>
+                <thead>
+                    <tr>
+                        <td>&staff.server.admin.non_cat_types.name;</td>
+                        <td>&staff.server.admin.non_cat_types.owning_location;</td>
+                        <td>&staff.server.admin.non_cat_types.duration;</td>
+                        <td>&staff.server.admin.non_cat_types.in_house.circulate;</td>
+                        <td>&staff.server.admin.non_cat_types.edit;</td>
+                        <td>&staff.server.admin.non_cat_types.delete;</td>
+                    </tr>
+                </thead>
+                <tbody id='nc_tbody'>
+                    <tr id='nc_row_template'>
+                        <td><b name='nc_name'> </b></td>
+                        <td name='nc_owner'/>
+                        <td>
+                            <input name='nc_interval_count' type='text' size='3' maxlength='3' disabled='disabled'/>
+                            <select name='nc_interval_type' style='width: 6em;' disabled='disabled'>
+                                <option value='minutes'>&staff.server.admin.non_cat_types.editor.minutes;</option>
+                                <option value='hours'>&staff.server.admin.non_cat_types.editor.hours;</option>
+                                <option value='days'>&staff.server.admin.non_cat_types.editor.days;</option>
+                                <option value='weeks'>&staff.server.admin.non_cat_types.editor.weeks;</option>
+                                <option value='months'>&staff.server.admin.non_cat_types.editor.months;</option>
+                            </select>
+                        </td>
+                        <td>
+                            <input name='nc_inhouse' type='checkbox' disabled='disabled'/>
+                        </td>
+                        <td><input name='nc_edit' type='submit' value='&staff.server.admin.non_cat_types.edit;' disabled='disabled'/></td>
+                        <td><input name='nc_delete' type='submit' value='&staff.server.admin.non_cat_types.delete;' disabled='disabled'/></td>
+                    </tr>
+                </tbody>
+            </table>
+        </center>
+
+        <table class='hide_me'> <!-- repository for template rows -->
+            <tbody>
+                <tr id='nc_edit_row_template' class='insert_row' edit='1'>
+                    <td align='center'>
+                        <span class='padded'>
+                            <input name='nc_edit_name' type='text'> </input>
+                        </span>
+                    </td>
+                    <td name='nc_edit_owner'/>
+                    <td>
+                        <span>
+                            <input name='nc_edit_interval_count' type='text' size='3' maxlength='3'/>
+                            <select name='nc_edit_interval_type' style='width: 6em;'>
+                                <option value='minutes'>&staff.server.admin.non_cat_types.editor.minutes;</option>
+                                <option value='hours'>&staff.server.admin.non_cat_types.editor.hours;</option>
+                                <option value='days'>&staff.server.admin.non_cat_types.editor.days;</option>
+                                <option value='weeks'>&staff.server.admin.non_cat_types.editor.weeks;</option>
+                                <option value='months'>&staff.server.admin.non_cat_types.editor.months;</option>
+                            </select>
+                        </span>
+                    </td>
+
+                    <td><input name='nc_edit_inhouse' type='checkbox'/></td>
+
+                    <td>
+                        <span class='padded'>
+                            <input name='nc_edit_submit' type='submit' value='&staff.server.admin.non_cat_types.submit;'> </input>
+                        </span>
+                    </td>
+                    <td>
+                        <span class='padded'>
+                            <input name='nc_edit_cancel' type='submit' value='&staff.server.admin.non_cat_types.cancel;'> </input>
+                        </span>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+
+    <span class='hide_me' id='nc_delete_confirm'>
+        &staff.server.admin.non_cat_types.delete.confirm;
+    </span>
+
+    <span class='hide_me' id='cd_in_house_exp'>
+        &staff.server.admin.non_cat_types.in_house.help;
+    </span>
+
+    <span class='hide_me' id='nc_update_success'>
+        &staff.server.admin.non_cat_types.update.success;
+    </span>
+
+    <span class='hide_me' id='nc_type_exists'>
+        &staff.server.admin.non_cat_types.name_exists;
+    </span>
 
 
 </html>
diff --git a/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul b/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul
index 487f49d46a..dd8b1d5a44 100644
--- a/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul
+++ b/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,87 +19,87 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="admin_offline_manage_xacts_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for admin_offline_manage_xacts.xul');
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for admin_offline_manage_xacts.xul');
 
-				JSAN.use('admin.offline_manage_xacts'); g.admin = new admin.offline_manage_xacts();
-				g.admin.init({});
+                JSAN.use('admin.offline_manage_xacts'); g.admin = new admin.offline_manage_xacts();
+                g.admin.init({});
 
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['admin/offline_manage_xacts.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
+            } catch(E) {
+                var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['admin/offline_manage_xacts.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
 
-	]]>
-	</script>
-	<messagecatalog id="adminStrings" src="/xul/server/locale/<!--#echo var='locale'-->/admin.properties"/>
+    ]]>
+    </script>
+    <messagecatalog id="adminStrings" src="/xul/server/locale/<!--#echo var='locale'-->/admin.properties"/>
 
-	<vbox id="admin_offline_manage_xacts_main" flex="1">
+    <vbox id="admin_offline_manage_xacts_main" flex="1">
 
-		<groupbox flex="1">
-			<caption label="&staff.server.admin.offline.xacts.caption;"/>
-			<hbox>
-				<button id="refresh" label="&common.refresh;" accesskey="&staff.server.admin.offline.xacts.refresh.accesskey;"/>
-				<button id="create" label="&staff.server.admin.offline.xacts.create.label;" disabled="true"/>
-				<button id="execute" label="&staff.server.admin.offline.xacts.execute.label;" disabled="true"/>
-				<spacer flex="1"/>
-				<button id="upload" label="&staff.server.admin.offline.xacts.upload.label;" disabled="true"/>
-			</hbox>
-			<tree id="session_tree" enableColumnDrag="true" seltype="single" flex="1"/>
-		</groupbox>
-			<splitter><grippy/></splitter>
-		<deck flex="1" id="deck">
-			<label value=" "/>
-			<groupbox flex="1">
-				<caption id="status_caption" label="&staff.server.admin.offline.xacts.status.label;"/>
-				<description style="background-color: lightgreen">
+        <groupbox flex="1">
+            <caption label="&staff.server.admin.offline.xacts.caption;"/>
+            <hbox>
+                <button id="refresh" label="&common.refresh;" accesskey="&staff.server.admin.offline.xacts.refresh.accesskey;"/>
+                <button id="create" label="&staff.server.admin.offline.xacts.create.label;" disabled="true"/>
+                <button id="execute" label="&staff.server.admin.offline.xacts.execute.label;" disabled="true"/>
+                <spacer flex="1"/>
+                <button id="upload" label="&staff.server.admin.offline.xacts.upload.label;" disabled="true"/>
+            </hbox>
+            <tree id="session_tree" enableColumnDrag="true" seltype="single" flex="1"/>
+        </groupbox>
+            <splitter><grippy/></splitter>
+        <deck flex="1" id="deck">
+            <label value=" "/>
+            <groupbox flex="1">
+                <caption id="status_caption" label="&staff.server.admin.offline.xacts.status.label;"/>
+                <description style="background-color: lightgreen">
                 &staff.server.admin.offline.xacts.status.desc;
-				</description>
-				<tree id="script_tree" enableColumnDrag="true" seltype="single" flex="1"/>
-			</groupbox>
-			<groupbox flex="1">
-				<caption id="errors_caption" label="&staff.server.admin.offline.xacts.errors.label;"/>
-				<description style="background-color: orange">
+                </description>
+                <tree id="script_tree" enableColumnDrag="true" seltype="single" flex="1"/>
+            </groupbox>
+            <groupbox flex="1">
+                <caption id="errors_caption" label="&staff.server.admin.offline.xacts.errors.label;"/>
+                <description style="background-color: orange">
                 &staff.server.admin.offline.xacts.errors.desc;
-				</description>
-				<vbox flex="1">
-					<hbox>
-						<button id='export_btn' label="&staff.server.admin.offline.xacts.export.label;" />
-						<button id='print_export_btn' label="&staff.server.admin.offline.xacts.print.label;" />
-						<spacer flex="1"/>
-						<button id='retrieve_item' label="&staff.server.admin.offline.xacts.get_item.label;" disabled="true"/>
-						<button id='retrieve_patron' label="&staff.server.admin.offline.xacts.get_patron.label;" disabled="true"/>
-						<button id='retrieve_details' label="&staff.server.admin.offline.xacts.get_details.label;" disabled="true"/>
-					</hbox>
-					<tree id="error_tree" enableColumnDrag="true" seltype="multiple" flex="1"/>
-				</vbox>
-			</groupbox>
-			<groupbox flex="1">
-				<caption id="errors_caption" label="&staff.server.admin.offline.xacts.errors.caption;"/>
-			</groupbox>
-		</deck>
-		<hbox id="iframe_placeholder" hidden="false" flex="0"/>
+                </description>
+                <vbox flex="1">
+                    <hbox>
+                        <button id='export_btn' label="&staff.server.admin.offline.xacts.export.label;" />
+                        <button id='print_export_btn' label="&staff.server.admin.offline.xacts.print.label;" />
+                        <spacer flex="1"/>
+                        <button id='retrieve_item' label="&staff.server.admin.offline.xacts.get_item.label;" disabled="true"/>
+                        <button id='retrieve_patron' label="&staff.server.admin.offline.xacts.get_patron.label;" disabled="true"/>
+                        <button id='retrieve_details' label="&staff.server.admin.offline.xacts.get_details.label;" disabled="true"/>
+                    </hbox>
+                    <tree id="error_tree" enableColumnDrag="true" seltype="multiple" flex="1"/>
+                </vbox>
+            </groupbox>
+            <groupbox flex="1">
+                <caption id="errors_caption" label="&staff.server.admin.offline.xacts.errors.caption;"/>
+            </groupbox>
+        </deck>
+        <hbox id="iframe_placeholder" hidden="false" flex="0"/>
 
-	</vbox>
+    </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
index 32367d65ff..b0549597b2 100644
--- a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
@@ -14,9 +14,9 @@
 -->
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns='http://www.w3.org/1999/xhtml'>
diff --git a/Open-ILS/xul/staff_client/server/admin/printer_settings.html b/Open-ILS/xul/staff_client/server/admin/printer_settings.html
index e9a2b02268..783138ed33 100644
--- a/Open-ILS/xul/staff_client/server/admin/printer_settings.html
+++ b/Open-ILS/xul/staff_client/server/admin/printer_settings.html
@@ -1,29 +1,29 @@
 <html><head>
 
-	<script type="text/javascript" src="/opac/common/js/utils.js"></script>
-	<script type="text/javascript" src="/opac/common/js/CGI.js"></script>
-	<script type="text/javascript" src="/opac/common/js/md5.js"></script>
-	<script type="text/javascript" src="/opac/common/js/JSON_v1.js"></script>
-	<script type="text/javascript" src="/opac/common/js/fmall.js"></script>
-	<script type="text/javascript" src="/opac/common/js/fmgen.js"></script>
-	<script type="text/javascript" src="/opac/common/js/RemoteRequest.js"></script>
-	<script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'></script>
-	<script type="text/javascript" src="/opac/common/js/org_utils.js"></script>
+    <script type="text/javascript" src="/opac/common/js/utils.js"></script>
+    <script type="text/javascript" src="/opac/common/js/CGI.js"></script>
+    <script type="text/javascript" src="/opac/common/js/md5.js"></script>
+    <script type="text/javascript" src="/opac/common/js/JSON_v1.js"></script>
+    <script type="text/javascript" src="/opac/common/js/fmall.js"></script>
+    <script type="text/javascript" src="/opac/common/js/fmgen.js"></script>
+    <script type="text/javascript" src="/opac/common/js/RemoteRequest.js"></script>
+    <script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'></script>
+    <script type="text/javascript" src="/opac/common/js/org_utils.js"></script>
 
-	<script type="text/javascript" src="/xul/server/OpenILS/global_util.js"></script>
-	<script type="text/javascript" src="/xul/server/main/constants.js"></script>
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
-	<script type="text/javascript" src="printer_settings.js"></script>
+    <script type="text/javascript" src="/xul/server/OpenILS/global_util.js"></script>
+    <script type="text/javascript" src="/xul/server/main/constants.js"></script>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
+    <script type="text/javascript" src="printer_settings.js"></script>
 </head><body onload="try { my_init(); } catch(E) { alert(E); }" style="background: white;">
-	<h1>Normal Settings</h1>
-	<iframe id="sample" src="printer_settings.txt"></iframe><br />
-	<button onclick="try { g.printer_settings(); } catch(E) { alert(E); }">Set Default Printer and Print Test Page</button>
-	<button onclick="try { g.page_settings(); } catch(E) { alert(E); }">Page Settings</button><br />
-	<h1>Advanced Settings</h1>
-	<button onclick="try { g.set_print_strategy('webBrowserPrint'); } catch(E) { alert(E); }">Use default print strategy (Mozilla Print)</button>
-	<button onclick="try { g.set_print_strategy('dos.print'); } catch(E) { alert(E); }">Use alternate print strategy (DOS LPT1 Print)</button>
-	<p>
-		<b>Warning:</b> The alternate (DOS LPT1) print strategy will ignore the printer settings made in the "Normal Settings" section.  In Windows, you must map your printer to the LPT1 port, under Start Menu -&gt; Printers and Faxes -&gt; your printer -&gt; right-click, Properties -&gt; Ports.  Also, HTML styling such as different font weights and sizes will be lost when using the DOS LPT1 print.  Data is sent to the printer as simple text in this case.
-	</p>
+    <h1>Normal Settings</h1>
+    <iframe id="sample" src="printer_settings.txt"></iframe><br />
+    <button onclick="try { g.printer_settings(); } catch(E) { alert(E); }">Set Default Printer and Print Test Page</button>
+    <button onclick="try { g.page_settings(); } catch(E) { alert(E); }">Page Settings</button><br />
+    <h1>Advanced Settings</h1>
+    <button onclick="try { g.set_print_strategy('webBrowserPrint'); } catch(E) { alert(E); }">Use default print strategy (Mozilla Print)</button>
+    <button onclick="try { g.set_print_strategy('dos.print'); } catch(E) { alert(E); }">Use alternate print strategy (DOS LPT1 Print)</button>
+    <p>
+        <b>Warning:</b> The alternate (DOS LPT1) print strategy will ignore the printer settings made in the "Normal Settings" section.  In Windows, you must map your printer to the LPT1 port, under Start Menu -&gt; Printers and Faxes -&gt; your printer -&gt; right-click, Properties -&gt; Ports.  Also, HTML styling such as different font weights and sizes will be lost when using the DOS LPT1 print.  Data is sent to the printer as simple text in this case.
+    </p>
 </body></html>
 
diff --git a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
index bd6f419945..e9f63620a8 100644
--- a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
@@ -1,261 +1,261 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>&staff.server.admin.stat_cat.title;</title>
-		<script language='javascript' src='/opac/common/js/utils.js'> </script>
-		<script language='javascript' src='/opac/common/js//config.js'> </script> 
-		<script language='javascript' src='/opac/common/js/CGI.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookie.js'> </script>
-	
-		<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmall.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
-		<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
-		<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/init.js'> </script>
-		<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-		<script language='javascript' src='adminlib.js'> </script>
-		<script language='javascript' src='stat_cat_editor.js'> </script>
-		<link type='text/css' rel='stylesheet' href='admin.css'/>
-	</head>
-
-	<body onload='try{scEditorInit();}catch(e){alert(js2JSON(e));}'>
-
-
-		<div style='position:absolute; top: 5px; right: 5px;'>
-			<span>&staff.server.admin.stat_cat.greeting;</span><b><span id='sc_user'/></b>
-		</div>
-
-		<center>
-			<div style='font-weight: bold; font-size: 12pt;'>&staff.server.admin.stat_cat.heading;</div>
-		</center>
-
-		<hr/> 
-
-
-		<center>
-			<br/>
-
-
-			<table class='data_grid data_grid_center' width='80%'>
-				<thead>
-					<tr>
-						<td colspan='4'>&staff.server.admin.stat_cat.create;</td>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>&staff.server.admin.stat_cat.name;</td>
-						<td>
-							<input type='text' id='sc_new_name'> </input>
-							<script>$('sc_new_name').focus();</script>
-						</td>
-						<td>&staff.server.admin.stat_cat.owning_library;</td>
-						<td>
-							<select id='sc_owning_lib_selector'>
-							</select>
-						</td>
-					</tr>
-					<tr>
-						<td>&staff.server.admin.stat_cat.opac_visibility;</td>
-						<td>	
-							<span>&staff.server.admin.stat_cat.on;</span>
-							<input type='radio' name='opac_visibility' id='sc_make_opac_visible'> </input>
-							<span>&staff.server.admin.stat_cat.off;</span>
-							<input type='radio' name='opac_visibility' checked='checked'> </input>
-						</td>
-						<td>&staff.server.admin.stat_cat.type;</td>
-						<td>
-							<select id='sc_type_selector'>
-								<option value='asset' selected='selected'>&staff.server.admin.stat_cat.copy;</option>
-								<option value='actor'>&staff.server.admin.stat_cat.patron;</option>
-							</select>
-						</td>
-					</tr>
-					<tr>
-						<td colspan='4'>
-							<input type='submit' value='&staff.server.admin.stat_cat.create.submit;' onclick='scNew();' id='sc_new'/>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-
-			<br/>
-			<hr/>
-			<br/>
+    <head>
+        <title>&staff.server.admin.stat_cat.title;</title>
+        <script language='javascript' src='/opac/common/js/utils.js'> </script>
+        <script language='javascript' src='/opac/common/js//config.js'> </script> 
+        <script language='javascript' src='/opac/common/js/CGI.js'> </script>
+        <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
+    
+        <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
+        <script language='javascript' src='/opac/common/js/fmall.js'> </script>
+        <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
+        <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
+        <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
+        <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
+        <script language='javascript' src='/opac/common/js/org_utils.js'> </script>
+        <script language='javascript' src='/opac/common/js/init.js'> </script>
+        <script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
+        <script language='javascript' src='adminlib.js'> </script>
+        <script language='javascript' src='stat_cat_editor.js'> </script>
+        <link type='text/css' rel='stylesheet' href='admin.css'/>
+    </head>
+
+    <body onload='try{scEditorInit();}catch(e){alert(js2JSON(e));}'>
+
+
+        <div style='position:absolute; top: 5px; right: 5px;'>
+            <span>&staff.server.admin.stat_cat.greeting;</span><b><span id='sc_user'/></b>
+        </div>
+
+        <center>
+            <div style='font-weight: bold; font-size: 12pt;'>&staff.server.admin.stat_cat.heading;</div>
+        </center>
+
+        <hr/> 
+
+
+        <center>
+            <br/>
+
+
+            <table class='data_grid data_grid_center' width='80%'>
+                <thead>
+                    <tr>
+                        <td colspan='4'>&staff.server.admin.stat_cat.create;</td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>&staff.server.admin.stat_cat.name;</td>
+                        <td>
+                            <input type='text' id='sc_new_name'> </input>
+                            <script>$('sc_new_name').focus();</script>
+                        </td>
+                        <td>&staff.server.admin.stat_cat.owning_library;</td>
+                        <td>
+                            <select id='sc_owning_lib_selector'>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>&staff.server.admin.stat_cat.opac_visibility;</td>
+                        <td>    
+                            <span>&staff.server.admin.stat_cat.on;</span>
+                            <input type='radio' name='opac_visibility' id='sc_make_opac_visible'> </input>
+                            <span>&staff.server.admin.stat_cat.off;</span>
+                            <input type='radio' name='opac_visibility' checked='checked'> </input>
+                        </td>
+                        <td>&staff.server.admin.stat_cat.type;</td>
+                        <td>
+                            <select id='sc_type_selector'>
+                                <option value='asset' selected='selected'>&staff.server.admin.stat_cat.copy;</option>
+                                <option value='actor'>&staff.server.admin.stat_cat.patron;</option>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan='4'>
+                            <input type='submit' value='&staff.server.admin.stat_cat.create.submit;' onclick='scNew();' id='sc_new'/>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+
+            <br/>
+            <hr/>
+            <br/>
 
             &staff.server.admin.copy_locations.editor.library.filter; <select disabled='disabled' id='sc_org_filter'> </select>
             <br/><br/>
 
-			<div id='loading' class='has_color'><h2>&staff.server.admin.stat_cat.loading_status;</h2></div>
-
-			<table width='98%'>
-				<tbody>
-					<tr>
-						<td width='20%'> </td>
-						<td id='sc_show_copy' width='30%' class='has_color'
-							align='center'><a href='javascript:scShow("asset");'>&staff.server.admin.stat_cat.copy_stat_cats;</a></td>
-						<td id='sc_show_actor' width='30%' 
-							align='center'><a href='javascript:scShow("actor");'>&staff.server.admin.stat_cat.patron_stat_cats;</a></td>
-						<td width='20%'> </td>
-					</tr>
-				</tbody>
-			</table>
-
-
-
-			<br/>
-			<div>&staff.server.admin.stat_cat.info_prompt;</div>
-			<br/>
-
-			<div style='padding: 20px;' id='sc_none' class='hide_me'><b>&staff.server.admin.stat_cat.none_defined;</b></div>
-
-			<!--
-			<div style='overflow: auto; max-height: 200px;'>
-			-->
-				<table width='95%' class='hide_me data_grid data_grid_center' id='sc_table'>
-					<thead>
-						<tr>
-							<td>&staff.server.admin.stat_cat.name.label;</td>
-							<td>&staff.server.admin.stat_cat.owning_library.label;</td>
-							<td>&staff.server.admin.stat_cat.opac_visibility.label;</td>
-							<td id='sc_usr_summary_label'>&staff.server.admin.stat_cat.usr_summary.label;</td>
-							<td>&staff.server.admin.stat_cat.entries.label;</td>
-							<td>&staff.server.admin.stat_cat.add_entry;</td>
-							<td>&staff.server.admin.stat_cat.edit;</td>
-						</tr>
-					</thead>
-	
-					<tbody id='sc_tbody'>
-						<tr id='sc_tr'>
-							<td><b name='sc_name'> </b></td>
-							<td name='sc_owning_lib'> </td>
-	
-							<td>
-								<span class='hide_me' name='sc_opac_visible'>&staff.server.admin.stat_cat.on;</span> 
-								<span class='hide_me' name='sc_opac_invisible'>&staff.server.admin.stat_cat.off;</span> 
-							</td>
-							<td name='sc_usr_summary_td'>
-								<span class='hide_me' name='sc_usr_summary_on'>&staff.server.admin.stat_cat.on;</span> 
-								<span class='hide_me' name='sc_usr_summary'>&staff.server.admin.stat_cat.off;</span> 
+            <div id='loading' class='has_color'><h2>&staff.server.admin.stat_cat.loading_status;</h2></div>
+
+            <table width='98%'>
+                <tbody>
+                    <tr>
+                        <td width='20%'> </td>
+                        <td id='sc_show_copy' width='30%' class='has_color'
+                            align='center'><a href='javascript:scShow("asset");'>&staff.server.admin.stat_cat.copy_stat_cats;</a></td>
+                        <td id='sc_show_actor' width='30%' 
+                            align='center'><a href='javascript:scShow("actor");'>&staff.server.admin.stat_cat.patron_stat_cats;</a></td>
+                        <td width='20%'> </td>
+                    </tr>
+                </tbody>
+            </table>
+
+
+
+            <br/>
+            <div>&staff.server.admin.stat_cat.info_prompt;</div>
+            <br/>
+
+            <div style='padding: 20px;' id='sc_none' class='hide_me'><b>&staff.server.admin.stat_cat.none_defined;</b></div>
+
+            <!--
+            <div style='overflow: auto; max-height: 200px;'>
+            -->
+                <table width='95%' class='hide_me data_grid data_grid_center' id='sc_table'>
+                    <thead>
+                        <tr>
+                            <td>&staff.server.admin.stat_cat.name.label;</td>
+                            <td>&staff.server.admin.stat_cat.owning_library.label;</td>
+                            <td>&staff.server.admin.stat_cat.opac_visibility.label;</td>
+                            <td id='sc_usr_summary_label'>&staff.server.admin.stat_cat.usr_summary.label;</td>
+                            <td>&staff.server.admin.stat_cat.entries.label;</td>
+                            <td>&staff.server.admin.stat_cat.add_entry;</td>
+                            <td>&staff.server.admin.stat_cat.edit;</td>
+                        </tr>
+                    </thead>
+    
+                    <tbody id='sc_tbody'>
+                        <tr id='sc_tr'>
+                            <td><b name='sc_name'> </b></td>
+                            <td name='sc_owning_lib'> </td>
+    
+                            <td>
+                                <span class='hide_me' name='sc_opac_visible'>&staff.server.admin.stat_cat.on;</span> 
+                                <span class='hide_me' name='sc_opac_invisible'>&staff.server.admin.stat_cat.off;</span> 
                             </td>
-							<td>
+                            <td name='sc_usr_summary_td'>
+                                <span class='hide_me' name='sc_usr_summary_on'>&staff.server.admin.stat_cat.on;</span> 
+                                <span class='hide_me' name='sc_usr_summary'>&staff.server.admin.stat_cat.off;</span> 
+                            </td>
+                            <td>
                                 <select class='selector' name='sc_entries_selector'>
                                     <option>&staff.server.admin.stat_cat.none;</option>
                                 </select>
                             </td>
-							<td><a href='javascript:void(0);' name='sc_new_entry'>&staff.server.admin.stat_cat.add.label;</a></td>
-							<td><a href='javascript:void(0);' name='sc_edit'>&staff.server.admin.stat_cat.edit;</a></td>
-						</tr>
-					</tbody>
-				</table>
-			<!--
-			</div>
-			-->
-	
-		
-
-			
-		</center>
-
-
-		<!-- Text spans  / template +++++++++++++++++++++++++++++++++++++  -->
-		<span class='hide_me' id='sc_new_entry_text'>&staff.server.admin.stat_cat.add.prompt;</span>
-
-		<span class='hide_me' id='sc_delete_confirm'>
-			&staff.server.admin.stat_cat.delete.confirm;
-		</span>
-
-		<span class='hide_me' id='sc_entry_delete_confirm'>
-			&staff.server.admin.stat_cat.entry_delete.confirm;
-		</span>
-
-		<table class='hide_me'>
-			<tr class='insert_row' id='sc_edit_row'>
-				<td><input name='sc_edit_name'> </input></td>
-				<td>
-					<span class='hide_me' name='sc_edit_show_owning_lib'> </span>
-					<select class='hide_me' name='sc_edit_owning_lib'> </select>
-				</td>
-
-				<td>
-					<span>&staff.server.admin.stat_cat.on;</span>
-					<span name='sc_edit_opac_vis'>
-						<input type='radio' name='sc_edit_opac_visibility'> </input>
-					</span>
-					<span>&staff.server.admin.stat_cat.off;</span>
-					<span name='sc_edit_opac_invis'>
-						<input type='radio' name='sc_edit_opac_visibility'> </input>
-					</span>
-				</td>
+                            <td><a href='javascript:void(0);' name='sc_new_entry'>&staff.server.admin.stat_cat.add.label;</a></td>
+                            <td><a href='javascript:void(0);' name='sc_edit'>&staff.server.admin.stat_cat.edit;</a></td>
+                        </tr>
+                    </tbody>
+                </table>
+            <!--
+            </div>
+            -->
+    
+        
+
+            
+        </center>
+
+
+        <!-- Text spans  / template +++++++++++++++++++++++++++++++++++++  -->
+        <span class='hide_me' id='sc_new_entry_text'>&staff.server.admin.stat_cat.add.prompt;</span>
+
+        <span class='hide_me' id='sc_delete_confirm'>
+            &staff.server.admin.stat_cat.delete.confirm;
+        </span>
+
+        <span class='hide_me' id='sc_entry_delete_confirm'>
+            &staff.server.admin.stat_cat.entry_delete.confirm;
+        </span>
+
+        <table class='hide_me'>
+            <tr class='insert_row' id='sc_edit_row'>
+                <td><input name='sc_edit_name'> </input></td>
+                <td>
+                    <span class='hide_me' name='sc_edit_show_owning_lib'> </span>
+                    <select class='hide_me' name='sc_edit_owning_lib'> </select>
+                </td>
+
+                <td>
+                    <span>&staff.server.admin.stat_cat.on;</span>
+                    <span name='sc_edit_opac_vis'>
+                        <input type='radio' name='sc_edit_opac_visibility'> </input>
+                    </span>
+                    <span>&staff.server.admin.stat_cat.off;</span>
+                    <span name='sc_edit_opac_invis'>
+                        <input type='radio' name='sc_edit_opac_visibility'> </input>
+                    </span>
+                </td>
                 <td name='sc_edit_usr_summary_td'>
                     <input type='checkbox' name='sc_edit_usr_summary'/>
                 </td>
-				<td colspan='4'>
-					<span class='padded'>
-						<input  type='submit' value='&staff.server.admin.stat_cat.edit_submit;' name='sc_edit_submit'/>
-					</span>
-					<span class='padded'>
-						<input  type='submit' value='&staff.server.admin.stat_cat.edit_delete;' name='sc_edit_delete'/>
-					</span>
-					<input type='submit' name='sc_edit_cancel' value='&staff.server.admin.stat_cat.cancel;'/>
-				</td>
-			</tr>
-
-			<tr class='insert_row' id='sc_edit_entry_row'>
-				<td colspan='7'>
-					<span class='padded'>
-						<span>&staff.server.admin.stat_cat.edit_entry_owner;</span><b name='sc_edit_entry_owner'/>
-					</span>
-					<span class='padded'>
-						<input type='text' name='sc_edit_entry_name' class='padded'/>
-					</span>
-					<span class='padded'>
-						<input type='submit' name='sc_edit_entry_name_submit' value='&staff.server.admin.stat_cat.edit_entry_name_submit;' class='padded'/>
-					</span>
-					<span class='padded'>
-						<input type='submit' name='sc_edit_entry_delete' value='&staff.server.admin.stat_cat.edit_entry_delete;' class='padded'/>
-					</span>
-					<span class='padded'>
-						<input type='submit' name='sc_edit_entry_cancel' value='&staff.server.admin.stat_cat.cancel;'/>
-					</span>
-				</td>
-			</tr>
-
-			<tr class='insert_row' id='sc_new_entry_row'>
-				<td colspan='7'> 
-					<span>&staff.server.admin.stat_cat.new_entry_name;</span>
-					<span class='padded'>
-						<input type='text' name='sc_new_entry_name'/>
-					</span>
-					<span class='padded'>
-						<select name='sc_new_entry_lib'> </select>
-					</span>
-					<span class='padded'>
-						<input type='submit' name='sc_new_entry_create' value='&staff.server.admin.stat_cat.new_entry_create;'/>
-					</span>
-					<span class='padded'>
-						<input type='submit' name='sc_new_entry_cancel' value='&staff.server.admin.stat_cat.cancel;'/>
-					</span>
-				</td>
-			</tr>
-		</table>
-
-	</body>
-
-	<span class='hide_me' id='sc_update_success'>
-		&staff.server.admin.stat_cat.update_success;
-	</span>
+                <td colspan='4'>
+                    <span class='padded'>
+                        <input  type='submit' value='&staff.server.admin.stat_cat.edit_submit;' name='sc_edit_submit'/>
+                    </span>
+                    <span class='padded'>
+                        <input  type='submit' value='&staff.server.admin.stat_cat.edit_delete;' name='sc_edit_delete'/>
+                    </span>
+                    <input type='submit' name='sc_edit_cancel' value='&staff.server.admin.stat_cat.cancel;'/>
+                </td>
+            </tr>
+
+            <tr class='insert_row' id='sc_edit_entry_row'>
+                <td colspan='7'>
+                    <span class='padded'>
+                        <span>&staff.server.admin.stat_cat.edit_entry_owner;</span><b name='sc_edit_entry_owner'/>
+                    </span>
+                    <span class='padded'>
+                        <input type='text' name='sc_edit_entry_name' class='padded'/>
+                    </span>
+                    <span class='padded'>
+                        <input type='submit' name='sc_edit_entry_name_submit' value='&staff.server.admin.stat_cat.edit_entry_name_submit;' class='padded'/>
+                    </span>
+                    <span class='padded'>
+                        <input type='submit' name='sc_edit_entry_delete' value='&staff.server.admin.stat_cat.edit_entry_delete;' class='padded'/>
+                    </span>
+                    <span class='padded'>
+                        <input type='submit' name='sc_edit_entry_cancel' value='&staff.server.admin.stat_cat.cancel;'/>
+                    </span>
+                </td>
+            </tr>
+
+            <tr class='insert_row' id='sc_new_entry_row'>
+                <td colspan='7'> 
+                    <span>&staff.server.admin.stat_cat.new_entry_name;</span>
+                    <span class='padded'>
+                        <input type='text' name='sc_new_entry_name'/>
+                    </span>
+                    <span class='padded'>
+                        <select name='sc_new_entry_lib'> </select>
+                    </span>
+                    <span class='padded'>
+                        <input type='submit' name='sc_new_entry_create' value='&staff.server.admin.stat_cat.new_entry_create;'/>
+                    </span>
+                    <span class='padded'>
+                        <input type='submit' name='sc_new_entry_cancel' value='&staff.server.admin.stat_cat.cancel;'/>
+                    </span>
+                </td>
+            </tr>
+        </table>
+
+    </body>
+
+    <span class='hide_me' id='sc_update_success'>
+        &staff.server.admin.stat_cat.update_success;
+    </span>
 
 </html>
 
diff --git a/Open-ILS/xul/staff_client/server/admin/transit_list.xul b/Open-ILS/xul/staff_client/server/admin/transit_list.xul
index 7196e0465d..352c0372fb 100644
--- a/Open-ILS/xul/staff_client/server/admin/transit_list.xul
+++ b/Open-ILS/xul/staff_client/server/admin/transit_list.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -18,139 +18,139 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="admin_transit_list_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for admin_transit_list.xul');
-
-				JSAN.use('admin.transit_list');
-				g.transit_list = new admin.transit_list();
-				g.transit_list.init();
-
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('admin/transit_list.xul',E); } catch(F) { alert(E); }
-			}
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
-	<messagecatalog id="circStrings" src='/xul/server/locale/<!--#echo var="locale"-->/circ.properties'/>
-	<messagecatalog id="catStrings" src='/xul/server/locale/<!--#echo var="locale"-->/cat.properties'/>
-
-	<vbox flex="1" class="my_overflow">
-		<hbox>
-			<groupbox id="lib_hbox" orient="horizontal">
-				<caption label="&staff.server.admin.transit.filter.caption;" class="shrinkable_groupbox"/> 
-				<vbox>
-					<label value="&staff.server.admin.transit.library.label;" class="header"/>
-					<hbox>
-						<menulist id="transit_direction">
-							<menupopup>
-								<menuitem label="&staff.server.admin.transit.to.label;" value="transit_to" selected="true"/>
-								<menuitem label="&staff.server.admin.transit.from.label;" value="transit_from" />
-							</menupopup>
-						</menulist>
-						<hbox id="libmenu_placeholder"/>
-					</hbox>
-					<label value="&staff.server.admin.transit.date.label;" class="header"/> 
-					<hbox>
-						<menulist id="sdate" editable="true">
-							<menupopup>
-								<menuitem label="&staff.server.admin.transit.date.today;" selected="true"/>
-								<menuitem label="&staff.server.admin.transit.date.week;" />
-								<menuitem label="&staff.server.admin.transit.date.2weeks;" />
-								<menuitem label="&staff.server.admin.transit.date.3weeks;" />
-								<menuitem label="&staff.server.admin.transit.date.30days;" />
-								<menuitem label="&staff.server.admin.transit.date.start;" />
-							</menupopup>
-						</menulist>
-						<menulist id="edate" editable="true">
-							<menupopup>
-								<menuitem label="&staff.server.admin.transit.date.today;" selected="true"/>
-								<menuitem label="&staff.server.admin.transit.date.week;" />
-								<menuitem label="&staff.server.admin.transit.date.2weeks;" />
-								<menuitem label="&staff.server.admin.transit.date.3weeks;" />
-								<menuitem label="&staff.server.admin.transit.date.30days;" />
-							</menupopup>
-						</menulist>
-					</hbox>
-				</vbox>
-				<button label="&staff.server.admin.transit.retrieve.label;" accesskey="&staff.server.admin.transit.retrieve.accesskey;" command="cmd_kick_off"/>
-			</groupbox>
-		</hbox>
-
-		<groupbox flex="1">
-			<caption label="&staff.server.admin.transit.list.label;" />
-			<hbox>
-				<button label="&staff.server.admin.transit.list.print;" command="cmd_print_list" />
-				<spacer flex="1"/>
-				<menubar>
-					<menu label="&staff.server.admin.transit.list.actions;" accesskey="&staff.server.admin.transit.list.actions.accesskey;">
-						<menupopup>
-							<menuitem command="sel_clip" label="&staff.server.admin.transit.list.copy.label;" accesskey="&staff.server.admin.transit.list.copy.accesskey;" />
-							<menuitem command="sel_bucket" label="&staff.server.admin.transit.list.add.label;" accesskey="&staff.server.admin.transit.list.add.accesskey;"/>
-							<menuitem command="sel_opac" label="&staff.server.admin.transit.list.show.label;" accesskey="&staff.server.admin.transit.list.show.accesskey;" />
-							<menuitem command="sel_copy_details" label="&staff.server.admin.transit.list.details.label;" accesskey="&staff.server.admin.transit.list.details.accesskey;" />
-							<menuitem command="sel_patron" label="&staff.server.admin.transit.list.circs.label;" accesskey="&staff.server.admin.transit.list.circs.accesskey;"/>
-							<menuseparator />
-							<menuitem command="sel_edit" label="&staff.server.admin.transit.list.edit.label;" accesskey="&staff.server.admin.transit.list.edit.accesskey;" />
-							<menuitem command="sel_transit_abort" label="&staff.server.admin.transit.list.abort.label;" />
-							<menuseparator />
-							<menuitem command="save_columns" label="&staff.server.admin.transit.list.save.label;"/>
-						</menupopup>
-					</menu>
-				</menubar>
-			</hbox>
-			<tree id="transit_list" flex="1" enableColumnDrag="true" context="transit_list_actions"/>
-		</groupbox>
-	</vbox>
-
-	<popupset id="transit_list_popupset">
-		<popup id="transit_list_actions" position="at_pointer"> 
-			<menuitem command="sel_clip" label="&staff.server.admin.transit.list.copy.label;" accesskey="&staff.server.admin.transit.list.copy.accesskey;" />
-			<menuitem command="sel_bucket" label="&staff.server.admin.transit.list.add.label;" accesskey="&staff.server.admin.transit.list.add.accesskey;"/>
-			<menuitem command="sel_opac" label="&staff.server.admin.transit.list.show.label;" accesskey="&staff.server.admin.transit.list.show.accesskey;" />
-			<menuitem command="sel_copy_details" label="&staff.server.admin.transit.list.details.label;" accesskey="&staff.server.admin.transit.list.details.accesskey;" />
-			<menuitem command="sel_patron" label="&staff.server.admin.transit.list.circs.label;" accesskey="&staff.server.admin.transit.list.circs.accesskey;"/>
-			<menuseparator />
-			<menuitem command="sel_edit" label="&staff.server.admin.transit.list.edit.label;" accesskey="&staff.server.admin.transit.list.edit.accesskey;" />
-			<menuitem command="sel_transit_abort" label="&staff.server.admin.transit.list.abort.label;" />
-			<menuseparator />
-			<menuitem command="save_columns" label="&staff.server.admin.transit.list.save.label;"/>
-		</popup>
-	</popupset>
-
-	<commandset id="transit_list_cmds">
-		<command id="cmd_print_list" />
-		<command id="save_columns" />
-		<command id="sel_copy_details" disabled="true"/>
-		<command id="sel_patron" disabled="true"/>
-		<command id="sel_edit" disabled="true"/>
-		<command id="sel_opac" disabled="true"/>
-		<command id="sel_bucket" disabled="true"/>
-		<command id="sel_transit_abort" disabled="true"/>
-		<command id="sel_clip" disabled="true"/>
-		<command id="cmd_kick_off"/>
-	</commandset>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for admin_transit_list.xul');
+
+                JSAN.use('admin.transit_list');
+                g.transit_list = new admin.transit_list();
+                g.transit_list.init();
+
+            } catch(E) {
+                try { g.error.standard_unexpected_error_alert('admin/transit_list.xul',E); } catch(F) { alert(E); }
+            }
+        }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
+    <messagecatalog id="circStrings" src='/xul/server/locale/<!--#echo var="locale"-->/circ.properties'/>
+    <messagecatalog id="catStrings" src='/xul/server/locale/<!--#echo var="locale"-->/cat.properties'/>
+
+    <vbox flex="1" class="my_overflow">
+        <hbox>
+            <groupbox id="lib_hbox" orient="horizontal">
+                <caption label="&staff.server.admin.transit.filter.caption;" class="shrinkable_groupbox"/> 
+                <vbox>
+                    <label value="&staff.server.admin.transit.library.label;" class="header"/>
+                    <hbox>
+                        <menulist id="transit_direction">
+                            <menupopup>
+                                <menuitem label="&staff.server.admin.transit.to.label;" value="transit_to" selected="true"/>
+                                <menuitem label="&staff.server.admin.transit.from.label;" value="transit_from" />
+                            </menupopup>
+                        </menulist>
+                        <hbox id="libmenu_placeholder"/>
+                    </hbox>
+                    <label value="&staff.server.admin.transit.date.label;" class="header"/> 
+                    <hbox>
+                        <menulist id="sdate" editable="true">
+                            <menupopup>
+                                <menuitem label="&staff.server.admin.transit.date.today;" selected="true"/>
+                                <menuitem label="&staff.server.admin.transit.date.week;" />
+                                <menuitem label="&staff.server.admin.transit.date.2weeks;" />
+                                <menuitem label="&staff.server.admin.transit.date.3weeks;" />
+                                <menuitem label="&staff.server.admin.transit.date.30days;" />
+                                <menuitem label="&staff.server.admin.transit.date.start;" />
+                            </menupopup>
+                        </menulist>
+                        <menulist id="edate" editable="true">
+                            <menupopup>
+                                <menuitem label="&staff.server.admin.transit.date.today;" selected="true"/>
+                                <menuitem label="&staff.server.admin.transit.date.week;" />
+                                <menuitem label="&staff.server.admin.transit.date.2weeks;" />
+                                <menuitem label="&staff.server.admin.transit.date.3weeks;" />
+                                <menuitem label="&staff.server.admin.transit.date.30days;" />
+                            </menupopup>
+                        </menulist>
+                    </hbox>
+                </vbox>
+                <button label="&staff.server.admin.transit.retrieve.label;" accesskey="&staff.server.admin.transit.retrieve.accesskey;" command="cmd_kick_off"/>
+            </groupbox>
+        </hbox>
+
+        <groupbox flex="1">
+            <caption label="&staff.server.admin.transit.list.label;" />
+            <hbox>
+                <button label="&staff.server.admin.transit.list.print;" command="cmd_print_list" />
+                <spacer flex="1"/>
+                <menubar>
+                    <menu label="&staff.server.admin.transit.list.actions;" accesskey="&staff.server.admin.transit.list.actions.accesskey;">
+                        <menupopup>
+                            <menuitem command="sel_clip" label="&staff.server.admin.transit.list.copy.label;" accesskey="&staff.server.admin.transit.list.copy.accesskey;" />
+                            <menuitem command="sel_bucket" label="&staff.server.admin.transit.list.add.label;" accesskey="&staff.server.admin.transit.list.add.accesskey;"/>
+                            <menuitem command="sel_opac" label="&staff.server.admin.transit.list.show.label;" accesskey="&staff.server.admin.transit.list.show.accesskey;" />
+                            <menuitem command="sel_copy_details" label="&staff.server.admin.transit.list.details.label;" accesskey="&staff.server.admin.transit.list.details.accesskey;" />
+                            <menuitem command="sel_patron" label="&staff.server.admin.transit.list.circs.label;" accesskey="&staff.server.admin.transit.list.circs.accesskey;"/>
+                            <menuseparator />
+                            <menuitem command="sel_edit" label="&staff.server.admin.transit.list.edit.label;" accesskey="&staff.server.admin.transit.list.edit.accesskey;" />
+                            <menuitem command="sel_transit_abort" label="&staff.server.admin.transit.list.abort.label;" />
+                            <menuseparator />
+                            <menuitem command="save_columns" label="&staff.server.admin.transit.list.save.label;"/>
+                        </menupopup>
+                    </menu>
+                </menubar>
+            </hbox>
+            <tree id="transit_list" flex="1" enableColumnDrag="true" context="transit_list_actions"/>
+        </groupbox>
+    </vbox>
+
+    <popupset id="transit_list_popupset">
+        <popup id="transit_list_actions" position="at_pointer"> 
+            <menuitem command="sel_clip" label="&staff.server.admin.transit.list.copy.label;" accesskey="&staff.server.admin.transit.list.copy.accesskey;" />
+            <menuitem command="sel_bucket" label="&staff.server.admin.transit.list.add.label;" accesskey="&staff.server.admin.transit.list.add.accesskey;"/>
+            <menuitem command="sel_opac" label="&staff.server.admin.transit.list.show.label;" accesskey="&staff.server.admin.transit.list.show.accesskey;" />
+            <menuitem command="sel_copy_details" label="&staff.server.admin.transit.list.details.label;" accesskey="&staff.server.admin.transit.list.details.accesskey;" />
+            <menuitem command="sel_patron" label="&staff.server.admin.transit.list.circs.label;" accesskey="&staff.server.admin.transit.list.circs.accesskey;"/>
+            <menuseparator />
+            <menuitem command="sel_edit" label="&staff.server.admin.transit.list.edit.label;" accesskey="&staff.server.admin.transit.list.edit.accesskey;" />
+            <menuitem command="sel_transit_abort" label="&staff.server.admin.transit.list.abort.label;" />
+            <menuseparator />
+            <menuitem command="save_columns" label="&staff.server.admin.transit.list.save.label;"/>
+        </popup>
+    </popupset>
+
+    <commandset id="transit_list_cmds">
+        <command id="cmd_print_list" />
+        <command id="save_columns" />
+        <command id="sel_copy_details" disabled="true"/>
+        <command id="sel_patron" disabled="true"/>
+        <command id="sel_edit" disabled="true"/>
+        <command id="sel_opac" disabled="true"/>
+        <command id="sel_bucket" disabled="true"/>
+        <command id="sel_transit_abort" disabled="true"/>
+        <command id="sel_clip" disabled="true"/>
+        <command id="cmd_kick_off"/>
+    </commandset>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml b/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
index 16c3e347dd..eae0bbeb90 100644
--- a/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
@@ -1,42 +1,42 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
-	<!ENTITY nbsp " "> <!-- calendar needs this entity -->
+    "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!ENTITY nbsp " "> <!-- calendar needs this entity -->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <head>
-	<title>&staff.server.admin.upload_xacts.title;</title>
-	<link rel="stylesheet" type="text/css" media="all" href="chrome://global/skin/" title="chrome_skin" />
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
-	<script type="text/javascript" src="/xul/server/main/constants.js" />
-	<script type="text/javascript" src="/xul/server/OpenILS/global_util.js" />
+    <title>&staff.server.admin.upload_xacts.title;</title>
+    <link rel="stylesheet" type="text/css" media="all" href="chrome://global/skin/" title="chrome_skin" />
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
+    <script type="text/javascript" src="/xul/server/main/constants.js" />
+    <script type="text/javascript" src="/xul/server/OpenILS/global_util.js" />
 
-	<script type="text/javascript" src="/opac/common/js/utils.js" />
-	<script type="text/javascript" src="/opac/common/js/CGI.js" />
-	<script type="text/javascript" src="/opac/common/js/md5.js" />
-	<script type="text/javascript" src="/opac/common/js/JSON_v1.js" />
-	<script type="text/javascript" src="/opac/common/js/fmall.js" />
-	<script type="text/javascript" src="/opac/common/js/fmgen.js" />
-	<script type="text/javascript" src="/opac/common/js/RemoteRequest.js" />
+    <script type="text/javascript" src="/opac/common/js/utils.js" />
+    <script type="text/javascript" src="/opac/common/js/CGI.js" />
+    <script type="text/javascript" src="/opac/common/js/md5.js" />
+    <script type="text/javascript" src="/opac/common/js/JSON_v1.js" />
+    <script type="text/javascript" src="/opac/common/js/fmall.js" />
+    <script type="text/javascript" src="/opac/common/js/fmgen.js" />
+    <script type="text/javascript" src="/opac/common/js/RemoteRequest.js" />
 
-	<script type="text/javascript" src="upload_xacts.js" />
+    <script type="text/javascript" src="upload_xacts.js" />
 </head>
 <body onload="try{my_init();}catch(E){alert(E);}">
-	<h3>&staff.server.admin.upload_xacts.header;</h3>
-	<form id="form" method='post' enctype='multipart/form-data' style="display: none">
-		action:<input type='text' id="action" name='action' value='load'></input>
-		ws:<input type='text' id="ws" name='ws' value=''></input>
-		delta:<input type='text' id="delta" name='delta' value='0'> </input>
-		ses:<input type='text' id="ses" name='ses' value=''> </input>
-		seskey:<input type='text' id="seskey" name='seskey' value=''> </input>
-		file:<input type='file' id="file" name='file'> </input> 
-		html:<input type='text' id="html" name='html' value='1'> </input> 
-		<input type='submit' id="submit" name='Submit' value='&staff.server.admin.upload_xacts.upload;' disabled="true"> </input>
-	</form>
+    <h3>&staff.server.admin.upload_xacts.header;</h3>
+    <form id="form" method='post' enctype='multipart/form-data' style="display: none">
+        action:<input type='text' id="action" name='action' value='load'></input>
+        ws:<input type='text' id="ws" name='ws' value=''></input>
+        delta:<input type='text' id="delta" name='delta' value='0'> </input>
+        ses:<input type='text' id="ses" name='ses' value=''> </input>
+        seskey:<input type='text' id="seskey" name='seskey' value=''> </input>
+        file:<input type='file' id="file" name='file'> </input> 
+        html:<input type='text' id="html" name='html' value='1'> </input> 
+        <input type='submit' id="submit" name='Submit' value='&staff.server.admin.upload_xacts.upload;' disabled="true"> </input>
+    </form>
 </body>
 </html>
diff --git a/Open-ILS/xul/staff_client/server/admin/work_log.xul b/Open-ILS/xul/staff_client/server/admin/work_log.xul
index a96c1cdb43..5c4dd13a23 100644
--- a/Open-ILS/xul/staff_client/server/admin/work_log.xul
+++ b/Open-ILS/xul/staff_client/server/admin/work_log.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -18,19 +18,19 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="work_log_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;
-	</script>
-	<scripts id="openils_util_scripts"/>
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <script type="text/javascript">
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;
+    </script>
+    <scripts id="openils_util_scripts"/>
     <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="work_log.js"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="work_log.js"/>
 
     <vbox flex="1">
         <toolbox>
diff --git a/Open-ILS/xul/staff_client/server/cat/bib_brief.xul b/Open-ILS/xul/staff_client/server/cat/bib_brief.xul
index 33264ebfd1..476ff7e22a 100644
--- a/Open-ILS/xul/staff_client/server/cat/bib_brief.xul
+++ b/Open-ILS/xul/staff_client/server/cat/bib_brief.xul
@@ -13,7 +13,7 @@ vim: noet:sw=4:ts=4:
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -22,26 +22,26 @@ vim: noet:sw=4:ts=4:
 <?xul-overlay href="/xul/server/cat/bib_brief_overlay.xul"?>
 
 <window id="cat_bib_brief_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="/xul/server/cat/bib_brief.js"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="/xul/server/cat/bib_brief.js"/>
 
     <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
     <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
 
-	<groupbox id="groupbox" flex="1">
-		<caption id="caption"><label value="&staff.cat.bib_brief.record_summary;"/>(<label value="&staff.cat.bib_brief.view_marc;" class="click_link" onclick="view_marc();"/>)</caption>
+    <groupbox id="groupbox" flex="1">
+        <caption id="caption"><label value="&staff.cat.bib_brief.record_summary;"/>(<label value="&staff.cat.bib_brief.view_marc;" class="click_link" onclick="view_marc();"/>)</caption>
         <grid id="bib_brief_grid" />
-	</groupbox>
+    </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.xul b/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.xul
index f7feaf70a5..b8c9d33a73 100644
--- a/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/cat/bib_brief_overlay.xul
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="bib_brief_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	    <script type="text/javascript" src="/xul/server/cat/bib_brief_overlay.js"/>
+        <script type="text/javascript" src="/xul/server/cat/bib_brief_overlay.js"/>
 
         <grid id="bib_brief_grid" flex="0">
             <columns>
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_browser.xul b/Open-ILS/xul/staff_client/server/cat/copy_browser.xul
index a364ff903e..b46730101c 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_browser.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_browser.xul
@@ -22,166 +22,166 @@ vim:noet:sw=4:ts=4:
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_copy_browser" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<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="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="/xul/server/cat/copy_browser.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { 
-					throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for cat_copy_browser.xul');
-
-				JSAN.use('cat.copy_browser'); g.copy_browser = new cat.copy_browser();
-
-				g.copy_browser.init( { 'docid' : xul_param('docid') } );
-
-				//if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-				//	try { window.xulG.set_tab_name('Holdings Maintenance'); } catch(E) { alert(E); }
-				//}
-
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['cat/copy_browser.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<commandset id="cat_copy_browser">
-		<command id="save_columns" />
-		<command id="cmd_broken" />
-		<command id="sel_copy_details"/>
-		<command id="sel_patron"/>
-		<command id="sel_clip" />
-		<command id="cmd_clear" />
-		<command id="cmd_show_my_libs" />
-		<command id="cmd_show_all_libs" />
-		<command id="cmd_show_libs_with_copies" />
-
-		<command id="sel_mark_items_damaged" />
-		<command id="sel_mark_items_missing" />
-		<command id="cmd_add_items"/>
-		<command id="cmd_add_items_to_buckets"/>
-		<command id="cmd_edit_items"/>
-		<command id="cmd_replace_barcode"/>
-		<command id="cmd_delete_items"/>
-		<command id="cmd_transfer_items"/>
-		<command id="cmd_print_spine_labels"/>
-		<command id="cmd_add_volumes"/>
-		<command id="cmd_edit_volumes"/>
-		<command id="cmd_delete_volumes"/>
-		<command id="cmd_mark_volume"/>
-		<command id="cmd_mark_library"/>
-		<command id="cmd_transfer_volume"/>
-		<command id="cmd_refresh_list"/>
-	</commandset>
-
-	<popupset>
-		<popup id="copy_browser_actions">
-			<menuitem command="sel_clip" label="&staff.cat.copy_browser.actions.sel_clip.label;" accesskey="&staff.cat.copy_browser.actions.sel_clip.accesskey;"/>
-			<menuitem command="cmd_add_items_to_buckets" label="&staff.cat.copy_browser.actions.cmd_add_items_to_buckets.label;" accesskey="&staff.cat.copy_browser.actions.cmd_add_items_to_buckets.accesskey;"/>
-			<menuitem command="sel_copy_details" label="&staff.cat.copy_browser.actions.sel_copy_details.label;" accesskey="&staff.cat.copy_browser.actions.sel_copy_details.label;" />
-			<menuitem command="sel_patron" label="&staff.cat.copy_browser.actions.sel_patron.label;" accesskey="&staff.cat.copy_browser.actions.sel_patron.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="cmd_edit_items" label="&staff.cat.copy_browser.actions.cmd_edit_items.label;" accesskey="&staff.cat.copy_browser.actions.cmd_edit_items.accesskey;"/>
-			<menuitem command="cmd_transfer_items" label="&staff.cat.copy_browser.actions.cmd_transfer_items.label;" accesskey="&staff.cat.copy_browser.actions.cmd_transfer_items.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="cmd_add_volumes" label="&staff.cat.copy_browser.actions.cmd_add_volumes.label;" accesskey="&staff.cat.copy_browser.actions.cmd_add_volumes.accesskey;"/>
-			<menuitem command="cmd_mark_library" label="&staff.cat.copy_browser.actions.cmd_mark_library.label;" accesskey="&staff.cat.copy_browser.actions.cmd_mark_library.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="cmd_add_items" label="&staff.cat.copy_browser.actions.cmd_add_items.label;" accesskey="&staff.cat.copy_browser.actions.cmd_add_items.accesskey;"/>
-			<menuitem command="cmd_edit_volumes" label="&staff.cat.copy_browser.actions.cmd_edit_volumes.label;" accesskey="&staff.cat.copy_browser.actions.cmd_edit_volumes.accesskey;"/>
-			<menuitem command="cmd_mark_volume" label="&staff.cat.copy_browser.actions.cmd_mark_volume.label;" accesskey="&staff.cat.copy_browser.actions.cmd_mark_volume.accesskey;"/>
-			<menuitem command="cmd_transfer_volume" label="&staff.cat.copy_browser.actions.cmd_transfer_volume.label;" accesskey="&staff.cat.copy_browser.actions.cmd_transfer_volume.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="cmd_delete_items" label="&staff.cat.copy_browser.actions.cmd_delete_items.label;" accesskey=""/>
-			<menuitem command="cmd_delete_volumes" label="&staff.cat.copy_browser.actions.cmd_delete_volumes.label;" accesskey=""/>
-			<menuseparator/>
-			<menuitem command="sel_mark_items_damaged" label="&staff.cat.copy_browser.actions.sel_mark_items_damaged.label;" accesskey="&staff.cat.copy_browser.actions.sel_mark_items_damaged.accesskey;"/>
-			<menuitem command="sel_mark_items_missing" label="&staff.cat.copy_browser.actions.sel_mark_items_missing.label;" accesskey="&staff.cat.copy_browser.actions.sel_mark_items_missing.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="cmd_print_spine_labels" label="&staff.cat.copy_browser.actions.cmd_print_spine_labels.label;" accesskey="&staff.cat.copy_browser.actions.cmd_print_spine_labels.accesskey;"/>
-			<menuitem command="cmd_replace_barcode" label="&staff.cat.copy_browser.actions.cmd_replace_barcode.label;" accesskey=""/>
-			<menuitem command="save_columns" label="&staff.cat.copy_browser.actions.save_columns.label;"/>
-			<menuitem command="cmd_refresh_list" label="&staff.cat.copy_browser.actions.cmd_refresh_list.label;" accesskey="&staff.cat.copy_browser.actions.cmd_refresh_list.accesskey;"/>
-		</popup>
-	</popupset>
-
-	<groupbox flex="1" class="my_overflow">
-		<caption label="&staff.cat.copy_browser.holdings_maintenance.caption;"/>
-		<hbox><label id="legend" style="font-size: large" class="has_copies" value="&staff.cat.copy_browser.holdings_maintenance.legend;" hidden="true"/></hbox>
-		<hbox>
-			<hbox id="x_lib_menu"/>
-			<spacer flex="1"/>
-			<label value="&staff.cat.copy_browser.holdings_maintenance.consortial_total;"/><label id="consortial_total"/>
-			<label value="&staff.cat.copy_browser.holdings_maintenance.consortial_available;"/><label id="consortial_available"/>
-		</hbox>
-		<hbox>
-			<checkbox id="show_acns" label="&staff.cat.copy_browser.holdings_maintenance.show_acns;" />
-			<checkbox id="show_acps" label="&staff.cat.copy_browser.holdings_maintenance.show_acps;" />
-			<button id="refresh_button" label="&staff.cat.copy_browser.holdings_maintenance.refresh_button.label;" command="cmd_refresh_list" />
-			<button label="&staff.cat.copy_browser.holdings_maintenance.show_libs.label;" command="cmd_show_libs_with_copies" accesskey="&staff.cat.copy_browser.holdings_maintenance.show_libs.accesskey;"/>
-			<!-- <button label="Show My Libs" command="cmd_show_my_libs" accesskey="M"/>-->
-			<!--
-			<button label="Show All Libs" command="cmd_show_all_libs" accesskey=""/>
-			-->
-			<spacer flex="1"/>
-			<menubar>
-				<menu label="&staff.cat.copy_browser.holdings_maintenance.actions.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.actions.accesskey;">
-					<menupopup>
-						<menuitem command="sel_clip" label="&staff.cat.copy_browser.holdings_maintenance.sel_clip.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_clip.accesskey;"/>
-						<menuitem command="cmd_add_items_to_buckets" label="&staff.cat.copy_browser.holdings_maintenance.add_items_to_bucket.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.add_items_to_bucket.accesskey;"/>
-						<menuitem command="sel_copy_details" label="&staff.cat.copy_browser.holdings_maintenance.sel_copy_details.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_copy_details.accesskey;" />
-						<menuitem command="sel_patron" label="&staff.cat.copy_browser.holdings_maintenance.sel_patron.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_patron.accesskey;"/>
-						<menuseparator/>
-						<menuitem command="cmd_edit_items" label="&staff.cat.copy_browser.holdings_maintenance.cmd_edit_items.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_edit_items.accesskey;"/>
-						<menuitem command="cmd_transfer_items" label="&staff.cat.copy_browser.holdings_maintenance.cmd_transfer_items.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_transfer_items.accesskey;"/>
-						<menuseparator/>
-						<menuitem command="cmd_add_volumes" label="&staff.cat.copy_browser.holdings_maintenance.cmd_add_volumes.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_add_volumes.accesskey;"/>
-						<menuitem command="cmd_mark_library" label="&staff.cat.copy_browser.holdings_maintenance.cmd_mark_library.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_mark_library.accesskey;"/>
-						<menuseparator/>
-						<menuitem command="cmd_add_items" label="&staff.cat.copy_browser.holdings_maintenance.cmd_add_items.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_add_items.accesskey;"/>
-						<menuitem command="cmd_edit_volumes" label="&staff.cat.copy_browser.holdings_maintenance.cmd_edit_volumes.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_edit_volumes.accesskey;"/>
-						<menuitem command="cmd_mark_volume" label="&staff.cat.copy_browser.holdings_maintenance.cmd_mark_volume.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_mark_volume.accesskey;"/>
-						<menuitem command="cmd_transfer_volume" label="&staff.cat.copy_browser.holdings_maintenance.cmd_transfer_volume.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_transfer_volume.accesskey;"/>
-						<menuseparator/>
-						<menuitem command="cmd_delete_items" label="&staff.cat.copy_browser.holdings_maintenance.cmd_delete_items.label;" accesskey=""/>
-						<menuitem command="cmd_delete_volumes" label="&staff.cat.copy_browser.holdings_maintenance.cmd_delete_volumes.label;" accesskey=""/>
-						<menuseparator/>
-						<menuitem command="sel_mark_items_damaged" label="&staff.cat.copy_browser.holdings_maintenance.sel_mark_items_damaged.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_mark_items_damaged.accesskey;"/>
-						<menuitem command="sel_mark_items_missing" label="&staff.cat.copy_browser.holdings_maintenance.sel_mark_items_missing.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_mark_items_missing.accesskey;"/>
-						<menuseparator/>
-						<menuitem command="cmd_print_spine_labels" label="&staff.cat.copy_browser.holdings_maintenance.cmd_print_spine_labels.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_print_spine_labels.accesskey;"/>
-						<menuitem command="cmd_replace_barcode" label="&staff.cat.copy_browser.holdings_maintenance.cmd_replace_barcode.label;" accesskey=""/>
-						<menuitem command="save_columns" label="&staff.cat.copy_browser.holdings_maintenance.save_columns.label;"/>
-						<menuitem command="cmd_refresh_list" label="&staff.cat.copy_browser.holdings_maintenance.cmd_refresh_list.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_refresh_list.accesskey;"/>
-					</menupopup>
-				</menu>
-			</menubar>
-		</hbox>
-		<tree id="copy_tree" flex="1" enableColumnDrag="true" context="copy_browser_actions"/>
-	</groupbox>
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <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="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="/xul/server/cat/copy_browser.js"/>
+    <script>
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { 
+                    throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
+                }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for cat_copy_browser.xul');
+
+                JSAN.use('cat.copy_browser'); g.copy_browser = new cat.copy_browser();
+
+                g.copy_browser.init( { 'docid' : xul_param('docid') } );
+
+                //if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+                //    try { window.xulG.set_tab_name('Holdings Maintenance'); } catch(E) { alert(E); }
+                //}
+
+            } catch(E) {
+                var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['cat/copy_browser.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+    <commandset id="cat_copy_browser">
+        <command id="save_columns" />
+        <command id="cmd_broken" />
+        <command id="sel_copy_details"/>
+        <command id="sel_patron"/>
+        <command id="sel_clip" />
+        <command id="cmd_clear" />
+        <command id="cmd_show_my_libs" />
+        <command id="cmd_show_all_libs" />
+        <command id="cmd_show_libs_with_copies" />
+
+        <command id="sel_mark_items_damaged" />
+        <command id="sel_mark_items_missing" />
+        <command id="cmd_add_items"/>
+        <command id="cmd_add_items_to_buckets"/>
+        <command id="cmd_edit_items"/>
+        <command id="cmd_replace_barcode"/>
+        <command id="cmd_delete_items"/>
+        <command id="cmd_transfer_items"/>
+        <command id="cmd_print_spine_labels"/>
+        <command id="cmd_add_volumes"/>
+        <command id="cmd_edit_volumes"/>
+        <command id="cmd_delete_volumes"/>
+        <command id="cmd_mark_volume"/>
+        <command id="cmd_mark_library"/>
+        <command id="cmd_transfer_volume"/>
+        <command id="cmd_refresh_list"/>
+    </commandset>
+
+    <popupset>
+        <popup id="copy_browser_actions">
+            <menuitem command="sel_clip" label="&staff.cat.copy_browser.actions.sel_clip.label;" accesskey="&staff.cat.copy_browser.actions.sel_clip.accesskey;"/>
+            <menuitem command="cmd_add_items_to_buckets" label="&staff.cat.copy_browser.actions.cmd_add_items_to_buckets.label;" accesskey="&staff.cat.copy_browser.actions.cmd_add_items_to_buckets.accesskey;"/>
+            <menuitem command="sel_copy_details" label="&staff.cat.copy_browser.actions.sel_copy_details.label;" accesskey="&staff.cat.copy_browser.actions.sel_copy_details.label;" />
+            <menuitem command="sel_patron" label="&staff.cat.copy_browser.actions.sel_patron.label;" accesskey="&staff.cat.copy_browser.actions.sel_patron.accesskey;"/>
+            <menuseparator/>
+            <menuitem command="cmd_edit_items" label="&staff.cat.copy_browser.actions.cmd_edit_items.label;" accesskey="&staff.cat.copy_browser.actions.cmd_edit_items.accesskey;"/>
+            <menuitem command="cmd_transfer_items" label="&staff.cat.copy_browser.actions.cmd_transfer_items.label;" accesskey="&staff.cat.copy_browser.actions.cmd_transfer_items.accesskey;"/>
+            <menuseparator/>
+            <menuitem command="cmd_add_volumes" label="&staff.cat.copy_browser.actions.cmd_add_volumes.label;" accesskey="&staff.cat.copy_browser.actions.cmd_add_volumes.accesskey;"/>
+            <menuitem command="cmd_mark_library" label="&staff.cat.copy_browser.actions.cmd_mark_library.label;" accesskey="&staff.cat.copy_browser.actions.cmd_mark_library.accesskey;"/>
+            <menuseparator/>
+            <menuitem command="cmd_add_items" label="&staff.cat.copy_browser.actions.cmd_add_items.label;" accesskey="&staff.cat.copy_browser.actions.cmd_add_items.accesskey;"/>
+            <menuitem command="cmd_edit_volumes" label="&staff.cat.copy_browser.actions.cmd_edit_volumes.label;" accesskey="&staff.cat.copy_browser.actions.cmd_edit_volumes.accesskey;"/>
+            <menuitem command="cmd_mark_volume" label="&staff.cat.copy_browser.actions.cmd_mark_volume.label;" accesskey="&staff.cat.copy_browser.actions.cmd_mark_volume.accesskey;"/>
+            <menuitem command="cmd_transfer_volume" label="&staff.cat.copy_browser.actions.cmd_transfer_volume.label;" accesskey="&staff.cat.copy_browser.actions.cmd_transfer_volume.accesskey;"/>
+            <menuseparator/>
+            <menuitem command="cmd_delete_items" label="&staff.cat.copy_browser.actions.cmd_delete_items.label;" accesskey=""/>
+            <menuitem command="cmd_delete_volumes" label="&staff.cat.copy_browser.actions.cmd_delete_volumes.label;" accesskey=""/>
+            <menuseparator/>
+            <menuitem command="sel_mark_items_damaged" label="&staff.cat.copy_browser.actions.sel_mark_items_damaged.label;" accesskey="&staff.cat.copy_browser.actions.sel_mark_items_damaged.accesskey;"/>
+            <menuitem command="sel_mark_items_missing" label="&staff.cat.copy_browser.actions.sel_mark_items_missing.label;" accesskey="&staff.cat.copy_browser.actions.sel_mark_items_missing.accesskey;"/>
+            <menuseparator/>
+            <menuitem command="cmd_print_spine_labels" label="&staff.cat.copy_browser.actions.cmd_print_spine_labels.label;" accesskey="&staff.cat.copy_browser.actions.cmd_print_spine_labels.accesskey;"/>
+            <menuitem command="cmd_replace_barcode" label="&staff.cat.copy_browser.actions.cmd_replace_barcode.label;" accesskey=""/>
+            <menuitem command="save_columns" label="&staff.cat.copy_browser.actions.save_columns.label;"/>
+            <menuitem command="cmd_refresh_list" label="&staff.cat.copy_browser.actions.cmd_refresh_list.label;" accesskey="&staff.cat.copy_browser.actions.cmd_refresh_list.accesskey;"/>
+        </popup>
+    </popupset>
+
+    <groupbox flex="1" class="my_overflow">
+        <caption label="&staff.cat.copy_browser.holdings_maintenance.caption;"/>
+        <hbox><label id="legend" style="font-size: large" class="has_copies" value="&staff.cat.copy_browser.holdings_maintenance.legend;" hidden="true"/></hbox>
+        <hbox>
+            <hbox id="x_lib_menu"/>
+            <spacer flex="1"/>
+            <label value="&staff.cat.copy_browser.holdings_maintenance.consortial_total;"/><label id="consortial_total"/>
+            <label value="&staff.cat.copy_browser.holdings_maintenance.consortial_available;"/><label id="consortial_available"/>
+        </hbox>
+        <hbox>
+            <checkbox id="show_acns" label="&staff.cat.copy_browser.holdings_maintenance.show_acns;" />
+            <checkbox id="show_acps" label="&staff.cat.copy_browser.holdings_maintenance.show_acps;" />
+            <button id="refresh_button" label="&staff.cat.copy_browser.holdings_maintenance.refresh_button.label;" command="cmd_refresh_list" />
+            <button label="&staff.cat.copy_browser.holdings_maintenance.show_libs.label;" command="cmd_show_libs_with_copies" accesskey="&staff.cat.copy_browser.holdings_maintenance.show_libs.accesskey;"/>
+            <!-- <button label="Show My Libs" command="cmd_show_my_libs" accesskey="M"/>-->
+            <!--
+            <button label="Show All Libs" command="cmd_show_all_libs" accesskey=""/>
+            -->
+            <spacer flex="1"/>
+            <menubar>
+                <menu label="&staff.cat.copy_browser.holdings_maintenance.actions.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.actions.accesskey;">
+                    <menupopup>
+                        <menuitem command="sel_clip" label="&staff.cat.copy_browser.holdings_maintenance.sel_clip.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_clip.accesskey;"/>
+                        <menuitem command="cmd_add_items_to_buckets" label="&staff.cat.copy_browser.holdings_maintenance.add_items_to_bucket.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.add_items_to_bucket.accesskey;"/>
+                        <menuitem command="sel_copy_details" label="&staff.cat.copy_browser.holdings_maintenance.sel_copy_details.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_copy_details.accesskey;" />
+                        <menuitem command="sel_patron" label="&staff.cat.copy_browser.holdings_maintenance.sel_patron.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_patron.accesskey;"/>
+                        <menuseparator/>
+                        <menuitem command="cmd_edit_items" label="&staff.cat.copy_browser.holdings_maintenance.cmd_edit_items.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_edit_items.accesskey;"/>
+                        <menuitem command="cmd_transfer_items" label="&staff.cat.copy_browser.holdings_maintenance.cmd_transfer_items.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_transfer_items.accesskey;"/>
+                        <menuseparator/>
+                        <menuitem command="cmd_add_volumes" label="&staff.cat.copy_browser.holdings_maintenance.cmd_add_volumes.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_add_volumes.accesskey;"/>
+                        <menuitem command="cmd_mark_library" label="&staff.cat.copy_browser.holdings_maintenance.cmd_mark_library.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_mark_library.accesskey;"/>
+                        <menuseparator/>
+                        <menuitem command="cmd_add_items" label="&staff.cat.copy_browser.holdings_maintenance.cmd_add_items.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_add_items.accesskey;"/>
+                        <menuitem command="cmd_edit_volumes" label="&staff.cat.copy_browser.holdings_maintenance.cmd_edit_volumes.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_edit_volumes.accesskey;"/>
+                        <menuitem command="cmd_mark_volume" label="&staff.cat.copy_browser.holdings_maintenance.cmd_mark_volume.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_mark_volume.accesskey;"/>
+                        <menuitem command="cmd_transfer_volume" label="&staff.cat.copy_browser.holdings_maintenance.cmd_transfer_volume.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_transfer_volume.accesskey;"/>
+                        <menuseparator/>
+                        <menuitem command="cmd_delete_items" label="&staff.cat.copy_browser.holdings_maintenance.cmd_delete_items.label;" accesskey=""/>
+                        <menuitem command="cmd_delete_volumes" label="&staff.cat.copy_browser.holdings_maintenance.cmd_delete_volumes.label;" accesskey=""/>
+                        <menuseparator/>
+                        <menuitem command="sel_mark_items_damaged" label="&staff.cat.copy_browser.holdings_maintenance.sel_mark_items_damaged.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_mark_items_damaged.accesskey;"/>
+                        <menuitem command="sel_mark_items_missing" label="&staff.cat.copy_browser.holdings_maintenance.sel_mark_items_missing.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_mark_items_missing.accesskey;"/>
+                        <menuseparator/>
+                        <menuitem command="cmd_print_spine_labels" label="&staff.cat.copy_browser.holdings_maintenance.cmd_print_spine_labels.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_print_spine_labels.accesskey;"/>
+                        <menuitem command="cmd_replace_barcode" label="&staff.cat.copy_browser.holdings_maintenance.cmd_replace_barcode.label;" accesskey=""/>
+                        <menuitem command="save_columns" label="&staff.cat.copy_browser.holdings_maintenance.save_columns.label;"/>
+                        <menuitem command="cmd_refresh_list" label="&staff.cat.copy_browser.holdings_maintenance.cmd_refresh_list.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_refresh_list.accesskey;"/>
+                    </menupopup>
+                </menu>
+            </menubar>
+        </hbox>
+        <tree id="copy_tree" flex="1" enableColumnDrag="true" context="copy_browser_actions"/>
+    </groupbox>
 
 </window>
 
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 3b98befa93..ac6b9f6089 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,77 +20,77 @@
 <?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(); 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">
+    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">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for copy_buckets.xul');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for copy_buckets.xul');
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
 
-				var copy_ids = xul_param(
-					'copy_ids',{
-						'concat' : true,
-						'JSON2js_if_cgi' : true,
-						'JSON2js_if_xpcom' : true,
-						'stash_name':'cb_temp_copy_ids',
-						'clear_xpcom' : true,
-					}
-				);
+                var copy_ids = xul_param(
+                    'copy_ids',{
+                        'concat' : true,
+                        'JSON2js_if_cgi' : true,
+                        'JSON2js_if_xpcom' : true,
+                        'stash_name':'cb_temp_copy_ids',
+                        'clear_xpcom' : true,
+                    }
+                );
 
-				JSAN.use('cat.copy_buckets'); g.copy_buckets = new cat.copy_buckets();
-				g.copy_buckets.init( 
-					{ 
-						'copy_ids' : copy_ids,
-					} 
-				);
-	
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name(document.getElementById("catStrings").getString('cat.copy_buckets.tab')); } catch(E) { alert(E); }
-				}
+                JSAN.use('cat.copy_buckets'); g.copy_buckets = new cat.copy_buckets();
+                g.copy_buckets.init( 
+                    { 
+                        'copy_ids' : copy_ids,
+                    } 
+                );
+    
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+                    try { window.xulG.set_tab_name(document.getElementById("catStrings").getString('cat.copy_buckets.tab')); } catch(E) { alert(E); }
+                }
 
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ["cat/copy_buckets.xul", E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
+            } catch(E) {
+                var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ["cat/copy_buckets.xul", E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
 
-		function default_focus() { try { setTimeout( function() { document.getElementById('copy_bucket_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
-	]]>
-	</script>
+        function default_focus() { try { setTimeout( function() { document.getElementById('copy_bucket_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
+    ]]>
+    </script>
 
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
 
-	<commandset id="copy_buckets_cmds">
-		<command id="cmd_copy_bucket_submit_barcode" />
-		<command id="cmd_export_to_copy_status" />
-		<command id="copy_buckets_new_bucket" />
-		<command id="copy_buckets_delete_bucket" />
-		<command id="copy_buckets_delete_item" />
-		<command id="copy_buckets_add" />
-		<command id="copy_buckets_sel_add" />
-		<command id="copy_buckets_export" />
-		<command id="copy_buckets_transfer_to_volume" />
-		<command id="copy_buckets_batch_copy_edit" />
-		<command id="copy_buckets_batch_copy_delete" />
-	</commandset>
+    <commandset id="copy_buckets_cmds">
+        <command id="cmd_copy_bucket_submit_barcode" />
+        <command id="cmd_export_to_copy_status" />
+        <command id="copy_buckets_new_bucket" />
+        <command id="copy_buckets_delete_bucket" />
+        <command id="copy_buckets_delete_item" />
+        <command id="copy_buckets_add" />
+        <command id="copy_buckets_sel_add" />
+        <command id="copy_buckets_export" />
+        <command id="copy_buckets_transfer_to_volume" />
+        <command id="copy_buckets_batch_copy_edit" />
+        <command id="copy_buckets_batch_copy_delete" />
+    </commandset>
 
-	<box id="copy_buckets_main" />
+    <box id="copy_buckets_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_buckets_overlay.xul b/Open-ILS/xul/staff_client/server/cat/copy_buckets_overlay.xul
index 1c357d016b..5eb2992e0b 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_buckets_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_buckets_overlay.xul
@@ -1,82 +1,82 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="copy_buckets_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading copy_buckets_overlay.xul\n');</script>
 
 <commandset id="copy_buckets_cmds" />
 
 <box id="copy_buckets_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="cmvb1" flex="1"/>
+    <vbox id="cmvb1" flex="1"/>
 </box>
 
 <vbox id="cmvb1" flex="1">
-	<groupbox flex="1">
-		<caption label="&staff.cat.copy_buckets_overlay.pending_copies;" />
-		<hbox id="pending_buckets_top_ui" />
-		<tree id="pending_copies_list" flex="1" enableColumnDrag="true"/>
-		<hbox id="pending_buckets_bottom_ui" />
-	</groupbox>
-	<splitter><grippy /></splitter>
-	<groupbox flex="2">
-		<caption label="&staff.cat.copy_buckets_overlay.bucket_view;" />
-		<hbox id="copy_buckets_top_ui" />
-		<hbox id="info_box"/>
-		<tree id="copies_in_bucket_list" flex="1" enableColumnDrag="true"/>
-		<hbox id="copy_buckets_bottom_ui" />
-	</groupbox>
+    <groupbox flex="1">
+        <caption label="&staff.cat.copy_buckets_overlay.pending_copies;" />
+        <hbox id="pending_buckets_top_ui" />
+        <tree id="pending_copies_list" flex="1" enableColumnDrag="true"/>
+        <hbox id="pending_buckets_bottom_ui" />
+    </groupbox>
+    <splitter><grippy /></splitter>
+    <groupbox flex="2">
+        <caption label="&staff.cat.copy_buckets_overlay.bucket_view;" />
+        <hbox id="copy_buckets_top_ui" />
+        <hbox id="info_box"/>
+        <tree id="copies_in_bucket_list" flex="1" enableColumnDrag="true"/>
+        <hbox id="copy_buckets_bottom_ui" />
+    </groupbox>
 </vbox>
 
 <hbox id="pending_buckets_top_ui">
-	<label id="copy_bucket_scan_barcode_label" 
-		value="&staff.circ.copy_status_overlay.copy_status_scan_barcode.label;"
-		accesskey="&staff.circ.copy_status_overlay.copy_status_scan_barcode.accesskey;"
-		control="copy_bucket_barcode_entry_textbox"/>
-	<textbox id="copy_bucket_barcode_entry_textbox" context="clipboard"/>
-	<button id="copy_bucket_submit_barcode_button" 
-		label="&staff.circ.copy_status_overlay.copy_status_submit_barcode.label;"
-		accesskey="&staff.circ.copy_status_overlay.copy_status_submit_barcode.accesskey;"
-		command="cmd_copy_bucket_submit_barcode"/>
+    <label id="copy_bucket_scan_barcode_label" 
+        value="&staff.circ.copy_status_overlay.copy_status_scan_barcode.label;"
+        accesskey="&staff.circ.copy_status_overlay.copy_status_scan_barcode.accesskey;"
+        control="copy_bucket_barcode_entry_textbox"/>
+    <textbox id="copy_bucket_barcode_entry_textbox" context="clipboard"/>
+    <button id="copy_bucket_submit_barcode_button" 
+        label="&staff.circ.copy_status_overlay.copy_status_submit_barcode.label;"
+        accesskey="&staff.circ.copy_status_overlay.copy_status_submit_barcode.accesskey;"
+        command="cmd_copy_bucket_submit_barcode"/>
 </hbox>
 
 <hbox id="pending_buckets_bottom_ui">
     <hbox id="list_actions1"/>
-	<spacer flex="1"/>
-	<button label="&staff.cat.copy_buckets_overlay.pending_buckets.copy_buckets_add.label;" command="copy_buckets_add" accesskey="&staff.cat.copy_buckets_overlay.pending_buckets.copy_buckets_add.accesskey;" image="/xul/server/skin/media/images/down_arrow.gif"/>
-	<button label="&staff.cat.copy_buckets_overlay.pending_buckets.copy_buckets_sel_add.label;" command="copy_buckets_sel_add" accesskey="" image="/xul/server/skin/media/images/down_arrow.gif"/>
+    <spacer flex="1"/>
+    <button label="&staff.cat.copy_buckets_overlay.pending_buckets.copy_buckets_add.label;" command="copy_buckets_add" accesskey="&staff.cat.copy_buckets_overlay.pending_buckets.copy_buckets_add.accesskey;" image="/xul/server/skin/media/images/down_arrow.gif"/>
+    <button label="&staff.cat.copy_buckets_overlay.pending_buckets.copy_buckets_sel_add.label;" command="copy_buckets_sel_add" accesskey="" image="/xul/server/skin/media/images/down_arrow.gif"/>
 </hbox>
 
 <hbox id="copy_buckets_top_ui">
-	<hbox id="copy_buckets_menulist_placeholder" />
-	<button command="copy_buckets_new_bucket" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_new_bucket.label;"/>
-	<button command="copy_buckets_delete_bucket" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_delete_bucket.label;"/>
-	<button id="refresh" label="&staff.cat.copy_buckets_overlay.copy_buckets.refresh.label;"/>
-	<spacer flex="1"/>
-	<button command="copy_buckets_delete_item" label="&staff.cat.copy_buckets_overlay.copy_buckets.delete_item.label;" disabled="true" image="/xul/server/skin/media/images/icon_delete.gif"/>
-	<button command="copy_buckets_export" label="&staff.cat.copy_buckets_overlay.copy_buckets.export.label;" disabled="true" image="/xul/server/skin/media/images/up_arrow.gif"/>
+    <hbox id="copy_buckets_menulist_placeholder" />
+    <button command="copy_buckets_new_bucket" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_new_bucket.label;"/>
+    <button command="copy_buckets_delete_bucket" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_delete_bucket.label;"/>
+    <button id="refresh" label="&staff.cat.copy_buckets_overlay.copy_buckets.refresh.label;"/>
+    <spacer flex="1"/>
+    <button command="copy_buckets_delete_item" label="&staff.cat.copy_buckets_overlay.copy_buckets.delete_item.label;" disabled="true" image="/xul/server/skin/media/images/icon_delete.gif"/>
+    <button command="copy_buckets_export" label="&staff.cat.copy_buckets_overlay.copy_buckets.export.label;" disabled="true" image="/xul/server/skin/media/images/up_arrow.gif"/>
 </hbox>
 
 <hbox id="info_box" hidden="true" style="font-size: large;">
-	<label value="&staff.cat.copy_buckets_overlay.info_box.bucket.label;"/>
-	<label id="bucket_number" style="color: blue; text-decoration: underline; -moz-user-focus: normal;" onclick="copy_to_clipboard(event)"/>
-	<label id="bucket_name" style="color: blue;"/>
-	<label value="&staff.cat.copy_buckets_overlay.info_box.owner.label;"/>
-	<label id="bucket_owner" style="color: blue;"/>
+    <label value="&staff.cat.copy_buckets_overlay.info_box.bucket.label;"/>
+    <label id="bucket_number" style="color: blue; text-decoration: underline; -moz-user-focus: normal;" onclick="copy_to_clipboard(event)"/>
+    <label id="bucket_name" style="color: blue;"/>
+    <label value="&staff.cat.copy_buckets_overlay.info_box.owner.label;"/>
+    <label id="bucket_owner" style="color: blue;"/>
 </hbox>
 
 <hbox id="copy_buckets_bottom_ui">
     <hbox id="list_actions2"/>
-	<spacer flex="1"/>
-	<hbox style="background: grey">
-		<vbox><spacer flex="1"/><label value="&staff.cat.copy_buckets_overlay.copy_buckets.batch.label;" style="font-weight: bold"/><spacer flex="1"/></vbox>
-		<button label="&staff.cat.copy_buckets_overlay.copy_buckets.cmd_export_to_copy_status.label;" command="cmd_export_to_copy_status"/>
-		<button command="copy_buckets_transfer_to_volume" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_transfer_to_volume.label;"/>
-		<button command="copy_buckets_batch_copy_edit" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_batch_copy_edit.label;" image="/xul/server/skin/media/images/grinder.gif"/>
-		<button command="copy_buckets_batch_copy_delete" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_batch_copy_delete.label;" />
-	</hbox>
+    <spacer flex="1"/>
+    <hbox style="background: grey">
+        <vbox><spacer flex="1"/><label value="&staff.cat.copy_buckets_overlay.copy_buckets.batch.label;" style="font-weight: bold"/><spacer flex="1"/></vbox>
+        <button label="&staff.cat.copy_buckets_overlay.copy_buckets.cmd_export_to_copy_status.label;" command="cmd_export_to_copy_status"/>
+        <button command="copy_buckets_transfer_to_volume" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_transfer_to_volume.label;"/>
+        <button command="copy_buckets_batch_copy_edit" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_batch_copy_edit.label;" image="/xul/server/skin/media/images/grinder.gif"/>
+        <button command="copy_buckets_batch_copy_delete" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_batch_copy_delete.label;" />
+    </hbox>
 </hbox>
 
 </overlay>
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 08bfd58f46..36636fd843 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
@@ -14,7 +14,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -22,154 +22,154 @@
 <?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(); persist_helper(); } catch(E) { alert(E); }" oils_persist="height width"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		function $c(n) { return document.createElement(n); }
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') {
-					throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for copy_buckets.xul');
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				g.copy_ids = xul_param(
-					'copy_ids',{
-						'concat' : true,
-						'JSON2js_if_cgi' : true,
-						'JSON2js_if_xpcom' : true,
-						'stash_name':'cb_temp_copy_ids',
-						'clear_xpcom' : true,
-					}
-				);
-
-				$('desc').appendChild(
-					document.createTextNode( 
-						(g.copy_ids.length == 1 ?
-							$('catStrings').getString('staff.cat.copy_buckets_quick.bucket_prompt') :
-							$('catStrings').getFormattedString('staff.cat.copy_buckets_quick.bucket_prompt.plural', [g.copy_ids.length]) 
-						) 
-					)
-				);
-				var robj = g.network.simple_request('BUCKET_RETRIEVE_VIA_USER',[ ses(), g.data.list.au[0].id() ]);
-				if (typeof robj.ilsevent != 'undefined') throw(robj);
-
-				for (var i = 0; i < robj.copy.length; i++) {
-					var listitem = $c('listitem');
-					listitem.setAttribute('label', robj.copy[i].name());
-					listitem.setAttribute('id', robj.copy[i].id());
-					$('bucket_list').appendChild(listitem);
-				}
-
-				try { $('bucket_list').selectedIndex = 0; } catch(E) { }
-
-				$('bucket_list').focus();
-
-			} catch(E) {
-				try { 
-					g.error.standard_unexpected_error_alert('Trying to init copy_buckets_quick.xul',E); 
-				} catch(F) { 
-					alert(E); 
-				}
-			}
-		}
-
-		g.new_bucket = function() {
-			try {
-				var name = prompt(
-					$('catStrings').getString('staff.cat.copy_buckets_quick.copy_buckets_new_bucket.prompt'),
-					'',
-					$('catStrings').getString('staff.cat.copy_buckets_quick.copy_buckets_new_bucket.title')
-				);
-				if (name) {
-					var bucket = new ccb();
-					bucket.btype('staff_client');
-					bucket.owner( g.data.list.au[0].id() );
-					bucket.name( name );
-
-					var bucket_id = g.network.simple_request('BUCKET_CREATE',[ses(),'copy',bucket]);
-					if (typeof bucket_id == 'object') throw bucket_id;
-
-					g.add_to_bucket(bucket_id);
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets_quick.copy_buckets_new_bucket.error'), E);
-			}
-		}
-
-		g.add_to_bucket = function(b) {
-			var bucket_id;
-			if (b) {
-				bucket_id = b;
-			} else {
-				try {
-					if ($('bucket_list').selectedItem) bucket_id = $('bucket_list').selectedItem.getAttribute('id');
-				} catch(E) {
-				}
-			}
-			if (!bucket_id) return;
-			for (var i = 0; i < g.copy_ids.length; i++) {
-				var bucket_item = new ccbi();
-				bucket_item.isnew('1');
-				bucket_item.bucket(bucket_id);
-				bucket_item.target_copy( g.copy_ids[i] );
-				try {
-					var robj = g.network.simple_request('BUCKET_ITEM_CREATE', [ ses(), 'copy', bucket_item ]);
-					if (typeof robj == 'object') throw robj;
-
-				} catch(E) {
-					g.error.standard_unexpected_error_alert($('catStrings').getFormattedString('staff.cat.copy_buckets_quick.addition.error', [bucket_id, g.copy_ids[i]]), E);
-				}
-			}
-			window.close();
-		}
-
-		g.advanced = function() {
-			JSAN.use('util.window'); var win = new util.window();
-			g.data.cb_temp_copy_ids = js2JSON( g.copy_ids ); g.data.stash('cb_temp_copy_ids');
-			win.open(urls.XUL_COPY_BUCKETS,'adv_copy_buckets','chrome,resizable,modal');
-			window.close();
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<vbox flex="1" style="overflow: auto">
-	<groupbox flex="1">
-		<caption label="&staff.cat.copy_buckets_quick.item_buckets.label;"/>
-		<description id="desc"/>
-		<listbox id="bucket_list" rows="5" flex="1" style="overflow: auto"/>
-		<hbox>
-			<button label="&staff.cat.copy_buckets_quick.item_buckets.add_to_bucket.label;" accesskey="&staff.cat.copy_buckets_quick.item_buckets.add_to_bucket.accesskey;" oncommand="g.add_to_bucket()"/>
-			<button label="&staff.cat.copy_buckets_quick.item_buckets.new_bucket.label;" accesskey="&staff.cat.copy_buckets_quick.item_buckets.new_bucket.accesskey;" oncommand="g.new_bucket()"/>
-		</hbox>
-		<hbox>
-			<!--
-			<button label="Advanced" accesskey="v" oncommand="g.advanced()"/>
-			-->
-			<button label="&staff.cat.copy_buckets_quick.item_buckets.cancel.label;" accesskey="&staff.cat.copy_buckets_quick.item_buckets.cancel.accesskey;" oncommand="window.close()"/>
-		</hbox>
-	</groupbox>
-	</vbox>
+    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">
+
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <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="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function $(id) { return document.getElementById(id); }
+        function $c(n) { return document.createElement(n); }
+
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') {
+                    throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
+                }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for copy_buckets.xul');
+                JSAN.use('util.network'); g.network = new util.network();
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+                g.copy_ids = xul_param(
+                    'copy_ids',{
+                        'concat' : true,
+                        'JSON2js_if_cgi' : true,
+                        'JSON2js_if_xpcom' : true,
+                        'stash_name':'cb_temp_copy_ids',
+                        'clear_xpcom' : true,
+                    }
+                );
+
+                $('desc').appendChild(
+                    document.createTextNode( 
+                        (g.copy_ids.length == 1 ?
+                            $('catStrings').getString('staff.cat.copy_buckets_quick.bucket_prompt') :
+                            $('catStrings').getFormattedString('staff.cat.copy_buckets_quick.bucket_prompt.plural', [g.copy_ids.length]) 
+                        ) 
+                    )
+                );
+                var robj = g.network.simple_request('BUCKET_RETRIEVE_VIA_USER',[ ses(), g.data.list.au[0].id() ]);
+                if (typeof robj.ilsevent != 'undefined') throw(robj);
+
+                for (var i = 0; i < robj.copy.length; i++) {
+                    var listitem = $c('listitem');
+                    listitem.setAttribute('label', robj.copy[i].name());
+                    listitem.setAttribute('id', robj.copy[i].id());
+                    $('bucket_list').appendChild(listitem);
+                }
+
+                try { $('bucket_list').selectedIndex = 0; } catch(E) { }
+
+                $('bucket_list').focus();
+
+            } catch(E) {
+                try { 
+                    g.error.standard_unexpected_error_alert('Trying to init copy_buckets_quick.xul',E); 
+                } catch(F) { 
+                    alert(E); 
+                }
+            }
+        }
+
+        g.new_bucket = function() {
+            try {
+                var name = prompt(
+                    $('catStrings').getString('staff.cat.copy_buckets_quick.copy_buckets_new_bucket.prompt'),
+                    '',
+                    $('catStrings').getString('staff.cat.copy_buckets_quick.copy_buckets_new_bucket.title')
+                );
+                if (name) {
+                    var bucket = new ccb();
+                    bucket.btype('staff_client');
+                    bucket.owner( g.data.list.au[0].id() );
+                    bucket.name( name );
+
+                    var bucket_id = g.network.simple_request('BUCKET_CREATE',[ses(),'copy',bucket]);
+                    if (typeof bucket_id == 'object') throw bucket_id;
+
+                    g.add_to_bucket(bucket_id);
+                }
+            } catch(E) {
+                g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets_quick.copy_buckets_new_bucket.error'), E);
+            }
+        }
+
+        g.add_to_bucket = function(b) {
+            var bucket_id;
+            if (b) {
+                bucket_id = b;
+            } else {
+                try {
+                    if ($('bucket_list').selectedItem) bucket_id = $('bucket_list').selectedItem.getAttribute('id');
+                } catch(E) {
+                }
+            }
+            if (!bucket_id) return;
+            for (var i = 0; i < g.copy_ids.length; i++) {
+                var bucket_item = new ccbi();
+                bucket_item.isnew('1');
+                bucket_item.bucket(bucket_id);
+                bucket_item.target_copy( g.copy_ids[i] );
+                try {
+                    var robj = g.network.simple_request('BUCKET_ITEM_CREATE', [ ses(), 'copy', bucket_item ]);
+                    if (typeof robj == 'object') throw robj;
+
+                } catch(E) {
+                    g.error.standard_unexpected_error_alert($('catStrings').getFormattedString('staff.cat.copy_buckets_quick.addition.error', [bucket_id, g.copy_ids[i]]), E);
+                }
+            }
+            window.close();
+        }
+
+        g.advanced = function() {
+            JSAN.use('util.window'); var win = new util.window();
+            g.data.cb_temp_copy_ids = js2JSON( g.copy_ids ); g.data.stash('cb_temp_copy_ids');
+            win.open(urls.XUL_COPY_BUCKETS,'adv_copy_buckets','chrome,resizable,modal');
+            window.close();
+        }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+    <vbox flex="1" style="overflow: auto">
+    <groupbox flex="1">
+        <caption label="&staff.cat.copy_buckets_quick.item_buckets.label;"/>
+        <description id="desc"/>
+        <listbox id="bucket_list" rows="5" flex="1" style="overflow: auto"/>
+        <hbox>
+            <button label="&staff.cat.copy_buckets_quick.item_buckets.add_to_bucket.label;" accesskey="&staff.cat.copy_buckets_quick.item_buckets.add_to_bucket.accesskey;" oncommand="g.add_to_bucket()"/>
+            <button label="&staff.cat.copy_buckets_quick.item_buckets.new_bucket.label;" accesskey="&staff.cat.copy_buckets_quick.item_buckets.new_bucket.accesskey;" oncommand="g.new_bucket()"/>
+        </hbox>
+        <hbox>
+            <!--
+            <button label="Advanced" accesskey="v" oncommand="g.advanced()"/>
+            -->
+            <button label="&staff.cat.copy_buckets_quick.item_buckets.cancel.label;" accesskey="&staff.cat.copy_buckets_quick.item_buckets.cancel.accesskey;" oncommand="window.close()"/>
+        </hbox>
+    </groupbox>
+    </vbox>
 
 </window>
 
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 525a87ca78..4117fda296 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_editor.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_editor.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -18,81 +18,81 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_copy_editor_win" 
-	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">
+    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">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="copy_editor.js"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="copy_editor.js"/>
 
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
     <vbox id="brief_display_box"/>
 
-	<groupbox flex="1" class="my_overflow">
-		<caption id="caption" label="&staff.cat.copy_editor.groupbox1.label;"/>
+    <groupbox flex="1" class="my_overflow">
+        <caption id="caption" label="&staff.cat.copy_editor.groupbox1.label;"/>
 
-		<hbox id="top_nav">
-			<hbox style="background: grey">
-				<vbox><spacer flex="1"/><label value="&staff.cat.copy_editor.templates.label;" style="font-weight: bold"/><spacer flex="1"/></vbox>
-				<hbox id="template_placeholder"/>
-				<button id="apply_template" label="&staff.cat.copy_editor.templates.apply_template.label;" accesskey="&staff.cat.copy_editor.templates.apply_template.accesskey;" oncommand="g.apply_template()"/>
-				<button id="delete_template" label="&staff.cat.copy_editor.templates.delete_template.label;" oncommand="g.delete_template()"/>
-				<button id="import_templates" label="&staff.cat.copy_editor.templates.import_template.label;" oncommand="g.import_templates()"/>
-				<button id="export_templates" label="&staff.cat.copy_editor.templates.export_template.label;" oncommand="g.export_templates()"/>
-				<button id="save_template" label="&staff.cat.copy_editor.templates.save_template.label;" oncommand="g.save_template()"/>
-			</hbox>
-			<spacer flex="1"/>
-			<button label="&staff.cat.copy_editor.templates.reset.label;" accesskey="&staff.cat.copy_editor.templates.reset.accesskey;" oncommand="g.reset()"/>
-		</hbox>
+        <hbox id="top_nav">
+            <hbox style="background: grey">
+                <vbox><spacer flex="1"/><label value="&staff.cat.copy_editor.templates.label;" style="font-weight: bold"/><spacer flex="1"/></vbox>
+                <hbox id="template_placeholder"/>
+                <button id="apply_template" label="&staff.cat.copy_editor.templates.apply_template.label;" accesskey="&staff.cat.copy_editor.templates.apply_template.accesskey;" oncommand="g.apply_template()"/>
+                <button id="delete_template" label="&staff.cat.copy_editor.templates.delete_template.label;" oncommand="g.delete_template()"/>
+                <button id="import_templates" label="&staff.cat.copy_editor.templates.import_template.label;" oncommand="g.import_templates()"/>
+                <button id="export_templates" label="&staff.cat.copy_editor.templates.export_template.label;" oncommand="g.export_templates()"/>
+                <button id="save_template" label="&staff.cat.copy_editor.templates.save_template.label;" oncommand="g.save_template()"/>
+            </hbox>
+            <spacer flex="1"/>
+            <button label="&staff.cat.copy_editor.templates.reset.label;" accesskey="&staff.cat.copy_editor.templates.reset.accesskey;" oncommand="g.reset()"/>
+        </hbox>
 
-		<hbox flex="1" style="overflow: scroll">
-			<vbox flex="1">
-				<label value="&staff.cat.copy_editor.identification.label;" style="font-weight: bold; font-size: large"/>
-				<vbox id="left_pane" flex="1"/>
-			</vbox>
-			<splitter><grippy /></splitter>
-			<vbox flex="1">
-				<button style="font-weight: bold; font-size: normal" label="&staff.cat.copy_editor.identification.location.label;" accesskey="&staff.cat.copy_editor.identification.location.accesskey;" oncommand="document.getElementById('right_pane').firstChild.firstChild.focus();"/>
-				<vbox id="right_pane" flex="1"/>
-			</vbox>
-			<splitter><grippy /></splitter>
-			<vbox flex="1">
-				<button style="font-weight: bold; font-size: normal" label="&staff.cat.copy_editor.identification.circulation.label;" accesskey="&staff.cat.copy_editor.identification.circulation.accesskey;" oncommand="document.getElementById('right_pane2').firstChild.firstChild.focus();"/>
-				<vbox id="right_pane2" flex="1"/>
-			</vbox>
-			<splitter><grippy /></splitter>
-			<vbox flex="1">
-				<button style="font-weight: bold; font-size: normal" label="&staff.cat.copy_editor.identification.miscellaneous.label;" accesskey="&staff.cat.copy_editor.identification.miscellaneous.accesskey;" oncommand="document.getElementById('right_pane3').firstChild.firstChild.focus();"/>
-				<vbox id="right_pane3" flex="1"/>
-			</vbox>
-			<splitter><grippy /></splitter>
-			<vbox flex="1">
-				<button style="font-weight: bold; font-size: normal" label="&staff.cat.copy_editor.identification.statistics.label;" accesskey="&staff.cat.copy_editor.identification.statistics.accesskey;" oncommand="document.getElementById('right_pane4').firstChild.firstChild.focus();"/>
+        <hbox flex="1" style="overflow: scroll">
+            <vbox flex="1">
+                <label value="&staff.cat.copy_editor.identification.label;" style="font-weight: bold; font-size: large"/>
+                <vbox id="left_pane" flex="1"/>
+            </vbox>
+            <splitter><grippy /></splitter>
+            <vbox flex="1">
+                <button style="font-weight: bold; font-size: normal" label="&staff.cat.copy_editor.identification.location.label;" accesskey="&staff.cat.copy_editor.identification.location.accesskey;" oncommand="document.getElementById('right_pane').firstChild.firstChild.focus();"/>
+                <vbox id="right_pane" flex="1"/>
+            </vbox>
+            <splitter><grippy /></splitter>
+            <vbox flex="1">
+                <button style="font-weight: bold; font-size: normal" label="&staff.cat.copy_editor.identification.circulation.label;" accesskey="&staff.cat.copy_editor.identification.circulation.accesskey;" oncommand="document.getElementById('right_pane2').firstChild.firstChild.focus();"/>
+                <vbox id="right_pane2" flex="1"/>
+            </vbox>
+            <splitter><grippy /></splitter>
+            <vbox flex="1">
+                <button style="font-weight: bold; font-size: normal" label="&staff.cat.copy_editor.identification.miscellaneous.label;" accesskey="&staff.cat.copy_editor.identification.miscellaneous.accesskey;" oncommand="document.getElementById('right_pane3').firstChild.firstChild.focus();"/>
+                <vbox id="right_pane3" flex="1"/>
+            </vbox>
+            <splitter><grippy /></splitter>
+            <vbox flex="1">
+                <button style="font-weight: bold; font-size: normal" label="&staff.cat.copy_editor.identification.statistics.label;" accesskey="&staff.cat.copy_editor.identification.statistics.accesskey;" oncommand="document.getElementById('right_pane4').firstChild.firstChild.focus();"/>
                 <menu label="&staff.cat.copy_editor.stat_cat_lib_filter_menu.label;" id="stat_cat_lib_filter_menu">
                     <menupopup />
                 </menu>
-				<vbox id="right_pane4" flex="1"/>
-			</vbox>
-		</hbox>
+                <vbox id="right_pane4" flex="1"/>
+            </vbox>
+        </hbox>
 
-		<hbox id="nav">
-			<spacer flex="1"/>
-			<button id="copy_notes" label="&staff.cat.copy_editor.copy_notes.label;" accesskey="&staff.cat.copy_editor.copy_notes.accesskey;" oncommand="g.copy_notes();"/>
-			<button id="save" label="&staff.cat.copy_editor.save.label;" hidden="true" accesskey="&staff.cat.copy_editor.save.accesskey;" oncommand="g.stash_and_close();"/>
-			<button id="cancel" label="&staff.cat.copy_editor.cancel.label;" accesskey="&staff.cat.copy_editor.cancel.accesskey;" oncommand="window.close();"/>
-		</hbox>
+        <hbox id="nav">
+            <spacer flex="1"/>
+            <button id="copy_notes" label="&staff.cat.copy_editor.copy_notes.label;" accesskey="&staff.cat.copy_editor.copy_notes.accesskey;" oncommand="g.copy_notes();"/>
+            <button id="save" label="&staff.cat.copy_editor.save.label;" hidden="true" accesskey="&staff.cat.copy_editor.save.accesskey;" oncommand="g.stash_and_close();"/>
+            <button id="cancel" label="&staff.cat.copy_editor.cancel.label;" accesskey="&staff.cat.copy_editor.cancel.accesskey;" oncommand="window.close();"/>
+        </hbox>
 
-		<spacer/>
-	</groupbox>
+        <spacer/>
+    </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_notes.xul b/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
index 5b90381194..1d9d0b5cf6 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
@@ -14,7 +14,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -22,201 +22,201 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="copy_notes_win" width="700" height="550"
-	onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function $(id) { return document.getElementById(id); }
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { 
-					throw( $("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-
-				JSAN.use('util.error'); g.error = new util.error();
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date'); JSAN.use('util.money'); 
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				g.error.sdump('D_TRACE','my_init() for copy_notes.xul');
-
-				g.copy_id = xul_param('copy_id',{'modal_xulG':true});
-
-				refresh();
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/copy_notes.xul', js2JSON(E)]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function refresh() {
-			retrieve_notes(); render_notes();
-		}
-
-		function retrieve_notes() {
-			g.notes = g.network.simple_request('FM_ACPN_RETRIEVE_ALL',[ { 'authtoken' : ses(), 'itemid' : g.copy_id } ]).reverse();
-		}
-
-		function apply(node,field,value) {
-			util.widgets.apply(
-				node,'name',field,
-				function(n) {
-					switch(n.nodeName) {
-						case 'description' : n.appendChild( document.createTextNode( value ) ); break;
-						case 'label' : n.value = value; break;
-						default : n.value = value; break;
-					}
-				}
-			);
-		}
-
-		function render_notes() {
-			JSAN.use('util.widgets'); util.widgets.remove_children('notes_panel');
-			var np = $('notes_panel');
-				var hbox = document.createElement('hbox'); np.appendChild(hbox);
-					var btn = document.createElement('button'); hbox.appendChild(btn);
-						btn.setAttribute('label', $('catStrings').getString('staff.cat.copy_notes.render_notes.label'));
-						btn.setAttribute('accesskey', $('catStrings').getString('staff.cat.copy_notes.render_notes.accesskey'));
-						btn.setAttribute('oncommand','new_note()');
-
-			for (var i = 0; i < g.notes.length; i++) {
-
-				/* template */
-				var node = $('note_template').cloneNode(true); np.appendChild(node); node.hidden = false;
-				apply(node,'create_date',g.notes[i].create_date().toString().substr(0,10));
-				util.widgets.apply(node,'name','create_date',
-					function(n) {
-						n.setAttribute(
-							"tooltiptext",
-							$('catStrings').getString('staff.cat.copy_notes.widgets_apply.note_id') + " "
-							+ g.notes[i].id() + " " 
-							+ $('catStrings').getString('staff.cat.copy_notes.widgets_apply.creator_id') + " "
-							+ g.notes[i].creator()
-						);
-					}
-				);
-				apply(node,'title',g.notes[i].title());
-				apply(node,'pub',get_bool( g.notes[i].pub() ) ? $('catStrings').getString('staff.cat.copy_notes.widgets.public') : $('catStrings').getString('staff.cat.copy_notes.widgets.private'));
-				apply(node,'value',g.notes[i].value());
-				apply(node,'id',g.notes[i].id());
-				apply(node,'creator',g.notes[i].creator());
-
-				/* button bar */
-				var hb = document.createElement('hbox'); np.appendChild(hb);
-					var btn1 = document.createElement('button'); hb.appendChild(btn1);
-						btn1.setAttribute('label', $('catStrings').getString('staff.cat.copy_notes.delete_note.label'));
-						btn1.setAttribute('image',"/xul/server/skin/media/images/up_arrow.gif");
-
-						btn1.addEventListener(
-							'command',
-							function(id){ return function() { 
-								var r = g.error.yns_alert(
-									$('catStrings').getFormattedString('staff.cat.copy_notes.delete_note.prompt.msg', [g.notes[id].title(), g.notes[id].create_date().toString().substr(0,10)]),
-									$('catStrings').getString('staff.cat.copy_notes.delete_note.prompt.title'),
-									$('catStrings').getString('staff.cat.copy_notes.delete_note.prompt.yes'),
-									$('catStrings').getString('staff.cat.copy_notes.delete_note.prompt.no'),
-									null,
-									$('commonStrings').getString('common.confirm')
-								); 
-								if (r == 0) {
-									g.network.simple_request('FM_ACPN_DELETE',[ses(),g.notes[id].id()]);
-									setTimeout(function() { 
-										alert($('catStrings').getString('staff.cat.copy_notes.delete_note.success'));
-										refresh(); },0
-									);
-								}
-							} }(i),
-							false
-						);
-					var spacer = document.createElement('spacer'); hb.appendChild(spacer); spacer.flex = 1;
-					var btn2 = document.createElement('button'); hb.appendChild(btn2);
-						btn2.setAttribute('label', $('catStrings').getString('staff.cat.copy_notes.delete_note.close_window'));
-						btn2.setAttribute('oncommand','window.close();');
-			}
-
-		}
-		
-		function new_note() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalBrowserWrite");
-				var xml = '<groupbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1"> \
-					<caption label="' + $('catStrings').getString('staff.cat.copy_notes.new_note.label') + '"/> \
-					<grid flex="1"><columns><column/><column flex="1"/></columns> \
-						<rows> \
-							<row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.public') + '"/><checkbox id="pub" name="fancy_data" checked="false"/></row> \
-							<row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.title') + '"/><textbox id="title" name="fancy_data" context="clipboard"/></row> \
-							<row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.note') + '"/><textbox multiline="true" id="note" name="fancy_data" context="clipboard"/></row> \
-							<row><spacer/><hbox> \
-								<button label="' + $('catStrings').getString('staff.cat.copy_notes.new_note.cancel.label') + '" name="fancy_cancel" accesskey="' + $('catStrings').getString('staff.cat.copy_notes.new_note.cancel.accesskey') + '"/> \
-								<button label="' + $('catStrings').getString('staff.cat.copy_notes.new_note.add_note.label') + '" accesskey="' + $('catStrings').getString('staff.cat.copy_notes.new_note.add_note.accesskey') + '" name="fancy_submit"/></hbox></row> \
-						</rows></grid></groupbox>';
-				//g.data.init({'via':'stash'});
-				//g.data.temp_note_xml = xml; g.data.stash('temp_note_xml');
-				JSAN.use('util.window'); var win = new util.window();
-				var fancy_prompt_data = win.open(
-					urls.XUL_FANCY_PROMPT,
-					//+ '?xml_in_stash=temp_note_xml'
-					//+ '&focus=' + window.escape('title')
-					//+ '&title=' + window.escape('Add Note'),
-					'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
-					{ 'xml' : xml, 'focus' : 'title', 'title' : $('catStrings').getString('staff.cat.copy_notes.new_note.add_note.label') }
-				);
-				//g.data.init({'via':'stash'});
-				if (fancy_prompt_data.fancy_status == 'complete') {
-					//alert(js2JSON(g.data.fancy_prompt_data));
-					var note = new acpn();
-					note.isnew(1);
-					note.title( fancy_prompt_data.title );
-					note.value( fancy_prompt_data.note );
-					note.pub( get_bool( fancy_prompt_data.pub ) ? get_db_true() : get_db_false() );
-					note.owning_copy( g.copy_id );
-					var r = g.network.simple_request('FM_ACPN_CREATE',[ ses(), note ]);
-					if (typeof r.ilsevent != 'undefined') throw(r);
-					setTimeout(function() {
-						alert($('catStrings').getString('staff.cat.copy_notes.new_note.success'));
-						refresh();},0
-					);
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_notes.new_note.error'),E);
-			}
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<stack hidden="true" id="note_template" flex="1">
-		<groupbox flex="1" style="background-color: black;"/>
-		<groupbox flex="1" style="background-color: #FFDE00; -moz-border-radius-topright: 35px;" >
-			<hbox>
-				<description name="title" class="copyable" style="font-weight: bold"/>
-				<spacer flex="1"/>
-				<description name="create_date" class="copyable" style="font-weight: bold"/>
-				<description name="pub" class="copyable" style="font-weight: bold"/>
-			</hbox>
-			<description class="copyable" name="value"/>
-		</groupbox>
-	</stack>
-
-	<vbox flex="1" class="my_overflow" id="notes_panel">
-	</vbox>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+
+        function $(id) { return document.getElementById(id); }
+
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { 
+                    throw( $("commonStrings").getString('common.jsan.missing') );
+                }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+
+                JSAN.use('util.error'); g.error = new util.error();
+                JSAN.use('util.network'); g.network = new util.network();
+                JSAN.use('util.date'); JSAN.use('util.money'); 
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+                g.error.sdump('D_TRACE','my_init() for copy_notes.xul');
+
+                g.copy_id = xul_param('copy_id',{'modal_xulG':true});
+
+                refresh();
+
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/copy_notes.xul', js2JSON(E)]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function refresh() {
+            retrieve_notes(); render_notes();
+        }
+
+        function retrieve_notes() {
+            g.notes = g.network.simple_request('FM_ACPN_RETRIEVE_ALL',[ { 'authtoken' : ses(), 'itemid' : g.copy_id } ]).reverse();
+        }
+
+        function apply(node,field,value) {
+            util.widgets.apply(
+                node,'name',field,
+                function(n) {
+                    switch(n.nodeName) {
+                        case 'description' : n.appendChild( document.createTextNode( value ) ); break;
+                        case 'label' : n.value = value; break;
+                        default : n.value = value; break;
+                    }
+                }
+            );
+        }
+
+        function render_notes() {
+            JSAN.use('util.widgets'); util.widgets.remove_children('notes_panel');
+            var np = $('notes_panel');
+                var hbox = document.createElement('hbox'); np.appendChild(hbox);
+                    var btn = document.createElement('button'); hbox.appendChild(btn);
+                        btn.setAttribute('label', $('catStrings').getString('staff.cat.copy_notes.render_notes.label'));
+                        btn.setAttribute('accesskey', $('catStrings').getString('staff.cat.copy_notes.render_notes.accesskey'));
+                        btn.setAttribute('oncommand','new_note()');
+
+            for (var i = 0; i < g.notes.length; i++) {
+
+                /* template */
+                var node = $('note_template').cloneNode(true); np.appendChild(node); node.hidden = false;
+                apply(node,'create_date',g.notes[i].create_date().toString().substr(0,10));
+                util.widgets.apply(node,'name','create_date',
+                    function(n) {
+                        n.setAttribute(
+                            "tooltiptext",
+                            $('catStrings').getString('staff.cat.copy_notes.widgets_apply.note_id') + " "
+                            + g.notes[i].id() + " " 
+                            + $('catStrings').getString('staff.cat.copy_notes.widgets_apply.creator_id') + " "
+                            + g.notes[i].creator()
+                        );
+                    }
+                );
+                apply(node,'title',g.notes[i].title());
+                apply(node,'pub',get_bool( g.notes[i].pub() ) ? $('catStrings').getString('staff.cat.copy_notes.widgets.public') : $('catStrings').getString('staff.cat.copy_notes.widgets.private'));
+                apply(node,'value',g.notes[i].value());
+                apply(node,'id',g.notes[i].id());
+                apply(node,'creator',g.notes[i].creator());
+
+                /* button bar */
+                var hb = document.createElement('hbox'); np.appendChild(hb);
+                    var btn1 = document.createElement('button'); hb.appendChild(btn1);
+                        btn1.setAttribute('label', $('catStrings').getString('staff.cat.copy_notes.delete_note.label'));
+                        btn1.setAttribute('image',"/xul/server/skin/media/images/up_arrow.gif");
+
+                        btn1.addEventListener(
+                            'command',
+                            function(id){ return function() { 
+                                var r = g.error.yns_alert(
+                                    $('catStrings').getFormattedString('staff.cat.copy_notes.delete_note.prompt.msg', [g.notes[id].title(), g.notes[id].create_date().toString().substr(0,10)]),
+                                    $('catStrings').getString('staff.cat.copy_notes.delete_note.prompt.title'),
+                                    $('catStrings').getString('staff.cat.copy_notes.delete_note.prompt.yes'),
+                                    $('catStrings').getString('staff.cat.copy_notes.delete_note.prompt.no'),
+                                    null,
+                                    $('commonStrings').getString('common.confirm')
+                                ); 
+                                if (r == 0) {
+                                    g.network.simple_request('FM_ACPN_DELETE',[ses(),g.notes[id].id()]);
+                                    setTimeout(function() { 
+                                        alert($('catStrings').getString('staff.cat.copy_notes.delete_note.success'));
+                                        refresh(); },0
+                                    );
+                                }
+                            } }(i),
+                            false
+                        );
+                    var spacer = document.createElement('spacer'); hb.appendChild(spacer); spacer.flex = 1;
+                    var btn2 = document.createElement('button'); hb.appendChild(btn2);
+                        btn2.setAttribute('label', $('catStrings').getString('staff.cat.copy_notes.delete_note.close_window'));
+                        btn2.setAttribute('oncommand','window.close();');
+            }
+
+        }
+        
+        function new_note() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalBrowserWrite");
+                var xml = '<groupbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1"> \
+                    <caption label="' + $('catStrings').getString('staff.cat.copy_notes.new_note.label') + '"/> \
+                    <grid flex="1"><columns><column/><column flex="1"/></columns> \
+                        <rows> \
+                            <row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.public') + '"/><checkbox id="pub" name="fancy_data" checked="false"/></row> \
+                            <row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.title') + '"/><textbox id="title" name="fancy_data" context="clipboard"/></row> \
+                            <row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.note') + '"/><textbox multiline="true" id="note" name="fancy_data" context="clipboard"/></row> \
+                            <row><spacer/><hbox> \
+                                <button label="' + $('catStrings').getString('staff.cat.copy_notes.new_note.cancel.label') + '" name="fancy_cancel" accesskey="' + $('catStrings').getString('staff.cat.copy_notes.new_note.cancel.accesskey') + '"/> \
+                                <button label="' + $('catStrings').getString('staff.cat.copy_notes.new_note.add_note.label') + '" accesskey="' + $('catStrings').getString('staff.cat.copy_notes.new_note.add_note.accesskey') + '" name="fancy_submit"/></hbox></row> \
+                        </rows></grid></groupbox>';
+                //g.data.init({'via':'stash'});
+                //g.data.temp_note_xml = xml; g.data.stash('temp_note_xml');
+                JSAN.use('util.window'); var win = new util.window();
+                var fancy_prompt_data = win.open(
+                    urls.XUL_FANCY_PROMPT,
+                    //+ '?xml_in_stash=temp_note_xml'
+                    //+ '&focus=' + window.escape('title')
+                    //+ '&title=' + window.escape('Add Note'),
+                    'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
+                    { 'xml' : xml, 'focus' : 'title', 'title' : $('catStrings').getString('staff.cat.copy_notes.new_note.add_note.label') }
+                );
+                //g.data.init({'via':'stash'});
+                if (fancy_prompt_data.fancy_status == 'complete') {
+                    //alert(js2JSON(g.data.fancy_prompt_data));
+                    var note = new acpn();
+                    note.isnew(1);
+                    note.title( fancy_prompt_data.title );
+                    note.value( fancy_prompt_data.note );
+                    note.pub( get_bool( fancy_prompt_data.pub ) ? get_db_true() : get_db_false() );
+                    note.owning_copy( g.copy_id );
+                    var r = g.network.simple_request('FM_ACPN_CREATE',[ ses(), note ]);
+                    if (typeof r.ilsevent != 'undefined') throw(r);
+                    setTimeout(function() {
+                        alert($('catStrings').getString('staff.cat.copy_notes.new_note.success'));
+                        refresh();},0
+                    );
+                }
+            } catch(E) {
+                g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_notes.new_note.error'),E);
+            }
+        }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+    <stack hidden="true" id="note_template" flex="1">
+        <groupbox flex="1" style="background-color: black;"/>
+        <groupbox flex="1" style="background-color: #FFDE00; -moz-border-radius-topright: 35px;" >
+            <hbox>
+                <description name="title" class="copyable" style="font-weight: bold"/>
+                <spacer flex="1"/>
+                <description name="create_date" class="copyable" style="font-weight: bold"/>
+                <description name="pub" class="copyable" style="font-weight: bold"/>
+            </hbox>
+            <description class="copyable" name="value"/>
+        </groupbox>
+    </stack>
+
+    <vbox flex="1" class="my_overflow" id="notes_panel">
+    </vbox>
 
 
 </window>
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 0c06536984..e373f41c72 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_summary.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_summary.xul
@@ -2,7 +2,7 @@
 <!-- Application: Evergreen Staff Client -->
 <!-- Screen: Brief Bib Display -->
 <!--
-	vim:noet:sw=4:ts=4:
+    vim:noet:sw=4:ts=4:
 -->
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -13,7 +13,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,224 +21,224 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_copy_summary_win" 
-	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">
+    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">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		function $w(id,text) { if ($(id)) util.widgets.set_text($(id),text); }
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { 
-					throw( $("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for cat_copy_summary.xul');
-
-				var copy_id = xul_param('copy_id'); 
-
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date'); JSAN.use('util.widgets');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
-				var copy = xul_param('copy',{'stash_name':'temp_copy','clear_xpcom':true});
-				var callnumber = xul_param('callnumber',{'stash_name':'temp_callnumber','clear_xpcom':true});
-
-				$('caption').setAttribute('tooltiptext', $('catStrings').getFormattedString('staff.cat.copy_summary.copy_id', [(copy_id || copy.id())]));
-
-				JSAN.use('circ.util');
-				var columns = circ.util.columns( 
-					{ 
-						'barcode' : { 'hidden' : false },
-						'location' : { 'hidden' : false },
-						'owning_lib' : { 'hidden' : false },
-						'circ_lib' : { 'hidden' : false },
-						'call_number' : { 'hidden' : false },
-						'status' : { 'hidden' : false },
-						'alert_message' : { 'hidden' : false },
-					} 
-				).concat(
-					{
-						'id' : 'total_circs', 'label' : $('catStrings').getString('staff.cat.copy_summary.total_circs.label'), 'flex' : 1,
-						'primary' : false, 'hidden' : false, 'persist' : 'hidden width ordinal',
-						'render' : 'v = obj.network.simple_request("FM_CIRC_COUNT_RETRIEVE_VIA_COPY",[ my.acp.id() ]).total.count; v;' 
-					}
-				);
-
-				JSAN.use('util.list'); g.list = new util.list('item_summary_list');
-				g.list.init(
-					{
-						'columns' : columns,
-						'map_row_to_columns' : circ.util.std_map_row_to_columns(),
-					}
-				);
-	
-				function acp_callback(req) {
-					try {
-						var copy = req.getResultObject();
-						if (typeof copy.ilsevent != 'undefined') throw(copy);
-
-						function acn_callback(rreq) {
-							try {
-								$w('barcode',copy.barcode());	
-								$w('ref',get_bool(copy.ref()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no'));	
-								$w('opac_visible',get_bool(copy.opac_visible()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no'));	
-								$w('circulate',get_bool(copy.circulate()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no'));	
-								$w('holdable',get_bool(copy.holdable()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no'));	
-								$w('age_protect',copy.age_protect() == null ? $('staff.cat.copy_summary.unset') : ( typeof copy.age_protect() == 'object' ? copy.age_protect().name() : g.data.hash.crahp[ copy.age_protect() ].name() ) );	
-								$w('location',typeof copy.location() == 'object' ? copy.location().name() : g.data.lookup('acpl',copy.location()).name() );	
-								$w('create_date',util.date.formatted_date(copy.create_date(),'%F'));
-								$w('edit_date',util.date.formatted_date(copy.edit_date(),'%F'));
-								$w('status',typeof copy.status() == 'object' ? copy.status().name() : g.data.hash.ccs[ copy.status() ].name() );	
-							} catch(E) {
-								g.error.standard_unexpected_error_alert('rendering copy',E);
-							}
-							try {
-								var cn = rreq.getResultObject();
-								if (typeof cn.ilsevent != 'undefined') {
-									switch(Number(cn.ilsevent)) {
-										case 1508 /* ASSET_CALL_NUMBER_NOT_FOUND */ :
-											$w('callnumber', $('catStrings').getString('staff.cat.copy_summary.not_cataloged'));	
-										break;
-										default:
-											throw(cn);
-										break;
-									}
-								} else {
-									$w('callnumber',cn.label());	
-								}
-								g.list.append({'row':{'my':{'acp':copy,'acn':cn}}});
-							} catch(E) {
-								g.error.standard_unexpected_error_alert('retrieving volume',E);
-							}
-						}
-
-						if (callnumber) {
-							acn_callback( { 'getResultObject' : function() { return callnumber; } } );
-						} else {
-							g.network.simple_request(
-								'FM_ACN_RETRIEVE.authoritative',
-								[ copy.call_number() ], acn_callback
-							);
-						}
-					} catch(E) {
-						g.error.standard_unexpected_error_alert('retrieving copy',E);
-					}
-				}
-
-				if (copy_id) {
-					g.network.simple_request( 'FM_ACP_RETRIEVE', [ copy_id ], acp_callback);
-				} else {
-					acp_callback( { 'getResultObject' : function() { return copy; } } );
-					copy_id = copy.id();
-				}
-
-				g.network.simple_request('FM_CIRC_COUNT_RETRIEVE_VIA_COPY',[ copy_id ],function(req) {
-					try {
-						var robj = req.getResultObject();
-						if (typeof robj.ilsevent != 'undefined') throw(robj);
-						$w('total_circs',robj.total.count);
-					} catch(E) {
-						g.error.standard_unexpected_error_alert('retrieving circ total',E);
-					}
-				});
-
-				toggle_deck(); toggle_deck(); /* quick hack */
-
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('copy_summary.xul',E); } catch(F) { alert(E + '\n' + F); }
-			}
-		}
-
-		function toggle_deck() {
-			try {
-				if ($('item_deck').selectedIndex == 0) {
-					$('item_deck').selectedIndex = 1; /* change to grid */
-					$('save_columns').hidden = true;
-					$('sel_clip').hidden = true;
-				} else {
-					$('item_deck').selectedIndex = 0; /* change to tree */
-					$('save_columns').hidden = false;
-					$('sel_clip').hidden = false;
-				}
-			} catch(E) {
-			}
-		}
-	]]>
-	</script>
-
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<groupbox id="groupbox" flex="1" style="overflow: none; min-height: 80;">
-		<caption label="&staff.cat.copy_summary.label;" id="caption"/>
-		<deck id="item_deck" oils_persist="selectedIndex">
-			<tree id="item_summary_list" enableColumnDrag="true" flex="1"/>
-			<grid>
-				<columns>
-					<column/>
-					<column/>
-					<column/>
-					<column/>
-					<column/>
-					<column/>
-					<column/>
-					<column/>
-				</columns>
-				<rows>
-					<row>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.barcode.label;"/>
-						<label id="barcode" style="color: blue; text-decoration: underline; -moz-user-focus: normal;" onclick="copy_to_clipboard(event);"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.location.label;"/>
-						<label id="location"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.call_number.label;"/>
-						<label id="callnumber"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.status.label;"/>
-						<label id="status"/>
-					</row>
-					<row>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.circulate.label;"/>
-						<label id="circulate"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.reference.label;"/>
-						<label id="ref"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.holdable.label;"/>
-						<label id="holdable"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.opac_visible.label;"/>
-						<label id="opac_visible"/>
-					</row>
-					<row>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.created.label;"/>
-						<label id="create_date"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.edited.label;"/>
-						<label id="edit_date"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.age_protect.label;"/>
-						<label id="age_protect"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.total_circs.label;"/>
-						<label id="total_circs"/>
-					</row>
-				</rows>
-			</grid>
-		</deck>
-		<hbox>
-			<button label="&staff.cat.copy_summary.alternate_view.label;" oncommand="toggle_deck()"/>
-			<button id="save_columns" label="&staff.cat.copy_summary.save_columns.label;" oncommand="try { g.list.save_columns(); } catch(E) { alert(E); }"/>
-			<button id="sel_clip" label="&staff.cat.copy_summary.sel_clip.label;" oncommand="try { g.list.node.view.selection.selectAll(); g.list.clipboard(); } catch(E) { alert(E); }"/>
-			<button id="print_export" label="&staff.cat.copy_summary.print_export.label;" oncommand="try { g.list.on_all_fleshed = function() { JSAN.use('util.print'); var p = new util.print(); p.simple( g.list.dump_csv(), { 'content_type' : 'text/plain' } ); setTimeout( function() { g.list.on_all_fleshed = null; }, 0); }; g.list.full_retrieve(); } catch(E) { alert(E); }"/>
-		</hbox>
-	</groupbox>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function $(id) { return document.getElementById(id); }
+        function $w(id,text) { if ($(id)) util.widgets.set_text($(id),text); }
+
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { 
+                    throw( $("commonStrings").getString('common.jsan.missing') );
+                }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for cat_copy_summary.xul');
+
+                var copy_id = xul_param('copy_id'); 
+
+                JSAN.use('util.network'); g.network = new util.network();
+                JSAN.use('util.date'); JSAN.use('util.widgets');
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
+                var copy = xul_param('copy',{'stash_name':'temp_copy','clear_xpcom':true});
+                var callnumber = xul_param('callnumber',{'stash_name':'temp_callnumber','clear_xpcom':true});
+
+                $('caption').setAttribute('tooltiptext', $('catStrings').getFormattedString('staff.cat.copy_summary.copy_id', [(copy_id || copy.id())]));
+
+                JSAN.use('circ.util');
+                var columns = circ.util.columns( 
+                    { 
+                        'barcode' : { 'hidden' : false },
+                        'location' : { 'hidden' : false },
+                        'owning_lib' : { 'hidden' : false },
+                        'circ_lib' : { 'hidden' : false },
+                        'call_number' : { 'hidden' : false },
+                        'status' : { 'hidden' : false },
+                        'alert_message' : { 'hidden' : false },
+                    } 
+                ).concat(
+                    {
+                        'id' : 'total_circs', 'label' : $('catStrings').getString('staff.cat.copy_summary.total_circs.label'), 'flex' : 1,
+                        'primary' : false, 'hidden' : false, 'persist' : 'hidden width ordinal',
+                        'render' : 'v = obj.network.simple_request("FM_CIRC_COUNT_RETRIEVE_VIA_COPY",[ my.acp.id() ]).total.count; v;' 
+                    }
+                );
+
+                JSAN.use('util.list'); g.list = new util.list('item_summary_list');
+                g.list.init(
+                    {
+                        'columns' : columns,
+                        'map_row_to_columns' : circ.util.std_map_row_to_columns(),
+                    }
+                );
+    
+                function acp_callback(req) {
+                    try {
+                        var copy = req.getResultObject();
+                        if (typeof copy.ilsevent != 'undefined') throw(copy);
+
+                        function acn_callback(rreq) {
+                            try {
+                                $w('barcode',copy.barcode());    
+                                $w('ref',get_bool(copy.ref()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no'));    
+                                $w('opac_visible',get_bool(copy.opac_visible()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no'));    
+                                $w('circulate',get_bool(copy.circulate()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no'));    
+                                $w('holdable',get_bool(copy.holdable()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no'));    
+                                $w('age_protect',copy.age_protect() == null ? $('staff.cat.copy_summary.unset') : ( typeof copy.age_protect() == 'object' ? copy.age_protect().name() : g.data.hash.crahp[ copy.age_protect() ].name() ) );    
+                                $w('location',typeof copy.location() == 'object' ? copy.location().name() : g.data.lookup('acpl',copy.location()).name() );    
+                                $w('create_date',util.date.formatted_date(copy.create_date(),'%F'));
+                                $w('edit_date',util.date.formatted_date(copy.edit_date(),'%F'));
+                                $w('status',typeof copy.status() == 'object' ? copy.status().name() : g.data.hash.ccs[ copy.status() ].name() );    
+                            } catch(E) {
+                                g.error.standard_unexpected_error_alert('rendering copy',E);
+                            }
+                            try {
+                                var cn = rreq.getResultObject();
+                                if (typeof cn.ilsevent != 'undefined') {
+                                    switch(Number(cn.ilsevent)) {
+                                        case 1508 /* ASSET_CALL_NUMBER_NOT_FOUND */ :
+                                            $w('callnumber', $('catStrings').getString('staff.cat.copy_summary.not_cataloged'));    
+                                        break;
+                                        default:
+                                            throw(cn);
+                                        break;
+                                    }
+                                } else {
+                                    $w('callnumber',cn.label());    
+                                }
+                                g.list.append({'row':{'my':{'acp':copy,'acn':cn}}});
+                            } catch(E) {
+                                g.error.standard_unexpected_error_alert('retrieving volume',E);
+                            }
+                        }
+
+                        if (callnumber) {
+                            acn_callback( { 'getResultObject' : function() { return callnumber; } } );
+                        } else {
+                            g.network.simple_request(
+                                'FM_ACN_RETRIEVE.authoritative',
+                                [ copy.call_number() ], acn_callback
+                            );
+                        }
+                    } catch(E) {
+                        g.error.standard_unexpected_error_alert('retrieving copy',E);
+                    }
+                }
+
+                if (copy_id) {
+                    g.network.simple_request( 'FM_ACP_RETRIEVE', [ copy_id ], acp_callback);
+                } else {
+                    acp_callback( { 'getResultObject' : function() { return copy; } } );
+                    copy_id = copy.id();
+                }
+
+                g.network.simple_request('FM_CIRC_COUNT_RETRIEVE_VIA_COPY',[ copy_id ],function(req) {
+                    try {
+                        var robj = req.getResultObject();
+                        if (typeof robj.ilsevent != 'undefined') throw(robj);
+                        $w('total_circs',robj.total.count);
+                    } catch(E) {
+                        g.error.standard_unexpected_error_alert('retrieving circ total',E);
+                    }
+                });
+
+                toggle_deck(); toggle_deck(); /* quick hack */
+
+            } catch(E) {
+                try { g.error.standard_unexpected_error_alert('copy_summary.xul',E); } catch(F) { alert(E + '\n' + F); }
+            }
+        }
+
+        function toggle_deck() {
+            try {
+                if ($('item_deck').selectedIndex == 0) {
+                    $('item_deck').selectedIndex = 1; /* change to grid */
+                    $('save_columns').hidden = true;
+                    $('sel_clip').hidden = true;
+                } else {
+                    $('item_deck').selectedIndex = 0; /* change to tree */
+                    $('save_columns').hidden = false;
+                    $('sel_clip').hidden = false;
+                }
+            } catch(E) {
+            }
+        }
+    ]]>
+    </script>
+
+    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+    <groupbox id="groupbox" flex="1" style="overflow: none; min-height: 80;">
+        <caption label="&staff.cat.copy_summary.label;" id="caption"/>
+        <deck id="item_deck" oils_persist="selectedIndex">
+            <tree id="item_summary_list" enableColumnDrag="true" flex="1"/>
+            <grid>
+                <columns>
+                    <column/>
+                    <column/>
+                    <column/>
+                    <column/>
+                    <column/>
+                    <column/>
+                    <column/>
+                    <column/>
+                </columns>
+                <rows>
+                    <row>
+                        <label style="font-weight: bold" value="&staff.cat.copy_summary.barcode.label;"/>
+                        <label id="barcode" style="color: blue; text-decoration: underline; -moz-user-focus: normal;" onclick="copy_to_clipboard(event);"/>
+                        <label style="font-weight: bold" value="&staff.cat.copy_summary.location.label;"/>
+                        <label id="location"/>
+                        <label style="font-weight: bold" value="&staff.cat.copy_summary.call_number.label;"/>
+                        <label id="callnumber"/>
+                        <label style="font-weight: bold" value="&staff.cat.copy_summary.status.label;"/>
+                        <label id="status"/>
+                    </row>
+                    <row>
+                        <label style="font-weight: bold" value="&staff.cat.copy_summary.circulate.label;"/>
+                        <label id="circulate"/>
+                        <label style="font-weight: bold" value="&staff.cat.copy_summary.reference.label;"/>
+                        <label id="ref"/>
+                        <label style="font-weight: bold" value="&staff.cat.copy_summary.holdable.label;"/>
+                        <label id="holdable"/>
+                        <label style="font-weight: bold" value="&staff.cat.copy_summary.opac_visible.label;"/>
+                        <label id="opac_visible"/>
+                    </row>
+                    <row>
+                        <label style="font-weight: bold" value="&staff.cat.copy_summary.created.label;"/>
+                        <label id="create_date"/>
+                        <label style="font-weight: bold" value="&staff.cat.copy_summary.edited.label;"/>
+                        <label id="edit_date"/>
+                        <label style="font-weight: bold" value="&staff.cat.copy_summary.age_protect.label;"/>
+                        <label id="age_protect"/>
+                        <label style="font-weight: bold" value="&staff.cat.copy_summary.total_circs.label;"/>
+                        <label id="total_circs"/>
+                    </row>
+                </rows>
+            </grid>
+        </deck>
+        <hbox>
+            <button label="&staff.cat.copy_summary.alternate_view.label;" oncommand="toggle_deck()"/>
+            <button id="save_columns" label="&staff.cat.copy_summary.save_columns.label;" oncommand="try { g.list.save_columns(); } catch(E) { alert(E); }"/>
+            <button id="sel_clip" label="&staff.cat.copy_summary.sel_clip.label;" oncommand="try { g.list.node.view.selection.selectAll(); g.list.clipboard(); } catch(E) { alert(E); }"/>
+            <button id="print_export" label="&staff.cat.copy_summary.print_export.label;" oncommand="try { g.list.on_all_fleshed = function() { JSAN.use('util.print'); var p = new util.print(); p.simple( g.list.dump_csv(), { 'content_type' : 'text/plain' } ); setTimeout( function() { g.list.on_all_fleshed = null; }, 0); }; g.list.full_retrieve(); } catch(E) { alert(E); }"/>
+        </hbox>
+    </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/marc_new.xul b/Open-ILS/xul/staff_client/server/cat/marc_new.xul
index 17b221d96b..4e4a21fcaf 100644
--- a/Open-ILS/xul/staff_client/server/cat/marc_new.xul
+++ b/Open-ILS/xul/staff_client/server/cat/marc_new.xul
@@ -2,7 +2,7 @@
 <!-- Application: Evergreen Staff Client -->
 <!-- Screen: Example Template for remote xul -->
 <!--
-	vim:noet:sw=4:ts=4:
+    vim:noet:sw=4:ts=4:
 -->
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -13,7 +13,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,75 +21,75 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="example_template_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		var catStrings;
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        var catStrings;
 
-		function $(id) { return document.getElementById(id); }
+        function $(id) { return document.getElementById(id); }
 
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-				/* load translatable strings for cataloging interfaces */
+                /* load translatable strings for cataloging interfaces */
                 catStrings = document.getElementById('catStrings');
 
-				if (typeof JSAN == 'undefined') { 
-					throw( $('commonStrings').getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for example_template.xul');
-
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name(catStrings.getString('staff.cat.marc_new.tab_name')); } catch(E) { alert(E); }
-				}
-
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.widgets');
-				JSAN.use('util.functional');
-
-				var templates = g.network.simple_request('MARC_XML_TEMPLATE_LIST',[]);
-				if (typeof templates.ilsevent != 'undefined') throw(templates);
-				var ml = util.widgets.make_menulist(
-					util.functional.map_list(
-						templates.sort(),
-						function(el) {
-							return [ el /* The menu entry label */, el /* The menu entry value */ ];
-						}
-					)
-				);
-				$('menu_placeholder').appendChild(ml);
-
-				$('load').addEventListener(
-					'command',
-					function(ev) {
-
-						var template_name;
-						try {
-
-							template_name = $('menu_placeholder').firstChild.value;
-							var marc = g.network.simple_request(
-								'MARC_XML_TEMPLATE_RETRIEVE',
-								[ template_name ]
-							);
-							if (typeof marc.ilsevent != 'undefined') throw(marc);
-	
-							var url = urls.XUL_MARC_EDIT;
-							var params = {
-								'record' : { 'marc' : marc },
+                if (typeof JSAN == 'undefined') { 
+                    throw( $('commonStrings').getString('common.jsan.missing') );
+                }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for example_template.xul');
+
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+                    try { window.xulG.set_tab_name(catStrings.getString('staff.cat.marc_new.tab_name')); } catch(E) { alert(E); }
+                }
+
+                JSAN.use('util.network'); g.network = new util.network();
+                JSAN.use('util.widgets');
+                JSAN.use('util.functional');
+
+                var templates = g.network.simple_request('MARC_XML_TEMPLATE_LIST',[]);
+                if (typeof templates.ilsevent != 'undefined') throw(templates);
+                var ml = util.widgets.make_menulist(
+                    util.functional.map_list(
+                        templates.sort(),
+                        function(el) {
+                            return [ el /* The menu entry label */, el /* The menu entry value */ ];
+                        }
+                    )
+                );
+                $('menu_placeholder').appendChild(ml);
+
+                $('load').addEventListener(
+                    'command',
+                    function(ev) {
+
+                        var template_name;
+                        try {
+
+                            template_name = $('menu_placeholder').firstChild.value;
+                            var marc = g.network.simple_request(
+                                'MARC_XML_TEMPLATE_RETRIEVE',
+                                [ template_name ]
+                            );
+                            if (typeof marc.ilsevent != 'undefined') throw(marc);
+    
+                            var url = urls.XUL_MARC_EDIT;
+                            var params = {
+                                'record' : { 'marc' : marc },
                                 'fast_add_item' : function(doc_id,cn_label,cp_barcode) {
                                     try {
                                         JSAN.use('cat.util'); return cat.util.fast_item_add(doc_id,cn_label,cp_barcode);
@@ -97,25 +97,25 @@
                                         alert(E);
                                     }
                                 },
-								'save' : {
-									'label' : catStrings.getString('staff.cat.marc_new.create_record.label'),
-									'func' : function(new_marcxml) {
-										try {
-											var robj = g.network.simple_request(
-												'MARC_XML_RECORD_IMPORT',
-												[ ses(), new_marcxml, catStrings.getString('staff.cat.marc_new.system_local.label'), 1 ]
-											);
-											if (typeof robj.ilsevent != 'undefined') throw(robj);
-											alert(catStrings.getString('staff.cat.marc_new.record_created.label'));
-
-											/* Replace tab with OPAC-view of record */
-
-											var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + robj.id();
-											var content_params = {
-												'session' : ses(),
-												'authtime' : ses('authtime'),
-												'opac_url' : opac_url
-											};
+                                'save' : {
+                                    'label' : catStrings.getString('staff.cat.marc_new.create_record.label'),
+                                    'func' : function(new_marcxml) {
+                                        try {
+                                            var robj = g.network.simple_request(
+                                                'MARC_XML_RECORD_IMPORT',
+                                                [ ses(), new_marcxml, catStrings.getString('staff.cat.marc_new.system_local.label'), 1 ]
+                                            );
+                                            if (typeof robj.ilsevent != 'undefined') throw(robj);
+                                            alert(catStrings.getString('staff.cat.marc_new.record_created.label'));
+
+                                            /* Replace tab with OPAC-view of record */
+
+                                            var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + robj.id();
+                                            var content_params = {
+                                                'session' : ses(),
+                                                'authtime' : ses('authtime'),
+                                                'opac_url' : opac_url
+                                            };
                                             return { 
                                                 'id' : robj.id(), 
                                                 'on_complete' : function() {
@@ -131,53 +131,53 @@
                                                 }
                                             };
 
-										} catch(E) {
-											g.error.standard_unexpected_error_alert(
-												catStrings.getString('staff.cat.marc_new.creating_record.error'), E
-											);
-										}
-									}
-								}
-							};
+                                        } catch(E) {
+                                            g.error.standard_unexpected_error_alert(
+                                                catStrings.getString('staff.cat.marc_new.creating_record.error'), E
+                                            );
+                                        }
+                                    }
+                                }
+                            };
                             var marc_editor = document.createElement('iframe');
                             $('marc_editor_box').appendChild(marc_editor);
-							marc_editor.setAttribute('flex','1');
-							marc_editor.setAttribute('src',url);
-							netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-							get_contentWindow(marc_editor).xulG = params;
-
-							/* hide template widgets */
-							$('actions').hidden = true;
-
-							window.xulG.set_tab_name(template_name);
-
-						} catch(E) {
-							g.error.standard_unexpected_error_alert(
-								catStrings.getFormattedString('staff.cat.marc_new.loading_template.error', [template_name]), E
-							);
-						}
-
-					},
-					false
-				);
-
-			} catch(E) {
-				g.error.standard_unexpected_error_alert('cat/marc_new.xul',E);
-			}
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<vbox id="marc_editor_box" flex="1">
-		<hbox id="actions">
-			<hbox id="menu_placeholder" />
-			<button id="load" label="&staff.cat.marc_new.load.label;" accesskey="&staff.cat.marc_new.load.accesskey;"/>
-		</hbox>
-	</vbox>
+                            marc_editor.setAttribute('flex','1');
+                            marc_editor.setAttribute('src',url);
+                            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                            get_contentWindow(marc_editor).xulG = params;
+
+                            /* hide template widgets */
+                            $('actions').hidden = true;
+
+                            window.xulG.set_tab_name(template_name);
+
+                        } catch(E) {
+                            g.error.standard_unexpected_error_alert(
+                                catStrings.getFormattedString('staff.cat.marc_new.loading_template.error', [template_name]), E
+                            );
+                        }
+
+                    },
+                    false
+                );
+
+            } catch(E) {
+                g.error.standard_unexpected_error_alert('cat/marc_new.xul',E);
+            }
+        }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+    <vbox id="marc_editor_box" flex="1">
+        <hbox id="actions">
+            <hbox id="menu_placeholder" />
+            <button id="load" label="&staff.cat.marc_new.load.label;" accesskey="&staff.cat.marc_new.load.accesskey;"/>
+        </hbox>
+    </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/marc_view.html b/Open-ILS/xul/staff_client/server/cat/marc_view.html
index fac51d5d33..ba1bae360d 100644
--- a/Open-ILS/xul/staff_client/server/cat/marc_view.html
+++ b/Open-ILS/xul/staff_client/server/cat/marc_view.html
@@ -7,31 +7,31 @@
 <script type='text/javascript'>
 <![CDATA[
 
-	var xsltProcessor;
+    var xsltProcessor;
 
-	function xsl_marc2html_init() {
+    function xsl_marc2html_init() {
         try {
-    		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-    		xsltProcessor = new XSLTProcessor();
-    		var req = new XMLHttpRequest();
-    		req.open("GET", urls.xsl_marc2html, false);
-    		req.send(null);
+            netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+            xsltProcessor = new XSLTProcessor();
+            var req = new XMLHttpRequest();
+            req.open("GET", urls.xsl_marc2html, false);
+            req.send(null);
             if (req.status != 200) {
                 alert('We were unable to load ' + urls.xsl_marc2html + ' and thus cannot display the MARC here.\nReason: ' + req.statusText);
                 return false;
             }
-    		var xsl = req.responseXML;
-    		xsltProcessor.importStylesheet(xsl);
+            var xsl = req.responseXML;
+            xsltProcessor.importStylesheet(xsl);
             return true;
         } catch(E) {
             alert('An error occurred and we are unable to display the MARC here.\nError in xsl_marc2html_init: ' + E);
             return false;
         }
-	}
+    }
 
-	function apply_xsl_marc2html(marc) {
+    function apply_xsl_marc2html(marc) {
         try {
-    		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+            netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
             var obj = this;
             var parser = new DOMParser();
             var doc = parser.parseFromString( marc, 'text/xml' );
@@ -41,14 +41,14 @@
         } catch(E) {
             alert('An error occurred and we are unable to display the MARC here.\nError in apply_xsl_marc2html: ' + E);
         }
-	}
+    }
 
-	function my_init() {
-		if (!xsl_marc2html_init()) return;
-		document.body.innerHTML = "<button onclick='window.print()'>Print Page<\/button>";
-		if (typeof xulG != 'undefined' && xulG.marcxml) apply_xsl_marc2html(xulG.marcxml);
-		document.body.firstChild.focus();
-	}
+    function my_init() {
+        if (!xsl_marc2html_init()) return;
+        document.body.innerHTML = "<button onclick='window.print()'>Print Page<\/button>";
+        if (typeof xulG != 'undefined' && xulG.marcxml) apply_xsl_marc2html(xulG.marcxml);
+        document.body.firstChild.focus();
+    }
 
 ]]>
 </script>
diff --git a/Open-ILS/xul/staff_client/server/cat/marc_view.xul b/Open-ILS/xul/staff_client/server/cat/marc_view.xul
index ce3448c5e2..daa9ea7aad 100644
--- a/Open-ILS/xul/staff_client/server/cat/marc_view.xul
+++ b/Open-ILS/xul/staff_client/server/cat/marc_view.xul
@@ -13,7 +13,7 @@ vim:noet:sw=4:ts=4:
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,44 +21,44 @@ vim:noet:sw=4:ts=4:
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_marc_view_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { 
-					throw( document.getElementById('commonStrings').getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for cat/marc_view.xul');
-
-				var docid = xul_param('docid');
-				var noprint = xul_param('noprint');
-
-				JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-				var key = location.pathname + location.search + location.hash;
-				if (!docid && typeof data.modal_xulG_stack != 'undefined' && typeof data.modal_xulG_stack[key] != 'undefined') {
-					var modal_xulG = data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ];
-					if (typeof modal_xulG == 'object') {
-						docid = modal_xulG.docid;
-						if (modal_xulG.noprint) noprint = modal_xulG.noprint;
-					}
-				}
-
-				JSAN.use('util.network'); g.network = new util.network();
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { 
+                    throw( document.getElementById('commonStrings').getString('common.jsan.missing') );
+                }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for cat/marc_view.xul');
+
+                var docid = xul_param('docid');
+                var noprint = xul_param('noprint');
+
+                JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+                var key = location.pathname + location.search + location.hash;
+                if (!docid && typeof data.modal_xulG_stack != 'undefined' && typeof data.modal_xulG_stack[key] != 'undefined') {
+                    var modal_xulG = data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ];
+                    if (typeof modal_xulG == 'object') {
+                        docid = modal_xulG.docid;
+                        if (modal_xulG.noprint) noprint = modal_xulG.noprint;
+                    }
+                }
+
+                JSAN.use('util.network'); g.network = new util.network();
 
                 if (docid > -1) {
                     g.network.request(
@@ -76,22 +76,22 @@ vim:noet:sw=4:ts=4:
                     document.getElementById('marc_frame').setAttribute('src', 'data:text/html,' + marc_html);
                 }
 
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['cat/marc_view.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
+            } catch(E) {
+                var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['cat/marc_view.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
 
-	]]>
-	</script>
+    ]]>
+    </script>
 
     <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
 
-	<groupbox flex="1">
-		<caption label="&staff.cat.marc_view.title;"/>
-		<iframe id="marc_frame" flex="1"/>
-	</groupbox>
+    <groupbox flex="1">
+        <caption label="&staff.cat.marc_view.title;"/>
+        <iframe id="marc_frame" flex="1"/>
+    </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/marcedit.css b/Open-ILS/xul/staff_client/server/cat/marcedit.css
index 7db7b02277..76f8cb58a9 100644
--- a/Open-ILS/xul/staff_client/server/cat/marcedit.css
+++ b/Open-ILS/xul/staff_client/server/cat/marcedit.css
@@ -1,98 +1,98 @@
 messagecatalog { -moz-binding: url('../main/bindings.xml#messagecatalog'); }
 input {
-	background-color: lightgrey;
+    background-color: lightgrey;
 }
 
 input:focus {
-	background-color: lightcyan;
+    background-color: lightcyan;
 }
 
 .marcSubfieldDelimiter, .marcSubfieldCode, .marcInd1, .marcInd2, .marcTag, .marcEditableControlfield, .marcSubfield, .marcControlfield, .marcLeader {
-	font-family: fixed, monospace;
-	margin: 0;
+    font-family: fixed, monospace;
+    margin: 0;
 }
 
 .marcEditableControlfield {
-	text-align: left;
+    text-align: left;
 }
 
 .marcSubfieldCode, .marcInd1, .marcInd2, .marcTag {
-	width: 1em;
+    width: 1em;
 }
 
 .marcSubfieldDelimiter, .marcSubfieldCode {
-	color: blue;
+    color: blue;
 }
 
 .marcInd1, .marcInd2, .marcTag {
-	text-align: center;
+    text-align: center;
 }
 
 .marcSubfield {
-	min-width: 1em;
+    min-width: 1em;
 }
 
 .tooltip {
-	/* width: 10em; */
+    /* width: 10em; */
 }
 
 caption {
-	font-weight: bold;
+    font-weight: bold;
 }
 
 grid row, grid column {
-	border-collapse: collapse;
-	border: solid thin gray;
-	vertical-align: bottom;
+    border-collapse: collapse;
+    border: solid thin gray;
+    vertical-align: bottom;
 }
 
 grid column {
-	background-color: lightgray; 
-	padding: 2px;
+    background-color: lightgray; 
+    padding: 2px;
 }
 
 grid#leaderGrid textbox {
-	min-width: 1em;
+    min-width: 1em;
 }
 
 grid#leaderGrid label {
-	font-weight: bold;
+    font-weight: bold;
 }
 
 grid#leaderGrid label, grid#leaderGrid textbox {
-	visibility: hidden;
+    visibility: hidden;
 }
 
 grid#leaderGrid[type="BKS"] *[set~="BKS"], grid#leaderGrid[type="BKS"] *[set~="BKS"] + textbox {
-	visibility: visible;
+    visibility: visible;
 }
 
 grid#leaderGrid[type="SER"] *[set~="SER"], grid#leaderGrid[type="SER"] *[set~="SER"] + textbox {
-	visibility: visible;
+    visibility: visible;
 }
 
 grid#leaderGrid[type="VIS"] *[set~="VIS"], grid#leaderGrid[type="VIS"] *[set~="VIS"] + textbox {
-	visibility: visible;
+    visibility: visible;
 }
 
 grid#leaderGrid[type="MIX"] *[set~="MIX"], grid#leaderGrid[type="MIX"] *[set~="MIX"] + textbox {
-	visibility: visible;
+    visibility: visible;
 }
 
 grid#leaderGrid[type="MAP"] *[set~="MAP"], grid#leaderGrid[type="MAP"] *[set~="MAP"] + textbox {
-	visibility: visible;
+    visibility: visible;
 }
 
 grid#leaderGrid[type="SCO"] *[set~="SCO"], grid#leaderGrid[type="SCO"] *[set~="SCO"] + textbox {
-	visibility: visible;
+    visibility: visible;
 }
 
 grid#leaderGrid[type="REC"] *[set~="REC"], grid#leaderGrid[type="REC"] *[set~="REC"] + textbox {
-	visibility: visible;
+    visibility: visible;
 }
 
 grid#leaderGrid[type="COM"] *[set~="COM"], grid#leaderGrid[type="COM"] *[set~="COM"] + textbox {
-	visibility: visible;
+    visibility: visible;
 }
 
 grid[name="-none-"] * label { color: black; }
diff --git a/Open-ILS/xul/staff_client/server/cat/marcedit.xul b/Open-ILS/xul/staff_client/server/cat/marcedit.xul
index 48dc45ac10..e56fa3b24d 100644
--- a/Open-ILS/xul/staff_client/server/cat/marcedit.xul
+++ b/Open-ILS/xul/staff_client/server/cat/marcedit.xul
@@ -21,9 +21,9 @@
 <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
 <groupbox flex="0">
-	<caption label="&staff.cat.marcedit.options.label;"/>
-	<hbox flex="1">
-		<checkbox oils_persist="checked" accesskey="&staff.cat.marcedit.stackSubfields.accesskey;" label="&staff.cat.marcedit.stackSubfields.label;" oncommand="stackSubfields(this);" checked="false" id="stackSubfields"/>
+    <caption label="&staff.cat.marcedit.options.label;"/>
+    <hbox flex="1">
+        <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;" />
@@ -31,192 +31,192 @@
             <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>
-		<button label="&staff.cat.marcedit.validate.label;" accesskey="&staff.cat.marcedit.validate.accesskey;" oncommand="validateAuthority(this);"/>
-		<button id="save-button" accesskey="&staff.cat.marcedit.save-button.accesskey;"/>
-		<button label="&staff.cat.marcedit.help.label;" accesskey="&staff.cat.marcedit.help.accesskey;"
-			oncommand="alert(
-				$('catStrings').getString('staff.cat.marcedit.help.add_row') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.insert_row') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.copy_row_up') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.copy_row_down') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.add_subfield') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.remove_row') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.remove_subfield') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.replace_006') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.replace_007') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.replace_008')
-			);"
-		/>
-	</hbox>
+        <button label="&staff.cat.marcedit.validate.label;" accesskey="&staff.cat.marcedit.validate.accesskey;" oncommand="validateAuthority(this);"/>
+        <button id="save-button" accesskey="&staff.cat.marcedit.save-button.accesskey;"/>
+        <button label="&staff.cat.marcedit.help.label;" accesskey="&staff.cat.marcedit.help.accesskey;"
+            oncommand="alert(
+                $('catStrings').getString('staff.cat.marcedit.help.add_row') + '\n' +
+                $('catStrings').getString('staff.cat.marcedit.help.insert_row') + '\n' +
+                $('catStrings').getString('staff.cat.marcedit.help.copy_row_up') + '\n' +
+                $('catStrings').getString('staff.cat.marcedit.help.copy_row_down') + '\n' +
+                $('catStrings').getString('staff.cat.marcedit.help.add_subfield') + '\n' +
+                $('catStrings').getString('staff.cat.marcedit.help.remove_row') + '\n' +
+                $('catStrings').getString('staff.cat.marcedit.help.remove_subfield') + '\n' +
+                $('catStrings').getString('staff.cat.marcedit.help.replace_006') + '\n' +
+                $('catStrings').getString('staff.cat.marcedit.help.replace_007') + '\n' +
+                $('catStrings').getString('staff.cat.marcedit.help.replace_008')
+            );"
+        />
+    </hbox>
 </groupbox>
 
 <groupbox flex="1">
-	<caption label="&staff.cat.marcedit.caption.label;"/>
-	<vbox flex="1" style="overflow: auto;">
-		<hbox>
-		<groupbox flex="0">
-			<caption>
-				<label value="&staff.cat.marcedit.toggleFFE.label;" ondblclick="toggleFFE();"/>
-				<label id="recordTypeLabel" context="recordTypeMenu"/>
-			</caption>
-			<vbox flex="0">
-				<grid flex="0" id="leaderGrid" type="BKS" hidden="false" oils_persist="hidden">
-					<columns>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-					</columns>
-					<rows>
-						<row>
-							<label name="Type" control="Type_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="Type" />
-							<textbox id="Type_tb" context="clipboard" class="plain" name="Type" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="ELvl" control="ELvl_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="ELvl" />
-							<textbox id="Elvl_tb" context="clipboard" class="plain" name="ELvl" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Srce" control="Srce_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="Srce" />
-							<textbox id="Srce_tb" context="clipboard" class="plain" name="Srce" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Audn" control="Audn_tb" set="BKS VIS SCO REC COM" value="Audn" />
-							<textbox id="Audn_tb" context="clipboard" class="plain" name="Audn" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Ctrl" control="Ctrl_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="Ctrl" />
-							<textbox id="Ctrl_tb" context="clipboard" class="plain" name="Ctrl" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Lang" control="Lang_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="Lang" />
-							<textbox id="Lang_tb" context="clipboard" class="plain" name="Lang" maxlength="3" size="3" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-						</row>
-						<row>
-							<label name="BLvl" control="BLvl_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="BLvl" />
-							<textbox id="BLvl_tb" context="clipboard" class="plain" name="BLvl" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Form" control="Form_tb" set="BKS SER VIS MIX MAP SCO REC" value="Form" />
-							<textbox id="Form_tb" context="clipboard" class="plain" name="Form" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Conf" control="Conf_tb" set="BKS SER" value="Conf" />
-							<textbox id="Conf_tb" context="clipboard" class="plain" name="Conf" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Biog" control="Biog_tb" set="BKS" value="Biog" />
-							<textbox id="Biog_tb" context="clipboard" class="plain" name="Biog" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="MRec" control="MRec_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="MRec" />
-							<textbox id="MRec_tb" context="clipboard" class="plain" name="MRec" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Ctry" control="Ctry_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="Ctry" />
-							<textbox id="Ctry_tb" context="clipboard" class="plain" name="Ctry" maxlength="3" size="3" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-						</row>
-						<row>
-							<label name="S/L" control="s_l_tb" set="SER" value="S/L" />
-							<textbox id="s_l_tb" context="clipboard" class="plain" name="S/L" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Cont" control="Cont_tb" set="BKS SER" value="Cont" />
-							<textbox id="Cont_tb" context="clipboard" class="plain" name="Cont" maxlength="4" size="4" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="GPub" control="GPub_tb" set="BKS SER VIS MAP COM" value="GPub" />
-							<textbox id="GPub_tb" context="clipboard" class="plain" name="GPub" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="LitF" control="LitF_tb" set="BKS" value="LitF" />
-							<textbox id="LitF_tb" context="clipboard" class="plain" name="LitF" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Indx" control="Indx_tb" set="BKS MAP" value="Indx" />
-							<textbox id="Indx_tb" context="clipboard" class="plain" name="Indx" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Alph" control="Alph_tb" set="SER" value="Alph" />
-							<textbox id="Alph_tb" context="clipboard" class="plain" name="Alph" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-						</row>
-						<row>
-							<label name="Desc" control="Desc_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="Desc" />
-							<textbox id="Desc_tb" context="clipboard" class="plain" name="Desc" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Ills" control="Ills_tb" set="BKS" value="Ills" />
-							<textbox id="Ills_tb" context="clipboard" class="plain" name="Ills" maxlength="4" size="4" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Fest" control="Fest_tb" set="BKS" value="Fest" />
-							<textbox id="Fest_tb" context="clipboard" class="plain" name="Fest" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="DtSt" control="DtSt_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="DtSt" />
-							<textbox id="DtSt_tb" context="clipboard" class="plain" name="DtSt" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Date1" control="Date1_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="Date1" />
-							<textbox id="Date1_tb" context="clipboard" class="plain" name="Date1" maxlength="4" size="4" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Date2" control="Date2_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="Date2" />
-							<textbox id="Date2_tb" context="clipboard" class="plain" name="Date2" maxlength="4" size="4" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-						</row>
-						<row>
-							<label name="SrTp" control="SrTp_tb" set="SER" value="SrTp" />
-							<textbox id="SrTp_tb" context="clipboard" class="plain" name="SrTp" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Regl" control="Regl_tb" set="SER" value="Regl" />
-							<textbox id="Regl_tb" context="clipboard" class="plain" name="Regl" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Orig" control="Orig_tb" set="SER" value="Orig" />
-							<textbox id="Orig_tb" context="clipboard" class="plain" name="Orig" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Freq" control="Freq_tb" set="SER" value="Freq" />
-							<textbox id="Freq_tb" context="clipboard" class="plain" name="Freq" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="EntW" control="EntW_tb" set="SER" value="EntW" />
-							<textbox id="EntW_tb" context="clipboard" class="plain" name="EntW" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-						</row>
-						<row>
-							<label name="TrAr" control="TrAr_tb" set="SCO REC" value="TrAr" />
-							<textbox id="TrAr_tb" context="clipboard" class="plain" name="TrAr" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Part" control="Part_tb" set="SCO REC" value="Part" />
-							<textbox id="Part_tb" context="clipboard" class="plain" name="Part" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="LTxt" control="LTxt_tb" set="SCO REC" value="LTxt" />
-							<textbox id="LTxt_tb" context="clipboard" class="plain" name="LTxt" maxlength="2" size="2" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="FMus" control="FMus_tb" set="SCO REC" value="FMus" />
-							<textbox id="FMus_tb" context="clipboard" class="plain" name="FMus" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="AccM" control="AccM_tb" set="SCO REC" value="AccM" />
-							<textbox id="AccM_tb" context="clipboard" class="plain" name="AccM" maxlength="6" size="6" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Comp" control="Comp_tb" set="SCO REC" value="Comp" />
-							<textbox id="Comp_tb" context="clipboard" class="plain" name="Comp" maxlength="2" size="2" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-						</row>
-						<row>
-							<label name="SpFm" control="SpFm_tb" set="MAP" value="SpFm" />
-							<textbox id="SpFm_tb" context="clipboard" class="plain" name="SpFm" maxlength="2" size="2" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Relf" control="Relf_tb" set="MAP" value="Relf" />
-							<textbox id="Relf_tb" context="clipboard" class="plain" name="Relf" maxlength="4" size="4" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Proj" control="Proj_tb" set="MAP" value="Proj" />
-							<textbox id="Proj_tb" context="clipboard" class="plain" name="Proj" maxlength="2" size="2" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="CrTp" control="CrTp_tb" set="MAP" value="CrTp" />
-							<textbox id="CrTp_tb" context="clipboard" class="plain" name="CrTp" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-						</row>
-						<row>
-							<label name="TMat" control="TMat_tb" set="VIS" value="TMat" />
-							<textbox id="TMat_tb" context="clipboard" class="plain" name="TMat" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Time" control="Time_tb" set="VIS" value="Time" />
-							<textbox id="Time_tb" context="clipboard" class="plain" name="Time" maxlength="3" size="3" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="Tech" control="Tech_tb" set="VIS" value="Tech" />
-							<textbox id="Tech_tb" context="clipboard" class="plain" name="Tech" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-							<label name="File" control="File_tb" set="COM" value="File" />
-							<textbox id="File_tb" context="clipboard" class="plain" name="File" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
-						</row>
-					</rows>
-				</grid>
-			</vbox>
-		</groupbox>
-		</hbox>
+    <caption label="&staff.cat.marcedit.caption.label;"/>
+    <vbox flex="1" style="overflow: auto;">
+        <hbox>
+        <groupbox flex="0">
+            <caption>
+                <label value="&staff.cat.marcedit.toggleFFE.label;" ondblclick="toggleFFE();"/>
+                <label id="recordTypeLabel" context="recordTypeMenu"/>
+            </caption>
+            <vbox flex="0">
+                <grid flex="0" id="leaderGrid" type="BKS" hidden="false" oils_persist="hidden">
+                    <columns>
+                        <column flex="1"/>
+                        <column flex="1"/>
+                        <column flex="1"/>
+                        <column flex="1"/>
+                        <column flex="1"/>
+                        <column flex="1"/>
+                        <column flex="1"/>
+                        <column flex="1"/>
+                        <column flex="1"/>
+                        <column flex="1"/>
+                        <column flex="1"/>
+                        <column flex="1"/>
+                    </columns>
+                    <rows>
+                        <row>
+                            <label name="Type" control="Type_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="Type" />
+                            <textbox id="Type_tb" context="clipboard" class="plain" name="Type" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="ELvl" control="ELvl_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="ELvl" />
+                            <textbox id="Elvl_tb" context="clipboard" class="plain" name="ELvl" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Srce" control="Srce_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="Srce" />
+                            <textbox id="Srce_tb" context="clipboard" class="plain" name="Srce" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Audn" control="Audn_tb" set="BKS VIS SCO REC COM" value="Audn" />
+                            <textbox id="Audn_tb" context="clipboard" class="plain" name="Audn" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Ctrl" control="Ctrl_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="Ctrl" />
+                            <textbox id="Ctrl_tb" context="clipboard" class="plain" name="Ctrl" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Lang" control="Lang_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="Lang" />
+                            <textbox id="Lang_tb" context="clipboard" class="plain" name="Lang" maxlength="3" size="3" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                        </row>
+                        <row>
+                            <label name="BLvl" control="BLvl_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="BLvl" />
+                            <textbox id="BLvl_tb" context="clipboard" class="plain" name="BLvl" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Form" control="Form_tb" set="BKS SER VIS MIX MAP SCO REC" value="Form" />
+                            <textbox id="Form_tb" context="clipboard" class="plain" name="Form" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Conf" control="Conf_tb" set="BKS SER" value="Conf" />
+                            <textbox id="Conf_tb" context="clipboard" class="plain" name="Conf" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Biog" control="Biog_tb" set="BKS" value="Biog" />
+                            <textbox id="Biog_tb" context="clipboard" class="plain" name="Biog" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="MRec" control="MRec_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="MRec" />
+                            <textbox id="MRec_tb" context="clipboard" class="plain" name="MRec" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Ctry" control="Ctry_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="Ctry" />
+                            <textbox id="Ctry_tb" context="clipboard" class="plain" name="Ctry" maxlength="3" size="3" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                        </row>
+                        <row>
+                            <label name="S/L" control="s_l_tb" set="SER" value="S/L" />
+                            <textbox id="s_l_tb" context="clipboard" class="plain" name="S/L" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Cont" control="Cont_tb" set="BKS SER" value="Cont" />
+                            <textbox id="Cont_tb" context="clipboard" class="plain" name="Cont" maxlength="4" size="4" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="GPub" control="GPub_tb" set="BKS SER VIS MAP COM" value="GPub" />
+                            <textbox id="GPub_tb" context="clipboard" class="plain" name="GPub" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="LitF" control="LitF_tb" set="BKS" value="LitF" />
+                            <textbox id="LitF_tb" context="clipboard" class="plain" name="LitF" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Indx" control="Indx_tb" set="BKS MAP" value="Indx" />
+                            <textbox id="Indx_tb" context="clipboard" class="plain" name="Indx" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Alph" control="Alph_tb" set="SER" value="Alph" />
+                            <textbox id="Alph_tb" context="clipboard" class="plain" name="Alph" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                        </row>
+                        <row>
+                            <label name="Desc" control="Desc_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="Desc" />
+                            <textbox id="Desc_tb" context="clipboard" class="plain" name="Desc" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Ills" control="Ills_tb" set="BKS" value="Ills" />
+                            <textbox id="Ills_tb" context="clipboard" class="plain" name="Ills" maxlength="4" size="4" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Fest" control="Fest_tb" set="BKS" value="Fest" />
+                            <textbox id="Fest_tb" context="clipboard" class="plain" name="Fest" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="DtSt" control="DtSt_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="DtSt" />
+                            <textbox id="DtSt_tb" context="clipboard" class="plain" name="DtSt" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Date1" control="Date1_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="Date1" />
+                            <textbox id="Date1_tb" context="clipboard" class="plain" name="Date1" maxlength="4" size="4" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Date2" control="Date2_tb" set="BKS SER VIS MIX MAP SCO REC COM" value="Date2" />
+                            <textbox id="Date2_tb" context="clipboard" class="plain" name="Date2" maxlength="4" size="4" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                        </row>
+                        <row>
+                            <label name="SrTp" control="SrTp_tb" set="SER" value="SrTp" />
+                            <textbox id="SrTp_tb" context="clipboard" class="plain" name="SrTp" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Regl" control="Regl_tb" set="SER" value="Regl" />
+                            <textbox id="Regl_tb" context="clipboard" class="plain" name="Regl" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Orig" control="Orig_tb" set="SER" value="Orig" />
+                            <textbox id="Orig_tb" context="clipboard" class="plain" name="Orig" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Freq" control="Freq_tb" set="SER" value="Freq" />
+                            <textbox id="Freq_tb" context="clipboard" class="plain" name="Freq" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="EntW" control="EntW_tb" set="SER" value="EntW" />
+                            <textbox id="EntW_tb" context="clipboard" class="plain" name="EntW" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                        </row>
+                        <row>
+                            <label name="TrAr" control="TrAr_tb" set="SCO REC" value="TrAr" />
+                            <textbox id="TrAr_tb" context="clipboard" class="plain" name="TrAr" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Part" control="Part_tb" set="SCO REC" value="Part" />
+                            <textbox id="Part_tb" context="clipboard" class="plain" name="Part" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="LTxt" control="LTxt_tb" set="SCO REC" value="LTxt" />
+                            <textbox id="LTxt_tb" context="clipboard" class="plain" name="LTxt" maxlength="2" size="2" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="FMus" control="FMus_tb" set="SCO REC" value="FMus" />
+                            <textbox id="FMus_tb" context="clipboard" class="plain" name="FMus" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="AccM" control="AccM_tb" set="SCO REC" value="AccM" />
+                            <textbox id="AccM_tb" context="clipboard" class="plain" name="AccM" maxlength="6" size="6" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Comp" control="Comp_tb" set="SCO REC" value="Comp" />
+                            <textbox id="Comp_tb" context="clipboard" class="plain" name="Comp" maxlength="2" size="2" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                        </row>
+                        <row>
+                            <label name="SpFm" control="SpFm_tb" set="MAP" value="SpFm" />
+                            <textbox id="SpFm_tb" context="clipboard" class="plain" name="SpFm" maxlength="2" size="2" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Relf" control="Relf_tb" set="MAP" value="Relf" />
+                            <textbox id="Relf_tb" context="clipboard" class="plain" name="Relf" maxlength="4" size="4" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Proj" control="Proj_tb" set="MAP" value="Proj" />
+                            <textbox id="Proj_tb" context="clipboard" class="plain" name="Proj" maxlength="2" size="2" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="CrTp" control="CrTp_tb" set="MAP" value="CrTp" />
+                            <textbox id="CrTp_tb" context="clipboard" class="plain" name="CrTp" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                        </row>
+                        <row>
+                            <label name="TMat" control="TMat_tb" set="VIS" value="TMat" />
+                            <textbox id="TMat_tb" context="clipboard" class="plain" name="TMat" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Time" control="Time_tb" set="VIS" value="Time" />
+                            <textbox id="Time_tb" context="clipboard" class="plain" name="Time" maxlength="3" size="3" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="Tech" control="Tech_tb" set="VIS" value="Tech" />
+                            <textbox id="Tech_tb" context="clipboard" class="plain" name="Tech" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                            <label name="File" control="File_tb" set="COM" value="File" />
+                            <textbox id="File_tb" context="clipboard" class="plain" name="File" maxlength="1" size="1" oninput="updateFixedFields(this);" onfocus="this.select();"/>
+                        </row>
+                    </rows>
+                </grid>
+            </vbox>
+        </groupbox>
+        </hbox>
 
-		<grid id="recGrid" flex="1">
-			<columns>
-				<column/>
-				<column/>
-				<column/>
-				<column flex="1"/>
-			</columns>
-			<rows/>
-		</grid>
-	</vbox>
+        <grid id="recGrid" flex="1">
+            <columns>
+                <column/>
+                <column/>
+                <column/>
+                <column flex="1"/>
+            </columns>
+            <rows/>
+        </grid>
+    </vbox>
 </groupbox>
 
 <grid name="authority-marc-template" hidden="true">
-	<columns>
-		<column/>
-		<column/>
-		<column/>
-		<column flex="1"/>
-	</columns>
-	<rows/>
+    <columns>
+        <column/>
+        <column/>
+        <column/>
+        <column flex="1"/>
+    </columns>
+    <rows/>
 </grid>
 
 <popupset>
-	<popup id="recordTypeMenu" position="after_start">
-		<menuitem label="BKS" oncommand="changeFFEditor('BKS');"/>
-		<menuitem label="SER" oncommand="changeFFEditor('SER');"/>
-		<menuitem label="VIS" oncommand="changeFFEditor('VIS');"/>
-		<menuitem label="MIX" oncommand="changeFFEditor('MIX');"/>
-		<menuitem label="MAP" oncommand="changeFFEditor('MAP');"/>
-		<menuitem label="SCO" oncommand="changeFFEditor('SCO');"/>
-		<menuitem label="REC" oncommand="changeFFEditor('REC');"/>
-		<menuitem label="COM" oncommand="changeFFEditor('COM');"/>
-	</popup>
+    <popup id="recordTypeMenu" position="after_start">
+        <menuitem label="BKS" oncommand="changeFFEditor('BKS');"/>
+        <menuitem label="SER" oncommand="changeFFEditor('SER');"/>
+        <menuitem label="VIS" oncommand="changeFFEditor('VIS');"/>
+        <menuitem label="MIX" oncommand="changeFFEditor('MIX');"/>
+        <menuitem label="MAP" oncommand="changeFFEditor('MAP');"/>
+        <menuitem label="SCO" oncommand="changeFFEditor('SCO');"/>
+        <menuitem label="REC" oncommand="changeFFEditor('REC');"/>
+        <menuitem label="COM" oncommand="changeFFEditor('COM');"/>
+    </popup>
 </popupset>
 
 </window>
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 9f7f522a3d..6d5098507e 100644
--- a/Open-ILS/xul/staff_client/server/cat/record_buckets.xul
+++ b/Open-ILS/xul/staff_client/server/cat/record_buckets.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,117 +20,117 @@
 <?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(); 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">
+    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">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
         var catStrings;
 
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-				/* ugly hack so we don't have to upgrade the chrome for quick buckets */
-				if (typeof xulG == 'undefined') location.href = String(location.href).replace(/record_buckets.xul/,'record_buckets_quick.xul');
+                /* ugly hack so we don't have to upgrade the chrome for quick buckets */
+                if (typeof xulG == 'undefined') location.href = String(location.href).replace(/record_buckets.xul/,'record_buckets_quick.xul');
 
-				/* load translatable strings into easily referenced variables */
+                /* load translatable strings into easily referenced variables */
                 catStrings = document.getElementById('catStrings');
                 commonStrings = document.getElementById('commonStrings');
 
                 if (typeof JSAN == 'undefined') { throw( commonStrings.getString('common.jsan.missing') ); }
 
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for record_buckets.xul');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				var record_ids = xul_param(
-					'record_ids',{
-						'concat' : true,
-						'JSON2js_if_cgi' : true,
-						'JSON2js_if_xpcom' : true,
-						'stash_name':'rb_temp_record_ids',
-						'clear_xpcom' : true,
-					}
-				);
-
-				JSAN.use('cat.record_buckets'); g.record_buckets = new cat.record_buckets();
-				g.record_buckets.init( 
-					{ 
-						'record_ids' : record_ids,
-					} 
-				);
-	
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name(catStrings.getString('staff.cat.record_buckets.tab_name')); } catch(E) { alert(E); }
-				}
-
-			} catch(E) {
-				var err_msg = commonStrings.getFormattedString('common.exception', ['cat/record_buckets.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-	]]>
-	</script>
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for record_buckets.xul');
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+                var record_ids = xul_param(
+                    'record_ids',{
+                        'concat' : true,
+                        'JSON2js_if_cgi' : true,
+                        'JSON2js_if_xpcom' : true,
+                        'stash_name':'rb_temp_record_ids',
+                        'clear_xpcom' : true,
+                    }
+                );
+
+                JSAN.use('cat.record_buckets'); g.record_buckets = new cat.record_buckets();
+                g.record_buckets.init( 
+                    { 
+                        'record_ids' : record_ids,
+                    } 
+                );
+    
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+                    try { window.xulG.set_tab_name(catStrings.getString('staff.cat.record_buckets.tab_name')); } catch(E) { alert(E); }
+                }
+
+            } catch(E) {
+                var err_msg = commonStrings.getFormattedString('common.exception', ['cat/record_buckets.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+    ]]>
+    </script>
 
     <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
     <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
 
-	<commandset id="record_buckets_cmds">
-		<command id="sel_clip0" disabled="true"/>
-		<command id="sel_clip1" disabled="true"/>
-		<command id="sel_clip2" disabled="true"/>
-		<command id="save_columns0" />
-		<command id="save_columns1" />
-		<command id="save_columns2" />
-
-		<command id="cmd_record_query_csv_to_printer" />
-		<command id="cmd_record_query_csv_to_clipboard" />
-		<command id="cmd_record_query_csv_to_file" />
-
-		<command id="cmd_pending_buckets_csv_to_printer" />
-		<command id="cmd_pending_buckets_csv_to_clipboard" />
-		<command id="cmd_pending_buckets_csv_to_file" />
-
-		<command id="cmd_record_buckets_new_bucket" />
-		<command id="cmd_record_buckets_delete_bucket" disabled="true"/>
-		<command id="cmd_record_buckets_refresh" disabled="true"/>
-
-    	<command id="cmd_record_buckets_delete_item" />
-    	<command id="cmd_record_buckets_to_pending_buckets" />
-
-		<command id="cmd_record_buckets_csv_to_printer" />
-		<command id="cmd_record_buckets_csv_to_clipboard" />
-		<command id="cmd_record_buckets_csv_to_file" />
-		
+    <commandset id="record_buckets_cmds">
+        <command id="sel_clip0" disabled="true"/>
+        <command id="sel_clip1" disabled="true"/>
+        <command id="sel_clip2" disabled="true"/>
+        <command id="save_columns0" />
+        <command id="save_columns1" />
+        <command id="save_columns2" />
+
+        <command id="cmd_record_query_csv_to_printer" />
+        <command id="cmd_record_query_csv_to_clipboard" />
+        <command id="cmd_record_query_csv_to_file" />
+
+        <command id="cmd_pending_buckets_csv_to_printer" />
+        <command id="cmd_pending_buckets_csv_to_clipboard" />
+        <command id="cmd_pending_buckets_csv_to_file" />
+
+        <command id="cmd_record_buckets_new_bucket" />
+        <command id="cmd_record_buckets_delete_bucket" disabled="true"/>
+        <command id="cmd_record_buckets_refresh" disabled="true"/>
+
+        <command id="cmd_record_buckets_delete_item" />
+        <command id="cmd_record_buckets_to_pending_buckets" />
+
+        <command id="cmd_record_buckets_csv_to_printer" />
+        <command id="cmd_record_buckets_csv_to_clipboard" />
+        <command id="cmd_record_buckets_csv_to_file" />
+        
         <command id="cmd_add_all_query_to_pending" />
         <command id="cmd_add_sel_query_to_pending" />
 
         <command id="cmd_add_all_pending_to_record_bucket" />
         <command id="cmd_add_sel_pending_to_record_bucket" />
 
-		<command id="cmd_merge_records" disabled="true" />
-		<command id="cmd_export_records_usmarc" />
-		<command id="cmd_export_records_unimarc" />
-		<command id="cmd_export_records_xml" />
-		<command id="cmd_export_records_bre" />
-		<command id="cmd_delete_records" disabled="true" />
-		<command id="cmd_sel_opac" disabled="true" />
-		
+        <command id="cmd_merge_records" disabled="true" />
+        <command id="cmd_export_records_usmarc" />
+        <command id="cmd_export_records_unimarc" />
+        <command id="cmd_export_records_xml" />
+        <command id="cmd_export_records_bre" />
+        <command id="cmd_delete_records" disabled="true" />
+        <command id="cmd_sel_opac" disabled="true" />
+        
         <command id="cmd_submit_query" />
-	</commandset>
+    </commandset>
 
-	<box id="record_buckets_main" />
+    <box id="record_buckets_main" />
 
 </window>
 
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 ca6b8ff214..22d966d625 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
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="record_buckets_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading record_buckets_overlay.xul\n');</script>
 
@@ -13,18 +13,18 @@
 <commandset id="record_buckets_cmds" />
 
 <box id="record_buckets_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="cmvb1" flex="1"/>
+    <vbox id="cmvb1" flex="1"/>
 </box>
 
 <vbox id="cmvb1" flex="1">
     <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;"/>
+                                    accesskey="&staff.cat.record_buckets_overlay.record_query_tab.accesskey;"/>
             <tab id="pending_records_tab" label="&staff.cat.record_buckets_overlay.pending_records_tab.label;"
-									accesskey="&staff.cat.record_buckets_overlay.pending_records_tab.accesskey;"/>
+                                    accesskey="&staff.cat.record_buckets_overlay.pending_records_tab.accesskey;"/>
             <tab id="bucket_view_tab" label="&staff.cat.record_buckets_overlay.bucket_view_tab.label;"
-								 accesskey="&staff.cat.record_buckets_overlay.bucket_view_tab.accesskey;" />
+                                 accesskey="&staff.cat.record_buckets_overlay.bucket_view_tab.accesskey;" />
         </tabs>
         <tabpanels flex="1">
             <tabpanel id="record_query_panel">
@@ -84,99 +84,99 @@
 </hbox>
 
 <hbox id="record_query_bottom_ui">
-	<button id="record_query_list_actions" oncommand="this.firstChild.showPopup();"
+    <button id="record_query_list_actions" oncommand="this.firstChild.showPopup();"
         label="&staff.cat.record_buckets_overlay.query_list_actions.label;" 
         accesskey="&staff.cat.record_buckets_overlay.query_list_actions.accesskey;" 
         type="menu" allowevents="true">
         <menupopup id="record_query_list_actions_popup">
-        	<menuitem command="sel_clip0" label="&staff.cat.record_buckets_overlay.menuitem.sel_clip0.label;" disabled="true" />
-    	    <menuitem command="cmd_record_query_csv_to_printer" label="&staff.cat.record_buckets_overlay.menuitem.query_csv_to_printer.label;" />
-        	<menuitem command="cmd_record_query_csv_to_clipboard" label="&staff.cat.record_buckets_overlay.menuitem.query_csv_to_clipboard.label;" accesskey=""/>
-        	<menuitem command="cmd_record_query_csv_to_file" label="&staff.cat.record_buckets_overlay.menuitem.query_csv_to_file.label;" accesskey=""/>
-	        <menuitem command="save_columns0" label="&staff.cat.record_buckets_overlay.menuitem.save_columns0.label;" />
+            <menuitem command="sel_clip0" label="&staff.cat.record_buckets_overlay.menuitem.sel_clip0.label;" disabled="true" />
+            <menuitem command="cmd_record_query_csv_to_printer" label="&staff.cat.record_buckets_overlay.menuitem.query_csv_to_printer.label;" />
+            <menuitem command="cmd_record_query_csv_to_clipboard" label="&staff.cat.record_buckets_overlay.menuitem.query_csv_to_clipboard.label;" accesskey=""/>
+            <menuitem command="cmd_record_query_csv_to_file" label="&staff.cat.record_buckets_overlay.menuitem.query_csv_to_file.label;" accesskey=""/>
+            <menuitem command="save_columns0" label="&staff.cat.record_buckets_overlay.menuitem.save_columns0.label;" />
         </menupopup>
     </button>
-	<spacer flex="1"/>
-	<button command="cmd_add_all_query_to_pending"
+    <spacer flex="1"/>
+    <button command="cmd_add_all_query_to_pending"
       label="&staff.cat.record_buckets_overlay.add_all_query_to_pending.label;"
-		  accesskey="" image="/xul/server/skin/media/images/right_arrow.png"/>
-	<button command="cmd_add_sel_query_to_pending"
-	  label="&staff.cat.record_buckets_overlay.add_sel_query_to_pending.label;"
-		accesskey="" image="/xul/server/skin/media/images/right_arrow.png"/>
+          accesskey="" image="/xul/server/skin/media/images/right_arrow.png"/>
+    <button command="cmd_add_sel_query_to_pending"
+      label="&staff.cat.record_buckets_overlay.add_sel_query_to_pending.label;"
+        accesskey="" image="/xul/server/skin/media/images/right_arrow.png"/>
 </hbox>
 
 <hbox id="pending_buckets_bottom_ui">
-	<button id="pending_buckets_list_actions" oncommand="this.firstChild.showPopup();"
+    <button id="pending_buckets_list_actions" oncommand="this.firstChild.showPopup();"
       label="&staff.cat.record_buckets_overlay.pending_buckets_list_actions.label;"
       accesskey="&staff.cat.record_buckets_overlay.pending_buckets_list_actions.accesskey;"
       type="menu" allowevents="true">
         <menupopup id="pending_buckets_list_actions_popup">
-        	<menuitem command="sel_clip1" label="&staff.cat.record_buckets_overlay.menuitem.sel_clip1.label;" disabled="true" />
-    	    <menuitem command="cmd_pending_buckets_csv_to_printer" label="&staff.cat.record_buckets_overlay.menuitem.pending_buckets_csv_to_printer.label;" />
-        	<menuitem command="cmd_pending_buckets_csv_to_clipboard" label="&staff.cat.record_buckets_overlay.menuitem.pending_buckets_csv_to_clipboard.label;" accesskey=""/>
-        	<menuitem command="cmd_pending_buckets_csv_to_file" label="&staff.cat.record_buckets_overlay.menuitem.pending_buckets_csv_to_file.label;" accesskey=""/>
-	        <menuitem command="save_columns1" label="&staff.cat.record_buckets_overlay.menuitem.save_columns1.label;" />
+            <menuitem command="sel_clip1" label="&staff.cat.record_buckets_overlay.menuitem.sel_clip1.label;" disabled="true" />
+            <menuitem command="cmd_pending_buckets_csv_to_printer" label="&staff.cat.record_buckets_overlay.menuitem.pending_buckets_csv_to_printer.label;" />
+            <menuitem command="cmd_pending_buckets_csv_to_clipboard" label="&staff.cat.record_buckets_overlay.menuitem.pending_buckets_csv_to_clipboard.label;" accesskey=""/>
+            <menuitem command="cmd_pending_buckets_csv_to_file" label="&staff.cat.record_buckets_overlay.menuitem.pending_buckets_csv_to_file.label;" accesskey=""/>
+            <menuitem command="save_columns1" label="&staff.cat.record_buckets_overlay.menuitem.save_columns1.label;" />
         </menupopup>
     </button>
-	<spacer flex="1"/>
-	<button command="cmd_add_all_pending_to_record_bucket"
+    <spacer flex="1"/>
+    <button command="cmd_add_all_pending_to_record_bucket"
       label="&staff.cat.record_buckets_overlay.add_all_pending_to_record_bucket.label;"
       accesskey="&staff.cat.record_buckets_overlay.add_all_pending_to_record_bucket.accesskey;"
       image="/xul/server/skin/media/images/right_arrow.png"/>
-	<button command="cmd_add_sel_pending_to_record_bucket"
+    <button command="cmd_add_sel_pending_to_record_bucket"
       label="&staff.cat.record_buckets_overlay.add_sel_pending_to_record_bucket.label;"
       accesskey="" image="/xul/server/skin/media/images/right_arrow.png"/>
 </hbox>
 
 <hbox id="record_buckets_top_ui">
-	<button command="cmd_record_buckets_delete_item"
+    <button command="cmd_record_buckets_delete_item"
       label="&staff.cat.record_buckets_overlay.record_buckets_del_item.label;"
       disabled="true" image="/xul/server/skin/media/images/icon_delete.gif"/>
-	<button command="cmd_record_buckets_to_pending_buckets"
+    <button command="cmd_record_buckets_to_pending_buckets"
       label="&staff.cat.record_buckets_overlay.record_buckets_to_pending_buckets.label;"
       disabled="true" image="/xul/server/skin/media/images/left_arrow.png"/>
 </hbox>
 
 <hbox id="info_box" hidden="true" style="font-size: large;">
-	<label value="&staff.cat.record_buckets_overlay.info_box.label;"/>
-	<label id="bucket_number" style="color: blue; text-decoration: underline; -moz-user-focus: normal;" onclick="copy_to_clipboard(event)"/>
-	<label id="bucket_name" style="color: blue;"/>
-	<label value="&staff.cat.record_buckets_overlay.bucket_owner.label;"/>
-	<label id="bucket_owner" style="color: blue;"/>
+    <label value="&staff.cat.record_buckets_overlay.info_box.label;"/>
+    <label id="bucket_number" style="color: blue; text-decoration: underline; -moz-user-focus: normal;" onclick="copy_to_clipboard(event)"/>
+    <label id="bucket_name" style="color: blue;"/>
+    <label value="&staff.cat.record_buckets_overlay.bucket_owner.label;"/>
+    <label id="bucket_owner" style="color: blue;"/>
 </hbox>
 
 <hbox id="record_buckets_bottom_ui">
-	<button id="record_buckets_list_actions" oncommand="this.firstChild.showPopup();"
+    <button id="record_buckets_list_actions" oncommand="this.firstChild.showPopup();"
       label="&staff.cat.record_buckets_overlay.record_buckets_list_actions.label;"
       accesskey="&staff.cat.record_buckets_overlay.record_buckets_list_actions.accesskey;"
       type="menu" allowevents="true" disabled="true">
         <menupopup id="record_buckets_list_actions_popup">
-	        <menuitem command="sel_clip2"
-						label="&staff.cat.record_buckets_overlay.menuitem.sel_clip2.label;" disabled="true" />
-    	    <menuitem command="cmd_record_buckets_csv_to_printer"
-						label="&staff.cat.record_buckets_overlay.menuitem.record_buckets_csv_to_printer.label;" />
-						<menuitem command="cmd_record_buckets_csv_to_clipboard"
-							label="&staff.cat.record_buckets_overlay.menuitem.record_buckets_csv_to_clipboard.label;" />
-						<menuitem command="cmd_record_buckets_csv_to_file"
-							label="&staff.cat.record_buckets_overlay.menuitem.record_buckets_csv_to_file.label;" accesskey=""/>
-	        <menuitem command="save_columns2" label="&staff.cat.record_buckets_overlay.menuitem.save_columns2.label;" />
+            <menuitem command="sel_clip2"
+                        label="&staff.cat.record_buckets_overlay.menuitem.sel_clip2.label;" disabled="true" />
+            <menuitem command="cmd_record_buckets_csv_to_printer"
+                        label="&staff.cat.record_buckets_overlay.menuitem.record_buckets_csv_to_printer.label;" />
+                        <menuitem command="cmd_record_buckets_csv_to_clipboard"
+                            label="&staff.cat.record_buckets_overlay.menuitem.record_buckets_csv_to_clipboard.label;" />
+                        <menuitem command="cmd_record_buckets_csv_to_file"
+                            label="&staff.cat.record_buckets_overlay.menuitem.record_buckets_csv_to_file.label;" accesskey=""/>
+            <menuitem command="save_columns2" label="&staff.cat.record_buckets_overlay.menuitem.save_columns2.label;" />
         </menupopup>
     </button>
-	<spacer flex="1"/>
-	<hbox style="background: grey">
-		<vbox><spacer flex="1"/><label value="&staff.cat.record_buckets_overlay.box.label;" style="font-weight: bold"/><spacer flex="1"/></vbox>
-		<button command="cmd_sel_opac" label="&staff.cat.record_buckets_overlay.sel_opac.label;" accesskey=""/>
-		<button command="cmd_delete_records" label="&staff.cat.record_buckets_overlay.del_records.label;"/>
-		<button command="cmd_merge_records" label="&staff.cat.record_buckets_overlay.merge_records.label;"/>
-		<button id="record_buckets_export_records" label="&staff.cat.record_buckets_overlay.export_records.label;" type="menu" allowevents="true" disabled="true">
-			<menupopup id="record_buckets_export_record_types" allowevents="true">
-				<menuitem command="cmd_export_records_usmarc" label="&staff.cat.record_buckets_overlay.menuitem.export_usmarc.label;"/>
-				<menuitem command="cmd_export_records_unimarc" label="&staff.cat.record_buckets_overlay.menuitem.export_unimarc.label;"/>
-				<menuitem command="cmd_export_records_xml" label="&staff.cat.record_buckets_overlay.menuitem.export_xml.label;"/>
-				<menuitem command="cmd_export_records_bre" label="&staff.cat.record_buckets_overlay.menuitem.export_eg_bre.label;"/>
-			</menupopup>
-		</button>
-	</hbox>
+    <spacer flex="1"/>
+    <hbox style="background: grey">
+        <vbox><spacer flex="1"/><label value="&staff.cat.record_buckets_overlay.box.label;" style="font-weight: bold"/><spacer flex="1"/></vbox>
+        <button command="cmd_sel_opac" label="&staff.cat.record_buckets_overlay.sel_opac.label;" accesskey=""/>
+        <button command="cmd_delete_records" label="&staff.cat.record_buckets_overlay.del_records.label;"/>
+        <button command="cmd_merge_records" label="&staff.cat.record_buckets_overlay.merge_records.label;"/>
+        <button id="record_buckets_export_records" label="&staff.cat.record_buckets_overlay.export_records.label;" type="menu" allowevents="true" disabled="true">
+            <menupopup id="record_buckets_export_record_types" allowevents="true">
+                <menuitem command="cmd_export_records_usmarc" label="&staff.cat.record_buckets_overlay.menuitem.export_usmarc.label;"/>
+                <menuitem command="cmd_export_records_unimarc" label="&staff.cat.record_buckets_overlay.menuitem.export_unimarc.label;"/>
+                <menuitem command="cmd_export_records_xml" label="&staff.cat.record_buckets_overlay.menuitem.export_xml.label;"/>
+                <menuitem command="cmd_export_records_bre" label="&staff.cat.record_buckets_overlay.menuitem.export_eg_bre.label;"/>
+            </menupopup>
+        </button>
+    </hbox>
 </hbox>
 
 </overlay>
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 e7c945e1c7..b7331c2cfe 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
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,149 +19,149 @@
 <?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(); persist_helper(); } catch(E) { alert(E); }" oils_persist="height width"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		function $c(n) { return document.createElement(n); }
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for cat/record_buckets_quick.xul');
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				g.record_ids = xul_param(
-					'record_ids',{
-						'concat' : true,
-						'JSON2js_if_cgi' : true,
-						'JSON2js_if_xpcom' : true,
-						'stash_name':'rb_temp_record_ids',
-						'clear_xpcom' : true,
-					}
-				);
-
-				$('desc').appendChild( document.createTextNode( 
-					(g.record_ids.length == 1 ?
-						$("catStrings").getString('staff.cat.record_buckets_quick.copy_one_record') :
-						$("catStrings").getFormattedString('staff.cat.record_buckets_quick.copy_multiple_records', [g.record_ids.length])) 
-				) );
-				var robj = g.network.simple_request('BUCKET_RETRIEVE_VIA_USER',[ ses(), g.data.list.au[0].id() ]);
-				if (typeof robj.ilsevent != 'undefined') throw(robj);
-
-				for (var i = 0; i < robj.biblio.length; i++) {
-					if (robj.biblio[i].btype() != 'staff_client') continue;
-					var listitem = $c('listitem');
-					listitem.setAttribute('label', robj.biblio[i].name());
-					listitem.setAttribute('id', robj.biblio[i].id());
-					$('bucket_list').appendChild(listitem);
-				}
-				try { $('bucket_list').selectedIndex = 0; } catch(E) { }
-				$('bucket_list').focus();
-
-			} catch(E) {
-				try { 
-					g.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets_quick.initing_record_buckets_quick_xul'), E);
-				} catch(F) { 
-					alert(E); 
-				}
-			}
-		}
-
-		g.new_bucket = function() {
-			try {
-				var name = prompt($("catStrings").getString('staff.cat.record_buckets_quick.name_of_bucket'),
-					'',
-					$("catStrings").getString('staff.cat.record_buckets_quick.name_of_bucket.title'));
-				if (name) {
-					var bucket = new cbreb();
-					bucket.btype('staff_client');
-					bucket.owner( g.data.list.au[0].id() );
-					bucket.name( name );
-
-					var bucket_id = g.network.simple_request('BUCKET_CREATE',[ses(),'biblio',bucket]);
-					if (typeof bucket_id == 'object') throw bucket_id;
-
-					g.add_to_bucket(bucket_id);
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets_quick.bucket_creation_failure'),E);
-			}
-		}
-
-		g.add_to_bucket = function(b) {
-			var bucket_id;
-			if (b) {
-				bucket_id = b;
-			} else {
-				try {
-					if ($('bucket_list').selectedItem) bucket_id = $('bucket_list').selectedItem.getAttribute('id');
-				} catch(E) {
-				}
-			}
-			if (!bucket_id) return;
-			for (var i = 0; i < g.record_ids.length; i++) {
-				var bucket_item = new cbrebi();
-				bucket_item.isnew('1');
-				bucket_item.bucket(bucket_id);
-				bucket_item.target_biblio_record_entry( g.record_ids[i] );
-				try {
-					var robj = g.network.simple_request('BUCKET_ITEM_CREATE', [ ses(), 'biblio', bucket_item ]);
-					if (typeof robj == 'object') throw robj;
-
-				} catch(E) {
-					g.error.standard_unexpected_error_alert($("catStrings").getFormattedString('staff.cat.record_buckets_quick.add_to_bucket.addition_failed', [bucket_id, g.record_ids[i]]), E);
-				}
-			}
-			window.close();
-		}
-
-		g.advanced = function() {
-			JSAN.use('util.window'); var win = new util.window();
-			g.data.rb_temp_record_ids = js2JSON( g.record_ids ); g.data.stash('rb_temp_record_ids');
-			win.open(urls.XUL_RECORD_BUCKETS,'adv_record_buckets','chrome,resizable,modal');
-			window.close();
-		}
-
-	]]>
-	</script>
-	
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<vbox flex="1" style="overflow: auto">
-	<groupbox flex="1">
-		<caption label="&staff.cat.record_buckets_quick.groupbox.caption;"/>
-		<description id="desc"/>
-		<listbox id="bucket_list" rows="5" flex="1" style="overflow: auto"/>
-		<hbox>
-			<button label="&staff.cat.record_buckets_quick.add_to_bucket.label;"
-				accesskey="&staff.cat.record_buckets_quick.add_to_bucket.accesskey;" oncommand="g.add_to_bucket()"/>
-			<button label="&staff.cat.record_buckets_quick.new_bucket.label;"
-				accesskey="&staff.cat.record_buckets_quick.new_bucket.accesskey;" oncommand="g.new_bucket()"/>
-		</hbox>
-		<hbox>
-			<!--
-			<button label="Advanced" accesskey="v" oncommand="g.advanced()"/>
-			-->
-			<button label="&staff.cat.record_buckets_quick.cancel.label;"
-				accesskey="&staff.cat.record_buckets_quick.cancel.accesskey;" oncommand="window.close()"/>
-		</hbox>
-	</groupbox>
-	</vbox>
+    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">
+
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <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="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function $(id) { return document.getElementById(id); }
+        function $c(n) { return document.createElement(n); }
+
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                        if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for cat/record_buckets_quick.xul');
+                JSAN.use('util.network'); g.network = new util.network();
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+                g.record_ids = xul_param(
+                    'record_ids',{
+                        'concat' : true,
+                        'JSON2js_if_cgi' : true,
+                        'JSON2js_if_xpcom' : true,
+                        'stash_name':'rb_temp_record_ids',
+                        'clear_xpcom' : true,
+                    }
+                );
+
+                $('desc').appendChild( document.createTextNode( 
+                    (g.record_ids.length == 1 ?
+                        $("catStrings").getString('staff.cat.record_buckets_quick.copy_one_record') :
+                        $("catStrings").getFormattedString('staff.cat.record_buckets_quick.copy_multiple_records', [g.record_ids.length])) 
+                ) );
+                var robj = g.network.simple_request('BUCKET_RETRIEVE_VIA_USER',[ ses(), g.data.list.au[0].id() ]);
+                if (typeof robj.ilsevent != 'undefined') throw(robj);
+
+                for (var i = 0; i < robj.biblio.length; i++) {
+                    if (robj.biblio[i].btype() != 'staff_client') continue;
+                    var listitem = $c('listitem');
+                    listitem.setAttribute('label', robj.biblio[i].name());
+                    listitem.setAttribute('id', robj.biblio[i].id());
+                    $('bucket_list').appendChild(listitem);
+                }
+                try { $('bucket_list').selectedIndex = 0; } catch(E) { }
+                $('bucket_list').focus();
+
+            } catch(E) {
+                try { 
+                    g.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets_quick.initing_record_buckets_quick_xul'), E);
+                } catch(F) { 
+                    alert(E); 
+                }
+            }
+        }
+
+        g.new_bucket = function() {
+            try {
+                var name = prompt($("catStrings").getString('staff.cat.record_buckets_quick.name_of_bucket'),
+                    '',
+                    $("catStrings").getString('staff.cat.record_buckets_quick.name_of_bucket.title'));
+                if (name) {
+                    var bucket = new cbreb();
+                    bucket.btype('staff_client');
+                    bucket.owner( g.data.list.au[0].id() );
+                    bucket.name( name );
+
+                    var bucket_id = g.network.simple_request('BUCKET_CREATE',[ses(),'biblio',bucket]);
+                    if (typeof bucket_id == 'object') throw bucket_id;
+
+                    g.add_to_bucket(bucket_id);
+                }
+            } catch(E) {
+                g.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets_quick.bucket_creation_failure'),E);
+            }
+        }
+
+        g.add_to_bucket = function(b) {
+            var bucket_id;
+            if (b) {
+                bucket_id = b;
+            } else {
+                try {
+                    if ($('bucket_list').selectedItem) bucket_id = $('bucket_list').selectedItem.getAttribute('id');
+                } catch(E) {
+                }
+            }
+            if (!bucket_id) return;
+            for (var i = 0; i < g.record_ids.length; i++) {
+                var bucket_item = new cbrebi();
+                bucket_item.isnew('1');
+                bucket_item.bucket(bucket_id);
+                bucket_item.target_biblio_record_entry( g.record_ids[i] );
+                try {
+                    var robj = g.network.simple_request('BUCKET_ITEM_CREATE', [ ses(), 'biblio', bucket_item ]);
+                    if (typeof robj == 'object') throw robj;
+
+                } catch(E) {
+                    g.error.standard_unexpected_error_alert($("catStrings").getFormattedString('staff.cat.record_buckets_quick.add_to_bucket.addition_failed', [bucket_id, g.record_ids[i]]), E);
+                }
+            }
+            window.close();
+        }
+
+        g.advanced = function() {
+            JSAN.use('util.window'); var win = new util.window();
+            g.data.rb_temp_record_ids = js2JSON( g.record_ids ); g.data.stash('rb_temp_record_ids');
+            win.open(urls.XUL_RECORD_BUCKETS,'adv_record_buckets','chrome,resizable,modal');
+            window.close();
+        }
+
+    ]]>
+    </script>
+    
+    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+    <vbox flex="1" style="overflow: auto">
+    <groupbox flex="1">
+        <caption label="&staff.cat.record_buckets_quick.groupbox.caption;"/>
+        <description id="desc"/>
+        <listbox id="bucket_list" rows="5" flex="1" style="overflow: auto"/>
+        <hbox>
+            <button label="&staff.cat.record_buckets_quick.add_to_bucket.label;"
+                accesskey="&staff.cat.record_buckets_quick.add_to_bucket.accesskey;" oncommand="g.add_to_bucket()"/>
+            <button label="&staff.cat.record_buckets_quick.new_bucket.label;"
+                accesskey="&staff.cat.record_buckets_quick.new_bucket.accesskey;" oncommand="g.new_bucket()"/>
+        </hbox>
+        <hbox>
+            <!--
+            <button label="Advanced" accesskey="v" oncommand="g.advanced()"/>
+            -->
+            <button label="&staff.cat.record_buckets_quick.cancel.label;"
+                accesskey="&staff.cat.record_buckets_quick.cancel.accesskey;" oncommand="window.close()"/>
+        </hbox>
+    </groupbox>
+    </vbox>
 
 </window>
 
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 0d96abc21b..6046743f85 100644
--- a/Open-ILS/xul/staff_client/server/cat/spine_labels.xul
+++ b/Open-ILS/xul/staff_client/server/cat/spine_labels.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,151 +19,151 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="spine_labels_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="/xul/server/cat/spine_labels.js"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="/xul/server/cat/spine_labels.js"/>
 
     <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
     <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
-	<vbox id="spine_labels_main" flex="1" class="my_overflow">
-		<hbox flex="1" class="my_overflow">
-		<vbox>
-			<hbox>
-				<button label="&staff.cat.spine_labels.re-generate.label;"
-					accesskey="&staff.cat.spine_labels.re-generate.accesskey;" oncommand="generate()"/>
-				<spacer />
-				<button id="preview" disabled="true" label="&staff.cat.spine_labels.preview_and_print.label;"
-					accesskey="&staff.cat.spine_labels.preview_and_print.accesskey;" oncommand="preview()"/>
-				<spacer />
-				<button id="close" disabled="false" label="&staff.cat.spine_labels.close_window.label;"
-					accesskey="&staff.cat.spine_labels.close_window.accesskey;" oncommand="window.close()"/>
-			</hbox>
+    <vbox id="spine_labels_main" flex="1" class="my_overflow">
+        <hbox flex="1" class="my_overflow">
+        <vbox>
+            <hbox>
+                <button label="&staff.cat.spine_labels.re-generate.label;"
+                    accesskey="&staff.cat.spine_labels.re-generate.accesskey;" oncommand="generate()"/>
+                <spacer />
+                <button id="preview" disabled="true" label="&staff.cat.spine_labels.preview_and_print.label;"
+                    accesskey="&staff.cat.spine_labels.preview_and_print.accesskey;" oncommand="preview()"/>
+                <spacer />
+                <button id="close" disabled="false" label="&staff.cat.spine_labels.close_window.label;"
+                    accesskey="&staff.cat.spine_labels.close_window.accesskey;" oncommand="window.close()"/>
+            </hbox>
 
-			<hbox>
-				<label value="&staff.cat.spine_labels.font_size.label;" control="pt"/>
-				<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)" 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" 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" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row>
-					<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" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</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" oils_persist="checked" label="Include Author"/>
-					<hbox>
-						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<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" 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" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row>
-					<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="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row>
-					<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="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row>
-					<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="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-				</hbox>
-				</row>
-				<row>
-					<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" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row>
-					<hbox>
-						<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="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row>
-					<hbox>
-						<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="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row>
-					<hbox>
-						<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="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row>
-					<hbox>
-						<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="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-			</rows></grid>
-			<button label="&staff.cat.spine_labels.available_macros.label;" oncommand="show_macros()"/>
-		</vbox>
-		<splitter><grippy/></splitter>
-		<vbox id="panel" flex="1" class="my_overflow"/>
-		</hbox>
-	</vbox>
+            <hbox>
+                <label value="&staff.cat.spine_labels.font_size.label;" control="pt"/>
+                <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)" 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" 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" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+                    </hbox>
+                </row>
+                <row>
+                    <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" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+                    </hbox>
+                </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" oils_persist="checked" label="Include Author"/>
+                    <hbox>
+                        <label value="&staff.cat.spine_labels.on_line.label;"/>
+                        <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" 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" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+                    </hbox>
+                </row>
+                <row>
+                    <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="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+                    </hbox>
+                </row>
+                <row>
+                    <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="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+                    </hbox>
+                </row>
+                <row>
+                    <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="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+                </hbox>
+                </row>
+                <row>
+                    <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" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+                    </hbox>
+                </row>
+                <row>
+                    <hbox>
+                        <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="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+                    </hbox>
+                </row>
+                <row>
+                    <hbox>
+                        <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="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+                    </hbox>
+                </row>
+                <row>
+                    <hbox>
+                        <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="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+                    </hbox>
+                </row>
+                <row>
+                    <hbox>
+                        <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="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+                    </hbox>
+                </row>
+            </rows></grid>
+            <button label="&staff.cat.spine_labels.available_macros.label;" oncommand="show_macros()"/>
+        </vbox>
+        <splitter><grippy/></splitter>
+        <vbox id="panel" flex="1" class="my_overflow"/>
+        </hbox>
+    </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_buckets.xul b/Open-ILS/xul/staff_client/server/cat/volume_buckets.xul
index 539ddca640..78ef04771e 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_buckets.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_buckets.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -18,46 +18,46 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="example_template_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-	function $(id) { return document.getElementById(id); }
-	
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for cat/volume_buckets.xul');
-
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name($("catStrings").getString('staff.cat.volume_buckets.window_tab_name')); } catch(E) { alert(E); }
-				}
-
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('cat/volume_buckets.xul',E); } catch(F) { alert(E); }
-			}
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-	
-	<label value="Just a stub, Not Yet Implemented"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+    function $(id) { return document.getElementById(id); }
+    
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for cat/volume_buckets.xul');
+
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+                    try { window.xulG.set_tab_name($("catStrings").getString('staff.cat.volume_buckets.window_tab_name')); } catch(E) { alert(E); }
+                }
+
+            } catch(E) {
+                try { g.error.standard_unexpected_error_alert('cat/volume_buckets.xul',E); } catch(F) { alert(E); }
+            }
+        }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    
+    <label value="Just a stub, Not Yet Implemented"/>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
index 38328e4c14..a7d9a4388f 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -18,44 +18,44 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_volume_copy_creator_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	width="800" height="580"
-	title="&staff.cat.volume_copy_creator.title;"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">
-	var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; 
-	</script>
-	<scripts id="openils_util_scripts"/>
-
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="volume_copy_creator.js"/>
-	
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    width="800" height="580"
+    title="&staff.cat.volume_copy_creator.title;"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <script type="text/javascript">
+    var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; 
+    </script>
+    <scripts id="openils_util_scripts"/>
+
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="volume_copy_creator.js"/>
+    
+    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <vbox id="summary_box"/>
-	<groupbox flex="1" class="my_overflow">
-		<caption id="caption" label="&staff.cat.volume_copy_creator.label;"/>
-		<hbox style="border-bottom: solid black thin">
-			<hbox id="marc_cn"/>
-			<spacer flex="1" />
-			<checkbox id="check_barcodes" label="&staff.cat.volume_copy_creator.check_barcodes.label;" oncommand="g.save_prefs();" accesskey="&staff.cat.volume_copy_creator.check_barcodes.accesskey;"/>
-			<checkbox id="print_labels" label="&staff.cat.volume_copy_creator.print_labels.label;"  oncommand="g.save_prefs();" accesskey="&staff.cat.volume_copy_creator.print_labels.accesskey;"/>
-			<button id="Create" accesskey="&staff.cat.volume_copy_creator.create.accesskey;" label="&staff.cat.volume_copy_creator.create.label;" disabled="true" oncommand="g.stash_and_close();"/>
-		</hbox>
-		<grid flex="1">
-			<columns> <column flex="0"/> <column flex="0"/> <column flex="1"/> </columns>
-			<rows id="rows">
-				<row>
-					<label value="&staff.cat.volume_copy_creator.library_label.value;" style="font-weight: bold"/>
-					<label value="&staff.cat.volume_copy_creator.num_of_volumes_label.value;" style="font-weight: bold"/>
-				</row>
-			</rows>
-		</grid>
-	</groupbox>
+    <groupbox flex="1" class="my_overflow">
+        <caption id="caption" label="&staff.cat.volume_copy_creator.label;"/>
+        <hbox style="border-bottom: solid black thin">
+            <hbox id="marc_cn"/>
+            <spacer flex="1" />
+            <checkbox id="check_barcodes" label="&staff.cat.volume_copy_creator.check_barcodes.label;" oncommand="g.save_prefs();" accesskey="&staff.cat.volume_copy_creator.check_barcodes.accesskey;"/>
+            <checkbox id="print_labels" label="&staff.cat.volume_copy_creator.print_labels.label;"  oncommand="g.save_prefs();" accesskey="&staff.cat.volume_copy_creator.print_labels.accesskey;"/>
+            <button id="Create" accesskey="&staff.cat.volume_copy_creator.create.accesskey;" label="&staff.cat.volume_copy_creator.create.label;" disabled="true" oncommand="g.stash_and_close();"/>
+        </hbox>
+        <grid flex="1">
+            <columns> <column flex="0"/> <column flex="0"/> <column flex="1"/> </columns>
+            <rows id="rows">
+                <row>
+                    <label value="&staff.cat.volume_copy_creator.library_label.value;" style="font-weight: bold"/>
+                    <label value="&staff.cat.volume_copy_creator.num_of_volumes_label.value;" style="font-weight: bold"/>
+                </row>
+            </rows>
+        </grid>
+    </groupbox>
 
 </window>
 
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 8084cdaa88..28cfc2658f 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -18,99 +18,99 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_volume_editor_win" 
-	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">
+    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">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
 
-		var xulG = {};
+        var xulG = {};
 
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for cat/volume_editor.xul');
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for cat/volume_editor.xul');
 
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
 
-				JSAN.use('util.network'); g.network = new util.network();
+                JSAN.use('util.network'); g.network = new util.network();
 
-				JSAN.use('util.functional');
+                JSAN.use('util.functional');
 
-				g.volumes = xul_param('volumes',{'stash_name':'volumes_temp','clear_xpcom':true,'modal_xulG':true}); //JSON2js( g.data.volumes_temp );
-				//g.data.volumes_temp = ''; g.data.stash('volumes_temp');
+                g.volumes = xul_param('volumes',{'stash_name':'volumes_temp','clear_xpcom':true,'modal_xulG':true}); //JSON2js( g.data.volumes_temp );
+                //g.data.volumes_temp = ''; g.data.stash('volumes_temp');
 
-				var rows = document.getElementById('rows');
+                var rows = document.getElementById('rows');
 
-				for (var i = 0; i < g.volumes.length; i++) {
-					var row = document.createElement('row'); rows.appendChild(row);
-					var lib_label = document.createElement('label'); row.appendChild(lib_label);
-					var tb = document.createElement('textbox'); row.appendChild(tb);
+                for (var i = 0; i < g.volumes.length; i++) {
+                    var row = document.createElement('row'); rows.appendChild(row);
+                    var lib_label = document.createElement('label'); row.appendChild(lib_label);
+                    var tb = document.createElement('textbox'); row.appendChild(tb);
 
-					var lib_id = g.volumes[i].owning_lib();
-					var last_lib_seen;
+                    var lib_id = g.volumes[i].owning_lib();
+                    var last_lib_seen;
 
-					if (last_lib_seen != lib_id ) {
-						lib_label.setAttribute('value',g.data.hash.aou[ lib_id ].shortname() );
-						last_lib_seen = lib_id;
-					}
+                    if (last_lib_seen != lib_id ) {
+                        lib_label.setAttribute('value',g.data.hash.aou[ lib_id ].shortname() );
+                        last_lib_seen = lib_id;
+                    }
 
-					tb.setAttribute('value',g.volumes[i].label());
-					tb.setAttribute('onchange','try { var v = g.volumes['+i+']; v.ischanged("1"); v.label( this.value ); } catch(E) { alert(E); }');
-				}
+                    tb.setAttribute('value',g.volumes[i].label());
+                    tb.setAttribute('onchange','try { var v = g.volumes['+i+']; v.ischanged("1"); v.label( this.value ); } catch(E) { alert(E); }');
+                }
 
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/volume_editor.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); dump(js2JSON(E)); }
-				alert(err_msg);
-			}
-		}
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/volume_editor.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); dump(js2JSON(E)); }
+                alert(err_msg);
+            }
+        }
 
-		g.stash_and_close = function() {
-			try {
-				//g.data.volumes_temp = js2JSON( g.volumes );
-				//g.error.sdump('D_CAT','in modal window, g.data.volumes_temp = \n' + g.data.volumes_temp + '\n');
-				//g.data.stash('volumes_temp');
-				xulG.volumes = g.volumes;
+        g.stash_and_close = function() {
+            try {
+                //g.data.volumes_temp = js2JSON( g.volumes );
+                //g.error.sdump('D_CAT','in modal window, g.data.volumes_temp = \n' + g.data.volumes_temp + '\n');
+                //g.data.stash('volumes_temp');
+                xulG.volumes = g.volumes;
                 xulG.update_these_volumes = 1;
-				update_modal_xulG(xulG);
-				window.close();
-			} catch(E) {
-				alert('FIXME: volume editor -> ' + E);
-			}
-		}
-
-	]]>
-	</script>
-	
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<groupbox flex="1" style="overflow: auto">
-		<caption id="caption" label="&staff.cat.volume_editor.caption.label;"/>
-		<hbox>
-			<button label="&staff.cat.volume_editor.cancel.label;" oncommand="window.close();"/>
-			<spacer flex="1" />
-			<button label="&staff.cat.volume_editor.modify.label;" oncommand="g.stash_and_close();"/>
-		</hbox>
-		<grid flex="1">
-			<columns> <column /> <column /> <column flex="1"/> </columns>
-			<rows id="rows" />
-		</grid>
-	</groupbox>
+                update_modal_xulG(xulG);
+                window.close();
+            } catch(E) {
+                alert('FIXME: volume editor -> ' + E);
+            }
+        }
+
+    ]]>
+    </script>
+    
+    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+    <groupbox flex="1" style="overflow: auto">
+        <caption id="caption" label="&staff.cat.volume_editor.caption.label;"/>
+        <hbox>
+            <button label="&staff.cat.volume_editor.cancel.label;" oncommand="window.close();"/>
+            <spacer flex="1" />
+            <button label="&staff.cat.volume_editor.modify.label;" oncommand="g.stash_and_close();"/>
+        </hbox>
+        <grid flex="1">
+            <columns> <column /> <column /> <column flex="1"/> </columns>
+            <rows id="rows" />
+        </grid>
+    </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/z3950.xul b/Open-ILS/xul/staff_client/server/cat/z3950.xul
index d67e198a3f..3b63172c91 100644
--- a/Open-ILS/xul/staff_client/server/cat/z3950.xul
+++ b/Open-ILS/xul/staff_client/server/cat/z3950.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 
@@ -19,78 +19,78 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_z3950_win2" 
-	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">
+    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">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for cat_z3950.xul');
-
-				JSAN.use('cat.z3950'); g.z3950 = new cat.z3950();
-
-				g.z3950.init( 
-					{ 
-						/* this guy grabs most things through the DOM, but I want to move JSAN libraries away from that,
-						or at the very least, push node ID's in through here. */
-					} 
-				);
-
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name('Z39.50'); } catch(E) { alert(E); }
-				}
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/z3950.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function handle_enter(ev) {
-			g.z3950.handle_enter(ev);
-		}
-
-		function default_focus() {
-			setTimeout( function() { try { g.z3950.focus(); } catch(E) { alert(E); } }, 0 );
-		}
-
-	]]>
-	</script>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function $(id) { return document.getElementById(id); }
+        
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for cat_z3950.xul');
+
+                JSAN.use('cat.z3950'); g.z3950 = new cat.z3950();
+
+                g.z3950.init( 
+                    { 
+                        /* this guy grabs most things through the DOM, but I want to move JSAN libraries away from that,
+                        or at the very least, push node ID's in through here. */
+                    } 
+                );
+
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+                    try { window.xulG.set_tab_name('Z39.50'); } catch(E) { alert(E); }
+                }
+
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/z3950.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function handle_enter(ev) {
+            g.z3950.handle_enter(ev);
+        }
+
+        function default_focus() {
+            setTimeout( function() { try { g.z3950.focus(); } catch(E) { alert(E); } }, 0 );
+        }
+
+    ]]>
+    </script>
 
     <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
      <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
-	<commandset id="cat_z3950_cmds">
-		<command id="cmd_broken" />
-		<command id="sel_clip" disabled="true" />
+    <commandset id="cat_z3950_cmds">
+        <command id="cmd_broken" />
+        <command id="sel_clip" disabled="true" />
         <command id="cmd_z3950_csv_to_printer" disabled="true" />
         <command id="cmd_z3950_csv_to_clipboard" disabled="true" />
         <command id="cmd_z3950_csv_to_file" disabled="true" />
-		<command id="save_columns" />
-		<command id="toggle_form" />
-		<command id="marc_view" />
-	</commandset>
+        <command id="save_columns" />
+        <command id="toggle_form" />
+        <command id="marc_view" />
+    </commandset>
 
-	<groupbox flex="1">
-		<caption label="&staff.cat.z3950.marc_import.label;"/>
+    <groupbox flex="1">
+        <caption label="&staff.cat.z3950.marc_import.label;"/>
             <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;"/>
@@ -185,7 +185,7 @@
                     <button id="marc_view_btn" command="marc_view" disabled="true"/>
                     <button id="marc_import_overlay" label="&staff.cat.z3950.marc_import_overlay.label;" accesskey="&staff.cat.z3950.marc_import_overlay.accesskey;" disabled="true"/>
                     <button id="marc_import" label="&staff.cat.z3950.result_message.marc_import.label;" accesskey="&staff.cat.z3950.result_message.marc_import.accesskey;" disabled="true"/>
-	                <button id="toggle_form_btn" command="toggle_form"/>
+                    <button id="toggle_form_btn" command="toggle_form"/>
                 </hbox>
                 <deck id="deck" flex="1">
                     <tree id="results" flex="1" enableColumnDrag="true" seltype="single"/>
diff --git a/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul b/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
index 9888e43535..87cfd8a43c 100644
--- a/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
+++ b/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,17 +19,17 @@
 <?xul-overlay href="/xul/server/cat/bib_brief_overlay.xul"?>
 
 <window id="alt_copy_summary_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;
-	</script>
-	<scripts id="openils_util_scripts"/>
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <script type="text/javascript">
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;
+    </script>
+    <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="alternate_copy_summary.js"/>
 
     <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
diff --git a/Open-ILS/xul/staff_client/server/circ/backdate_post_checkin.xul b/Open-ILS/xul/staff_client/server/circ/backdate_post_checkin.xul
index 8131ecfe76..81cdec091e 100644
--- a/Open-ILS/xul/staff_client/server/circ/backdate_post_checkin.xul
+++ b/Open-ILS/xul/staff_client/server/circ/backdate_post_checkin.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,22 +19,22 @@
 
 <window id="backdate_post_checkin_win" 
     onload="try { backdate_post_checkin_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     oils_persist="height width"
     title="&staff.hold_list.cancel_hold_dialog.title;">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;</script>
-	<scripts id="openils_util_scripts"/>
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;</script>
+    <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="backdate_post_checkin.js"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="backdate_post_checkin.js"/>
 
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- CONTENT -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- CONTENT -->
     <dialogheader title="&staff.circ.backdate_post_checkin.header;" description="&staff.circ.backdate_post_checkin.description;" />
     <vbox class="my_overflow" id="circ_brief_area" flex="1"/>
     <progressmeter type="determined" id="progress" />
diff --git a/Open-ILS/xul/staff_client/server/circ/checkin.xul b/Open-ILS/xul/staff_client/server/circ/checkin.xul
index 9d824eb167..8fafb68ce5 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkin.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkin.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,92 +20,92 @@
 <?xul-overlay href="/xul/server/circ/checkin_overlay.xul"?>
 
 <window id="checkin_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); document.getElementById('checkin_modifiers_popup').hidePopup(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); persist_helper(); document.getElementById('checkin_modifiers_popup').hidePopup(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for checkin.xul');
-
-				var tab_name;
-				if (xul_param('hold_capture')) {
-					var cb1 = document.getElementById('checkin_auto_print_slips'); cb1.hidden = true; cb1.checked = true;
-					var cb1_ind = document.getElementById('checkin_auto_print_slips_indicator'); cb1_ind.hidden = false;
-					var cb2 = document.getElementById('suppress_holds_and_transits'); cb2.hidden = true; cb2.checked = false;
-					var cb2_ind = document.getElementById('suppress_holds_and_transits_indicator'); cb2_ind.hidden = true;
-					document.getElementById('checkin_effective_date_hbox').hidden = true;
-					document.getElementById('caption').setAttribute('label',document.getElementById('circStrings').getString('staff.circ.checkin.hold_capture'));
-					tab_name = document.getElementById('circStrings').getString('staff.circ.checkin.hold_capture');
-				} else {
-					tab_name = document.getElementById('circStrings').getString('staff.circ.checkin.check_in.tab');
-				}
-
-				JSAN.use('circ.checkin'); g.checkin = new circ.checkin();
-				g.checkin.init( 
-					{ 
-					} 
-				);
-	
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name(tab_name); } catch(E) { alert(E); }
-				}
-
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ.checkin.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function default_focus() { try { setTimeout( function() { document.getElementById('checkin_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
-	]]>
-	</script>
-
-	<popupset id="copy_status_popupset"/>
-
-	<commandset id="checkin_cmds">
-		<command id="cmd_checkin_submit_barcode" />
-		<command id="cmd_checkin_print" />
-		<command id="cmd_csv_to_clipboard" />
-		<command id="cmd_csv_to_printer" />
-		<command id="cmd_csv_to_file" />
-		<command id="save_columns" />
-		
-		<command id="sel_clip" disabled="true"/>
-		<command id="sel_edit" disabled="true"/>
-		<command id="sel_backdate" disabled="true"/>
-		<command id="sel_opac" disabled="true"/>
-		<command id="sel_patron" disabled="true"/>
-		<command id="sel_last_patron" disabled="true"/>
-		<command id="sel_copy_details" disabled="true"/>
-		<command id="sel_bucket" disabled="true"/>
-		<command id="sel_spine" disabled="true"/>
-		<command id="sel_transit_abort" disabled="true"/>
-		<command id="sel_mark_items_damaged" disabled="true"/>
-
-		<command id="cmd_do_not_alert_on_precat" />
-		<command id="cmd_suppress_holds_and_transits" />
-		<command id="cmd_amnesty_mode" />
-		<command id="cmd_checkin_auto_print_slips" />
-	</commandset>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for checkin.xul');
+
+                var tab_name;
+                if (xul_param('hold_capture')) {
+                    var cb1 = document.getElementById('checkin_auto_print_slips'); cb1.hidden = true; cb1.checked = true;
+                    var cb1_ind = document.getElementById('checkin_auto_print_slips_indicator'); cb1_ind.hidden = false;
+                    var cb2 = document.getElementById('suppress_holds_and_transits'); cb2.hidden = true; cb2.checked = false;
+                    var cb2_ind = document.getElementById('suppress_holds_and_transits_indicator'); cb2_ind.hidden = true;
+                    document.getElementById('checkin_effective_date_hbox').hidden = true;
+                    document.getElementById('caption').setAttribute('label',document.getElementById('circStrings').getString('staff.circ.checkin.hold_capture'));
+                    tab_name = document.getElementById('circStrings').getString('staff.circ.checkin.hold_capture');
+                } else {
+                    tab_name = document.getElementById('circStrings').getString('staff.circ.checkin.check_in.tab');
+                }
+
+                JSAN.use('circ.checkin'); g.checkin = new circ.checkin();
+                g.checkin.init( 
+                    { 
+                    } 
+                );
+    
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+                    try { window.xulG.set_tab_name(tab_name); } catch(E) { alert(E); }
+                }
+
+            } catch(E) {
+                var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ.checkin.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function default_focus() { try { setTimeout( function() { document.getElementById('checkin_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
+    ]]>
+    </script>
+
+    <popupset id="copy_status_popupset"/>
+
+    <commandset id="checkin_cmds">
+        <command id="cmd_checkin_submit_barcode" />
+        <command id="cmd_checkin_print" />
+        <command id="cmd_csv_to_clipboard" />
+        <command id="cmd_csv_to_printer" />
+        <command id="cmd_csv_to_file" />
+        <command id="save_columns" />
+        
+        <command id="sel_clip" disabled="true"/>
+        <command id="sel_edit" disabled="true"/>
+        <command id="sel_backdate" disabled="true"/>
+        <command id="sel_opac" disabled="true"/>
+        <command id="sel_patron" disabled="true"/>
+        <command id="sel_last_patron" disabled="true"/>
+        <command id="sel_copy_details" disabled="true"/>
+        <command id="sel_bucket" disabled="true"/>
+        <command id="sel_spine" disabled="true"/>
+        <command id="sel_transit_abort" disabled="true"/>
+        <command id="sel_mark_items_damaged" disabled="true"/>
+
+        <command id="cmd_do_not_alert_on_precat" />
+        <command id="cmd_suppress_holds_and_transits" />
+        <command id="cmd_amnesty_mode" />
+        <command id="cmd_checkin_auto_print_slips" />
+    </commandset>
 
     <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
     <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
 
-	<box id="checkin_main" />
+    <box id="checkin_main" />
 
 </window>
 
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 bfb04503fc..e84561a99f 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
@@ -2,110 +2,110 @@
 
 <!-- LOCALIZATION -->
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <overlay id="checkin_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading checkin_overlay.xul\n');</script>
 
 <commandset id="checkin_cmds" />
 
 <popupset id="copy_status_popupset">
-	<popup id="copy_status_actions" position="at_pointer"> 
-		<menuitem command="sel_clip" label="&staff.circ.checkin_overlay.sel_clip.label;" accesskey="&staff.circ.checkin_overlay.sel_clip.accesskey;" />
-		<menuitem command="sel_bucket" label="&staff.circ.checkin_overlay.sel_bucket.label;" accesskey="&staff.circ.checkin_overlay.sel_bucket.accesskey;"/>
-		<menuitem command="sel_opac" label="&staff.circ.checkin_overlay.sel_opac.label;" accesskey="&staff.circ.checkin_overlay.sel_opac.accesskey;" />
-		<menuitem command="sel_copy_details" label="&staff.circ.checkin_overlay.sel_copy_details.label;" accesskey="&staff.circ.checkin_overlay.sel_copy_details.accesskey;" />
-		<menuitem command="sel_patron" label="&staff.circ.checkin_overlay.sel_patron.label;" accesskey="&staff.circ.checkin_overlay.sel_patron.accesskey;"/>
-		<menuitem command="sel_last_patron" label="&staff.circ.checkin_overlay.sel_last_patron.label;" accesskey="&staff.circ.checkin_overlay.sel_last_patron.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="sel_edit" label="&staff.circ.checkin_overlay.sel_edit.label;" accesskey="&staff.circ.checkin_overlay.sel_edit.accesskey;" />
-		<menuitem command="sel_backdate" label="&staff.circ.checkin_overlay.sel_backdate.label;" accesskey="&staff.circ.checkin_overlay.sel_backdate.accesskey;" />
-		<menuseparator />
-		<menuitem command="sel_mark_items_damaged" label="&staff.circ.checkin_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.checkin_overlay.sel_mark_items_damaged.accesskey;"/>
-		<menuseparator />
-		<menuitem command="sel_transit_abort" label="&staff.circ.checkin_overlay.sel_transit_abort.label;" />
-		<menuseparator />
-		<menuitem command="sel_spine" label="&staff.circ.checkin_overlay.sel_spine.label;" accesskey="&staff.circ.checkin_overlay.sel_spine.accesskey;"/>
-		<menuitem command="save_columns" label="&staff.circ.checkin_overlay.save_columns.label;"/>
-	</popup>
+    <popup id="copy_status_actions" position="at_pointer"> 
+        <menuitem command="sel_clip" label="&staff.circ.checkin_overlay.sel_clip.label;" accesskey="&staff.circ.checkin_overlay.sel_clip.accesskey;" />
+        <menuitem command="sel_bucket" label="&staff.circ.checkin_overlay.sel_bucket.label;" accesskey="&staff.circ.checkin_overlay.sel_bucket.accesskey;"/>
+        <menuitem command="sel_opac" label="&staff.circ.checkin_overlay.sel_opac.label;" accesskey="&staff.circ.checkin_overlay.sel_opac.accesskey;" />
+        <menuitem command="sel_copy_details" label="&staff.circ.checkin_overlay.sel_copy_details.label;" accesskey="&staff.circ.checkin_overlay.sel_copy_details.accesskey;" />
+        <menuitem command="sel_patron" label="&staff.circ.checkin_overlay.sel_patron.label;" accesskey="&staff.circ.checkin_overlay.sel_patron.accesskey;"/>
+        <menuitem command="sel_last_patron" label="&staff.circ.checkin_overlay.sel_last_patron.label;" accesskey="&staff.circ.checkin_overlay.sel_last_patron.accesskey;"/>
+        <menuseparator/>
+        <menuitem command="sel_edit" label="&staff.circ.checkin_overlay.sel_edit.label;" accesskey="&staff.circ.checkin_overlay.sel_edit.accesskey;" />
+        <menuitem command="sel_backdate" label="&staff.circ.checkin_overlay.sel_backdate.label;" accesskey="&staff.circ.checkin_overlay.sel_backdate.accesskey;" />
+        <menuseparator />
+        <menuitem command="sel_mark_items_damaged" label="&staff.circ.checkin_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.checkin_overlay.sel_mark_items_damaged.accesskey;"/>
+        <menuseparator />
+        <menuitem command="sel_transit_abort" label="&staff.circ.checkin_overlay.sel_transit_abort.label;" />
+        <menuseparator />
+        <menuitem command="sel_spine" label="&staff.circ.checkin_overlay.sel_spine.label;" accesskey="&staff.circ.checkin_overlay.sel_spine.accesskey;"/>
+        <menuitem command="save_columns" label="&staff.circ.checkin_overlay.save_columns.label;"/>
+    </popup>
 </popupset>
 
 <box id="checkin_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="cmvb1" flex="1"/>
+    <vbox id="cmvb1" flex="1"/>
 </box>
 
 <vbox id="cmvb1" flex="1">
-	<hbox id="background" class="checkin_screen_normal">
-		<spacer flex="1"/>
-		<vbox>
-			<hbox align="center"><label id="background-text" value="&staff.circ.checkin_overlay.background_text;" /></hbox>
+    <hbox id="background" class="checkin_screen_normal">
+        <spacer flex="1"/>
+        <vbox>
+            <hbox align="center"><label id="background-text" value="&staff.circ.checkin_overlay.background_text;" /></hbox>
             <vbox align="center">
                 <description id="do_not_alert_on_precat_indicator" hidden="true">&staff.circ.checkin_overlay.do_not_alert_on_precat.label;</description>
                 <description id="suppress_holds_and_transits_indicator" hidden="true">&staff.circ.checkin_overlay.suppress_holds_and_transits.label;</description>
                 <description id="amnesty_mode_indicator" hidden="true">&staff.circ.checkin_overlay.amnesty_mode.label;</description>
                 <description id="checkin_auto_print_slips_indicator" hidden="true">&staff.circ.checkin_overlay.checkin_auto_print_slips.label;</description>
             </vbox>
-		</vbox>
-		<spacer flex="1"/>
-	</hbox>
-	<groupbox id="cmgb1" flex="2">
-		<caption id="caption" label="&staff.circ.checkin.caption;" />
-		<hbox id="checkin_top_ui" />
-		<tree id="checkin_list" flex="1" enableColumnDrag="true" context="copy_status_actions" />
-		<hbox id="checkin_bottom_ui" />
-	</groupbox>
+        </vbox>
+        <spacer flex="1"/>
+    </hbox>
+    <groupbox id="cmgb1" flex="2">
+        <caption id="caption" label="&staff.circ.checkin.caption;" />
+        <hbox id="checkin_top_ui" />
+        <tree id="checkin_list" flex="1" enableColumnDrag="true" context="copy_status_actions" />
+        <hbox id="checkin_bottom_ui" />
+    </groupbox>
 </vbox>
 
 <hbox id="checkin_top_ui">
-	<vbox>
-		<hbox>
-			<label id="checkin_scan_barcode_label" 
-				value="&staff.circ.checkin.scan.label;" 
-				accesskey="&staff.circ.checkin.scan.accesskey;" 
-				control="checkin_barcode_entry_textbox"/>
-			<textbox id="checkin_barcode_entry_textbox" context="clipboard"/>
-			<button id="checkin_submit_barcode_button" 
-				label="&staff.circ.checkin.submit.label;" 
-				command="cmd_checkin_submit_barcode"
-				oldaccesskey="&staff.circ.checkin.submit.accesskey;"/>
-		</hbox>
-		<label id="no_change_label" value="" style="color: red" hidden="true"/>
-	</vbox>
-	<spacer flex="1"/>
-	<vbox>
-		<hbox>
-			<hbox id="checkin_effective_date_hbox">
-				<label id="checkin_effective_date_label" value="&staff.circ.checkin_overlay.effective_date.label;" control="checkin_effective_datepicker" accesskey="&staff.circ.checkin_overlay.effective_date.accesskey;"/>
-				<datepicker id="checkin_effective_datepicker" type="popup" context="clipboard"/>
-			</hbox>
-			<menubar>
-			<menu label="&staff.circ.checkin_overlay.actions.label;" accesskey="&staff.circ.checkin_overlay.actions.accesskey;">
-				<menupopup>
-					<menuitem command="sel_clip" label="&staff.circ.checkin_overlay.sel_clip.label;" accesskey="&staff.circ.checkin_overlay.sel_clip.accesskey;" />
-					<menuitem command="sel_bucket" label="&staff.circ.checkin_overlay.sel_bucket.label;" accesskey="&staff.circ.checkin_overlay.sel_bucket.accesskey;"/>
-					<menuitem command="sel_opac" label="&staff.circ.checkin_overlay.sel_opac.label;" accesskey="&staff.circ.checkin_overlay.sel_opac.accesskey;" />
-					<menuitem command="sel_copy_details" label="&staff.circ.checkin_overlay.sel_copy_details.label;" accesskey="&staff.circ.checkin_overlay.sel_copy_details.accesskey;" />
-					<menuitem command="sel_patron" label="&staff.circ.checkin_overlay.sel_patron.label;" accesskey="&staff.circ.checkin_overlay.sel_patron.accesskey;"/>
-					<menuitem command="sel_last_patron" label="&staff.circ.checkin_overlay.sel_last_patron.label;" accesskey="&staff.circ.checkin_overlay.sel_last_patron.accesskey;"/>
-					<menuseparator/>
-					<menuitem command="sel_edit" label="&staff.circ.checkin_overlay.sel_edit.label;" accesskey="&staff.circ.checkin_overlay.sel_edit.accesskey;" />
-		            <menuitem command="sel_backdate" label="&staff.circ.checkin_overlay.sel_backdate.label;" accesskey="&staff.circ.checkin_overlay.sel_backdate.accesskey;" />
-					<menuseparator />
-					<menuitem command="sel_mark_items_damaged" label="&staff.circ.checkin_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.checkin_overlay.sel_mark_items_damaged.accesskey;"/>
-					<menuseparator />
-					<menuitem command="sel_transit_abort" label="&staff.circ.checkin_overlay.sel_transit_abort.label;" />
-					<menuseparator />
-					<menuitem command="sel_spine" label="&staff.circ.checkin_overlay.sel_spine.label;" accesskey="&staff.circ.checkin_overlay.sel_spine.accesskey;"/>
-					<menuitem command="save_columns" label="&staff.circ.checkin_overlay.save_columns.label;"/>
-				</menupopup>
-			</menu>
-			</menubar>
-		</hbox>
+    <vbox>
+        <hbox>
+            <label id="checkin_scan_barcode_label" 
+                value="&staff.circ.checkin.scan.label;" 
+                accesskey="&staff.circ.checkin.scan.accesskey;" 
+                control="checkin_barcode_entry_textbox"/>
+            <textbox id="checkin_barcode_entry_textbox" context="clipboard"/>
+            <button id="checkin_submit_barcode_button" 
+                label="&staff.circ.checkin.submit.label;" 
+                command="cmd_checkin_submit_barcode"
+                oldaccesskey="&staff.circ.checkin.submit.accesskey;"/>
+        </hbox>
+        <label id="no_change_label" value="" style="color: red" hidden="true"/>
+    </vbox>
+    <spacer flex="1"/>
+    <vbox>
+        <hbox>
+            <hbox id="checkin_effective_date_hbox">
+                <label id="checkin_effective_date_label" value="&staff.circ.checkin_overlay.effective_date.label;" control="checkin_effective_datepicker" accesskey="&staff.circ.checkin_overlay.effective_date.accesskey;"/>
+                <datepicker id="checkin_effective_datepicker" type="popup" context="clipboard"/>
+            </hbox>
+            <menubar>
+            <menu label="&staff.circ.checkin_overlay.actions.label;" accesskey="&staff.circ.checkin_overlay.actions.accesskey;">
+                <menupopup>
+                    <menuitem command="sel_clip" label="&staff.circ.checkin_overlay.sel_clip.label;" accesskey="&staff.circ.checkin_overlay.sel_clip.accesskey;" />
+                    <menuitem command="sel_bucket" label="&staff.circ.checkin_overlay.sel_bucket.label;" accesskey="&staff.circ.checkin_overlay.sel_bucket.accesskey;"/>
+                    <menuitem command="sel_opac" label="&staff.circ.checkin_overlay.sel_opac.label;" accesskey="&staff.circ.checkin_overlay.sel_opac.accesskey;" />
+                    <menuitem command="sel_copy_details" label="&staff.circ.checkin_overlay.sel_copy_details.label;" accesskey="&staff.circ.checkin_overlay.sel_copy_details.accesskey;" />
+                    <menuitem command="sel_patron" label="&staff.circ.checkin_overlay.sel_patron.label;" accesskey="&staff.circ.checkin_overlay.sel_patron.accesskey;"/>
+                    <menuitem command="sel_last_patron" label="&staff.circ.checkin_overlay.sel_last_patron.label;" accesskey="&staff.circ.checkin_overlay.sel_last_patron.accesskey;"/>
+                    <menuseparator/>
+                    <menuitem command="sel_edit" label="&staff.circ.checkin_overlay.sel_edit.label;" accesskey="&staff.circ.checkin_overlay.sel_edit.accesskey;" />
+                    <menuitem command="sel_backdate" label="&staff.circ.checkin_overlay.sel_backdate.label;" accesskey="&staff.circ.checkin_overlay.sel_backdate.accesskey;" />
+                    <menuseparator />
+                    <menuitem command="sel_mark_items_damaged" label="&staff.circ.checkin_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.checkin_overlay.sel_mark_items_damaged.accesskey;"/>
+                    <menuseparator />
+                    <menuitem command="sel_transit_abort" label="&staff.circ.checkin_overlay.sel_transit_abort.label;" />
+                    <menuseparator />
+                    <menuitem command="sel_spine" label="&staff.circ.checkin_overlay.sel_spine.label;" accesskey="&staff.circ.checkin_overlay.sel_spine.accesskey;"/>
+                    <menuitem command="save_columns" label="&staff.circ.checkin_overlay.save_columns.label;"/>
+                </menupopup>
+            </menu>
+            </menubar>
+        </hbox>
         <label id="fine_tally" value="" amount="0.00" style="color: red" hidden="true" />
-	</vbox>
+    </vbox>
 
 </hbox>
 
@@ -115,21 +115,21 @@
         accesskey="&staff.generic.list_actions.accesskey;" 
         type="menu" allowevents="true">
         <menupopup id="list_actions_popup">
-        	<menuitem command="sel_clip" label="&staff.generic.list_actions.sel_clip.label;" accesskey="&staff.generic.list_actions.sel_clip.accesskey;" disabled="true" />
-    	    <menuitem command="cmd_csv_to_printer" label="&staff.generic.list_actions.csv_to_printer.label;" accesskey="&staff.generic.list_actions.csv_to_printer.accesskey;" />
-        	<menuitem command="cmd_csv_to_clipboard" label="&staff.generic.list_actions.csv_to_clipboard.label;" accesskey="&staff.generic.list_actions.csv_to_clipboard.accesskey;" />
-        	<menuitem command="cmd_csv_to_file" label="&staff.generic.list_actions.csv_to_file.label;" accesskey="&staff.generic.list_actions.csv_to_file.accesskey;" />
-	        <menuitem command="save_columns" label="&staff.generic.list_actions.save_columns.label;" accesskey="&staff.generic.list_actions.save_columns.accesskey;" />
+            <menuitem command="sel_clip" label="&staff.generic.list_actions.sel_clip.label;" accesskey="&staff.generic.list_actions.sel_clip.accesskey;" disabled="true" />
+            <menuitem command="cmd_csv_to_printer" label="&staff.generic.list_actions.csv_to_printer.label;" accesskey="&staff.generic.list_actions.csv_to_printer.accesskey;" />
+            <menuitem command="cmd_csv_to_clipboard" label="&staff.generic.list_actions.csv_to_clipboard.label;" accesskey="&staff.generic.list_actions.csv_to_clipboard.accesskey;" />
+            <menuitem command="cmd_csv_to_file" label="&staff.generic.list_actions.csv_to_file.label;" accesskey="&staff.generic.list_actions.csv_to_file.accesskey;" />
+            <menuitem command="save_columns" label="&staff.generic.list_actions.save_columns.label;" accesskey="&staff.generic.list_actions.save_columns.accesskey;" />
         </menupopup>
     </button>
 
-	<button id="checkin_print" 
-		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" oils_persist="checked"/> 
-	<checkbox id="strict_barcode" label="&staff.circ.checkin_overlay.strict_barcode.label;" checked="false" oils_persist="checked"/> 
-	<spacer id="pcii3s" flex="1"/>
+    <button id="checkin_print" 
+        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" oils_persist="checked"/> 
+    <checkbox id="strict_barcode" label="&staff.circ.checkin_overlay.strict_barcode.label;" checked="false" oils_persist="checked"/> 
+    <spacer id="pcii3s" flex="1"/>
     <button id="checkin_modifiers" oncommand="this.firstChild.showPopup();"
         label="&staff.circ.checkin_overlay.checkin_modifiers_btn.label;"
         accesskey="&staff.circ.checkin_overlay.checkin_modifiers_btn.accesskey;"
diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.xul b/Open-ILS/xul/staff_client/server/circ/checkout.xul
index 351cc0cc69..f95922167d 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkout.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,80 +20,80 @@
 <?xul-overlay href="/xul/server/circ/checkout_overlay.xul"?>
 
 <window id="checkout_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for checkout.xul');
-
-				var patron_id = xul_param('patron_id');
-
-				JSAN.use('circ.checkout'); g.checkout = new circ.checkout();
-				g.checkout.init( 
-					{ 
-						'patron_id' : patron_id,
-					} 
-				);
-		
-				default_focus();
-	
-			} catch(E) {
-				try {
-					g.error.standard_unexpected_error_alert('circ/checkout.xul',E);
-				} catch(F) {
-					dump('FIXME: circ/checkout.xul -> ' + E + ' -> ' + F + '\n');
-				}
-			}
-		}
-
-		function default_focus() {
-			try {
-				var x = document.getElementById('checkout_barcode_entry_textbox');
-				if (!x) return;
-				if (x.disabled) {
-					document.getElementById('checkout_duedate_menu').inputField.focus();
-				} else {
-				 x.focus();
-				}
-			} catch(E) {
-				try { g.error.sdump('D_ERROR','checkout default_focus(): ' + js2JSON(E)); } catch(F) { dump('FIXME: circ/checkout.xul default_focus() -> ' + E + ' -> ' + F) }
-			}
-		}
-
-		function refresh() {
-			g.checkout.check_disable();
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<commandset id="checkout_cmds">
-		<command id="cmd_checkout_submit" />
-		<command id="cmd_checkout_print" />
-		<command id="cmd_checkout_export" />
-		<command id="cmd_checkout_reprint" />
-		<command id="cmd_checkout_done" />
-		<command id="sel_clip" />
-		<command id="save_columns" />
-	</commandset>
-
-	<box id="checkout_main" />
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for checkout.xul');
+
+                var patron_id = xul_param('patron_id');
+
+                JSAN.use('circ.checkout'); g.checkout = new circ.checkout();
+                g.checkout.init( 
+                    { 
+                        'patron_id' : patron_id,
+                    } 
+                );
+        
+                default_focus();
+    
+            } catch(E) {
+                try {
+                    g.error.standard_unexpected_error_alert('circ/checkout.xul',E);
+                } catch(F) {
+                    dump('FIXME: circ/checkout.xul -> ' + E + ' -> ' + F + '\n');
+                }
+            }
+        }
+
+        function default_focus() {
+            try {
+                var x = document.getElementById('checkout_barcode_entry_textbox');
+                if (!x) return;
+                if (x.disabled) {
+                    document.getElementById('checkout_duedate_menu').inputField.focus();
+                } else {
+                 x.focus();
+                }
+            } catch(E) {
+                try { g.error.sdump('D_ERROR','checkout default_focus(): ' + js2JSON(E)); } catch(F) { dump('FIXME: circ/checkout.xul default_focus() -> ' + E + ' -> ' + F) }
+            }
+        }
+
+        function refresh() {
+            g.checkout.check_disable();
+        }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+    <commandset id="checkout_cmds">
+        <command id="cmd_checkout_submit" />
+        <command id="cmd_checkout_print" />
+        <command id="cmd_checkout_export" />
+        <command id="cmd_checkout_reprint" />
+        <command id="cmd_checkout_done" />
+        <command id="sel_clip" />
+        <command id="save_columns" />
+    </commandset>
+
+    <box id="checkout_main" />
 
 </window>
 
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 c1df24cbc6..f229016cc9 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkout_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkout_overlay.xul
@@ -1,70 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="checkout_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading checkout_overlay.xul\n');</script>
 
 <commandset id="checkout_cmds" />
 
 <box id="checkout_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="cmvb1" flex="1"/>
+    <vbox id="cmvb1" flex="1"/>
 </box>
 
 <vbox id="cmvb1" flex="1">
-	<groupbox id="cmgb1" flex="2">
-		<caption label="&staff.patron_navbar.checkout;" />
-		<hbox id="checkout_top_ui" />
-		<vbox id="msg_area" />
-		<tree id="checkout_list" flex="1" enableColumnDrag="true"/>
-		<hbox id="checkout_bottom_ui" />
-	</groupbox>
+    <groupbox id="cmgb1" flex="2">
+        <caption label="&staff.patron_navbar.checkout;" />
+        <hbox id="checkout_top_ui" />
+        <vbox id="msg_area" />
+        <tree id="checkout_list" flex="1" enableColumnDrag="true"/>
+        <hbox id="checkout_bottom_ui" />
+    </groupbox>
 </vbox>
 
 <hbox id="checkout_top_ui">
 <!--
-	<label id="checkout_scan_barcode.label" 
-		value="&staff.patron_display.checkout.scan.label;" 
-		accesskey="&staff.patron_display.checkout.scan.accesskey;" 
-		control="checkout_barcode_entry_textbox"/>
+    <label id="checkout_scan_barcode.label" 
+        value="&staff.patron_display.checkout.scan.label;" 
+        accesskey="&staff.patron_display.checkout.scan.accesskey;" 
+        control="checkout_barcode_entry_textbox"/>
 -->
-	<hbox id="checkout_menu_placeholder" flex="0"/>
-	<label accesskey="&staff.circ.checkout_overlay.barcode.accesskey;" control="checkout_barcode_entry_textbox"/>
-	<textbox id="checkout_barcode_entry_textbox" context="clipboard"/>
-	<button id="checkout_submit_barcode_button" 
-		label="&staff.patron_display.checkout.submit.label;" 
-		command="cmd_checkout_submit"
-		accesskey="&staff.patron_display.checkout.submit.accesskey;"/>
-	<spacer flex="1"/>
-	<hbox id="duedate_hbox">
-		<checkbox id="checkout_duedate_checkbox" label="&staff.circ.checkout_overlay.duedate.label;" accesskey="&staff.circ.checkout_overlay.duedate.accesskey;" oncommand="if (this.checked) { this.nextSibling.focus(); } else { document.getElementById('checkout_barcode_entry_textbox').focus(); }"/>
-		<datepicker id="checkout_duedate_datepicker" type="popup" />
-		<timepicker id="checkout_duedate_timepicker" type="popup" />
-	</hbox>
+    <hbox id="checkout_menu_placeholder" flex="0"/>
+    <label accesskey="&staff.circ.checkout_overlay.barcode.accesskey;" control="checkout_barcode_entry_textbox"/>
+    <textbox id="checkout_barcode_entry_textbox" context="clipboard"/>
+    <button id="checkout_submit_barcode_button" 
+        label="&staff.patron_display.checkout.submit.label;" 
+        command="cmd_checkout_submit"
+        accesskey="&staff.patron_display.checkout.submit.accesskey;"/>
+    <spacer flex="1"/>
+    <hbox id="duedate_hbox">
+        <checkbox id="checkout_duedate_checkbox" label="&staff.circ.checkout_overlay.duedate.label;" accesskey="&staff.circ.checkout_overlay.duedate.accesskey;" oncommand="if (this.checked) { this.nextSibling.focus(); } else { document.getElementById('checkout_barcode_entry_textbox').focus(); }"/>
+        <datepicker id="checkout_duedate_datepicker" type="popup" />
+        <timepicker id="checkout_duedate_timepicker" type="popup" />
+    </hbox>
 </hbox>
 
 <hbox id="checkout_bottom_ui">
-	<button id="checkout_print" 
-		label="&staff.patron_display.checkout.print_receipt.label;" 
-		command="cmd_checkout_print"
-		accesskey="&staff.patron_display.checkout.print_receipt.accesskey;"/>
-	<button id="checkout_export" 
-		label="&staff.circ.checkout_overlay.export.label;"
-		command="cmd_checkout_export"
-		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" oils_persist="checked"/> 
-	<spacer id="pcii3s" flex="1"/>
-	<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" 
-		label="&staff.patron_display.checkout.done.label;" 
-		command="cmd_checkout_done"
-		accesskey="&staff.patron_display.checkout.done.accesskey;"/>
+    <button id="checkout_print" 
+        label="&staff.patron_display.checkout.print_receipt.label;" 
+        command="cmd_checkout_print"
+        accesskey="&staff.patron_display.checkout.print_receipt.accesskey;"/>
+    <button id="checkout_export" 
+        label="&staff.circ.checkout_overlay.export.label;"
+        command="cmd_checkout_export"
+        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" oils_persist="checked"/> 
+    <spacer id="pcii3s" flex="1"/>
+    <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" 
+        label="&staff.patron_display.checkout.done.label;" 
+        command="cmd_checkout_done"
+        accesskey="&staff.patron_display.checkout.done.accesskey;"/>
 </hbox>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/circ/circ_brief.xul b/Open-ILS/xul/staff_client/server/circ/circ_brief.xul
index c95ecb4b47..e82f5c8353 100644
--- a/Open-ILS/xul/staff_client/server/circ/circ_brief.xul
+++ b/Open-ILS/xul/staff_client/server/circ/circ_brief.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,143 +19,143 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="circ_circ_brief_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns:html="http://www.w3.org/1999/xhtml"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for circ_circ_brief.xul');
-
-				g.circ_id = xul_param('circ_id');
-
-				var caption = xul_param('caption'); if (caption) $('caption').setAttribute('label',caption);
-				if (xul_param('no_border')) $('gb').setAttribute('style','border: none');
-
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				function circ_callback(req) {
-					try {
-						var r_circ = req.getResultObject();
-						$('circ_lib').value = r_circ.circ_lib() ? g.data.hash.aou[ r_circ.circ_lib() ].shortname() : '';
-						$('xact_start').value = r_circ.xact_start() ? r_circ.xact_start().toString().substr(0,16).replace(/T/,' ') : '';
-						$('due_date').value = r_circ.due_date() ? r_circ.due_date().toString().substr(0,10) : '';
-						$('circ_lib').setAttribute('tooltiptext', document.getElementById('circStrings').getFormattedString('staff.circ.circ_brief.staff_out_id', [r_circ.circ_staff()]) );
-						$('checkin_lib').value = r_circ.checkin_lib() ? g.data.hash.aou[ r_circ.checkin_lib() ].shortname() : '';
-						$('checkin_time').value = r_circ.checkin_time() ? r_circ.checkin_time().toString().substr(0,16).replace(/T/,' ') : '';
-						$('checkin_lib').setAttribute('tooltiptext', document.getElementById('circStrings').getFormattedString('staff.circ.circ_brief.staff_in_id', [r_circ.checkin_staff()]) );
-						$('id').value = r_circ.id() ? r_circ.id() : '';
-						$('stop_fines').value = r_circ.stop_fines() ? r_circ.stop_fines() : '';
-						$('stop_fines_time').value = r_circ.stop_fines_time() ? r_circ.stop_fines_time().toString().substr(0,16).replace(/T/,' ') : '';
-						var r = '';
-						if (get_bool( r_circ.desk_renewal() ) ) r += 'DESK ';
-						if (get_bool(r_circ.opac_renewal() ) ) r += 'OPAC ';
-						if (get_bool(r_circ.phone_renewal() ) ) r += 'PHONE ';
-						$('renewal').value = r || document.getElementById('circStrings').getString('staff.circ.checkout.no.btn');
-						g.patron_id = r_circ.usr(); $('add_billing').disabled = false;
-						g.network.simple_request('FM_AU_FLESHED_RETRIEVE_VIA_ID',[ ses(), r_circ.usr() ], function(preq) {
-							var r_au = preq.getResultObject();
-							JSAN.use('patron.util'); 
-							$('patron_name').value = patron.util.format_name( r_au ) + ' : ' + r_au.card().barcode();
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for circ_circ_brief.xul');
+
+                g.circ_id = xul_param('circ_id');
+
+                var caption = xul_param('caption'); if (caption) $('caption').setAttribute('label',caption);
+                if (xul_param('no_border')) $('gb').setAttribute('style','border: none');
+
+                JSAN.use('util.network'); g.network = new util.network();
+                JSAN.use('util.date');
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+                function circ_callback(req) {
+                    try {
+                        var r_circ = req.getResultObject();
+                        $('circ_lib').value = r_circ.circ_lib() ? g.data.hash.aou[ r_circ.circ_lib() ].shortname() : '';
+                        $('xact_start').value = r_circ.xact_start() ? r_circ.xact_start().toString().substr(0,16).replace(/T/,' ') : '';
+                        $('due_date').value = r_circ.due_date() ? r_circ.due_date().toString().substr(0,10) : '';
+                        $('circ_lib').setAttribute('tooltiptext', document.getElementById('circStrings').getFormattedString('staff.circ.circ_brief.staff_out_id', [r_circ.circ_staff()]) );
+                        $('checkin_lib').value = r_circ.checkin_lib() ? g.data.hash.aou[ r_circ.checkin_lib() ].shortname() : '';
+                        $('checkin_time').value = r_circ.checkin_time() ? r_circ.checkin_time().toString().substr(0,16).replace(/T/,' ') : '';
+                        $('checkin_lib').setAttribute('tooltiptext', document.getElementById('circStrings').getFormattedString('staff.circ.circ_brief.staff_in_id', [r_circ.checkin_staff()]) );
+                        $('id').value = r_circ.id() ? r_circ.id() : '';
+                        $('stop_fines').value = r_circ.stop_fines() ? r_circ.stop_fines() : '';
+                        $('stop_fines_time').value = r_circ.stop_fines_time() ? r_circ.stop_fines_time().toString().substr(0,16).replace(/T/,' ') : '';
+                        var r = '';
+                        if (get_bool( r_circ.desk_renewal() ) ) r += 'DESK ';
+                        if (get_bool(r_circ.opac_renewal() ) ) r += 'OPAC ';
+                        if (get_bool(r_circ.phone_renewal() ) ) r += 'PHONE ';
+                        $('renewal').value = r || document.getElementById('circStrings').getString('staff.circ.checkout.no.btn');
+                        g.patron_id = r_circ.usr(); $('add_billing').disabled = false;
+                        g.network.simple_request('FM_AU_FLESHED_RETRIEVE_VIA_ID',[ ses(), r_circ.usr() ], function(preq) {
+                            var r_au = preq.getResultObject();
+                            JSAN.use('patron.util'); 
+                            $('patron_name').value = patron.util.format_name( r_au ) + ' : ' + r_au.card().barcode();
                             patron.util.set_penalty_css(r_au);
-						});
-
-					} catch(E) {
-						g.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.circ_brief.failure'), E);
-					}
-				}
-
-				if (g.circ_id) {
-					g.network.simple_request( 'FM_CIRC_RETRIEVE_VIA_ID', [ ses(), g.circ_id ], circ_callback);
-				} else {
-					g.circ = g.data.temp_circ; g.data.temp_circ = null; g.data.stash('temp_circ');
-					g.circ_id = g.data.temp_circ_id; g.data.temp_circ_id = null; g.data.stash('temp_circ_id');
-					if (!g.circ_id) g.circ_id = g.circ.id();
+                        });
+
+                    } catch(E) {
+                        g.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.circ_brief.failure'), E);
+                    }
+                }
+
+                if (g.circ_id) {
+                    g.network.simple_request( 'FM_CIRC_RETRIEVE_VIA_ID', [ ses(), g.circ_id ], circ_callback);
+                } else {
+                    g.circ = g.data.temp_circ; g.data.temp_circ = null; g.data.stash('temp_circ');
+                    g.circ_id = g.data.temp_circ_id; g.data.temp_circ_id = null; g.data.stash('temp_circ_id');
+                    if (!g.circ_id) g.circ_id = g.circ.id();
                     if (g.circ) {
                         circ_callback( { 'getResultObject' : function() { return g.circ; } } );
                     } else {
-					    g.network.simple_request( 'FM_CIRC_RETRIEVE_VIA_ID', [ ses(), g.circ_id ], circ_callback);
+                        g.network.simple_request( 'FM_CIRC_RETRIEVE_VIA_ID', [ ses(), g.circ_id ], circ_callback);
                     }
-				}
-
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ/circ_brief.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function $(id) { return document.getElementById(id); }
-
-		g.add_billing = function() {
-			JSAN.use('util.window');
-			var win = new util.window();
-			var w = win.open(
-				urls.XUL_PATRON_BILL_WIZARD,
-					//+ '?patron_id=' + window.escape(g.patron_id)
-					//+ '&xact_id=' + window.escape( g.circ_id ),
-				'billwizard',
-				'chrome,resizable,modal',
-				{ 'patron_id' : g.patron_id, 'xact_id' : g.circ_id }
-			);
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<groupbox id="gb" flex="1" style="overflow: auto;">
-		<caption id="caption"/>
-		<hbox>
-			<label id="patron_name" class="patronNameLarge" flex="1"/>
-			<label value="&staff.circ.circ_brief.patron_id.label;"/><label id="id"/>
-			<button id="add_billing" disabled="true" label="&staff.circ.circ_brief.add_billing.label;" oncommand="g.add_billing();"/>
-		</hbox>
-		<grid flex="1">
-			<columns>
-				<column/>
-				<column flex="1"/>
-				<column/>
-				<column flex="1"/>
-				<column/>
-				<column flex="1"/>
-				<column/>
-				<column flex="1"/>
-			</columns>
-			<rows>
-				<row>
-					<label style="font-weight: bold" value="&staff.circ.circ_brief.xact_start.label;"/><label id="xact_start"/>
-					<label style="font-weight: bold" value="&staff.circ.circ_brief.due_date.label;"/><label id="due_date"/>
-					<label style="font-weight: bold" value="&staff.circ.circ_brief.stop_fines_time.label;"/><label id="stop_fines_time"/>
-					<label style="font-weight: bold" value="&staff.circ.circ_brief.checkin_time.label;"/><label id="checkin_time"/>
-				</row>
-				<row>
-					<label style="font-weight: bold" value="&staff.circ.circ_brief.circ_lib.label;"/><label id="circ_lib"/>
-					<label style="font-weight: bold" value="&staff.circ.circ_brief.renewal.label;"/><label id="renewal"/>
-					<label style="font-weight: bold" value="&staff.circ.circ_brief.stop_fines.label;"/><label id="stop_fines"/>
-					<label style="font-weight: bold" value="&staff.circ.circ_brief.checkin_lib.label;"/><label id="checkin_lib"/>
-				</row>
-			</rows>
-		</grid>
-	</groupbox>
+                }
+
+            } catch(E) {
+                var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ/circ_brief.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function $(id) { return document.getElementById(id); }
+
+        g.add_billing = function() {
+            JSAN.use('util.window');
+            var win = new util.window();
+            var w = win.open(
+                urls.XUL_PATRON_BILL_WIZARD,
+                    //+ '?patron_id=' + window.escape(g.patron_id)
+                    //+ '&xact_id=' + window.escape( g.circ_id ),
+                'billwizard',
+                'chrome,resizable,modal',
+                { 'patron_id' : g.patron_id, 'xact_id' : g.circ_id }
+            );
+        }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+    <groupbox id="gb" flex="1" style="overflow: auto;">
+        <caption id="caption"/>
+        <hbox>
+            <label id="patron_name" class="patronNameLarge" flex="1"/>
+            <label value="&staff.circ.circ_brief.patron_id.label;"/><label id="id"/>
+            <button id="add_billing" disabled="true" label="&staff.circ.circ_brief.add_billing.label;" oncommand="g.add_billing();"/>
+        </hbox>
+        <grid flex="1">
+            <columns>
+                <column/>
+                <column flex="1"/>
+                <column/>
+                <column flex="1"/>
+                <column/>
+                <column flex="1"/>
+                <column/>
+                <column flex="1"/>
+            </columns>
+            <rows>
+                <row>
+                    <label style="font-weight: bold" value="&staff.circ.circ_brief.xact_start.label;"/><label id="xact_start"/>
+                    <label style="font-weight: bold" value="&staff.circ.circ_brief.due_date.label;"/><label id="due_date"/>
+                    <label style="font-weight: bold" value="&staff.circ.circ_brief.stop_fines_time.label;"/><label id="stop_fines_time"/>
+                    <label style="font-weight: bold" value="&staff.circ.circ_brief.checkin_time.label;"/><label id="checkin_time"/>
+                </row>
+                <row>
+                    <label style="font-weight: bold" value="&staff.circ.circ_brief.circ_lib.label;"/><label id="circ_lib"/>
+                    <label style="font-weight: bold" value="&staff.circ.circ_brief.renewal.label;"/><label id="renewal"/>
+                    <label style="font-weight: bold" value="&staff.circ.circ_brief.stop_fines.label;"/><label id="stop_fines"/>
+                    <label style="font-weight: bold" value="&staff.circ.circ_brief.checkin_lib.label;"/><label id="checkin_lib"/>
+                </row>
+            </rows>
+        </grid>
+    </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/circ/circ_summary.xul b/Open-ILS/xul/staff_client/server/circ/circ_summary.xul
index e83e18579c..64f2e65184 100644
--- a/Open-ILS/xul/staff_client/server/circ/circ_summary.xul
+++ b/Open-ILS/xul/staff_client/server/circ/circ_summary.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,138 +19,138 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="circ_circ_brief_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	width="750" height="550"
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    width="750" height="550"
+    xmlns:html="http://www.w3.org/1999/xhtml"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function $(id) { return document.getElementById(id); }
 
-		var xulG = {};
+        var xulG = {};
 
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') {
-					throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for circ_circ_brief.xul');
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') {
+                    throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
+                }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for circ_circ_brief.xul');
 
-				g.copy_id = xul_param('copy_id',{'modal_xulG':true});
+                g.copy_id = xul_param('copy_id',{'modal_xulG':true});
 
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+                JSAN.use('util.network'); g.network = new util.network();
+                JSAN.use('util.date');
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
 
-				g.copy = g.network.simple_request('FM_ACP_RETRIEVE',[ g.copy_id ]);
-				if (typeof g.copy.ilsevent != 'undefined') throw(g.copy);
-				g.callnumber = g.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ g.copy.call_number() ]);
-				if (typeof g.callnumber.ilsevent != 'undefined') throw(g.callnumber);
+                g.copy = g.network.simple_request('FM_ACP_RETRIEVE',[ g.copy_id ]);
+                if (typeof g.copy.ilsevent != 'undefined') throw(g.copy);
+                g.callnumber = g.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ g.copy.call_number() ]);
+                if (typeof g.callnumber.ilsevent != 'undefined') throw(g.callnumber);
 
                 var tv = $('top_vbox'); while(tv.firstChild) tv.removeChild(tv.lastChild);
                 var top = document.createElement('iframe'); tv.appendChild(top);
-				top.setAttribute('src',urls.XUL_BIB_BRIEF);
+                top.setAttribute('src',urls.XUL_BIB_BRIEF);
                 top.setAttribute('flex','1');
-				get_contentWindow(top).xulG = { 'docid' : g.callnumber.record() };
+                get_contentWindow(top).xulG = { 'docid' : g.callnumber.record() };
                 var mv = $('mid_vbox'); while(mv.firstChild) mv.removeChild(mv.lastChild);
                 var mid = document.createElement('iframe'); mv.appendChild(mid);
-				mid.setAttribute('src',urls.XUL_COPY_SUMMARY);
+                mid.setAttribute('src',urls.XUL_COPY_SUMMARY);
                 mid.setAttribute('flex','1');
-				get_contentWindow(mid).xulG = { 'copy_id' : g.copy.id() };
-
-				show_circs();
-
-			} catch(E) {
-				g.error.standard_unexpected_error_alert('Error in circ_brief.xul, my_init()',E);
-			}
-		}
-
-		function show_circs() {
-			try {
-				$('r_last').disabled = true; $('r_all').disabled = true;	
-				g.circs = g.network.simple_request('FM_CIRC_RETRIEVE_VIA_COPY',
-					[ ses(), g.copy_id ]);
-				if (g.circs == null || typeof g.circs.ilsevent != 'undefined') throw(circs);
-				if (g.circs.length == 0) return;
-				//g.circs = g.circs.reverse(); /* put the most recent at the top */
-				$('r_last').disabled = false; $('r_all').disabled = false;	
-
-				var gb = $('circs');
-				for (var j = 0; j < g.circs.length; j++) {
-					var iframe = document.createElement('iframe');
-					iframe.setAttribute('style','overflow: none; min-height: 100px;');
-					iframe.setAttribute('flex','1');
-					gb.appendChild(iframe);
-					iframe.setAttribute('src', urls.XUL_CIRC_BRIEF); // + '?circ_id=' + g.circs[j].id() );
-					get_contentWindow(iframe).xulG = { 'circ_id' : g.circs[j].id() };
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert('error showing circs',E);
-			}
-		}
-
-		function retrieve_last() {
-			try {
-				//g.data.fancy_prompt_data = js2JSON( [ g.circs[0].usr() ] );
-				//g.data.stash('fancy_prompt_data');
-				xulG.retrieve_these_patrons = [ g.circs[0].usr() ];
-				update_modal_xulG(xulG);
-				window.close();
-			} catch(E) {
-				g.error.standard_unexpected_error_alert('retrieve_last',E);
-			}
-		}
-
-		function retrieve_all() {
-			try {
-				var patrons = []; var p_hash = {};
-				for (var i = 0; i < g.circs.length; i++) {
-					var usr = g.circs[i].usr();
-					if (typeof p_hash[usr] != 'undefined') { continue; }
-					p_hash[usr] = true;
-					patrons.push( function(a){return a;}(usr) );
-				}
-				//g.data.fancy_prompt_data = js2JSON(patrons);
-				//g.data.stash('fancy_prompt_data');
-				xulG.retrieve_these_patrons = patrons;
-				update_modal_xulG(xulG);
-				window.close();
-			} catch(E) {
-				g.error.standard_unexpected_error_alert('retrieve_all',E);
-			}
-		}
-
-	]]>
-	</script>
-
-	<vbox flex="1" class="my_overflow">
+                get_contentWindow(mid).xulG = { 'copy_id' : g.copy.id() };
+
+                show_circs();
+
+            } catch(E) {
+                g.error.standard_unexpected_error_alert('Error in circ_brief.xul, my_init()',E);
+            }
+        }
+
+        function show_circs() {
+            try {
+                $('r_last').disabled = true; $('r_all').disabled = true;    
+                g.circs = g.network.simple_request('FM_CIRC_RETRIEVE_VIA_COPY',
+                    [ ses(), g.copy_id ]);
+                if (g.circs == null || typeof g.circs.ilsevent != 'undefined') throw(circs);
+                if (g.circs.length == 0) return;
+                //g.circs = g.circs.reverse(); /* put the most recent at the top */
+                $('r_last').disabled = false; $('r_all').disabled = false;    
+
+                var gb = $('circs');
+                for (var j = 0; j < g.circs.length; j++) {
+                    var iframe = document.createElement('iframe');
+                    iframe.setAttribute('style','overflow: none; min-height: 100px;');
+                    iframe.setAttribute('flex','1');
+                    gb.appendChild(iframe);
+                    iframe.setAttribute('src', urls.XUL_CIRC_BRIEF); // + '?circ_id=' + g.circs[j].id() );
+                    get_contentWindow(iframe).xulG = { 'circ_id' : g.circs[j].id() };
+                }
+            } catch(E) {
+                g.error.standard_unexpected_error_alert('error showing circs',E);
+            }
+        }
+
+        function retrieve_last() {
+            try {
+                //g.data.fancy_prompt_data = js2JSON( [ g.circs[0].usr() ] );
+                //g.data.stash('fancy_prompt_data');
+                xulG.retrieve_these_patrons = [ g.circs[0].usr() ];
+                update_modal_xulG(xulG);
+                window.close();
+            } catch(E) {
+                g.error.standard_unexpected_error_alert('retrieve_last',E);
+            }
+        }
+
+        function retrieve_all() {
+            try {
+                var patrons = []; var p_hash = {};
+                for (var i = 0; i < g.circs.length; i++) {
+                    var usr = g.circs[i].usr();
+                    if (typeof p_hash[usr] != 'undefined') { continue; }
+                    p_hash[usr] = true;
+                    patrons.push( function(a){return a;}(usr) );
+                }
+                //g.data.fancy_prompt_data = js2JSON(patrons);
+                //g.data.stash('fancy_prompt_data');
+                xulG.retrieve_these_patrons = patrons;
+                update_modal_xulG(xulG);
+                window.close();
+            } catch(E) {
+                g.error.standard_unexpected_error_alert('retrieve_all',E);
+            }
+        }
+
+    ]]>
+    </script>
+
+    <vbox flex="1" class="my_overflow">
         <vbox id="top_vbox" flex="1" class="my_overflow"/>
-		<splitter><grippy/></splitter>
+        <splitter><grippy/></splitter>
         <vbox id="mid_vbox" flex="1" class="my_overflow"/>
-		<splitter><grippy/></splitter>
-		<groupbox flex="1" id="circs" class="my_overflow">
-			<caption label="&staff.circ.circ_summary.caption;"/>
-		</groupbox>
-		<hbox>
-			<button id="r_last" label="&staff.circ.circ_summary.retrieve_last.label;" accesskey="&staff.circ.circ_summary.retrieve_last.accesskey;" oncommand="retrieve_last();"/>
-			<button id="r_all" label="&staff.circ.circ_summary.retrieve_all.label;" accesskey="&staff.circ.circ_summary.retrieve_all.accesskey;" oncommand="retrieve_all();"/>
-			<spacer flex="1"/>
-			<button label="&staff.circ.circ_summary.done.label;" accesskey="&staff.circ.circ_summary.done.accesskey;" oncommand="window.close();"/>
-		</hbox>
-	</vbox>
+        <splitter><grippy/></splitter>
+        <groupbox flex="1" id="circs" class="my_overflow">
+            <caption label="&staff.circ.circ_summary.caption;"/>
+        </groupbox>
+        <hbox>
+            <button id="r_last" label="&staff.circ.circ_summary.retrieve_last.label;" accesskey="&staff.circ.circ_summary.retrieve_last.accesskey;" oncommand="retrieve_last();"/>
+            <button id="r_all" label="&staff.circ.circ_summary.retrieve_all.label;" accesskey="&staff.circ.circ_summary.retrieve_all.accesskey;" oncommand="retrieve_all();"/>
+            <spacer flex="1"/>
+            <button label="&staff.circ.circ_summary.done.label;" accesskey="&staff.circ.circ_summary.done.accesskey;" oncommand="window.close();"/>
+        </hbox>
+    </vbox>
 
 </window>
 
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 28dc84bdbf..662f139ecb 100644
--- a/Open-ILS/xul/staff_client/server/circ/copy_details.xul
+++ b/Open-ILS/xul/staff_client/server/circ/copy_details.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,210 +19,210 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="circ_copy_details_win" 
-	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">
+    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">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-
-		var xulG = {};
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { 
-					throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for circ_copy_details.xul');
-
-				g.copy_id = xul_param('copy_id',{'modal_xulG':true});
-
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				// uber method
-				var robj = g.network.simple_request('FM_ACP_DETAILS', [ ses(), g.copy_id ] );
-				if (typeof robj.ilsevent != 'undefined') {
-					throw(robj);
-				}
-				if (robj.copy) {
-					g.copy = robj.copy;
-				} else {
-					throw(robj);
-				}
-				g.hold = robj.hold; g.transit = robj.transit; g.circ = robj.circ; g.callnumber = robj.volume;
-				var tt_msg = '';
-				if (g.hold) {
-					tt_msg = $('circStrings').getFormattedString('staff.circ.copy_details.hold', [g.hold.id()]);
-					$('hold_caption').setAttribute('tooltiptext', tt_msg);
-				}
-				if (g.transit) {
-					tt_msg = $('circStrings').getFormattedString('staff.circ.copy_details.transit', [g.transit.id()]);
-					$('transit_caption').setAttribute('tooltiptext', tt_msg);
-				}
-				if (g.circ) {
-					tt_msg = $('circStrings').getFormattedString('staff.circ.copy_details.circ', [g.circ.id()]);
-					$('circ_caption').setAttribute('tooltiptext', tt_msg);
-				}
-
-				//g.callnumber = g.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ g.copy.call_number() ]);
-				//if (typeof g.callnumber.ilsevent != 'undefined') throw(g.callnumber);
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function $(id) { return document.getElementById(id); }
+
+        var xulG = {};
+
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { 
+                    throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
+                }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for circ_copy_details.xul');
+
+                g.copy_id = xul_param('copy_id',{'modal_xulG':true});
+
+                JSAN.use('util.network'); g.network = new util.network();
+                JSAN.use('util.date');
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+                // uber method
+                var robj = g.network.simple_request('FM_ACP_DETAILS', [ ses(), g.copy_id ] );
+                if (typeof robj.ilsevent != 'undefined') {
+                    throw(robj);
+                }
+                if (robj.copy) {
+                    g.copy = robj.copy;
+                } else {
+                    throw(robj);
+                }
+                g.hold = robj.hold; g.transit = robj.transit; g.circ = robj.circ; g.callnumber = robj.volume;
+                var tt_msg = '';
+                if (g.hold) {
+                    tt_msg = $('circStrings').getFormattedString('staff.circ.copy_details.hold', [g.hold.id()]);
+                    $('hold_caption').setAttribute('tooltiptext', tt_msg);
+                }
+                if (g.transit) {
+                    tt_msg = $('circStrings').getFormattedString('staff.circ.copy_details.transit', [g.transit.id()]);
+                    $('transit_caption').setAttribute('tooltiptext', tt_msg);
+                }
+                if (g.circ) {
+                    tt_msg = $('circStrings').getFormattedString('staff.circ.copy_details.circ', [g.circ.id()]);
+                    $('circ_caption').setAttribute('tooltiptext', tt_msg);
+                }
+
+                //g.callnumber = g.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ g.copy.call_number() ]);
+                //if (typeof g.callnumber.ilsevent != 'undefined') throw(g.callnumber);
 
                 var tb = $('top_box'); while (tb.firstChild) tb.removeChild(tb.lastChild);
                 var top = document.createElement('iframe'); tb.appendChild(top);
-				top.setAttribute('src',urls.XUL_BIB_BRIEF);
-				top.setAttribute('flex','1');
-				get_contentWindow(top).xulG = { 'docid' : g.callnumber.record() };
-				//g.data.temp_copy = g.copy; g.data.stash('temp_copy'); 
-				//g.data.temp_callnumber = g.callnumber; g.data.stash('temp_callnumber'); 
+                top.setAttribute('src',urls.XUL_BIB_BRIEF);
+                top.setAttribute('flex','1');
+                get_contentWindow(top).xulG = { 'docid' : g.callnumber.record() };
+                //g.data.temp_copy = g.copy; g.data.stash('temp_copy'); 
+                //g.data.temp_callnumber = g.callnumber; g.data.stash('temp_callnumber'); 
                 var ib = $('item_summary_box'); while(ib.firstChild) ib.removeChild(ib.lastChild);
                 var item_summary = document.createElement('iframe'); ib.appendChild(item_summary);
-				item_summary.setAttribute('src',urls.XUL_COPY_SUMMARY);
-				item_summary.setAttribute('flex','1');
-				get_contentWindow(item_summary).xulG = { 'copy' : g.copy, 'callnumber' : g.callnumber };
-
-				$('r_last').disabled = true;
-				if (g.circ) {
-					$('r_last').disabled = false;
-					g.data.temp_circ = g.circ; g.data.stash('temp_circ');
+                item_summary.setAttribute('src',urls.XUL_COPY_SUMMARY);
+                item_summary.setAttribute('flex','1');
+                get_contentWindow(item_summary).xulG = { 'copy' : g.copy, 'callnumber' : g.callnumber };
+
+                $('r_last').disabled = true;
+                if (g.circ) {
+                    $('r_last').disabled = false;
+                    g.data.temp_circ = g.circ; g.data.stash('temp_circ');
                     var cb = $('circ_box'); while(cb.firstChild) cb.removeChild(cb.lastChild);
                     var circ_frame = document.createElement('iframe'); cb.appendChild(circ_frame);
-					circ_frame.setAttribute('src',urls.XUL_CIRC_BRIEF);
-				    circ_frame.setAttribute('flex','1');
-					get_contentWindow(circ_frame).xulG = { 'no_border' : 1 };
-					if (g.circ.checkin_time()) {
-						$('circ_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.last_circ'));
-					} else {
-						$('circ_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.current_circ'));
-					}
-				} else {
-					$('circ_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.no_circ'));
-				}
-
-				if (g.transit) {
-					JSAN.use('circ.util'); var columns = circ.util.transit_columns({});
-
-					JSAN.use('util.list'); g.list = new util.list('transit');
-					g.list.init( { 'columns' : columns, 'map_row_to_columns' : circ.util.std_map_row_to_columns(), });
-					g.list.append( { 'row' : { 'my' : { 'atc' : g.transit, } } });
-	
-				} else {
-					$('transit_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.not_transit'));
-					$('transit').hidden = true;
-				}
-
-
-				$('r_hold').disabled = true;
-				if (g.hold) {
-					$('r_hold').disabled = false;
-					var status_robj = g.network.simple_request('FM_AHR_STATUS',[ ses(), g.hold.id() ]);
-					JSAN.use('circ.util');
-					var columns = circ.util.hold_columns( 
-						{ 
-							'request_time' : { 'hidden' : false },
-							'pickup_lib_shortname' : { 'hidden' : false },
-							'hold_type' : { 'hidden' : true },
-							'current_copy' : { 'hidden' : true },
-							'capture_time' : { 'hidden' : true },
-							'email_notify' : { 'hidden' : false },
-							'phone_notify' : { 'hidden' : false },
-						} 
-					);
-
-					JSAN.use('util.list'); g.list = new util.list('hold');
-					g.list.init( { 'columns' : columns, 'map_row_to_columns' : circ.util.std_map_row_to_columns(), });
-					g.list.append( { 'row' : { 'my' : { 'ahr' : g.hold, 'acp' : g.copy, 'status' : status_robj, } } });
-	
-					JSAN.use('patron.util'); 
-					var au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), g.hold.usr() );
-					$('patron_name').setAttribute('value', $('circStrings').getFormattedString('staff.circ.copy_details.user_details', [au_obj.family_name(), au_obj.first_given_name(), au_obj.card().barcode()]) );
-
-				} else {
-					if (g.copy.status() == 8 /* ON HOLDS SHELF */) {
-						$('hold_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.bad_hold_status'));
-					} else {
-						$('hold_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.no_hold'));
-					}
-					$('hold').hidden = true;
-				}
-
-			} catch(E) {
-				g.error.standard_unexpected_error_alert('Error in copy_details.xul, my_init()',E);
-			}
-		}
-
-		function retrieve_last_patron() {
-			try {
-				//g.data.fancy_prompt_data = js2JSON( [ g.circ.usr() ] );
-				//g.data.stash('fancy_prompt_data');
-				xulG.retrieve_these_patrons = [ g.circ.usr() ];
-				update_modal_xulG(xulG);
-				window.close();
-			} catch(E) {
-				alert(E);
-			}
-		}
-
-		function retrieve_hold_patron() {
-			try {
-				//g.data.fancy_prompt_data = js2JSON( [ g.hold.usr() ] );
-				//g.data.stash('fancy_prompt_data');
-				xulG.retrieve_these_patrons = [ g.hold.usr() ];
-				update_modal_xulG(xulG);
-				window.close();
-			} catch(E) {
-				alert(E);
-			}
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<vbox flex="1" style="overflow: auto;">
-		<vbox id="top_box" flex="1" style="border: none; overflow: none; min-height: 80;"/>
-		<splitter><grippy/></splitter>
-		<vbox id="item_summary_box" flex="1" style="border: none; overflow: none; min-height: 80;"/>
-		<splitter><grippy/></splitter>
-		<groupbox flex="1" id="holds" style="overflow: none; min-height: 80;">
-			<caption id="hold_caption" label="&staff.circ.copy_details.hold_caption;"/>
-			<label id="patron_name" class="patronNameLarge"/>
-			<tree id="hold" flex="1" enableColumnDrag="true"/>
-			<spacer FIXME="label and tree get swapped without this"/>
-		</groupbox>
-		<splitter><grippy/></splitter>
-		<groupbox flex="1" id="transits" style="overflow: none; min-height: 80;">
-			<caption id="transit_caption" label="&staff.circ.copy_details.transit_caption;"/>
-			<tree id="transit" flex="1" enableColumnDrag="true"/>
-		</groupbox>
-		<splitter><grippy/></splitter>
-		<groupbox flex="1" id="circs" style="overflow: none; min-height: 80;">
-			<caption id="circ_caption" label="&staff.circ.copy_details.circ_caption;" style="font-weight: bold"/>
+                    circ_frame.setAttribute('src',urls.XUL_CIRC_BRIEF);
+                    circ_frame.setAttribute('flex','1');
+                    get_contentWindow(circ_frame).xulG = { 'no_border' : 1 };
+                    if (g.circ.checkin_time()) {
+                        $('circ_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.last_circ'));
+                    } else {
+                        $('circ_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.current_circ'));
+                    }
+                } else {
+                    $('circ_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.no_circ'));
+                }
+
+                if (g.transit) {
+                    JSAN.use('circ.util'); var columns = circ.util.transit_columns({});
+
+                    JSAN.use('util.list'); g.list = new util.list('transit');
+                    g.list.init( { 'columns' : columns, 'map_row_to_columns' : circ.util.std_map_row_to_columns(), });
+                    g.list.append( { 'row' : { 'my' : { 'atc' : g.transit, } } });
+    
+                } else {
+                    $('transit_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.not_transit'));
+                    $('transit').hidden = true;
+                }
+
+
+                $('r_hold').disabled = true;
+                if (g.hold) {
+                    $('r_hold').disabled = false;
+                    var status_robj = g.network.simple_request('FM_AHR_STATUS',[ ses(), g.hold.id() ]);
+                    JSAN.use('circ.util');
+                    var columns = circ.util.hold_columns( 
+                        { 
+                            'request_time' : { 'hidden' : false },
+                            'pickup_lib_shortname' : { 'hidden' : false },
+                            'hold_type' : { 'hidden' : true },
+                            'current_copy' : { 'hidden' : true },
+                            'capture_time' : { 'hidden' : true },
+                            'email_notify' : { 'hidden' : false },
+                            'phone_notify' : { 'hidden' : false },
+                        } 
+                    );
+
+                    JSAN.use('util.list'); g.list = new util.list('hold');
+                    g.list.init( { 'columns' : columns, 'map_row_to_columns' : circ.util.std_map_row_to_columns(), });
+                    g.list.append( { 'row' : { 'my' : { 'ahr' : g.hold, 'acp' : g.copy, 'status' : status_robj, } } });
+    
+                    JSAN.use('patron.util'); 
+                    var au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), g.hold.usr() );
+                    $('patron_name').setAttribute('value', $('circStrings').getFormattedString('staff.circ.copy_details.user_details', [au_obj.family_name(), au_obj.first_given_name(), au_obj.card().barcode()]) );
+
+                } else {
+                    if (g.copy.status() == 8 /* ON HOLDS SHELF */) {
+                        $('hold_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.bad_hold_status'));
+                    } else {
+                        $('hold_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.no_hold'));
+                    }
+                    $('hold').hidden = true;
+                }
+
+            } catch(E) {
+                g.error.standard_unexpected_error_alert('Error in copy_details.xul, my_init()',E);
+            }
+        }
+
+        function retrieve_last_patron() {
+            try {
+                //g.data.fancy_prompt_data = js2JSON( [ g.circ.usr() ] );
+                //g.data.stash('fancy_prompt_data');
+                xulG.retrieve_these_patrons = [ g.circ.usr() ];
+                update_modal_xulG(xulG);
+                window.close();
+            } catch(E) {
+                alert(E);
+            }
+        }
+
+        function retrieve_hold_patron() {
+            try {
+                //g.data.fancy_prompt_data = js2JSON( [ g.hold.usr() ] );
+                //g.data.stash('fancy_prompt_data');
+                xulG.retrieve_these_patrons = [ g.hold.usr() ];
+                update_modal_xulG(xulG);
+                window.close();
+            } catch(E) {
+                alert(E);
+            }
+        }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+    <vbox flex="1" style="overflow: auto;">
+        <vbox id="top_box" flex="1" style="border: none; overflow: none; min-height: 80;"/>
+        <splitter><grippy/></splitter>
+        <vbox id="item_summary_box" flex="1" style="border: none; overflow: none; min-height: 80;"/>
+        <splitter><grippy/></splitter>
+        <groupbox flex="1" id="holds" style="overflow: none; min-height: 80;">
+            <caption id="hold_caption" label="&staff.circ.copy_details.hold_caption;"/>
+            <label id="patron_name" class="patronNameLarge"/>
+            <tree id="hold" flex="1" enableColumnDrag="true"/>
+            <spacer FIXME="label and tree get swapped without this"/>
+        </groupbox>
+        <splitter><grippy/></splitter>
+        <groupbox flex="1" id="transits" style="overflow: none; min-height: 80;">
+            <caption id="transit_caption" label="&staff.circ.copy_details.transit_caption;"/>
+            <tree id="transit" flex="1" enableColumnDrag="true"/>
+        </groupbox>
+        <splitter><grippy/></splitter>
+        <groupbox flex="1" id="circs" style="overflow: none; min-height: 80;">
+            <caption id="circ_caption" label="&staff.circ.copy_details.circ_caption;" style="font-weight: bold"/>
             <vbox id="circ_box" flex="1" style="min-height: 80"/>
-		</groupbox>
-	</vbox>
-	<hbox>
-		<button id="r_last" label="&staff.circ.copy_details.r_last.label;" accesskey="&staff.circ.copy_details.r_last.accesskey;" oncommand="retrieve_last_patron();"/>
-		<button id="r_hold" label="&staff.circ.copy_details.r_hold.label;" accesskey="&staff.circ.copy_details.r_hold.accesskey;" oncommand="retrieve_hold_patron();"/>
-		<spacer flex="1"/>
-		<button id="done" label="&staff.circ.copy_details.done.label;" accesskey="&staff.circ.copy_details.done.accesskey;" oncommand="window.close();"/>
-	</hbox>
+        </groupbox>
+    </vbox>
+    <hbox>
+        <button id="r_last" label="&staff.circ.copy_details.r_last.label;" accesskey="&staff.circ.copy_details.r_last.accesskey;" oncommand="retrieve_last_patron();"/>
+        <button id="r_hold" label="&staff.circ.copy_details.r_hold.label;" accesskey="&staff.circ.copy_details.r_hold.accesskey;" oncommand="retrieve_hold_patron();"/>
+        <spacer flex="1"/>
+        <button id="done" label="&staff.circ.copy_details.done.label;" accesskey="&staff.circ.copy_details.done.accesskey;" oncommand="window.close();"/>
+    </hbox>
 
 </window>
 
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 e5d1385da6..9f77af71f1 100644
--- a/Open-ILS/xul/staff_client/server/circ/copy_status.xul
+++ b/Open-ILS/xul/staff_client/server/circ/copy_status.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,118 +20,118 @@
 <?xul-overlay href="/xul/server/circ/copy_status_overlay.xul"?>
 
 <window id="copy_status_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') {
-					throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for copy_status.xul');
-
-				JSAN.use('circ.copy_status'); g.copy_status = new circ.copy_status();
-				g.copy_status.init( 
-					{ 
-					} 
-				);
-
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try {
-						window.xulG.set_tab_name(document.getElementById('circStrings').getString('staff.circ.copy_status.tab_name'));
-					} catch(E) {
-						alert(E);
-					}
-				}
-
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
-
-				g.barcodes = xul_param(
-					'barcodes',{
-						'concat' : true,
-						'JSON2js_if_cgi' : true,
-						'stash_name':'temp_barcodes_for_copy_status',
-						'clear_xpcom' : true,
-					}
-				) || [];
-				
-				if (g.barcodes.length > 0) {
-					JSAN.use('util.exec'); var exec = new util.exec();
-					var funcs = [];
-					for (var i = 0; i < g.barcodes.length; i++) {
-						funcs.push(
-							function(b){
-								return function() {
-									g.copy_status.copy_status(b);
-								}
-							}(g.barcodes[i])
-						);
-					}
-					exec.chain( funcs );
-				}
-	
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ.copy_status.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function default_focus() { try { setTimeout( function() { document.getElementById('copy_status_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-
-	<commandset id="copy_status_cmds">
-		<command id="cmd_copy_status_submit_barcode" />
-		<command id="cmd_copy_status_upload_file" />
-		<command id="cmd_copy_status_print" />
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') {
+                    throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
+                }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for copy_status.xul');
+
+                JSAN.use('circ.copy_status'); g.copy_status = new circ.copy_status();
+                g.copy_status.init( 
+                    { 
+                    } 
+                );
+
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+                    try {
+                        window.xulG.set_tab_name(document.getElementById('circStrings').getString('staff.circ.copy_status.tab_name'));
+                    } catch(E) {
+                        alert(E);
+                    }
+                }
+
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
+
+                g.barcodes = xul_param(
+                    'barcodes',{
+                        'concat' : true,
+                        'JSON2js_if_cgi' : true,
+                        'stash_name':'temp_barcodes_for_copy_status',
+                        'clear_xpcom' : true,
+                    }
+                ) || [];
+                
+                if (g.barcodes.length > 0) {
+                    JSAN.use('util.exec'); var exec = new util.exec();
+                    var funcs = [];
+                    for (var i = 0; i < g.barcodes.length; i++) {
+                        funcs.push(
+                            function(b){
+                                return function() {
+                                    g.copy_status.copy_status(b);
+                                }
+                            }(g.barcodes[i])
+                        );
+                    }
+                    exec.chain( funcs );
+                }
+    
+            } catch(E) {
+                var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ.copy_status.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function default_focus() { try { setTimeout( function() { document.getElementById('copy_status_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
+    ]]>
+    </script>
+
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+
+    <commandset id="copy_status_cmds">
+        <command id="cmd_copy_status_submit_barcode" />
+        <command id="cmd_copy_status_upload_file" />
+        <command id="cmd_copy_status_print" />
         <command id="cmd_alt_view" />
-		<command id="save_columns" />
-		<command id="sel_copy_details" disabled="true"/>
-		<command id="sel_mark_items_damaged" disabled="true"/>
-		<command id="sel_mark_items_missing" disabled="true"/>
-		<command id="cmd_replace_barcode" disabled="true"/>
-		<command id="sel_patron" disabled="true"/>
-		<command id="sel_checkin" disabled="true"/>
-		<command id="sel_renew" disabled="true"/>
-		<command id="sel_edit" disabled="true"/>
-		<command id="sel_opac" disabled="true"/>
-		<command id="sel_bucket" disabled="true"/>
-		<command id="sel_spine" disabled="true"/>
-		<command id="sel_transit_abort" disabled="true"/>
-		<command id="sel_clip" disabled="true"/>
-		
-		<command id="cmd_add_items" disabled="true"/>
-		<command id="cmd_delete_items" disabled="true"/>
-		<command id="cmd_transfer_items" disabled="true"/>
-		<command id="cmd_add_volumes" disabled="true"/>
-		<command id="cmd_edit_volumes" disabled="true"/>
-		<command id="cmd_delete_volumes" disabled="true"/>
-		<command id="cmd_mark_volume" disabled="true"/>
-		<command id="cmd_mark_library" disabled="true"/>
-		<command id="cmd_transfer_volume" disabled="true"/>
-
-	</commandset>
-
-	<popupset id="copy_status_popupset"/>
-	<popupset id="copy_cat_status_popupset"/>
-
-	<box id="copy_status_main" />
+        <command id="save_columns" />
+        <command id="sel_copy_details" disabled="true"/>
+        <command id="sel_mark_items_damaged" disabled="true"/>
+        <command id="sel_mark_items_missing" disabled="true"/>
+        <command id="cmd_replace_barcode" disabled="true"/>
+        <command id="sel_patron" disabled="true"/>
+        <command id="sel_checkin" disabled="true"/>
+        <command id="sel_renew" disabled="true"/>
+        <command id="sel_edit" disabled="true"/>
+        <command id="sel_opac" disabled="true"/>
+        <command id="sel_bucket" disabled="true"/>
+        <command id="sel_spine" disabled="true"/>
+        <command id="sel_transit_abort" disabled="true"/>
+        <command id="sel_clip" disabled="true"/>
+        
+        <command id="cmd_add_items" disabled="true"/>
+        <command id="cmd_delete_items" disabled="true"/>
+        <command id="cmd_transfer_items" disabled="true"/>
+        <command id="cmd_add_volumes" disabled="true"/>
+        <command id="cmd_edit_volumes" disabled="true"/>
+        <command id="cmd_delete_volumes" disabled="true"/>
+        <command id="cmd_mark_volume" disabled="true"/>
+        <command id="cmd_mark_library" disabled="true"/>
+        <command id="cmd_transfer_volume" disabled="true"/>
+
+    </commandset>
+
+    <popupset id="copy_status_popupset"/>
+    <popupset id="copy_cat_status_popupset"/>
+
+    <box id="copy_status_main" />
 
 </window>
 
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 bd2cffa0bc..f6a50b76bc 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
@@ -1,181 +1,181 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="copy_status_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading copy_status_overlay.xul\n');</script>
 
 <commandset id="copy_status_cmds" />
 
 <popupset id="copy_status_popupset">
-	<popup id="copy_status_actions" position="at_pointer"> 
-		<menuitem command="sel_clip" label="&staff.circ.copy_status_overlay.sel_clip.label;" accesskey="&staff.circ.copy_status_overlay.sel_clip.accesskey;" />
-		<menuitem command="sel_bucket" label="&staff.circ.copy_status_overlay.sel_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_bucket.accesskey;"/>
-		<menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
-		<menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
-		<menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
-		<menuseparator/>
-		<menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_damaged.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_missing.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="sel_transit_abort" label="&staff.circ.copy_status_overlay.sel_transit_abort.label;" />
-		<menuseparator/>
-		<menuitem command="sel_checkin" label="&staff.circ.copy_status_overlay.sel_checkin.label;" accesskey="&staff.circ.copy_status_overlay.sel_checkin.accesskey;" />
-		<menuseparator/>
-		<menuitem command="sel_renew" label="&staff.circ.copy_status_overlay.sel_renew.label;" accesskey="&staff.circ.copy_status_overlay.sel_renew.accesskey;" />
-		<menuseparator />
-		<menuitem command="sel_spine" label="&staff.circ.copy_status_overlay.sel_spine.label;" accesskey="&staff.circ.copy_status_overlay.sel_spine.accesskey;"/>
-		<menuitem command="cmd_replace_barcode" label="&staff.circ.copy_status_overlay.cmd_replace_barcode.label;" accesskey="&staff.circ.copy_status_overlay.cmd_replace_barcode.accesskey;"/>
-		<menuitem command="save_columns" label="&staff.circ.copy_status_overlay.save_columns.label;"/>
-	</popup>
+    <popup id="copy_status_actions" position="at_pointer"> 
+        <menuitem command="sel_clip" label="&staff.circ.copy_status_overlay.sel_clip.label;" accesskey="&staff.circ.copy_status_overlay.sel_clip.accesskey;" />
+        <menuitem command="sel_bucket" label="&staff.circ.copy_status_overlay.sel_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_bucket.accesskey;"/>
+        <menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
+        <menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
+        <menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
+        <menuseparator/>
+        <menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
+        <menuseparator/>
+        <menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_damaged.accesskey;"/>
+        <menuseparator/>
+        <menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_missing.accesskey;"/>
+        <menuseparator/>
+        <menuitem command="sel_transit_abort" label="&staff.circ.copy_status_overlay.sel_transit_abort.label;" />
+        <menuseparator/>
+        <menuitem command="sel_checkin" label="&staff.circ.copy_status_overlay.sel_checkin.label;" accesskey="&staff.circ.copy_status_overlay.sel_checkin.accesskey;" />
+        <menuseparator/>
+        <menuitem command="sel_renew" label="&staff.circ.copy_status_overlay.sel_renew.label;" accesskey="&staff.circ.copy_status_overlay.sel_renew.accesskey;" />
+        <menuseparator />
+        <menuitem command="sel_spine" label="&staff.circ.copy_status_overlay.sel_spine.label;" accesskey="&staff.circ.copy_status_overlay.sel_spine.accesskey;"/>
+        <menuitem command="cmd_replace_barcode" label="&staff.circ.copy_status_overlay.cmd_replace_barcode.label;" accesskey="&staff.circ.copy_status_overlay.cmd_replace_barcode.accesskey;"/>
+        <menuitem command="save_columns" label="&staff.circ.copy_status_overlay.save_columns.label;"/>
+    </popup>
 </popupset>
 
 <popupset id="copy_cat_status_popupset">
-	<popup id="copy_cat_status_actions" position="at_pointer"> 
-		<menuitem command="sel_clip" label="&staff.circ.copy_status_overlay.sel_clip.label;" accesskey="&staff.circ.copy_status_overlay.sel_clip.accesskey;" />
-		<menuitem command="sel_bucket" label="&staff.circ.copy_status_overlay.sel_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_bucket.accesskey;"/>
-		<menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
-		<menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
-		<menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
-		<menuitem command="cmd_transfer_items" label="&staff.circ.copy_status_overlay.cmd_transfer_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_transfer_items.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="cmd_add_volumes" label="&staff.circ.copy_status_overlay.cmd_add_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_add_volumes.accesskey;"/>
-		<menuitem command="cmd_mark_library" label="&staff.circ.copy_status_overlay.cmd_mark_library.label;" accesskey="&staff.circ.copy_status_overlay.cmd_mark_library.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="cmd_add_items" label="&staff.circ.copy_status_overlay.cmd_add_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_add_items.accesskey;"/>
-		<menuitem command="cmd_edit_volumes" label="&staff.circ.copy_status_overlay.cmd_edit_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_edit_volumes.accesskey;"/>
-		<menuitem command="cmd_mark_volume" label="&staff.circ.copy_status_overlay.cmd_mark_volume.label;" accesskey="&staff.circ.copy_status_overlay.cmd_mark_volume.accesskey;"/>
-		<menuitem command="cmd_transfer_volume" label="&staff.circ.copy_status_overlay.cmd_transfer_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_transfer_volumes.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="cmd_delete_items" label="&staff.circ.copy_status_overlay.cmd_delete_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_items.accesskey;"/>
-		<menuitem command="cmd_delete_volumes" label="&staff.circ.copy_status_overlay.cmd_delete_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_volumes.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_damaged.accesskey;"/>
-		<menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_missing.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="sel_spine" label="&staff.circ.copy_status_overlay.sel_spine.label;" accesskey="&staff.circ.copy_status_overlay.sel_spine.accesskey;"/>
-		<menuitem command="cmd_replace_barcode" label="&staff.circ.copy_status_overlay.cmd_replace_barcode.label;" accesskey="&staff.circ.copy_status_overlay.cmd_replace_barcode.accesskey;"/>
-		<menuitem command="save_columns" label="&staff.circ.copy_status_overlay.save_columns.label;"/>
-	</popup>
+    <popup id="copy_cat_status_actions" position="at_pointer"> 
+        <menuitem command="sel_clip" label="&staff.circ.copy_status_overlay.sel_clip.label;" accesskey="&staff.circ.copy_status_overlay.sel_clip.accesskey;" />
+        <menuitem command="sel_bucket" label="&staff.circ.copy_status_overlay.sel_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_bucket.accesskey;"/>
+        <menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
+        <menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
+        <menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
+        <menuseparator/>
+        <menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
+        <menuitem command="cmd_transfer_items" label="&staff.circ.copy_status_overlay.cmd_transfer_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_transfer_items.accesskey;"/>
+        <menuseparator/>
+        <menuitem command="cmd_add_volumes" label="&staff.circ.copy_status_overlay.cmd_add_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_add_volumes.accesskey;"/>
+        <menuitem command="cmd_mark_library" label="&staff.circ.copy_status_overlay.cmd_mark_library.label;" accesskey="&staff.circ.copy_status_overlay.cmd_mark_library.accesskey;"/>
+        <menuseparator/>
+        <menuitem command="cmd_add_items" label="&staff.circ.copy_status_overlay.cmd_add_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_add_items.accesskey;"/>
+        <menuitem command="cmd_edit_volumes" label="&staff.circ.copy_status_overlay.cmd_edit_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_edit_volumes.accesskey;"/>
+        <menuitem command="cmd_mark_volume" label="&staff.circ.copy_status_overlay.cmd_mark_volume.label;" accesskey="&staff.circ.copy_status_overlay.cmd_mark_volume.accesskey;"/>
+        <menuitem command="cmd_transfer_volume" label="&staff.circ.copy_status_overlay.cmd_transfer_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_transfer_volumes.accesskey;"/>
+        <menuseparator/>
+        <menuitem command="cmd_delete_items" label="&staff.circ.copy_status_overlay.cmd_delete_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_items.accesskey;"/>
+        <menuitem command="cmd_delete_volumes" label="&staff.circ.copy_status_overlay.cmd_delete_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_volumes.accesskey;"/>
+        <menuseparator/>
+        <menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_damaged.accesskey;"/>
+        <menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_missing.accesskey;"/>
+        <menuseparator/>
+        <menuitem command="sel_spine" label="&staff.circ.copy_status_overlay.sel_spine.label;" accesskey="&staff.circ.copy_status_overlay.sel_spine.accesskey;"/>
+        <menuitem command="cmd_replace_barcode" label="&staff.circ.copy_status_overlay.cmd_replace_barcode.label;" accesskey="&staff.circ.copy_status_overlay.cmd_replace_barcode.accesskey;"/>
+        <menuitem command="save_columns" label="&staff.circ.copy_status_overlay.save_columns.label;"/>
+    </popup>
 </popupset>
 
 
 <box id="copy_status_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="cmvb1" flex="1"/>
+    <vbox id="cmvb1" flex="1"/>
 </box>
 
 <vbox id="cmvb1" flex="1">
-	<hbox id="background" style="background-color: yellow">
-		<spacer flex="1"/>
-		<label value="&staff.circ.copy_status_overlay.item_status.label;" style="font-size: x-large; font-weight: bold;"/>
-		<spacer flex="1"/>
-	</hbox>
-	<hbox id="last_scanned_hbox" style="background-color: yellow">
-		<spacer flex="1"/>
-		<label id="last_scanned" style="font-weight: bold;"/>
-		<spacer flex="1"/>
-	</hbox>
-	<groupbox id="cmgb1" flex="2">
-		<caption label="&staff.circ.copy_status_overlay.last_scanned.caption;" />
-		<hbox id="copy_status_top_ui" />
+    <hbox id="background" style="background-color: yellow">
+        <spacer flex="1"/>
+        <label value="&staff.circ.copy_status_overlay.item_status.label;" style="font-size: x-large; font-weight: bold;"/>
+        <spacer flex="1"/>
+    </hbox>
+    <hbox id="last_scanned_hbox" style="background-color: yellow">
+        <spacer flex="1"/>
+        <label id="last_scanned" style="font-weight: bold;"/>
+        <spacer flex="1"/>
+    </hbox>
+    <groupbox id="cmgb1" flex="2">
+        <caption label="&staff.circ.copy_status_overlay.last_scanned.caption;" />
+        <hbox id="copy_status_top_ui" />
         <deck id="deck" flex="1">
             <tree id="copy_status_list" flex="1" enableColumnDrag="true" context="copy_status_actions" />
             <browser id="copy_status_frame" src="" flex="1" />
         </deck>
-		<hbox id="copy_status_bottom_ui" />
-	</groupbox>
+        <hbox id="copy_status_bottom_ui" />
+    </groupbox>
 </vbox>
 
 <hbox id="copy_status_top_ui">
-	<label id="copy_status_scan_barcode_label" 
-		value="&staff.circ.copy_status_overlay.copy_status_scan_barcode.label;"
-		accesskey="&staff.circ.copy_status_overlay.copy_status_scan_barcode.accesskey;"
-		control="copy_status_barcode_entry_textbox"/>
-	<textbox id="copy_status_barcode_entry_textbox" context="clipboard"/>
-	<button id="copy_status_submit_barcode_button" 
-		label="&staff.circ.copy_status_overlay.copy_status_submit_barcode.label;"
-		accesskey="&staff.circ.copy_status_overlay.copy_status_submit_barcode.accesskey;"
-		command="cmd_copy_status_submit_barcode"/>
-	<button id="copy_status_upload_file_button" 
-		label="&staff.circ.copy_status_overlay.copy_status_upload_file.label;"
-		accesskey="&staff.circ.copy_status_overlay.copy_status_upload_file.accesskey;"
-		command="cmd_copy_status_upload_file"/>
-	<spacer flex="1"/>
+    <label id="copy_status_scan_barcode_label" 
+        value="&staff.circ.copy_status_overlay.copy_status_scan_barcode.label;"
+        accesskey="&staff.circ.copy_status_overlay.copy_status_scan_barcode.accesskey;"
+        control="copy_status_barcode_entry_textbox"/>
+    <textbox id="copy_status_barcode_entry_textbox" context="clipboard"/>
+    <button id="copy_status_submit_barcode_button" 
+        label="&staff.circ.copy_status_overlay.copy_status_submit_barcode.label;"
+        accesskey="&staff.circ.copy_status_overlay.copy_status_submit_barcode.accesskey;"
+        command="cmd_copy_status_submit_barcode"/>
+    <button id="copy_status_upload_file_button" 
+        label="&staff.circ.copy_status_overlay.copy_status_upload_file.label;"
+        accesskey="&staff.circ.copy_status_overlay.copy_status_upload_file.accesskey;"
+        command="cmd_copy_status_upload_file"/>
+    <spacer flex="1"/>
     <button id="alt_view_btn" command="cmd_alt_view" />
-	<menubar>
-	<menu label="&staff.circ.copy_status_overlay.cataloger_actions.label;" accesskey="&staff.circ.copy_status_overlay.cataloger_actions.accesskey;">
-		<menupopup>
-			<menuitem command="sel_clip" label="&staff.circ.copy_status_overlay.sel_clip.label;" accesskey="&staff.circ.copy_status_overlay.sel_clip.accesskey;" />
-			<menuitem command="sel_bucket" label="&staff.circ.copy_status_overlay.sel_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_bucket.accesskey;"/>
-			<menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
-			<menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
-			<menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
-			<menuitem command="cmd_transfer_items" label="&staff.circ.copy_status_overlay.cmd_transfer_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_transfer_items.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="cmd_add_volumes" label="&staff.circ.copy_status_overlay.cmd_add_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_add_volumes.accesskey;"/>
-			<menuitem command="cmd_mark_library" label="&staff.circ.copy_status_overlay.cmd_mark_library.label;" accesskey="&staff.circ.copy_status_overlay.cmd_mark_library.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="cmd_add_items" label="&staff.circ.copy_status_overlay.cmd_add_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_add_items.accesskey;"/>
-			<menuitem command="cmd_edit_volumes" label="&staff.circ.copy_status_overlay.cmd_edit_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_edit_volumes.accesskey;"/>
-			<menuitem command="cmd_mark_volume" label="&staff.circ.copy_status_overlay.cmd_mark_volume.label;" accesskey="&staff.circ.copy_status_overlay.cmd_mark_volume.accesskey;"/>
-			<menuitem command="cmd_transfer_volume" label="&staff.circ.copy_status_overlay.cmd_transfer_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_transfer_volumes.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="cmd_delete_items" label="&staff.circ.copy_status_overlay.cmd_delete_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_items.accesskey;"/>
-			<menuitem command="cmd_delete_volumes" label="&staff.circ.copy_status_overlay.cmd_delete_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_volumes.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_damaged.accesskey;"/>
-			<menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_missing.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="sel_spine" label="&staff.circ.copy_status_overlay.sel_spine.label;" accesskey="&staff.circ.copy_status_overlay.sel_spine.accesskey;"/>
-			<menuitem command="cmd_replace_barcode" label="&staff.circ.copy_status_overlay.cmd_replace_barcode.label;" accesskey="&staff.circ.copy_status_overlay.cmd_replace_barcode.accesskey;"/>
-			<menuitem command="save_columns" label="&staff.circ.copy_status_overlay.save_columns.label;"/>
-		</menupopup>
-	</menu>
-	<menu label="&staff.circ.copy_status_overlay.sel_items.label;" accesskey="&staff.circ.copy_status_overlay.sel_items.accesskey;">
-		<menupopup>
-			<menuitem command="sel_clip" label="&staff.circ.copy_status_overlay.sel_clip.label;" accesskey="&staff.circ.copy_status_overlay.sel_clip.accesskey;" />
-			<menuitem command="sel_bucket" label="&staff.circ.copy_status_overlay.sel_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_bucket.accesskey;"/>
-			<menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
-			<menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
-			<menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
-			<menuseparator />
-			<menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
-			<menuseparator />
-			<menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_damaged.accesskey;"/>
-			<menuseparator />
-			<menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_missing.accesskey;"/>
-			<menuseparator />
-			<menuitem command="sel_transit_abort" label="&staff.circ.copy_status_overlay.sel_transit_abort.label;" />
-			<menuseparator />
-			<menuitem command="sel_checkin" label="&staff.circ.copy_status_overlay.sel_checkin.label;" accesskey="&staff.circ.copy_status_overlay.sel_checkin.accesskey;" />
-			<menuseparator />
-			<menuitem command="sel_renew" label="&staff.circ.copy_status_overlay.sel_renew.label;" accesskey="&staff.circ.copy_status_overlay.sel_renew.accesskey;" />
-			<menuseparator />
-			<menuitem command="sel_spine" label="&staff.circ.copy_status_overlay.sel_spine.label;" accesskey="&staff.circ.copy_status_overlay.sel_spine.accesskey;"/>
-			<menuitem command="cmd_replace_barcode" label="&staff.circ.copy_status_overlay.cmd_replace_barcode.label;" accesskey="&staff.circ.copy_status_overlay.cmd_replace_barcode.accesskey;"/>
-			<menuitem command="save_columns" label="&staff.circ.copy_status_overlay.save_columns.label;"/>
-		</menupopup>
-	</menu>
-	</menubar>
+    <menubar>
+    <menu label="&staff.circ.copy_status_overlay.cataloger_actions.label;" accesskey="&staff.circ.copy_status_overlay.cataloger_actions.accesskey;">
+        <menupopup>
+            <menuitem command="sel_clip" label="&staff.circ.copy_status_overlay.sel_clip.label;" accesskey="&staff.circ.copy_status_overlay.sel_clip.accesskey;" />
+            <menuitem command="sel_bucket" label="&staff.circ.copy_status_overlay.sel_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_bucket.accesskey;"/>
+            <menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
+            <menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
+            <menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
+            <menuseparator/>
+            <menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
+            <menuitem command="cmd_transfer_items" label="&staff.circ.copy_status_overlay.cmd_transfer_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_transfer_items.accesskey;"/>
+            <menuseparator/>
+            <menuitem command="cmd_add_volumes" label="&staff.circ.copy_status_overlay.cmd_add_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_add_volumes.accesskey;"/>
+            <menuitem command="cmd_mark_library" label="&staff.circ.copy_status_overlay.cmd_mark_library.label;" accesskey="&staff.circ.copy_status_overlay.cmd_mark_library.accesskey;"/>
+            <menuseparator/>
+            <menuitem command="cmd_add_items" label="&staff.circ.copy_status_overlay.cmd_add_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_add_items.accesskey;"/>
+            <menuitem command="cmd_edit_volumes" label="&staff.circ.copy_status_overlay.cmd_edit_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_edit_volumes.accesskey;"/>
+            <menuitem command="cmd_mark_volume" label="&staff.circ.copy_status_overlay.cmd_mark_volume.label;" accesskey="&staff.circ.copy_status_overlay.cmd_mark_volume.accesskey;"/>
+            <menuitem command="cmd_transfer_volume" label="&staff.circ.copy_status_overlay.cmd_transfer_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_transfer_volumes.accesskey;"/>
+            <menuseparator/>
+            <menuitem command="cmd_delete_items" label="&staff.circ.copy_status_overlay.cmd_delete_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_items.accesskey;"/>
+            <menuitem command="cmd_delete_volumes" label="&staff.circ.copy_status_overlay.cmd_delete_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_volumes.accesskey;"/>
+            <menuseparator/>
+            <menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_damaged.accesskey;"/>
+            <menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_missing.accesskey;"/>
+            <menuseparator/>
+            <menuitem command="sel_spine" label="&staff.circ.copy_status_overlay.sel_spine.label;" accesskey="&staff.circ.copy_status_overlay.sel_spine.accesskey;"/>
+            <menuitem command="cmd_replace_barcode" label="&staff.circ.copy_status_overlay.cmd_replace_barcode.label;" accesskey="&staff.circ.copy_status_overlay.cmd_replace_barcode.accesskey;"/>
+            <menuitem command="save_columns" label="&staff.circ.copy_status_overlay.save_columns.label;"/>
+        </menupopup>
+    </menu>
+    <menu label="&staff.circ.copy_status_overlay.sel_items.label;" accesskey="&staff.circ.copy_status_overlay.sel_items.accesskey;">
+        <menupopup>
+            <menuitem command="sel_clip" label="&staff.circ.copy_status_overlay.sel_clip.label;" accesskey="&staff.circ.copy_status_overlay.sel_clip.accesskey;" />
+            <menuitem command="sel_bucket" label="&staff.circ.copy_status_overlay.sel_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_bucket.accesskey;"/>
+            <menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
+            <menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
+            <menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
+            <menuseparator />
+            <menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
+            <menuseparator />
+            <menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_damaged.accesskey;"/>
+            <menuseparator />
+            <menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_missing.accesskey;"/>
+            <menuseparator />
+            <menuitem command="sel_transit_abort" label="&staff.circ.copy_status_overlay.sel_transit_abort.label;" />
+            <menuseparator />
+            <menuitem command="sel_checkin" label="&staff.circ.copy_status_overlay.sel_checkin.label;" accesskey="&staff.circ.copy_status_overlay.sel_checkin.accesskey;" />
+            <menuseparator />
+            <menuitem command="sel_renew" label="&staff.circ.copy_status_overlay.sel_renew.label;" accesskey="&staff.circ.copy_status_overlay.sel_renew.accesskey;" />
+            <menuseparator />
+            <menuitem command="sel_spine" label="&staff.circ.copy_status_overlay.sel_spine.label;" accesskey="&staff.circ.copy_status_overlay.sel_spine.accesskey;"/>
+            <menuitem command="cmd_replace_barcode" label="&staff.circ.copy_status_overlay.cmd_replace_barcode.label;" accesskey="&staff.circ.copy_status_overlay.cmd_replace_barcode.accesskey;"/>
+            <menuitem command="save_columns" label="&staff.circ.copy_status_overlay.save_columns.label;"/>
+        </menupopup>
+    </menu>
+    </menubar>
 
 </hbox>
 
 <hbox id="copy_status_bottom_ui">
     <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;"/>
+    <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" 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"/>
+    <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>
 
 </overlay>
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 29bb06fa1f..ae1292c053 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
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,90 +19,90 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="in_house_use_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') {
-					throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for in_house_use.xul');
-
-				JSAN.use('circ.in_house_use'); g.in_house_use = new circ.in_house_use();
-				g.in_house_use.init( 
-					{ 
-					} 
-				);
-	
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try {
-						window.xulG.set_tab_name(document.getElementById('circStrings').getString('staff.circ.in_house_use.tab_name'));
-					} catch(E) {
-						alert(E);
-					}
-				}
-
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ.in_house_use.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function default_focus() { try { setTimeout( function() { document.getElementById('in_house_use_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<commandset id="in_house_use_cmds">
-		<command id="sel_clip" disabled="true" />
-		<command id="cmd_csv_to_clipboard" />
-		<command id="cmd_csv_to_printer" />
-		<command id="cmd_csv_to_file" />
-		<command id="cmd_in_house_use_submit_barcode" />
-		<command id="cmd_in_house_use_print" />
-		<command id="save_columns" />
-	</commandset>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') {
+                    throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
+                }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for in_house_use.xul');
+
+                JSAN.use('circ.in_house_use'); g.in_house_use = new circ.in_house_use();
+                g.in_house_use.init( 
+                    { 
+                    } 
+                );
+    
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+                    try {
+                        window.xulG.set_tab_name(document.getElementById('circStrings').getString('staff.circ.in_house_use.tab_name'));
+                    } catch(E) {
+                        alert(E);
+                    }
+                }
+
+            } catch(E) {
+                var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ.in_house_use.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function default_focus() { try { setTimeout( function() { document.getElementById('in_house_use_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
+    ]]>
+    </script>
+
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+    <commandset id="in_house_use_cmds">
+        <command id="sel_clip" disabled="true" />
+        <command id="cmd_csv_to_clipboard" />
+        <command id="cmd_csv_to_printer" />
+        <command id="cmd_csv_to_file" />
+        <command id="cmd_in_house_use_submit_barcode" />
+        <command id="cmd_in_house_use_print" />
+        <command id="save_columns" />
+    </commandset>
 
 <box id="in_house_use_main" flex="1" orient="vertical" class="my_overflow">
 <vbox id="cmvb1" flex="1">
 <hbox id="background" style="background-color: purple; color: white;">
-	<spacer flex="1"/>
-	<label value="&staff.circ.in_house_use.main.label;" style="font-size: x-large; font-weight: bold;"/>
-	<spacer flex="1"/>
+    <spacer flex="1"/>
+    <label value="&staff.circ.in_house_use.main.label;" style="font-size: x-large; font-weight: bold;"/>
+    <spacer flex="1"/>
 </hbox>
 <groupbox id="cmgb1" flex="2">
 
-	<caption label="&staff.circ.in_house_use.cmgb1.caption;" />
+    <caption label="&staff.circ.in_house_use.cmgb1.caption;" />
 
-	<hbox id="in_house_use_top_ui">
-		<label id="in_house_use_multiplier_label" value="&staff.circ.in_house_use.multiplier.label;" control="in_house_use_multiplier_textbox" accesskey="&staff.circ.in_house_use.multiplier.accesskey;" hidden="false"/>
-		<textbox id="in_house_use_multiplier_textbox" value="1" hidden="false" size="2" cols="2" context="clipboard"/>
-		<hbox id="in_house_use_menu_placeholder" flex="0"/>
-		<textbox id="in_house_use_barcode_entry_textbox" context="clipboard"/>
-		<button id="in_house_use_submit_barcode_button" 
-			label="&staff.circ.in_house_use.submit.label;"
-			command="cmd_in_house_use_submit_barcode"
-			accesskey="&staff.circ.in_house_use.submit.accesskey;"/>
-	</hbox>
+    <hbox id="in_house_use_top_ui">
+        <label id="in_house_use_multiplier_label" value="&staff.circ.in_house_use.multiplier.label;" control="in_house_use_multiplier_textbox" accesskey="&staff.circ.in_house_use.multiplier.accesskey;" hidden="false"/>
+        <textbox id="in_house_use_multiplier_textbox" value="1" hidden="false" size="2" cols="2" context="clipboard"/>
+        <hbox id="in_house_use_menu_placeholder" flex="0"/>
+        <textbox id="in_house_use_barcode_entry_textbox" context="clipboard"/>
+        <button id="in_house_use_submit_barcode_button" 
+            label="&staff.circ.in_house_use.submit.label;"
+            command="cmd_in_house_use_submit_barcode"
+            accesskey="&staff.circ.in_house_use.submit.accesskey;"/>
+    </hbox>
 
-	<tree id="in_house_use_list" flex="1" enableColumnDrag="true" />
+    <tree id="in_house_use_list" flex="1" enableColumnDrag="true" />
 
-	<hbox id="in_house_use_bottom_ui">
+    <hbox id="in_house_use_bottom_ui">
         <button id="list_actions" oncommand="this.firstChild.showPopup();"
             label="&staff.generic.list_actions.label;" 
             accesskey="&staff.generic.list_actions.accesskey;" 
@@ -116,14 +116,14 @@
             </menupopup>
         </button>
 
-		<button id="in_house_use_print" 
-			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" 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>
+        <button id="in_house_use_print" 
+            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" 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>
 
 </groupbox>
 </vbox>
diff --git a/Open-ILS/xul/staff_client/server/circ/pre_cat_fields.xul b/Open-ILS/xul/staff_client/server/circ/pre_cat_fields.xul
index 5eade94909..2668ad39e1 100644
--- a/Open-ILS/xul/staff_client/server/circ/pre_cat_fields.xul
+++ b/Open-ILS/xul/staff_client/server/circ/pre_cat_fields.xul
@@ -13,7 +13,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,31 +21,31 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="pre_cat_fields" title="&staff.circ.pre_cat.window.title;"
-	orient="vertical" style="overflow: auto"
-	onload="try{my_init();font_helper(); }catch(E){alert(E);}"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    orient="vertical" style="overflow: auto"
+    onload="try{my_init();font_helper(); }catch(E){alert(E);}"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
 
-	<script>
-	<![CDATA[
+    <script>
+    <![CDATA[
 
-		function my_init() {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			if (typeof JSAN == 'undefined') {
-				throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
-			}
-			JSAN.errorLevel = "die"; // none, warn, or die
-			JSAN.addRepository('/xul/server/');
-			JSAN.use('util.error'); g.error = new util.error();
-			g.error.sdump('D_TRACE','my_init() for pre_cat_fields.xul');
-			JSAN.use('OpenILS.data'); g.data = new OpenILS.data();
-			g.data.init({'via':'stash'});
+        function my_init() {
+            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+            if (typeof JSAN == 'undefined') {
+                throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
+            }
+            JSAN.errorLevel = "die"; // none, warn, or die
+            JSAN.addRepository('/xul/server/');
+            JSAN.use('util.error'); g.error = new util.error();
+            g.error.sdump('D_TRACE','my_init() for pre_cat_fields.xul');
+            JSAN.use('OpenILS.data'); g.data = new OpenILS.data();
+            g.data.init({'via':'stash'});
 
             g.data.precat_dummy_title = '';
             g.data.precat_dummy_author = '';
@@ -65,10 +65,10 @@
                 x.setAttribute('value', g.data.precat_circ_modifier);
                 x.value = g.data.precat_circ_modifier;
             }
-			document.getElementById('dummy_title').focus();
-		}
+            document.getElementById('dummy_title').focus();
+        }
 
-		function my_finish() {
+        function my_finish() {
             g.data.precat_dummy_title = document.getElementById('dummy_title').value;
             g.data.precat_dummy_author = document.getElementById('dummy_author').value;
             g.data.precat_dummy_isbn = document.getElementById('dummy_isbn').value;
@@ -76,45 +76,45 @@
             if (cm == '<HACK:KLUDGE:NULL>') cm = null;
             g.data.precat_circ_modifier = cm;
             g.data.precat_submit = 'go';
-			g.data.stash('precat_dummy_title','precat_dummy_author','precat_dummy_isbn','precat_circ_modifier','precat_submit');
+            g.data.stash('precat_dummy_title','precat_dummy_author','precat_dummy_isbn','precat_circ_modifier','precat_submit');
             window.close();
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-
-	<groupbox>
-		<caption label="&staff.circ.pre_cat.caption.label;"/>
-		<grid>
-			<columns><column /><column flex="1"/></columns>
-			<rows>
-				<row>
-					<label value="&staff.circ.pre_cat.dummy_title.label;" accesskey="&staff.circ.pre_cat.dummy_title.accesskey;" control="dummy_title"/>
-					<textbox id="dummy_title" context="clipboard"/>
-				</row>
-				<row>
-					<label value="&staff.circ.pre_cat.dummy_author.label;" accesskey="&staff.circ.pre_cat.dummy_author.accesskey;" control="dummy_author"/>
-					<textbox id="dummy_author" context="clipboard"/>
-				</row>
-				<row>
-					<label value="&staff.circ.pre_cat.dummy_isbn.label;" accesskey="&staff.circ.pre_cat.dummy_isbn.accesskey;" control="dummy_isbn"/>
-					<textbox id="dummy_isbn" context="clipboard"/>
-				</row>
-				<row>
-					<label value="&staff.circ.pre_cat.dummy_circ_modifier.label;" accesskey="&staff.circ.pre_cat.dummy_circ_modifier.accesskey;" control="dummy_circ_modifier"/>
+        }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+
+    <groupbox>
+        <caption label="&staff.circ.pre_cat.caption.label;"/>
+        <grid>
+            <columns><column /><column flex="1"/></columns>
+            <rows>
+                <row>
+                    <label value="&staff.circ.pre_cat.dummy_title.label;" accesskey="&staff.circ.pre_cat.dummy_title.accesskey;" control="dummy_title"/>
+                    <textbox id="dummy_title" context="clipboard"/>
+                </row>
+                <row>
+                    <label value="&staff.circ.pre_cat.dummy_author.label;" accesskey="&staff.circ.pre_cat.dummy_author.accesskey;" control="dummy_author"/>
+                    <textbox id="dummy_author" context="clipboard"/>
+                </row>
+                <row>
+                    <label value="&staff.circ.pre_cat.dummy_isbn.label;" accesskey="&staff.circ.pre_cat.dummy_isbn.accesskey;" control="dummy_isbn"/>
+                    <textbox id="dummy_isbn" context="clipboard"/>
+                </row>
+                <row>
+                    <label value="&staff.circ.pre_cat.dummy_circ_modifier.label;" accesskey="&staff.circ.pre_cat.dummy_circ_modifier.accesskey;" control="dummy_circ_modifier"/>
                     <box id="placeholder" />
-				</row>
-			</rows>
-		</grid>
-		<hbox>
-			<spacer flex="1"/>
-			<button label="&staff.circ.pre_cat.cancel.label;" oncommand="window.close()" accesskey="&staff.circ.pre_cat.cancel.accesskey;"/>
-			<button label="&staff.circ.pre_cat.checkout.label;" oncommand="my_finish();" accesskey="&staff.circ.pre_cat.checkout.accesskey;"/>
-		</hbox>
-	</groupbox>
+                </row>
+            </rows>
+        </grid>
+        <hbox>
+            <spacer flex="1"/>
+            <button label="&staff.circ.pre_cat.cancel.label;" oncommand="window.close()" accesskey="&staff.circ.pre_cat.cancel.accesskey;"/>
+            <button label="&staff.circ.pre_cat.checkout.label;" oncommand="my_finish();" accesskey="&staff.circ.pre_cat.checkout.accesskey;"/>
+        </hbox>
+    </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.xul b/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.xul
index 310a5b3765..9bb56ff7e0 100644
--- a/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.xul
+++ b/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -18,110 +18,110 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="print_list_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') {
-					throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for print_list.xul');
-
-				JSAN.use('circ.print_list_template_editor');
-				g.editor = new circ.print_list_template_editor();
-
-				g.editor.init( 
-					{ 
-					} 
-				);
-
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name(document.getElementById('circStrings').getString('staff.circ.print_list_template.tab_name')); } catch(E) { alert(E); }
-				}
-
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ/print_list_template_editor.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<commandset id="print_list_cmds">
-		<command id="cmd_broken" />
-	</commandset>
-
-	<groupbox id="main" flex="1">
-		<caption label="&staff.circ.print_list.main.label;" />
-		<hbox id="top_ui">
-			<groupbox flex="1">
-				<caption label="&staff.circ.print_list.top_ui.label;" />
-				<hbox>
-					<label value="&staff.circ.print_list.top_ui.name.label;" accesskey="&staff.circ.print_list.top_ui.name.accesskey;" control="template_name_menu" />
-					<hbox id="template_name_menu_placeholder" flex="1"/>
-				</hbox>
-				<hbox>
-					<label value="&staff.circ.print_list.top_ui.type.label;" />
-					<hbox id="template_type_menu_placeholder" />
-				</hbox>
-			</groupbox>
-			<groupbox orient="horizontal">
-				<caption label="&staff.circ.print_list.top_ui.actions.label;" />
-				<vbox>
-					<button id="preview" label="&staff.circ.print_list.top_ui.preview.label;" accesskey="&staff.circ.print_list.top_ui.preview.accesskey;" />
-					<button id="macros" label="&staff.circ.print_list.top_ui.macros.label;" accesskey="&staff.circ.print_list.top_ui.macros.accesskey;" />
-				</vbox>
-				<vbox>
-					<button id="default" label="&staff.circ.print_list.top_ui.default.label;" accesskey="&staff.circ.print_list.top_ui.default.accesskey;" />
-					<button id="save" label="&staff.circ.print_list.top_ui.save.label;" accesskey="&staff.circ.print_list.top_ui.save.accesskey;" />
-				</vbox>
-				<vbox>
-					<description>&staff.circ.print_list.top_ui.description;</description>
-					<button id="export" label="&staff.circ.print_list.top_ui.description.export.label;" accesskey="&staff.circ.print_list.top_ui.description.export.accesskey;" />
-					<button id="import" label="&staff.circ.print_list.top_ui.description.import.label;" accesskey="&staff.circ.print_list.top_ui.description.import.accesskey;" />
-				</vbox>
-			</groupbox>
-		</hbox>
-		<hbox flex="1">
-			<groupbox flex="1">
-				<caption label="&staff.circ.print_list.top_ui.preview.label;" />
-				<iframe id="sample" flex="1"/>
-			</groupbox>
-			<vbox flex="1">
-				<groupbox flex="1">
-					<caption label="&staff.circ.print_list.header.label;"/>
-					<textbox id="header" multiline="true" flex="1" context="clipboard"/>
-				</groupbox>
-				<groupbox flex="1">
-					<caption label="&staff.circ.print_list.line_item.label;"/>
-					<textbox id="line_item" multiline="true" flex="1" context="clipboard"/>
-				</groupbox>
-				<groupbox flex="1">
-					<caption label="&staff.circ.print_list.footer.label;"/>
-					<textbox id="footer" multiline="true" flex="1" context="clipboard"/>
-				</groupbox>
-			</vbox>
-		</hbox>
-	</groupbox>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') {
+                    throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
+                }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for print_list.xul');
+
+                JSAN.use('circ.print_list_template_editor');
+                g.editor = new circ.print_list_template_editor();
+
+                g.editor.init( 
+                    { 
+                    } 
+                );
+
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+                    try { window.xulG.set_tab_name(document.getElementById('circStrings').getString('staff.circ.print_list_template.tab_name')); } catch(E) { alert(E); }
+                }
+
+            } catch(E) {
+                var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ/print_list_template_editor.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+    <commandset id="print_list_cmds">
+        <command id="cmd_broken" />
+    </commandset>
+
+    <groupbox id="main" flex="1">
+        <caption label="&staff.circ.print_list.main.label;" />
+        <hbox id="top_ui">
+            <groupbox flex="1">
+                <caption label="&staff.circ.print_list.top_ui.label;" />
+                <hbox>
+                    <label value="&staff.circ.print_list.top_ui.name.label;" accesskey="&staff.circ.print_list.top_ui.name.accesskey;" control="template_name_menu" />
+                    <hbox id="template_name_menu_placeholder" flex="1"/>
+                </hbox>
+                <hbox>
+                    <label value="&staff.circ.print_list.top_ui.type.label;" />
+                    <hbox id="template_type_menu_placeholder" />
+                </hbox>
+            </groupbox>
+            <groupbox orient="horizontal">
+                <caption label="&staff.circ.print_list.top_ui.actions.label;" />
+                <vbox>
+                    <button id="preview" label="&staff.circ.print_list.top_ui.preview.label;" accesskey="&staff.circ.print_list.top_ui.preview.accesskey;" />
+                    <button id="macros" label="&staff.circ.print_list.top_ui.macros.label;" accesskey="&staff.circ.print_list.top_ui.macros.accesskey;" />
+                </vbox>
+                <vbox>
+                    <button id="default" label="&staff.circ.print_list.top_ui.default.label;" accesskey="&staff.circ.print_list.top_ui.default.accesskey;" />
+                    <button id="save" label="&staff.circ.print_list.top_ui.save.label;" accesskey="&staff.circ.print_list.top_ui.save.accesskey;" />
+                </vbox>
+                <vbox>
+                    <description>&staff.circ.print_list.top_ui.description;</description>
+                    <button id="export" label="&staff.circ.print_list.top_ui.description.export.label;" accesskey="&staff.circ.print_list.top_ui.description.export.accesskey;" />
+                    <button id="import" label="&staff.circ.print_list.top_ui.description.import.label;" accesskey="&staff.circ.print_list.top_ui.description.import.accesskey;" />
+                </vbox>
+            </groupbox>
+        </hbox>
+        <hbox flex="1">
+            <groupbox flex="1">
+                <caption label="&staff.circ.print_list.top_ui.preview.label;" />
+                <iframe id="sample" flex="1"/>
+            </groupbox>
+            <vbox flex="1">
+                <groupbox flex="1">
+                    <caption label="&staff.circ.print_list.header.label;"/>
+                    <textbox id="header" multiline="true" flex="1" context="clipboard"/>
+                </groupbox>
+                <groupbox flex="1">
+                    <caption label="&staff.circ.print_list.line_item.label;"/>
+                    <textbox id="line_item" multiline="true" flex="1" context="clipboard"/>
+                </groupbox>
+                <groupbox flex="1">
+                    <caption label="&staff.circ.print_list.footer.label;"/>
+                    <textbox id="footer" multiline="true" flex="1" context="clipboard"/>
+                </groupbox>
+            </vbox>
+        </hbox>
+    </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/circ/renew.xul b/Open-ILS/xul/staff_client/server/circ/renew.xul
index 3d3bc6da59..9adc5212d9 100644
--- a/Open-ILS/xul/staff_client/server/circ/renew.xul
+++ b/Open-ILS/xul/staff_client/server/circ/renew.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,77 +20,77 @@
 <?xul-overlay href="/xul/server/circ/renew_overlay.xul"?>
 
 <window id="renew_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for renew.xul');
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for renew.xul');
 
                 var tab_name = document.getElementById('circStrings').getString('staff.circ.renew.tab.label');
 
-				JSAN.use('circ.renew'); g.renew = new circ.renew();
-				g.renew.init( 
-					{ 
-					} 
-				);
-	
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name(tab_name); } catch(E) { alert(E); }
-				}
-
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ.renew.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function default_focus() { try { setTimeout( function() { document.getElementById('renew_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
-	]]>
-	</script>
-
-	<popupset id="copy_status_popupset"/>
-
-	<commandset id="renew_cmds">
-		<command id="cmd_renew_submit_barcode" />
-		<command id="cmd_renew_print" />
-		<command id="cmd_csv_to_clipboard" />
-		<command id="cmd_csv_to_printer" />
-		<command id="cmd_csv_to_file" />
-		<command id="save_columns" />
-		
-		<command id="sel_clip" disabled="true"/>
-		<command id="sel_edit" disabled="true"/>
-		<command id="sel_opac" disabled="true"/>
-		<command id="sel_patron" disabled="true"/>
-		<command id="sel_last_patron" disabled="true"/>
-		<command id="sel_copy_details" disabled="true"/>
-		<command id="sel_bucket" disabled="true"/>
-		<command id="sel_spine" disabled="true"/>
-		<command id="sel_transit_abort" disabled="true"/>
-		<command id="sel_mark_items_damaged" disabled="true"/>
-
-	</commandset>
+                JSAN.use('circ.renew'); g.renew = new circ.renew();
+                g.renew.init( 
+                    { 
+                    } 
+                );
+    
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+                    try { window.xulG.set_tab_name(tab_name); } catch(E) { alert(E); }
+                }
+
+            } catch(E) {
+                var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ.renew.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function default_focus() { try { setTimeout( function() { document.getElementById('renew_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
+    ]]>
+    </script>
+
+    <popupset id="copy_status_popupset"/>
+
+    <commandset id="renew_cmds">
+        <command id="cmd_renew_submit_barcode" />
+        <command id="cmd_renew_print" />
+        <command id="cmd_csv_to_clipboard" />
+        <command id="cmd_csv_to_printer" />
+        <command id="cmd_csv_to_file" />
+        <command id="save_columns" />
+        
+        <command id="sel_clip" disabled="true"/>
+        <command id="sel_edit" disabled="true"/>
+        <command id="sel_opac" disabled="true"/>
+        <command id="sel_patron" disabled="true"/>
+        <command id="sel_last_patron" disabled="true"/>
+        <command id="sel_copy_details" disabled="true"/>
+        <command id="sel_bucket" disabled="true"/>
+        <command id="sel_spine" disabled="true"/>
+        <command id="sel_transit_abort" disabled="true"/>
+        <command id="sel_mark_items_damaged" disabled="true"/>
+
+    </commandset>
 
     <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
     <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
     <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
-	<box id="renew_main" />
+    <box id="renew_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/circ/renew_overlay.xul b/Open-ILS/xul/staff_client/server/circ/renew_overlay.xul
index 65ca8db471..1d163991e6 100644
--- a/Open-ILS/xul/staff_client/server/circ/renew_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/circ/renew_overlay.xul
@@ -2,98 +2,98 @@
 
 <!-- LOCALIZATION -->
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <overlay id="renew_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading renew_overlay.xul\n');</script>
 
 <commandset id="renew_cmds" />
 
 <popupset id="copy_status_popupset">
-	<popup id="copy_status_actions" position="at_pointer"> 
-		<menuitem command="sel_clip" label="&staff.circ.renew_overlay.sel_clip.label;" accesskey="&staff.circ.renew_overlay.sel_clip.accesskey;" />
-		<menuitem command="sel_bucket" label="&staff.circ.renew_overlay.sel_bucket.label;" accesskey="&staff.circ.renew_overlay.sel_bucket.accesskey;"/>
-		<menuitem command="sel_opac" label="&staff.circ.renew_overlay.sel_opac.label;" accesskey="&staff.circ.renew_overlay.sel_opac.accesskey;" />
-		<menuitem command="sel_copy_details" label="&staff.circ.renew_overlay.sel_copy_details.label;" accesskey="&staff.circ.renew_overlay.sel_copy_details.accesskey;" />
-		<menuitem command="sel_patron" label="&staff.circ.renew_overlay.sel_patron.label;" accesskey="&staff.circ.renew_overlay.sel_patron.accesskey;"/>
-		<menuitem command="sel_last_patron" label="&staff.circ.renew_overlay.sel_last_patron.label;" accesskey="&staff.circ.renew_overlay.sel_last_patron.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="sel_edit" label="&staff.circ.renew_overlay.sel_edit.label;" accesskey="&staff.circ.renew_overlay.sel_edit.accesskey;" />
-		<menuseparator />
-		<menuitem command="sel_mark_items_damaged" label="&staff.circ.renew_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.renew_overlay.sel_mark_items_damaged.accesskey;"/>
-		<menuseparator />
-		<menuitem command="sel_transit_abort" label="&staff.circ.renew_overlay.sel_transit_abort.label;" />
-		<menuseparator />
-		<menuitem command="sel_spine" label="&staff.circ.renew_overlay.sel_spine.label;" accesskey="&staff.circ.renew_overlay.sel_spine.accesskey;"/>
-		<menuitem command="save_columns" label="&staff.circ.renew_overlay.save_columns.label;"/>
-	</popup>
+    <popup id="copy_status_actions" position="at_pointer"> 
+        <menuitem command="sel_clip" label="&staff.circ.renew_overlay.sel_clip.label;" accesskey="&staff.circ.renew_overlay.sel_clip.accesskey;" />
+        <menuitem command="sel_bucket" label="&staff.circ.renew_overlay.sel_bucket.label;" accesskey="&staff.circ.renew_overlay.sel_bucket.accesskey;"/>
+        <menuitem command="sel_opac" label="&staff.circ.renew_overlay.sel_opac.label;" accesskey="&staff.circ.renew_overlay.sel_opac.accesskey;" />
+        <menuitem command="sel_copy_details" label="&staff.circ.renew_overlay.sel_copy_details.label;" accesskey="&staff.circ.renew_overlay.sel_copy_details.accesskey;" />
+        <menuitem command="sel_patron" label="&staff.circ.renew_overlay.sel_patron.label;" accesskey="&staff.circ.renew_overlay.sel_patron.accesskey;"/>
+        <menuitem command="sel_last_patron" label="&staff.circ.renew_overlay.sel_last_patron.label;" accesskey="&staff.circ.renew_overlay.sel_last_patron.accesskey;"/>
+        <menuseparator/>
+        <menuitem command="sel_edit" label="&staff.circ.renew_overlay.sel_edit.label;" accesskey="&staff.circ.renew_overlay.sel_edit.accesskey;" />
+        <menuseparator />
+        <menuitem command="sel_mark_items_damaged" label="&staff.circ.renew_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.renew_overlay.sel_mark_items_damaged.accesskey;"/>
+        <menuseparator />
+        <menuitem command="sel_transit_abort" label="&staff.circ.renew_overlay.sel_transit_abort.label;" />
+        <menuseparator />
+        <menuitem command="sel_spine" label="&staff.circ.renew_overlay.sel_spine.label;" accesskey="&staff.circ.renew_overlay.sel_spine.accesskey;"/>
+        <menuitem command="save_columns" label="&staff.circ.renew_overlay.save_columns.label;"/>
+    </popup>
 </popupset>
 
 <box id="renew_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="cmvb1" flex="1"/>
+    <vbox id="cmvb1" flex="1"/>
 </box>
 
 <vbox id="cmvb1" flex="1">
-	<hbox id="background" style="background-color: orange;">
-		<spacer flex="1"/>
-		<vbox>
-			<label id="background-text" value="&staff.circ.renew_overlay.background_text;" style="font-size: x-large; font-weight: bold;"/>
-		</vbox>
-		<spacer flex="1"/>
-	</hbox>
-	<groupbox id="cmgb1" flex="2">
-		<caption id="caption" label="&staff.circ.renew.caption;" />
-		<hbox id="renew_top_ui" />
-		<tree id="renew_list" flex="1" enableColumnDrag="true" context="copy_status_actions" />
-		<hbox id="renew_bottom_ui" />
-	</groupbox>
+    <hbox id="background" style="background-color: orange;">
+        <spacer flex="1"/>
+        <vbox>
+            <label id="background-text" value="&staff.circ.renew_overlay.background_text;" style="font-size: x-large; font-weight: bold;"/>
+        </vbox>
+        <spacer flex="1"/>
+    </hbox>
+    <groupbox id="cmgb1" flex="2">
+        <caption id="caption" label="&staff.circ.renew.caption;" />
+        <hbox id="renew_top_ui" />
+        <tree id="renew_list" flex="1" enableColumnDrag="true" context="copy_status_actions" />
+        <hbox id="renew_bottom_ui" />
+    </groupbox>
 </vbox>
 
 <hbox id="renew_top_ui">
-	<vbox>
-		<hbox>
-			<label id="renew_scan_barcode_label" 
-				value="&staff.circ.renew.scan.label;" 
-				accesskey="&staff.circ.renew.scan.accesskey;" 
-				control="renew_barcode_entry_textbox"/>
-			<textbox id="renew_barcode_entry_textbox" context="clipboard"/>
-			<button id="renew_submit_barcode_button" 
-				label="&staff.circ.renew.submit.label;" 
-				command="cmd_renew_submit_barcode"
-				oldaccesskey="&staff.circ.renew.submit.accesskey;"/>
-		</hbox>
-		<label id="no_change_label" value="" style="color: red" hidden="true"/>
-	</vbox>
-	<spacer flex="1"/>
-	<vbox>
-		<hbox>
-			<menubar>
-			<menu label="&staff.circ.renew_overlay.actions.label;" accesskey="&staff.circ.renew_overlay.actions.accesskey;">
-				<menupopup>
-					<menuitem command="sel_clip" label="&staff.circ.renew_overlay.sel_clip.label;" accesskey="&staff.circ.renew_overlay.sel_clip.accesskey;" />
-					<menuitem command="sel_bucket" label="&staff.circ.renew_overlay.sel_bucket.label;" accesskey="&staff.circ.renew_overlay.sel_bucket.accesskey;"/>
-					<menuitem command="sel_opac" label="&staff.circ.renew_overlay.sel_opac.label;" accesskey="&staff.circ.renew_overlay.sel_opac.accesskey;" />
-					<menuitem command="sel_copy_details" label="&staff.circ.renew_overlay.sel_copy_details.label;" accesskey="&staff.circ.renew_overlay.sel_copy_details.accesskey;" />
-					<menuitem command="sel_patron" label="&staff.circ.renew_overlay.sel_patron.label;" accesskey="&staff.circ.renew_overlay.sel_patron.accesskey;"/>
-					<menuitem command="sel_last_patron" label="&staff.circ.renew_overlay.sel_last_patron.label;" accesskey="&staff.circ.renew_overlay.sel_last_patron.accesskey;"/>
-					<menuseparator/>
-					<menuitem command="sel_edit" label="&staff.circ.renew_overlay.sel_edit.label;" accesskey="&staff.circ.renew_overlay.sel_edit.accesskey;" />
-					<menuseparator />
-					<menuitem command="sel_mark_items_damaged" label="&staff.circ.renew_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.renew_overlay.sel_mark_items_damaged.accesskey;"/>
-					<menuseparator />
-					<menuitem command="sel_transit_abort" label="&staff.circ.renew_overlay.sel_transit_abort.label;" />
-					<menuseparator />
-					<menuitem command="sel_spine" label="&staff.circ.renew_overlay.sel_spine.label;" accesskey="&staff.circ.renew_overlay.sel_spine.accesskey;"/>
-					<menuitem command="save_columns" label="&staff.circ.renew_overlay.save_columns.label;"/>
-				</menupopup>
-			</menu>
-			</menubar>
-		</hbox>
+    <vbox>
+        <hbox>
+            <label id="renew_scan_barcode_label" 
+                value="&staff.circ.renew.scan.label;" 
+                accesskey="&staff.circ.renew.scan.accesskey;" 
+                control="renew_barcode_entry_textbox"/>
+            <textbox id="renew_barcode_entry_textbox" context="clipboard"/>
+            <button id="renew_submit_barcode_button" 
+                label="&staff.circ.renew.submit.label;" 
+                command="cmd_renew_submit_barcode"
+                oldaccesskey="&staff.circ.renew.submit.accesskey;"/>
+        </hbox>
+        <label id="no_change_label" value="" style="color: red" hidden="true"/>
+    </vbox>
+    <spacer flex="1"/>
+    <vbox>
+        <hbox>
+            <menubar>
+            <menu label="&staff.circ.renew_overlay.actions.label;" accesskey="&staff.circ.renew_overlay.actions.accesskey;">
+                <menupopup>
+                    <menuitem command="sel_clip" label="&staff.circ.renew_overlay.sel_clip.label;" accesskey="&staff.circ.renew_overlay.sel_clip.accesskey;" />
+                    <menuitem command="sel_bucket" label="&staff.circ.renew_overlay.sel_bucket.label;" accesskey="&staff.circ.renew_overlay.sel_bucket.accesskey;"/>
+                    <menuitem command="sel_opac" label="&staff.circ.renew_overlay.sel_opac.label;" accesskey="&staff.circ.renew_overlay.sel_opac.accesskey;" />
+                    <menuitem command="sel_copy_details" label="&staff.circ.renew_overlay.sel_copy_details.label;" accesskey="&staff.circ.renew_overlay.sel_copy_details.accesskey;" />
+                    <menuitem command="sel_patron" label="&staff.circ.renew_overlay.sel_patron.label;" accesskey="&staff.circ.renew_overlay.sel_patron.accesskey;"/>
+                    <menuitem command="sel_last_patron" label="&staff.circ.renew_overlay.sel_last_patron.label;" accesskey="&staff.circ.renew_overlay.sel_last_patron.accesskey;"/>
+                    <menuseparator/>
+                    <menuitem command="sel_edit" label="&staff.circ.renew_overlay.sel_edit.label;" accesskey="&staff.circ.renew_overlay.sel_edit.accesskey;" />
+                    <menuseparator />
+                    <menuitem command="sel_mark_items_damaged" label="&staff.circ.renew_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.renew_overlay.sel_mark_items_damaged.accesskey;"/>
+                    <menuseparator />
+                    <menuitem command="sel_transit_abort" label="&staff.circ.renew_overlay.sel_transit_abort.label;" />
+                    <menuseparator />
+                    <menuitem command="sel_spine" label="&staff.circ.renew_overlay.sel_spine.label;" accesskey="&staff.circ.renew_overlay.sel_spine.accesskey;"/>
+                    <menuitem command="save_columns" label="&staff.circ.renew_overlay.save_columns.label;"/>
+                </menupopup>
+            </menu>
+            </menubar>
+        </hbox>
         <label id="fine_tally" value="" amount="0.00" style="color: red" hidden="true" />
-	</vbox>
+    </vbox>
 
 </hbox>
 
@@ -103,21 +103,21 @@
         accesskey="&staff.generic.list_actions.accesskey;" 
         type="menu" allowevents="true">
         <menupopup id="list_actions_popup">
-        	<menuitem command="sel_clip" label="&staff.generic.list_actions.sel_clip.label;" accesskey="&staff.generic.list_actions.sel_clip.accesskey;" disabled="true" />
-    	    <menuitem command="cmd_csv_to_printer" label="&staff.generic.list_actions.csv_to_printer.label;" accesskey="&staff.generic.list_actions.csv_to_printer.accesskey;" />
-        	<menuitem command="cmd_csv_to_clipboard" label="&staff.generic.list_actions.csv_to_clipboard.label;" accesskey="&staff.generic.list_actions.csv_to_clipboard.accesskey;" />
-        	<menuitem command="cmd_csv_to_file" label="&staff.generic.list_actions.csv_to_file.label;" accesskey="&staff.generic.list_actions.csv_to_file.accesskey;" />
-	        <menuitem command="save_columns" label="&staff.generic.list_actions.save_columns.label;" accesskey="&staff.generic.list_actions.save_columns.accesskey;" />
+            <menuitem command="sel_clip" label="&staff.generic.list_actions.sel_clip.label;" accesskey="&staff.generic.list_actions.sel_clip.accesskey;" disabled="true" />
+            <menuitem command="cmd_csv_to_printer" label="&staff.generic.list_actions.csv_to_printer.label;" accesskey="&staff.generic.list_actions.csv_to_printer.accesskey;" />
+            <menuitem command="cmd_csv_to_clipboard" label="&staff.generic.list_actions.csv_to_clipboard.label;" accesskey="&staff.generic.list_actions.csv_to_clipboard.accesskey;" />
+            <menuitem command="cmd_csv_to_file" label="&staff.generic.list_actions.csv_to_file.label;" accesskey="&staff.generic.list_actions.csv_to_file.accesskey;" />
+            <menuitem command="save_columns" label="&staff.generic.list_actions.save_columns.label;" accesskey="&staff.generic.list_actions.save_columns.accesskey;" />
         </menupopup>
     </button>
 
-	<button id="renew_print" 
-		label="&staff.renew.print_receipt.label;" 
-		command="cmd_renew_print"
-		accesskey="&staff.renew.print_receipt.accesskey;"/>
-	<checkbox id="trim_list" label="&staff.circ.renew_overlay.trim_list.label;" checked="true" oils_persist="checked"/> 
-	<checkbox id="strict_barcode" label="&staff.circ.renew_overlay.strict_barcode.label;" checked="false" oils_persist="checked"/> 
-	<spacer id="pcii3s" flex="1"/>
+    <button id="renew_print" 
+        label="&staff.renew.print_receipt.label;" 
+        command="cmd_renew_print"
+        accesskey="&staff.renew.print_receipt.accesskey;"/>
+    <checkbox id="trim_list" label="&staff.circ.renew_overlay.trim_list.label;" checked="true" oils_persist="checked"/> 
+    <checkbox id="strict_barcode" label="&staff.circ.renew_overlay.strict_barcode.label;" checked="false" oils_persist="checked"/> 
+    <spacer id="pcii3s" flex="1"/>
 </hbox>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/index.xhtml b/Open-ILS/xul/staff_client/server/index.xhtml
index 99f694ab20..655525ebbb 100644
--- a/Open-ILS/xul/staff_client/server/index.xhtml
+++ b/Open-ILS/xul/staff_client/server/index.xhtml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns='http://www.w3.org/1999/xhtml'>
diff --git a/Open-ILS/xul/staff_client/server/main/data.xul b/Open-ILS/xul/staff_client/server/main/data.xul
index 7e941599dc..040f510f71 100644
--- a/Open-ILS/xul/staff_client/server/main/data.xul
+++ b/Open-ILS/xul/staff_client/server/main/data.xul
@@ -20,7 +20,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -28,161 +28,161 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="data_win" 
-	onload="try { data_init(); } catch(E) { alert(E); }"
-	title="&staff.auth.title;"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function data_init() {
-
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-			if (typeof JSAN == 'undefined') {
-				throw(document.getElementById("commonStrings").getString('common.jsan.missing'));
-			}
-			/////////////////////////////////////////////////////////////////////////////
-
-			JSAN.errorLevel = "die"; // none, warn, or die
-			JSAN.addRepository('/xul/server/');
-
-			function cache_me(msg,how) {
-				try {
-					switch(how) {
-						case 'jsan' : JSAN.use(msg); break;
-						case 'http' :
-							var x = new XMLHttpRequest();
-							x.open("GET",msg,true);
-							x.send(null);
-						break;
-					}
-					dump(msg + '\n');
-					var x = document.getElementById('data_progress');
-					if (x) {
-						x.appendChild( document.createTextNode( msg + ' ') );
-					}
-				} catch(E) {
-					dump(msg + '\n' + E);
-				}
-			}
-
-			// load these just so they'll get cached
-			//cache_me('/xul/server//util/exec.js','http');
-			//cache_me('/xul/server//util/barcode.js','http');  
-			//cache_me('/xul/server//util/controller.js','http');  
-			//cache_me('/xul/server//util/deck.js','http');  
-			//cache_me('/xul/server//util/fm_utils.js','http');  
-			//cache_me('/xul/server//util/list.js','http');  
-			//cache_me('/xul/server//util/network.js','http'); 
-			//cache_me('/xul/server//util/sound.js','http'); 
-			//cache_me('/xul/server//util/widgets.js','http');  
-			//cache_me('/xul/server//util/browser.js','http');  
-			//cache_me('/xul/server//util/error.js','http');  
-			//cache_me('/xul/server//util/file.js','http'); 
-			//cache_me('/xul/server//util/functional.js','http');  
-			//cache_me('/xul/server//util/money.js','http');  
-			//cache_me('/xul/server//util/print.js','http');  
-			//cache_me('/xul/server//util/text.js','http'); 
-			//cache_me('/xul/server//util/window.js','http'); 
-
-			cache_me('/xul/server/util/fancy_prompt.xul','http');
-			//cache_me('/xul/server/util/browser.xul','http');
-			//cache_me('/xul/server/util/rbrowser.xul','http');
-
-			//cache_me('/xul/server//patron/display.js','http');  
-			//cache_me('/xul/server//patron/bills.js','http');  
-			//cache_me('/xul/server//patron/holds.js','http');  
-			//cache_me('/xul/server//patron/items.js','http'); 
-			//cache_me('/xul/server//patron/search_form.js','http');  
-			//cache_me('/xul/server//patron/search_result.js','http');  
-			//cache_me('/xul/server//patron/summary.js','http'); 
-			//cache_me('/xul/server//patron/util.js','http'); 
-
-			//cache_me('/xul/server/patron/display.xul','http');  
-			//cache_me('/xul/server/patron/display_overlay.xul','http');  
-			//cache_me('/xul/server/patron/bills.xul','http');  
-			//cache_me('/xul/server/patron/bills_overlay.xul','http');  
-			//cache_me('/xul/server/patron/holds.xul','http');  
-			//cache_me('/xul/server/patron/holds_overlay.xul','http');  
-			//cache_me('/xul/server/patron/items.xul','http'); 
-			//cache_me('/xul/server/patron/items_overlay.xul','http'); 
-			//cache_me('/xul/server/patron/search_form.xul','http');  
-			//cache_me('/xul/server/patron/search_form_overlay.xul','http');  
-			//cache_me('/xul/server/patron/search_result.xul','http');  
-			//cache_me('/xul/server/patron/search_result_overlay.xul','http');  
-			//cache_me('/xul/server/patron/summary.xul','http'); 
-			//cache_me('/xul/server/patron/summary_overlay.xul','http'); 
-			//cache_me('/xul/server/patron/barcode_entry.xul','http');
-
-			//cache_me('/xul/server/patron/ue.xhtml','http');
-			//cache_me('/xul/server/admin/adminlib.js','http');
-			//cache_me('/xul/server/admin/admin.css','http');
-			//cache_me('/xul/server/patron/ue_config.js','http');
-			//cache_me('/xul/server/patron/ue_ui.js','http');
-			//cache_me('/xul/server/patron/ue.js','http');
-			//cache_me('/opac/common/js//config.js','http');
-			//cache_me('/opac/common/js/Cookie.js','http');
-			//cache_me('/opac/common/js/Cookies.js','http');
-			//cache_me('/opac/common/js/opac_utils.js','http');
-			//cache_me('/opac/common/js/init.js','http');
-			//cache_me('/opac/common/js/jscalendar/calendar-brown.css','http');
-			//cache_me('/opac/common/js/jscalendar/calendar.js','http');
-			//cache_me('/opac/common/js/jscalendar/lang/calendar-en.js','http');
-			//cache_me('/opac/common/js/jscalendar/calendar-setup.js','http');
-			//cache_me('/opac/common/js/jscalendar/img.gif','http');
-
-			//cache_me('/xul/server/skin/media/images/stop_sign.png','http');
-			//cache_me('/xul/server/skin/media/images/bad_barcode.png','http');
-			//cache_me('/xul/server/skin/media/images/grinder.gif','http');     
-			//cache_me('/xul/server/skin/media/images/patron_left_arrow.png','http');
-			//cache_me('/xul/server/skin/media/images/skull.png','http');
-			//cache_me('/xul/server/skin/media/images/tools.png','http');
-			//cache_me('/xul/server/skin/media/images/up_arrow.gif','http');
-			//cache_me('/xul/server/skin/media/images/book_question.png','http');
-			//cache_me('/xul/server/skin/media/images/down_arrow.gif','http');
-			//cache_me('/xul/server/skin/media/images/icon_delete.gif','http');
-			//cache_me('/xul/server/skin/media/images/patron_right_arrow.png','http');
-			//cache_me('/xul/server/skin/media/images/turtle.gif','http');
-			//cache_me('/xul/server/skin/media/audio/bonus.wav','http');
-			//cache_me('/xul/server/skin/media/audio/question.wav','http');
-			//cache_me('/xul/server/skin/media/audio/redalert.wav','http');
-			//cache_me('/xul/server/skin/media/audio/toggled.wav','http');
-
-			//cache_me('/xul/server//circ/checkin.js','http');  
-			//cache_me('/xul/server//circ/checkout.js','http');  
-			//cache_me('/xul/server//circ/copy_status.js','http'); 
-			//cache_me('/xul/server//circ/hold_capture.js','http'); 
-			//cache_me('/xul/server//circ/in_house_use.js','http');  
-			//cache_me('/xul/server//circ/util.js','http'); 
-
-			//cache_me('/xul/server/circ/checkout_overlay.xul','http');
-			//cache_me('/xul/server/circ/checkout.xul','http');
-			//cache_me('/xul/server/circ/checkin_overlay.xul','http');
-			//cache_me('/xul/server/circ/checkin.xul','http');
-			//cache_me('/xul/server/circ/circ_brief.xul','http');
-			//cache_me('/xul/server/circ/circ_summary.xul','http');
-			//cache_me('/xul/server/circ/copy_status.xul','http');
-			//cache_me('/xul/server/circ/copy_status_overlay.xul','http');
-
-			// ----
+    onload="try { data_init(); } catch(E) { alert(E); }"
+    title="&staff.auth.title;"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <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="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+
+        function data_init() {
+
+            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+            if (typeof JSAN == 'undefined') {
+                throw(document.getElementById("commonStrings").getString('common.jsan.missing'));
+            }
+            /////////////////////////////////////////////////////////////////////////////
+
+            JSAN.errorLevel = "die"; // none, warn, or die
+            JSAN.addRepository('/xul/server/');
+
+            function cache_me(msg,how) {
+                try {
+                    switch(how) {
+                        case 'jsan' : JSAN.use(msg); break;
+                        case 'http' :
+                            var x = new XMLHttpRequest();
+                            x.open("GET",msg,true);
+                            x.send(null);
+                        break;
+                    }
+                    dump(msg + '\n');
+                    var x = document.getElementById('data_progress');
+                    if (x) {
+                        x.appendChild( document.createTextNode( msg + ' ') );
+                    }
+                } catch(E) {
+                    dump(msg + '\n' + E);
+                }
+            }
+
+            // load these just so they'll get cached
+            //cache_me('/xul/server//util/exec.js','http');
+            //cache_me('/xul/server//util/barcode.js','http');  
+            //cache_me('/xul/server//util/controller.js','http');  
+            //cache_me('/xul/server//util/deck.js','http');  
+            //cache_me('/xul/server//util/fm_utils.js','http');  
+            //cache_me('/xul/server//util/list.js','http');  
+            //cache_me('/xul/server//util/network.js','http'); 
+            //cache_me('/xul/server//util/sound.js','http'); 
+            //cache_me('/xul/server//util/widgets.js','http');  
+            //cache_me('/xul/server//util/browser.js','http');  
+            //cache_me('/xul/server//util/error.js','http');  
+            //cache_me('/xul/server//util/file.js','http'); 
+            //cache_me('/xul/server//util/functional.js','http');  
+            //cache_me('/xul/server//util/money.js','http');  
+            //cache_me('/xul/server//util/print.js','http');  
+            //cache_me('/xul/server//util/text.js','http'); 
+            //cache_me('/xul/server//util/window.js','http'); 
+
+            cache_me('/xul/server/util/fancy_prompt.xul','http');
+            //cache_me('/xul/server/util/browser.xul','http');
+            //cache_me('/xul/server/util/rbrowser.xul','http');
+
+            //cache_me('/xul/server//patron/display.js','http');  
+            //cache_me('/xul/server//patron/bills.js','http');  
+            //cache_me('/xul/server//patron/holds.js','http');  
+            //cache_me('/xul/server//patron/items.js','http'); 
+            //cache_me('/xul/server//patron/search_form.js','http');  
+            //cache_me('/xul/server//patron/search_result.js','http');  
+            //cache_me('/xul/server//patron/summary.js','http'); 
+            //cache_me('/xul/server//patron/util.js','http'); 
+
+            //cache_me('/xul/server/patron/display.xul','http');  
+            //cache_me('/xul/server/patron/display_overlay.xul','http');  
+            //cache_me('/xul/server/patron/bills.xul','http');  
+            //cache_me('/xul/server/patron/bills_overlay.xul','http');  
+            //cache_me('/xul/server/patron/holds.xul','http');  
+            //cache_me('/xul/server/patron/holds_overlay.xul','http');  
+            //cache_me('/xul/server/patron/items.xul','http'); 
+            //cache_me('/xul/server/patron/items_overlay.xul','http'); 
+            //cache_me('/xul/server/patron/search_form.xul','http');  
+            //cache_me('/xul/server/patron/search_form_overlay.xul','http');  
+            //cache_me('/xul/server/patron/search_result.xul','http');  
+            //cache_me('/xul/server/patron/search_result_overlay.xul','http');  
+            //cache_me('/xul/server/patron/summary.xul','http'); 
+            //cache_me('/xul/server/patron/summary_overlay.xul','http'); 
+            //cache_me('/xul/server/patron/barcode_entry.xul','http');
+
+            //cache_me('/xul/server/patron/ue.xhtml','http');
+            //cache_me('/xul/server/admin/adminlib.js','http');
+            //cache_me('/xul/server/admin/admin.css','http');
+            //cache_me('/xul/server/patron/ue_config.js','http');
+            //cache_me('/xul/server/patron/ue_ui.js','http');
+            //cache_me('/xul/server/patron/ue.js','http');
+            //cache_me('/opac/common/js//config.js','http');
+            //cache_me('/opac/common/js/Cookie.js','http');
+            //cache_me('/opac/common/js/Cookies.js','http');
+            //cache_me('/opac/common/js/opac_utils.js','http');
+            //cache_me('/opac/common/js/init.js','http');
+            //cache_me('/opac/common/js/jscalendar/calendar-brown.css','http');
+            //cache_me('/opac/common/js/jscalendar/calendar.js','http');
+            //cache_me('/opac/common/js/jscalendar/lang/calendar-en.js','http');
+            //cache_me('/opac/common/js/jscalendar/calendar-setup.js','http');
+            //cache_me('/opac/common/js/jscalendar/img.gif','http');
+
+            //cache_me('/xul/server/skin/media/images/stop_sign.png','http');
+            //cache_me('/xul/server/skin/media/images/bad_barcode.png','http');
+            //cache_me('/xul/server/skin/media/images/grinder.gif','http');     
+            //cache_me('/xul/server/skin/media/images/patron_left_arrow.png','http');
+            //cache_me('/xul/server/skin/media/images/skull.png','http');
+            //cache_me('/xul/server/skin/media/images/tools.png','http');
+            //cache_me('/xul/server/skin/media/images/up_arrow.gif','http');
+            //cache_me('/xul/server/skin/media/images/book_question.png','http');
+            //cache_me('/xul/server/skin/media/images/down_arrow.gif','http');
+            //cache_me('/xul/server/skin/media/images/icon_delete.gif','http');
+            //cache_me('/xul/server/skin/media/images/patron_right_arrow.png','http');
+            //cache_me('/xul/server/skin/media/images/turtle.gif','http');
+            //cache_me('/xul/server/skin/media/audio/bonus.wav','http');
+            //cache_me('/xul/server/skin/media/audio/question.wav','http');
+            //cache_me('/xul/server/skin/media/audio/redalert.wav','http');
+            //cache_me('/xul/server/skin/media/audio/toggled.wav','http');
+
+            //cache_me('/xul/server//circ/checkin.js','http');  
+            //cache_me('/xul/server//circ/checkout.js','http');  
+            //cache_me('/xul/server//circ/copy_status.js','http'); 
+            //cache_me('/xul/server//circ/hold_capture.js','http'); 
+            //cache_me('/xul/server//circ/in_house_use.js','http');  
+            //cache_me('/xul/server//circ/util.js','http'); 
+
+            //cache_me('/xul/server/circ/checkout_overlay.xul','http');
+            //cache_me('/xul/server/circ/checkout.xul','http');
+            //cache_me('/xul/server/circ/checkin_overlay.xul','http');
+            //cache_me('/xul/server/circ/checkin.xul','http');
+            //cache_me('/xul/server/circ/circ_brief.xul','http');
+            //cache_me('/xul/server/circ/circ_summary.xul','http');
+            //cache_me('/xul/server/circ/copy_status.xul','http');
+            //cache_me('/xul/server/circ/copy_status_overlay.xul','http');
+
+            // ----
 
             JSAN.use('util.error'); 
             g.error = new util.error();
-			JSAN.use('OpenILS.data');
-			g.data = new OpenILS.data()
+            JSAN.use('OpenILS.data');
+            g.data = new OpenILS.data()
 
-			g.data.session = {};
-			g.data.session.key = xulG.auth.session.key;
-			g.data.session.authtime = xulG.auth.session.authtime;
-			g.data.stash('session');
+            g.data.session = {};
+            g.data.session.key = xulG.auth.session.key;
+            g.data.session.authtime = xulG.auth.session.authtime;
+            g.data.stash('session');
             g.data.on_error = function(E) {
                 try {
                     g.error.standard_unexpected_error_alert('Error during login sequence.  The client will logout after this dialog.',E);
@@ -201,7 +201,7 @@
                 }
                 return false;
             }
-			g.data.on_complete = function () {
+            g.data.on_complete = function () {
 
                 try {
 
@@ -211,7 +211,7 @@
 
                     document.getElementById('iframe').setAttribute(
                         'src',
-                        urls.XUL_OFFLINE_GENERATE_WIDGETS	
+                        urls.XUL_OFFLINE_GENERATE_WIDGETS    
                     );
 
                     document.getElementById('caption').setAttribute('label', document.getElementById('commonStrings').getString('staff.main.data.loaded'));
@@ -221,11 +221,11 @@
                 } catch(E) {
                     alert(E);
                 }
-			}
+            }
 
             g.open_menu = function() {
                 try {
-			        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
                     var mframe = xulG.window.open(urls.XUL_MENU_FRAME
                         + '?server='+window.escape(xulG.url),
                         'main'+xulG.window.window_name_increment(),'chrome,resizable'
@@ -236,19 +236,19 @@
                 }
             }
 
-			g.data.init();
-	
-			g.data.init_observer_functions();
+            g.data.init();
+    
+            g.data.init_observer_functions();
 
-		}
-	]]>
-	</script>
+        }
+    ]]>
+    </script>
 
-	<groupbox id="data_groupbox" flex="1" class="my_overflow"> 
-		<caption id="caption" label="&staff.main.data.loading;"/> 
-		<description id="data_progress"/>
-		<iframe id="iframe" />
-	</groupbox>
+    <groupbox id="data_groupbox" flex="1" class="my_overflow"> 
+        <caption id="caption" label="&staff.main.data.loading;"/> 
+        <description id="data_progress"/>
+        <iframe id="iframe" />
+    </groupbox>
 
 </window>
 
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 3b98b13ed7..da5873f600 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
@@ -13,7 +13,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,33 +21,33 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="gen_offline_menus_win" 
-	onload="try { my_init(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
-	<scripts id="openils_util_scripts"/>
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
 
         function my_init() {
             netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-			if (typeof JSAN == 'undefined') {
-				throw(document.getElementById('commonStrings').getString('common.jsan.missing'));
-			}
-			/////////////////////////////////////////////////////////////////////////////
+            if (typeof JSAN == 'undefined') {
+                throw(document.getElementById('commonStrings').getString('common.jsan.missing'));
+            }
+            /////////////////////////////////////////////////////////////////////////////
 
-			JSAN.errorLevel = "die"; // none, warn, or die
-			JSAN.addRepository('/xul/server/');
+            JSAN.errorLevel = "die"; // none, warn, or die
+            JSAN.addRepository('/xul/server/');
 
-			JSAN.use('util.error'); g.error = new util.error();
-			JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-			JSAN.use('util.network'); g.network = new util.network();
+            JSAN.use('util.error'); g.error = new util.error();
+            JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+            JSAN.use('util.network'); g.network = new util.network();
 
             gen_offline_menus_init();
 
@@ -56,189 +56,189 @@
             g.data.stash('user_org_unit_opt_in_enabled');
         }
 
-		function gen_offline_menus_init() {
-
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-			JSAN.use('util.functional');
-
-			save_object('offline_ou_list', build_ou_list());
-
-			save_object('offline_pgt_list', build_pgt_list());
-
-			save_object('offline_cit_list', build_cit_list());
-
-			save_object('offline_cnct_list', build_cnct_list());
-
-			save_object('offline_asv_list', build_asv_list());
-
-			var server_time = g.network.request('open-ils.actor','opensrf.system.time',[]);
-			var local_time = parseInt( new Date().getTime() / 1000 );
-
-			var delta = server_time - local_time;
-
-			JSAN.use('util.file'); var file = new util.file('pending_xacts');
-			if (file._file.exists()) {
-				file.close();
-			} else {
-				file.close();
-				save_object('offline_delta', [ delta ]);
-			}
-
-			save_object('print_list_templates',g.data.print_list_templates);
-
-			$('placeholder').setAttribute('value', document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.synced'));
-
-		}
-
-		function $(id) {
-			return document.getElementById(id);
-		}
-
-		function save_object(filename,obj) {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			JSAN.use('util.file'); var file = new util.file(filename);
-			file.set_object(obj); file.close();
-		}
-
-		function build_ou_list() {
-			JSAN.use('util.fm_utils');
-			return [
-				util.functional.map_list( 
-					/*util.fm_utils.flatten_ou_branch(g.data.tree.aou)*/ g.data.list.aou,
-					function(obj) { 
-						var sname = obj.shortname();
-						for (i = sname.length; i < 20; i++) {
-							sname += ' ';
-						}
-						return [ 
-							obj.name() ? sname + ' ' + obj.name() : obj.shortname(),
-							obj.id(), 
-							( ! get_bool( g.data.hash.aout[ obj.ou_type() ].can_have_users() ) ),
-							( g.data.hash.aout[ obj.ou_type() ].depth() * 2),
-						]; 
-					}
-				),
-				g.data.list.au[0].ws_ou()
-			];
-		}
-
-		function build_pgt_list() {
-			var list = []; var added = {};
-
-			function walk(n) {
-				if (
-					(n.application_perm() == 'group_application.user.patron') ||
-					(n.application_perm() == null) ||
-					(n.application_perm() == '')
-				) {
-					if (typeof added[n.id()] == 'undefined') {
-						list.push(n); added[n.id()] = true;
-						var children = n.children();
-						if (children) for (var i = 0; i < children.length; i++) {
-							walk(children[i]);
-						}
-					}
-				} else if (n.parent() == null) {
-					var children = n.children();
-					if (children) for (var i = 0; i < children.length; i++) {
-						walk(children[i]);
-					}
-				}
-			}
-
-			walk(g.data.tree.pgt);
-
-			return [
-				util.functional.map_list( 
-					list,
-					function(obj) { return [ 
-						obj.description() ? obj.name() + ' : ' + obj.description() : obj.name(), 
-						obj.id() 
-					]; }
-				)
-			];
-		}
-
-		function build_cit_list() {
-			return [
-				util.functional.map_list( 
-					g.data.list.cit,
-					function(obj) { return [ 
-						obj.name(), 
-						obj.id() 
-					]; }
-				)
-			];
-		}
-
-		function build_cnct_list() {
-			JSAN.use('util.fm_utils');
-			return [
-				util.functional.map_list(
-					util.functional.filter_list(
-						g.data.list.cnct,
-						function(o) {
-							return util.fm_utils.compare_aou_a_is_b_or_ancestor(o.owning_lib(), g.data.list.au[0].ws_ou());
-						}
-					).sort(
-
-						function(a,b) {
-							try { 
-								return util.fm_utils.sort_func_aou_by_depth_and_then_string(
-									[ a.owning_lib(), a.name() ],
-									[ b.owning_lib(), b.name() ]
-								);
-							} catch(E) {
-								alert(document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.noncat_sort.error') + E);
-								return 0;
-							}
-						}
-
-					),
-					function(o) {
-						return [ g.data.hash.aou[ o.owning_lib() ].shortname() + ' : ' + o.name(), js2JSON( [ o.id(), o.circ_duration() ] ) ];
-					}
-				)
-			];
-		}
-
-		function build_asv_list() {
-			var obj = {};
-			/* loop through required surveys */
-			for (var i = 0; i < g.data.list.my_asv.length; i++) {
-				dump('i = ' + i + '\n');
-				var survey = g.data.list.my_asv[i];
-				obj[ survey.name() ] = {};
-				obj[ survey.name() ][ 'description' ] = survey.description();
-				obj[ survey.name() ][ 'questions' ] = [];
-
-				/* loop through survey questions */
-				for (var j = 0; j < survey.questions().length; j++) {
-					dump('\tj = ' + j + '\n');
-					var question = survey.questions()[j];
-					var q = {};
-					q[ 'question' ] = question.question();
-					q[ 'answers' ] = util.functional.map_list( 
-						question.answers(),
-						function(obj) { return [ 
-							obj.answer(), 
-							'[' + obj.id() + ',' 
-							+ obj.question() + ',' 
-							+ question.survey() + ']'
-						]; }
-					);
-					obj[ survey.name() ][ 'questions' ].push( q );
-				}
-			}
-			return obj;
-		}
-
-	]]>
-	</script>
-
-	<vbox flex="1">
-		<label id="placeholder"/>
-	</vbox>
+        function gen_offline_menus_init() {
+
+            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+            JSAN.use('util.functional');
+
+            save_object('offline_ou_list', build_ou_list());
+
+            save_object('offline_pgt_list', build_pgt_list());
+
+            save_object('offline_cit_list', build_cit_list());
+
+            save_object('offline_cnct_list', build_cnct_list());
+
+            save_object('offline_asv_list', build_asv_list());
+
+            var server_time = g.network.request('open-ils.actor','opensrf.system.time',[]);
+            var local_time = parseInt( new Date().getTime() / 1000 );
+
+            var delta = server_time - local_time;
+
+            JSAN.use('util.file'); var file = new util.file('pending_xacts');
+            if (file._file.exists()) {
+                file.close();
+            } else {
+                file.close();
+                save_object('offline_delta', [ delta ]);
+            }
+
+            save_object('print_list_templates',g.data.print_list_templates);
+
+            $('placeholder').setAttribute('value', document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.synced'));
+
+        }
+
+        function $(id) {
+            return document.getElementById(id);
+        }
+
+        function save_object(filename,obj) {
+            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+            JSAN.use('util.file'); var file = new util.file(filename);
+            file.set_object(obj); file.close();
+        }
+
+        function build_ou_list() {
+            JSAN.use('util.fm_utils');
+            return [
+                util.functional.map_list( 
+                    /*util.fm_utils.flatten_ou_branch(g.data.tree.aou)*/ g.data.list.aou,
+                    function(obj) { 
+                        var sname = obj.shortname();
+                        for (i = sname.length; i < 20; i++) {
+                            sname += ' ';
+                        }
+                        return [ 
+                            obj.name() ? sname + ' ' + obj.name() : obj.shortname(),
+                            obj.id(), 
+                            ( ! get_bool( g.data.hash.aout[ obj.ou_type() ].can_have_users() ) ),
+                            ( g.data.hash.aout[ obj.ou_type() ].depth() * 2),
+                        ]; 
+                    }
+                ),
+                g.data.list.au[0].ws_ou()
+            ];
+        }
+
+        function build_pgt_list() {
+            var list = []; var added = {};
+
+            function walk(n) {
+                if (
+                    (n.application_perm() == 'group_application.user.patron') ||
+                    (n.application_perm() == null) ||
+                    (n.application_perm() == '')
+                ) {
+                    if (typeof added[n.id()] == 'undefined') {
+                        list.push(n); added[n.id()] = true;
+                        var children = n.children();
+                        if (children) for (var i = 0; i < children.length; i++) {
+                            walk(children[i]);
+                        }
+                    }
+                } else if (n.parent() == null) {
+                    var children = n.children();
+                    if (children) for (var i = 0; i < children.length; i++) {
+                        walk(children[i]);
+                    }
+                }
+            }
+
+            walk(g.data.tree.pgt);
+
+            return [
+                util.functional.map_list( 
+                    list,
+                    function(obj) { return [ 
+                        obj.description() ? obj.name() + ' : ' + obj.description() : obj.name(), 
+                        obj.id() 
+                    ]; }
+                )
+            ];
+        }
+
+        function build_cit_list() {
+            return [
+                util.functional.map_list( 
+                    g.data.list.cit,
+                    function(obj) { return [ 
+                        obj.name(), 
+                        obj.id() 
+                    ]; }
+                )
+            ];
+        }
+
+        function build_cnct_list() {
+            JSAN.use('util.fm_utils');
+            return [
+                util.functional.map_list(
+                    util.functional.filter_list(
+                        g.data.list.cnct,
+                        function(o) {
+                            return util.fm_utils.compare_aou_a_is_b_or_ancestor(o.owning_lib(), g.data.list.au[0].ws_ou());
+                        }
+                    ).sort(
+
+                        function(a,b) {
+                            try { 
+                                return util.fm_utils.sort_func_aou_by_depth_and_then_string(
+                                    [ a.owning_lib(), a.name() ],
+                                    [ b.owning_lib(), b.name() ]
+                                );
+                            } catch(E) {
+                                alert(document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.noncat_sort.error') + E);
+                                return 0;
+                            }
+                        }
+
+                    ),
+                    function(o) {
+                        return [ g.data.hash.aou[ o.owning_lib() ].shortname() + ' : ' + o.name(), js2JSON( [ o.id(), o.circ_duration() ] ) ];
+                    }
+                )
+            ];
+        }
+
+        function build_asv_list() {
+            var obj = {};
+            /* loop through required surveys */
+            for (var i = 0; i < g.data.list.my_asv.length; i++) {
+                dump('i = ' + i + '\n');
+                var survey = g.data.list.my_asv[i];
+                obj[ survey.name() ] = {};
+                obj[ survey.name() ][ 'description' ] = survey.description();
+                obj[ survey.name() ][ 'questions' ] = [];
+
+                /* loop through survey questions */
+                for (var j = 0; j < survey.questions().length; j++) {
+                    dump('\tj = ' + j + '\n');
+                    var question = survey.questions()[j];
+                    var q = {};
+                    q[ 'question' ] = question.question();
+                    q[ 'answers' ] = util.functional.map_list( 
+                        question.answers(),
+                        function(obj) { return [ 
+                            obj.answer(), 
+                            '[' + obj.id() + ',' 
+                            + obj.question() + ',' 
+                            + question.survey() + ']'
+                        ]; }
+                    );
+                    obj[ survey.name() ][ 'questions' ].push( q );
+                }
+            }
+            return obj;
+        }
+
+    ]]>
+    </script>
+
+    <vbox flex="1">
+        <label id="placeholder"/>
+    </vbox>
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/main/simple_auth.xul b/Open-ILS/xul/staff_client/server/main/simple_auth.xul
index e89f6dc9ab..e67c9bc9af 100644
--- a/Open-ILS/xul/staff_client/server/main/simple_auth.xul
+++ b/Open-ILS/xul/staff_client/server/main/simple_auth.xul
@@ -14,7 +14,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -22,148 +22,148 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="simple_auth_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
 
         var offlineStrings = document.getElementById('offlineStrings');
 
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { 
-					throw( offlineStrings.getString('common.jsan.missing'));
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for simple_auth.xul');
-
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-				g.data.temporary_session = ''; g.data.stash('temporary_session');
-
-				$('server').value = g.data.server_unadorned;
-
-				addCSSClass(document.documentElement,xul_param('login_type',{'modal_xulG':true}))
-
-				if (xul_param('desc_brief',{'modal_xulG':true})) {
-					$('desc').hidden = false;
-					$('desc_brief').appendChild( document.createTextNode( xul_param('desc_brief',{'modal_xulG':true}) ) );
-				}
-				if (xul_param('desc_full',{'modal_xulG':true})) {
-					$('desc').hidden = false;
-					$('desc_full').appendChild( document.createTextNode( xul_param('desc_full',{'modal_xulG':true}) ) );
-				}
-
-				$('username').focus();
-
-				$('username').addEventListener('keypress',handle_keypress,false);
-				$('password').addEventListener('keypress',handle_keypress,false);
-
-			} catch(E) {
-				var err_msg =  offlineStrings.getFormattedString('common.exception', ['simple_auth.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function $(id) { return document.getElementById(id); }
-
-		function handle_keypress(ev) {
-			if ( (! ev.keyCode) || (ev.keyCode != 13) ) return;
-			switch(ev.target) {
-				case $('username') : $('password').focus(); break;
-				case $('password') : authorize(); break;
-				default: break;
-			}
-		}
-
-		function authorize() {
-			try {
-				JSAN.use('auth.session');
-				g.session = new auth.session(
-					{
-						'name_prompt' : $('username'),
-						'password_prompt' : $('password'),
-						'server_prompt' : $('server'),
-					},
-					xul_param('login_type',{'modal_xulG':true}) || 'temp'
-				);
-				g.session.on_init = function() { 
-					try {
-						JSAN.use('util.network'); var n = new util.network();
-						var staff = n.simple_request('FM_AU_RETRIEVE_VIA_SESSION',[ g.session.key ]);
-						g.data.temporary_session = {  // old way because of local chrome still out there
-							'key' : g.session.key, 
-							'authtime' : g.session.authtime, 
-							'usr' : js2JSON(staff)
-						}
-						g.data.stash('temporary_session');
-						var my_xulG = { // new way, to minimize the use of global spaces
-							'temporary_session' : g.data.temporary_session
-						};
-						update_modal_xulG(my_xulG);
-						window.close();
-					} catch(E) {
-						g.error.standard_unexpected_error_alert('simple_auth.session.on_init',E);
-					}
-				}
-				g.session.on_init_error = function() { 
-					$('password').value = '';
-					$('username').focus();
-					$('username').select();
-				 }
-				g.session.init();
-			} catch(E) {
-				alert(E);
-			}
-		}
-
-	]]>
-	</script>
-
-	<commandset id="simple_auth_cmds">
-		<command id="cmd_broken" />
-	</commandset>
-
-	<vbox id="simple_auth_main" flex="1">
-	<groupbox id="desc" hidden="true">
-		<caption label="&staff.main.simple_auth.exception.label;"/>
-		<description id="desc_brief" style="color: red"/>
-		<description id="desc_full"/>
-	</groupbox>
-	<groupbox>
-		<caption label="&staff.main.simple_auth.authorization.label;"/>
-		<grid>
-			<columns><column /><column /></columns>
-			<rows>
-				<row>
-					<label value="&common.username.label;" control="username" accesskey="&common.username.accesskey;"/>
-					<textbox id="username" />
-				</row>
-				<row>
-					<label value="&staff.auth.password_prompt;" control="password" accesskey="&staff.auth.password_prompt.accesskey;"/>
-					<textbox id="password" type="password"/>
-				</row>
-				<row>
-					<button label="&common.cancel;" accesskey="&common.cancel.accesskey;" oncommand="window.close()"/>
-					<button label="&staff.main.simple_auth.authorize.label;" accesskey="&staff.main.simple_auth.authorize.accesskey;" oncommand="authorize()"/>
-				</row>
-			</rows>
-		</grid>
-		<label id="server" hidden="true"/>
-	</groupbox>
-	<spacer flex="1"/>
-	</vbox>
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { 
+                    throw( offlineStrings.getString('common.jsan.missing'));
+                }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for simple_auth.xul');
+
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+                g.data.temporary_session = ''; g.data.stash('temporary_session');
+
+                $('server').value = g.data.server_unadorned;
+
+                addCSSClass(document.documentElement,xul_param('login_type',{'modal_xulG':true}))
+
+                if (xul_param('desc_brief',{'modal_xulG':true})) {
+                    $('desc').hidden = false;
+                    $('desc_brief').appendChild( document.createTextNode( xul_param('desc_brief',{'modal_xulG':true}) ) );
+                }
+                if (xul_param('desc_full',{'modal_xulG':true})) {
+                    $('desc').hidden = false;
+                    $('desc_full').appendChild( document.createTextNode( xul_param('desc_full',{'modal_xulG':true}) ) );
+                }
+
+                $('username').focus();
+
+                $('username').addEventListener('keypress',handle_keypress,false);
+                $('password').addEventListener('keypress',handle_keypress,false);
+
+            } catch(E) {
+                var err_msg =  offlineStrings.getFormattedString('common.exception', ['simple_auth.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function $(id) { return document.getElementById(id); }
+
+        function handle_keypress(ev) {
+            if ( (! ev.keyCode) || (ev.keyCode != 13) ) return;
+            switch(ev.target) {
+                case $('username') : $('password').focus(); break;
+                case $('password') : authorize(); break;
+                default: break;
+            }
+        }
+
+        function authorize() {
+            try {
+                JSAN.use('auth.session');
+                g.session = new auth.session(
+                    {
+                        'name_prompt' : $('username'),
+                        'password_prompt' : $('password'),
+                        'server_prompt' : $('server'),
+                    },
+                    xul_param('login_type',{'modal_xulG':true}) || 'temp'
+                );
+                g.session.on_init = function() { 
+                    try {
+                        JSAN.use('util.network'); var n = new util.network();
+                        var staff = n.simple_request('FM_AU_RETRIEVE_VIA_SESSION',[ g.session.key ]);
+                        g.data.temporary_session = {  // old way because of local chrome still out there
+                            'key' : g.session.key, 
+                            'authtime' : g.session.authtime, 
+                            'usr' : js2JSON(staff)
+                        }
+                        g.data.stash('temporary_session');
+                        var my_xulG = { // new way, to minimize the use of global spaces
+                            'temporary_session' : g.data.temporary_session
+                        };
+                        update_modal_xulG(my_xulG);
+                        window.close();
+                    } catch(E) {
+                        g.error.standard_unexpected_error_alert('simple_auth.session.on_init',E);
+                    }
+                }
+                g.session.on_init_error = function() { 
+                    $('password').value = '';
+                    $('username').focus();
+                    $('username').select();
+                 }
+                g.session.init();
+            } catch(E) {
+                alert(E);
+            }
+        }
+
+    ]]>
+    </script>
+
+    <commandset id="simple_auth_cmds">
+        <command id="cmd_broken" />
+    </commandset>
+
+    <vbox id="simple_auth_main" flex="1">
+    <groupbox id="desc" hidden="true">
+        <caption label="&staff.main.simple_auth.exception.label;"/>
+        <description id="desc_brief" style="color: red"/>
+        <description id="desc_full"/>
+    </groupbox>
+    <groupbox>
+        <caption label="&staff.main.simple_auth.authorization.label;"/>
+        <grid>
+            <columns><column /><column /></columns>
+            <rows>
+                <row>
+                    <label value="&common.username.label;" control="username" accesskey="&common.username.accesskey;"/>
+                    <textbox id="username" />
+                </row>
+                <row>
+                    <label value="&staff.auth.password_prompt;" control="password" accesskey="&staff.auth.password_prompt.accesskey;"/>
+                    <textbox id="password" type="password"/>
+                </row>
+                <row>
+                    <button label="&common.cancel;" accesskey="&common.cancel.accesskey;" oncommand="window.close()"/>
+                    <button label="&staff.main.simple_auth.authorize.label;" accesskey="&staff.main.simple_auth.authorize.accesskey;" oncommand="authorize()"/>
+                </row>
+            </rows>
+        </grid>
+        <label id="server" hidden="true"/>
+    </groupbox>
+    <spacer flex="1"/>
+    </vbox>
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/main/verify_credentials.xul b/Open-ILS/xul/staff_client/server/main/verify_credentials.xul
index 24c2e8c18b..3a6d357618 100644
--- a/Open-ILS/xul/staff_client/server/main/verify_credentials.xul
+++ b/Open-ILS/xul/staff_client/server/main/verify_credentials.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -18,27 +18,27 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="verify_win" onload="try { verify_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var G;</script>
-	<scripts id="openils_util_scripts"/>
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <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="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="verify_credentials.js"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="verify_credentials.js"/>
 
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
-	<commandset id="verify_cmds">
-		<command id="cmd_verify" />
-		<command id="cmd_retrieve" />
-	</commandset>
+    <commandset id="verify_cmds">
+        <command id="cmd_verify" />
+        <command id="cmd_retrieve" />
+    </commandset>
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- CONTENT -->
-	<groupbox id="verify_groupbox" flex="1" style="overflow: auto;">
-		<caption id="verify_caption" label="&staff.auth.verify.caption;"/>
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- CONTENT -->
+    <groupbox id="verify_groupbox" flex="1" style="overflow: auto;">
+        <caption id="verify_caption" label="&staff.auth.verify.caption;"/>
         <grid>
             <columns> <column /> <column /> </columns>
             <rows>
@@ -66,7 +66,7 @@
         <vbox id="messages" flex="1" class="my_overflow">
             <label id="footer"/>
         </vbox>
-	</groupbox>
+    </groupbox>
 
 </window>
 
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 e674931e88..bce872de67 100644
--- a/Open-ILS/xul/staff_client/server/main/ws_info.xul
+++ b/Open-ILS/xul/staff_client/server/main/ws_info.xul
@@ -13,7 +13,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,66 +21,66 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="wsinfo_win" 
-	onload="try { wsinfo_init(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<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='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'/>
-	<script type="text/javascript" src="/opac/common/js/org_utils.js"/>
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function wsinfo_init() {
-
-			document.getElementById('register_btn').disabled = true;
-			document.getElementById('wsname').disabled = true;
-			document.getElementById('wsname').value = document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.please_wait');
-
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-			if (typeof JSAN == 'undefined') {
-				throw(document.getElementById("commonStrings").getString('common.jsan.missing'));
-			}
-			/////////////////////////////////////////////////////////////////////////////
-
-			JSAN.errorLevel = "die"; // none, warn, or die
-			JSAN.addRepository('/xul/server/');
-
-			JSAN.use('util.error'); g.error = new util.error();
-			JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-			JSAN.use('util.network'); g.network = new util.network();
-			JSAN.use('util.widgets');
-			JSAN.use('util.functional');
-			JSAN.use('util.fm_utils');
-
-			g.user = g.network.simple_request( 'FM_AU_RETRIEVE_VIA_SESSION', [ xulG.auth.session.key ] );
-
-			g.my_lib = g.user.home_ou();
-
-			g.aout_list = g.network.simple_request(
-				'FM_AOUT_RETRIEVE',
-				[ ]
-			);
-			g.aout_hash = {};
-			for (var i = 0; i < g.aout_list.length; i++) {
-				g.aout_hash[ g.aout_list[i].id() ] = g.aout_list[i];
-			}
-
-			var work_ous = g.network.simple_request(
-				'PERM_RETRIEVE_WORK_OU',
-				[ xulG.auth.session.key, 'REGISTER_WORKSTATION']
-			);
-			if (work_ous.length == 0) {
-				alert(document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.workstation_registration_denied'));
-				xulG.auth.logoff();
-				return;
-			}
+    onload="try { wsinfo_init(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <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='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'/>
+    <script type="text/javascript" src="/opac/common/js/org_utils.js"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+
+        function wsinfo_init() {
+
+            document.getElementById('register_btn').disabled = true;
+            document.getElementById('wsname').disabled = true;
+            document.getElementById('wsname').value = document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.please_wait');
+
+            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+            if (typeof JSAN == 'undefined') {
+                throw(document.getElementById("commonStrings").getString('common.jsan.missing'));
+            }
+            /////////////////////////////////////////////////////////////////////////////
+
+            JSAN.errorLevel = "die"; // none, warn, or die
+            JSAN.addRepository('/xul/server/');
+
+            JSAN.use('util.error'); g.error = new util.error();
+            JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+            JSAN.use('util.network'); g.network = new util.network();
+            JSAN.use('util.widgets');
+            JSAN.use('util.functional');
+            JSAN.use('util.fm_utils');
+
+            g.user = g.network.simple_request( 'FM_AU_RETRIEVE_VIA_SESSION', [ xulG.auth.session.key ] );
+
+            g.my_lib = g.user.home_ou();
+
+            g.aout_list = g.network.simple_request(
+                'FM_AOUT_RETRIEVE',
+                [ ]
+            );
+            g.aout_hash = {};
+            for (var i = 0; i < g.aout_list.length; i++) {
+                g.aout_hash[ g.aout_list[i].id() ] = g.aout_list[i];
+            }
+
+            var work_ous = g.network.simple_request(
+                'PERM_RETRIEVE_WORK_OU',
+                [ xulG.auth.session.key, 'REGISTER_WORKSTATION']
+            );
+            if (work_ous.length == 0) {
+                alert(document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.workstation_registration_denied'));
+                xulG.auth.logoff();
+                return;
+            }
             g.my_libs = [];
             for (var i = 0; i < work_ous.length; i++ ) {
                 var perm_depth = findOrgDepth( work_ous[i] );
@@ -92,97 +92,97 @@
                 if (!instanceOf(g.my_libs_tree,aou)) { /* FIXME - workaround for weird descendants call result */
                     g.my_libs_tree = g.my_libs_tree[0];
                 }
-			    g.my_libs = g.my_libs.concat( util.fm_utils.flatten_ou_branch( g.my_libs_tree ) );
+                g.my_libs = g.my_libs.concat( util.fm_utils.flatten_ou_branch( g.my_libs_tree ) );
+            }
+
+            g.my_libs_shortname_hash = {};
+            g.my_libs_ou_hash = {};
+            for (var i = 0; i < g.my_libs.length; i++) {
+                g.my_libs_shortname_hash[ g.my_libs[i].id() ] = g.my_libs[i].shortname();
+                g.my_libs_ou_hash[ g.my_libs[i].id() ] = function(o){return o;}(g.my_libs[i]);
             }
 
-			g.my_libs_shortname_hash = {};
-			g.my_libs_ou_hash = {};
-			for (var i = 0; i < g.my_libs.length; i++) {
-				g.my_libs_shortname_hash[ g.my_libs[i].id() ] = g.my_libs[i].shortname();
-				g.my_libs_ou_hash[ g.my_libs[i].id() ] = function(o){return o;}(g.my_libs[i]);
-			}
-
-			g.tb = document.getElementById('wsname');
-
-			render_menulist();
-
-			document.getElementById('register_btn').disabled = false;
-			document.getElementById('wsname').disabled = false;
-			document.getElementById('wsname').value = '';
-
-			document.getElementById('wsname').focus();
-		}
-
-		function render_menulist() {
-			var x = document.getElementById('placeholder');
-			util.widgets.remove_children( x );
-
-			var default_lib = g.my_lib; 
-			if ( !get_bool( g.aout_hash[ g.my_libs_ou_hash[ default_lib ].ou_type() ].can_have_users() ) ) {
-				default_lib = null;
-			}
-
-			g.ml = util.widgets.make_menulist( 
-				util.functional.map_list( 
-					util.fm_utils.flatten_ou_branch( g.my_libs_tree ),
-					function(obj) { 
-						if (!default_lib) {
-							if ( get_bool( g.aout_hash[ obj.ou_type() ].can_have_users() ) ) default_lib = obj.id();
-						}
-						return [ 
-							obj.shortname(), 
-							obj.id(), 
-							( !get_bool( g.aout_hash[ obj.ou_type() ].can_have_users() ) ),
-							( g.aout_hash[ obj.ou_type() ].depth() )
-						]; 
-					}
-				),
-				default_lib
-			);
-
-			x.appendChild( g.ml );
-		}
-
-		function register() {
-			try {
-				var robj = g.network.simple_request(
-					'AUTH_WORKSTATION',
-					[ xulG.auth.session.key, g.my_libs_shortname_hash[ g.ml.value ] + '-' + g.tb.value, g.ml.value ],
-					null,
-					{
-						'title' : document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.registration.override'),
-						'overridable_events' : [ 
-							1703 /* WORKSTATION_NAME_EXISTS */
-						]
-					}
-				);
-
-				if (typeof robj.ilsevent != 'undefined') {
-					switch(Number(robj.ilsevent)) {
-						case -1 : g.error.standard_network_error_alert(); break;
-						case 1703 /* WORKSTATION_NAME_EXISTS */ : /* handled with override request */ break;
+            g.tb = document.getElementById('wsname');
+
+            render_menulist();
+
+            document.getElementById('register_btn').disabled = false;
+            document.getElementById('wsname').disabled = false;
+            document.getElementById('wsname').value = '';
+
+            document.getElementById('wsname').focus();
+        }
+
+        function render_menulist() {
+            var x = document.getElementById('placeholder');
+            util.widgets.remove_children( x );
+
+            var default_lib = g.my_lib; 
+            if ( !get_bool( g.aout_hash[ g.my_libs_ou_hash[ default_lib ].ou_type() ].can_have_users() ) ) {
+                default_lib = null;
+            }
+
+            g.ml = util.widgets.make_menulist( 
+                util.functional.map_list( 
+                    util.fm_utils.flatten_ou_branch( g.my_libs_tree ),
+                    function(obj) { 
+                        if (!default_lib) {
+                            if ( get_bool( g.aout_hash[ obj.ou_type() ].can_have_users() ) ) default_lib = obj.id();
+                        }
+                        return [ 
+                            obj.shortname(), 
+                            obj.id(), 
+                            ( !get_bool( g.aout_hash[ obj.ou_type() ].can_have_users() ) ),
+                            ( g.aout_hash[ obj.ou_type() ].depth() )
+                        ]; 
+                    }
+                ),
+                default_lib
+            );
+
+            x.appendChild( g.ml );
+        }
+
+        function register() {
+            try {
+                var robj = g.network.simple_request(
+                    'AUTH_WORKSTATION',
+                    [ xulG.auth.session.key, g.my_libs_shortname_hash[ g.ml.value ] + '-' + g.tb.value, g.ml.value ],
+                    null,
+                    {
+                        'title' : document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.registration.override'),
+                        'overridable_events' : [ 
+                            1703 /* WORKSTATION_NAME_EXISTS */
+                        ]
+                    }
+                );
+
+                if (typeof robj.ilsevent != 'undefined') {
+                    switch(Number(robj.ilsevent)) {
+                        case -1 : g.error.standard_network_error_alert(); break;
+                        case 1703 /* WORKSTATION_NAME_EXISTS */ : /* handled with override request */ break;
                         case 1001 /* NO_SESSION */ : /* handled with request dialog */ break;
-						default: g.error.standard_unexpected_error_alert(document.getElementById('commonStrings').getFormattedString('staff.main.gen_offline_widgets.registration.error', ['1']), robj); break;
-					}
-				} else {
-					netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead");
-					g.data.ws_info[ xulG.auth.controller.view.server_prompt.value ] = { 
-						'name' : g.my_libs_shortname_hash[ g.ml.value ] + '-' + g.tb.value, 
-						'owning_lib' : g.ml.value,
-						'lib_shortname' : g.my_libs_shortname_hash[ g.ml.value ]
-					};
-					xulG.file.get('ws_info');
-					xulG.file.set_object(g.data.ws_info);
-					alert(document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.registration.success'));
-					xulG.auth.logoff();
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert(document.getElementById('commonStrings').getFormattedString('staff.main.gen_offline_widgets.registration.error', ['2']) ,E);
-			}
-		}
-
-	]]>
-	</script>
+                        default: g.error.standard_unexpected_error_alert(document.getElementById('commonStrings').getFormattedString('staff.main.gen_offline_widgets.registration.error', ['1']), robj); break;
+                    }
+                } else {
+                    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead");
+                    g.data.ws_info[ xulG.auth.controller.view.server_prompt.value ] = { 
+                        'name' : g.my_libs_shortname_hash[ g.ml.value ] + '-' + g.tb.value, 
+                        'owning_lib' : g.ml.value,
+                        'lib_shortname' : g.my_libs_shortname_hash[ g.ml.value ]
+                    };
+                    xulG.file.get('ws_info');
+                    xulG.file.set_object(g.data.ws_info);
+                    alert(document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.registration.success'));
+                    xulG.auth.logoff();
+                }
+            } catch(E) {
+                g.error.standard_unexpected_error_alert(document.getElementById('commonStrings').getFormattedString('staff.main.gen_offline_widgets.registration.error', ['2']) ,E);
+            }
+        }
+
+    ]]>
+    </script>
 
     <vbox flex="1" class="my_overflow">
         <description id="desc" hidden="true">
diff --git a/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul b/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul
index d833295269..03fee95a18 100644
--- a/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul
+++ b/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -18,201 +18,201 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="patron_barcode_entry_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for patron/barcode_entry.xul');
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function $(id) { return document.getElementById(id); }
+        
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+            if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for patron/barcode_entry.xul');
 
                 JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
 
-				var tb = document.getElementById('barcode_tb');
-				tb.addEventListener(
-					'keypress',
-					function(ev) {
-						if (ev.keyCode == 13 || ev.keyCode == 77) {
-							setTimeout(
-								function() {
-									submit();
-								}, 0
-							);
-						}
-					},
-					false
-				);
-				tb.focus();
-	
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+                var tb = document.getElementById('barcode_tb');
+                tb.addEventListener(
+                    'keypress',
+                    function(ev) {
+                        if (ev.keyCode == 13 || ev.keyCode == 77) {
+                            setTimeout(
+                                function() {
+                                    submit();
+                                }, 0
+                            );
+                        }
+                    },
+                    false
+                );
+                tb.focus();
+    
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
                     if (xul_param('perm_editor')) {
-					    try { window.xulG.set_tab_name($("patronStrings").getString('staff.patron.barcode_entry.user_permission_editor')); } catch(E) { alert(E); }
+                        try { window.xulG.set_tab_name($("patronStrings").getString('staff.patron.barcode_entry.user_permission_editor')); } catch(E) { alert(E); }
                     } else {
-    					try { window.xulG.set_tab_name($("patronStrings").getString('staff.patron.barcode_entry.check_out')); } catch(E) { alert(E); }
+                        try { window.xulG.set_tab_name($("patronStrings").getString('staff.patron.barcode_entry.check_out')); } catch(E) { alert(E); }
                     }
-				}
-
-				if (xul_param('error')) { 
-					var error = xul_param('error');
-					alert(error);
-				}
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/barcode_entry.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function submit() {
-			var tb;
-			try {
-				JSAN.use('util.sound'); var sound = new util.sound();
-				tb = document.getElementById('barcode_tb');
-				var barcode = tb.value;
-
-				barcode = String( barcode ).replace( /\s+/g, '' );
-
-				if (!barcode) { sound.bad(); add_msg($("patronStrings").getString('staff.patron.barcode_entry.no_barcode')); tb.select(); tb.focus(); return; }
-
-				JSAN.use('util.network'); var net = new util.network();
-
-				tb.disabled = true;
-				document.getElementById('progress').setAttribute('hidden','false');
-				net.simple_request('FM_AU_ID_RETRIEVE_VIA_BARCODE_OR_USERNAME',[ ses(), barcode, null ],
-					function(req) {
-						document.getElementById('progress').setAttribute('hidden','true');
-						tb.disabled = false; tb.select(); tb.focus(); ;
-						var robj = req.getResultObject();
-						if (typeof robj.ilsevent != 'undefined') {
-							sound.bad();
+                }
+
+                if (xul_param('error')) { 
+                    var error = xul_param('error');
+                    alert(error);
+                }
+
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/barcode_entry.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function submit() {
+            var tb;
+            try {
+                JSAN.use('util.sound'); var sound = new util.sound();
+                tb = document.getElementById('barcode_tb');
+                var barcode = tb.value;
+
+                barcode = String( barcode ).replace( /\s+/g, '' );
+
+                if (!barcode) { sound.bad(); add_msg($("patronStrings").getString('staff.patron.barcode_entry.no_barcode')); tb.select(); tb.focus(); return; }
+
+                JSAN.use('util.network'); var net = new util.network();
+
+                tb.disabled = true;
+                document.getElementById('progress').setAttribute('hidden','false');
+                net.simple_request('FM_AU_ID_RETRIEVE_VIA_BARCODE_OR_USERNAME',[ ses(), barcode, null ],
+                    function(req) {
+                        document.getElementById('progress').setAttribute('hidden','true');
+                        tb.disabled = false; tb.select(); tb.focus(); ;
+                        var robj = req.getResultObject();
+                        if (typeof robj.ilsevent != 'undefined') {
+                            sound.bad();
                             switch(Number(robj.ilsevent)) {
-							    case 1002 /* ACTOR_USER_NOT_FOUND */: 
-							        add_msg($("patronStrings").getFormattedString('staff.patron.barcode_entry.barcode_not_found', [barcode]));
+                                case 1002 /* ACTOR_USER_NOT_FOUND */: 
+                                    add_msg($("patronStrings").getFormattedString('staff.patron.barcode_entry.barcode_not_found', [barcode]));
                                 break;
                                 default:
                                     add_msg($("patronStrings").getFormattedString('staff.patron.barcode_entry.barcode_retrieval_problem', [barcode, js2JSON(robj)]));
                             }
-							return;
-						}
+                            return;
+                        }
 
-						if (g.data.user_org_unit_opt_in_enabled) {
-							var r = net.simple_request('USER_ORG_UNIT_OPT_IN_CHECK',[ ses(), robj ]);
-							if (typeof r.ilsevent != 'undefined') {
-								throw(r);
-							} else {
+                        if (g.data.user_org_unit_opt_in_enabled) {
+                            var r = net.simple_request('USER_ORG_UNIT_OPT_IN_CHECK',[ ses(), robj ]);
+                            if (typeof r.ilsevent != 'undefined') {
+                                throw(r);
+                            } else {
 
-								if (r == 0) {
+                                if (r == 0) {
 
-									JSAN.use('patron.util');
-									var parts = patron.util.retrieve_name_via_id( ses(), robj );
+                                    JSAN.use('patron.util');
+                                    var parts = patron.util.retrieve_name_via_id( ses(), robj );
     
-									if (0 != g.error.yns_alert(
-											$("patronStrings").getFormattedString('staff.patron.barcode_entry.consent_from_patron',
-												[parts[0], parts[1] + (parts[2] ? ' ' + parts[2] : ''), g.data.hash.aou[ parts[3] ].name(), g.data.hash.aou[ parts[3] ].shortname()]),
-											$("patronStrings").getString('staff.patron.barcode_entry.patron_consent_title'),
-											$("patronStrings").getString('staff.patron.barcode_entry.patron_consent_accept'),
-											$("patronStrings").getString('staff.patron.barcode_entry.patron_consent_deny'), null,
-											$("patronStrings").getString('staff.patron.barcode_entry.patron_consent_confirm')
-										)
-									) {
-										tb.select(); tb.focus();
-										return;
-									} else {
-										var c = net.simple_request('USER_ORG_UNIT_OPT_IN_CREATE',[ ses(), robj ]);
-										if (typeof c.ilsevent != 'undefined') throw(r);
-									}
-								}
+                                    if (0 != g.error.yns_alert(
+                                            $("patronStrings").getFormattedString('staff.patron.barcode_entry.consent_from_patron',
+                                                [parts[0], parts[1] + (parts[2] ? ' ' + parts[2] : ''), g.data.hash.aou[ parts[3] ].name(), g.data.hash.aou[ parts[3] ].shortname()]),
+                                            $("patronStrings").getString('staff.patron.barcode_entry.patron_consent_title'),
+                                            $("patronStrings").getString('staff.patron.barcode_entry.patron_consent_accept'),
+                                            $("patronStrings").getString('staff.patron.barcode_entry.patron_consent_deny'), null,
+                                            $("patronStrings").getString('staff.patron.barcode_entry.patron_consent_confirm')
+                                        )
+                                    ) {
+                                        tb.select(); tb.focus();
+                                        return;
+                                    } else {
+                                        var c = net.simple_request('USER_ORG_UNIT_OPT_IN_CREATE',[ ses(), robj ]);
+                                        if (typeof c.ilsevent != 'undefined') throw(r);
+                                    }
+                                }
     
-    						    sound.good();
-    						    spawn(barcode);
+                                sound.good();
+                                spawn(barcode);
                             }
                         } else {
-						    sound.good();
-						    spawn(barcode);
+                            sound.good();
+                            spawn(barcode);
                         }
-					}
-				);
-			} catch(E) {
-				tb.select(); tb.focus();
-				g.error.standard_unexpected_error_alert('barcode_entry.xul',E);
-			}
-		}
-
-		function add_msg(text) {
-			var x = document.getElementById('status');
-			var d = document.createElement('description');
-			x.appendChild(d);
-			d.appendChild( document.createTextNode( text ) );
-			d.setAttribute('style','color: red');
-		}
-
-		function spawn(barcode) {
+                    }
+                );
+            } catch(E) {
+                tb.select(); tb.focus();
+                g.error.standard_unexpected_error_alert('barcode_entry.xul',E);
+            }
+        }
+
+        function add_msg(text) {
+            var x = document.getElementById('status');
+            var d = document.createElement('description');
+            x.appendChild(d);
+            d.appendChild( document.createTextNode( text ) );
+            d.setAttribute('style','color: red');
+        }
+
+        function spawn(barcode) {
             if (xul_param('perm_editor')) { spawn_perm_editor(barcode); } else { spawn_checkout(barcode); }
         }
 
-		function spawn_checkout(barcode) {
-			try {
+        function spawn_checkout(barcode) {
+            try {
                 var horizontal_interface = String( g.data.hash.aous['ui.circ.patron_summary.horizontal'] ) == 'true';
                 var loc = xulG.url_prefix( horizontal_interface ? urls.XUL_PATRON_HORIZ_DISPLAY : urls.XUL_PATRON_DISPLAY );
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab == 'function') {
-					window.xulG.set_tab( loc, {}, { 'barcode' : barcode } );
-				} else {
-					location.href = loc + '?barcode=' + window.escape(barcode);
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.barcode_entry.patron_display_error'),E);
-			}
-		}
-
-		function spawn_perm_editor(barcode) {
-			try {
-				JSAN.use('patron.util'); var patron_obj = patron.util.retrieve_fleshed_au_via_barcode( ses(), barcode );
-				var loc = urls.XUL_USER_PERM_EDITOR + '?ses=' + window.escape(ses()) + '&usr=' + patron_obj.id();
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab == 'function') {
-					window.xulG.set_tab( loc, {}, {} );
-				} else {
-					location.href = loc;
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.barcode_entry.user_perm_display_error'),E);
-			}
-		}
-
-
-		function default_focus() { try { setTimeout( function() { document.getElementById('barcode_tb').focus(); }, 0); } catch(E) {} }
-	]]>
-	</script>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
-
-	<vbox flex="1" class="my_overflow">
-		<groupbox orient="vertical" flex="1">
-			<caption label="&staff.pat.barcode_entry.retrieve_patron.label;" />
-			<hbox>
-				<label value="&staff.pat.barcode_entry.barcode.label;" accesskey="&staff.pat.barcode_entry.barcode.accesskey;" control="barcode_tb"/>
-				<textbox id="barcode_tb"  context="clipboard"/>
-				<button label="&staff.pat.barcode_entry.submit_btn.label;" accesskey="&staff.pat.barcode_entry.submit_btn.accesskey;" oncommand="submit();"/>
-			</hbox>
-			<label value="&staff.pat.barcode_entry.retrieving.label;" style="color: green" id="progress" hidden="true"/>
-			<vbox id="status">
-			</vbox>
-		</groupbox>
-	</vbox>
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab == 'function') {
+                    window.xulG.set_tab( loc, {}, { 'barcode' : barcode } );
+                } else {
+                    location.href = loc + '?barcode=' + window.escape(barcode);
+                }
+            } catch(E) {
+                g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.barcode_entry.patron_display_error'),E);
+            }
+        }
+
+        function spawn_perm_editor(barcode) {
+            try {
+                JSAN.use('patron.util'); var patron_obj = patron.util.retrieve_fleshed_au_via_barcode( ses(), barcode );
+                var loc = urls.XUL_USER_PERM_EDITOR + '?ses=' + window.escape(ses()) + '&usr=' + patron_obj.id();
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab == 'function') {
+                    window.xulG.set_tab( loc, {}, {} );
+                } else {
+                    location.href = loc;
+                }
+            } catch(E) {
+                g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.barcode_entry.user_perm_display_error'),E);
+            }
+        }
+
+
+        function default_focus() { try { setTimeout( function() { document.getElementById('barcode_tb').focus(); }, 0); } catch(E) {} }
+    ]]>
+    </script>
+    
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+
+    <vbox flex="1" class="my_overflow">
+        <groupbox orient="vertical" flex="1">
+            <caption label="&staff.pat.barcode_entry.retrieve_patron.label;" />
+            <hbox>
+                <label value="&staff.pat.barcode_entry.barcode.label;" accesskey="&staff.pat.barcode_entry.barcode.accesskey;" control="barcode_tb"/>
+                <textbox id="barcode_tb"  context="clipboard"/>
+                <button label="&staff.pat.barcode_entry.submit_btn.label;" accesskey="&staff.pat.barcode_entry.submit_btn.accesskey;" oncommand="submit();"/>
+            </hbox>
+            <label value="&staff.pat.barcode_entry.retrieving.label;" style="color: green" id="progress" hidden="true"/>
+            <vbox id="status">
+            </vbox>
+        </groupbox>
+    </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/bill2.xul b/Open-ILS/xul/staff_client/server/patron/bill2.xul
index 23c760e81b..ce241302e2 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill2.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill2.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,19 +21,19 @@
 <!--<?xul-overlay href="/xul/server/patron/bill_summary_overlay.xul"?>-->
 
 <window id="bill_interface_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">
+    onload="try{ my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="bill2.js"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="bill2.js"/>
 
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
 
     <commandset>
         <command id="opac" disabled="true"/>
@@ -53,7 +53,7 @@
         </popup>
     </popupset>
 
-	<vbox flex="1" class="my_overflow">
+    <vbox flex="1" class="my_overflow">
         <groupbox orient="vertical" flex="1">
             <caption id="caption" label="&staff.patron.bill_interface.caption.label;"/>
             <hbox>
@@ -108,7 +108,7 @@
                         </rows>
                     </grid>
                     <hbox>
-		                <checkbox id="annotate_payment" label="&staff.patron.bills_overlay.annotate_payment.label;" accesskey="n" oils_persist="checked" checked="false" oncommand="default_focus();"/>
+                        <checkbox id="annotate_payment" label="&staff.patron.bills_overlay.annotate_payment.label;" accesskey="n" oils_persist="checked" checked="false" oncommand="default_focus();"/>
                         <button label="See Distribution" accesskey="D" oncommand="default_focus();"/>
                         <button label="Apply Payment" accesskey="P"/>
                     </hbox>
@@ -209,7 +209,7 @@
                 </grid>
             </hbox>
         </groupbox>
-	</vbox>
+    </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul b/Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul
index 0588632d9c..937966926b 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,94 +19,94 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="patron_bill" title="&staff.patron.bill_cc_info.title;"
-	orient="vertical" style="overflow: auto"
-	onload="try{info_init(); font_helper();}catch(E){alert(E);}"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    orient="vertical" style="overflow: auto"
+    onload="try{info_init(); font_helper();}catch(E){alert(E);}"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-
-		function info_init() {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-			JSAN.errorLevel = "die"; // none, warn, or die
-			JSAN.addRepository('/xul/server/');
-			JSAN.use('util.error'); g.error = new util.error();
-			g.error.sdump('D_TRACE','my_init() for patron_display.xul');
-			g.OpenILS = {}; JSAN.use('OpenILS.data'); g.OpenILS.data = new OpenILS.data();
-			g.OpenILS.data.init({'via':'stash'});
-			g.payment_blob = { 'cc_args' : {}, 'cancelled' : true };
-			g.OpenILS.data.temp = js2JSON( g.payment_blob );
-			g.OpenILS.data.stash('temp');
-
-			document.getElementById('cc_number').focus();
-		}
-
-		function info_finish() {
-			/* FIXME -- need unique temp space name */
-			delete( g.payment_blob.cancelled );
-			g.OpenILS.data.temp = js2JSON( g.payment_blob );
-			g.OpenILS.data.stash('temp');
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
-
-	<groupbox>
-		<caption label="&staff.patron.bill_cc_info.info.label;"/>
-		<grid>
-			<columns> <column flex="0" /> <column flex="0" /> </columns>
-			<rows>
-				<row>
-					<label value="&staff.patron.bill_cc_info.type.label;"/>
-					<menulist id="cc_type" oncommand="g.payment_blob.cc_args.type = this.value;">
-						<menupopup>
-							<menuitem label="&staff.patron.bill_cc_info.visa.label;" value="Visa"/>
-							<menuitem label="&staff.patron.bill_cc_info.mastercard.label;" value="Mastercard"/>
-							<menuitem label="&staff.patron.bill_cc_info.american_express.label;" value="American Express"/>
-							<menuitem label="&staff.patron.bill_cc_info.discover.label;" value="Discover"/>
-							<menuitem label="&staff.patron.bill_cc_info.other.label;" value="Other"/>
-						</menupopup>
-					</menulist>
-				</row>
-				<row>
-					<label value="&staff.patron.bill_cc_info.cc_number.value;"/>
-					<textbox id="cc_number" onchange="g.payment_blob.cc_args.number = event.target.value" context="clipboard"/>
-				</row>
-				<row>
-					<label value="&staff.patron.bill_cc_info.month_expire.value;"/>
-					<textbox id="expire_month" onchange="g.payment_blob.cc_args.expire_month = event.target.value" context="clipboard"/>
-				</row>
-				<row>
-					<label value="&staff.patron.bill_cc_info.year_expire.value;"/>
-					<textbox id="expire_year" onchange="g.payment_blob.cc_args.expire_year = event.target.value" context="clipboard"/>
-				</row>
-				<row>
-					<label value="&staff.patron.bill_cc_info.approval_code.value;"/>
-					<textbox id="approval_code" onchange="g.payment_blob.cc_args.approval_code = event.target.value" context="clipboard"/>
-				</row>
-				<row>
-					<label value="&staff.patron.bill_cc_info.note.value;"/>
-					<textbox id="note" onchange="g.payment_blob.note = event.target.value" multiline="true" context="clipboard"/>
-				</row>
-			</rows>
-		</grid>
-		<hbox>
-			<spacer flex="1"/>
-			<button label="&staff.patron.bill_cc_info.cancel.label;" oncommand="window.close()" accesskey="&staff.patron.bill_cc_info.cancel.accesskey;"/>
-			<button label="&staff.patron.bill_cc_info.submit.label;" oncommand="info_finish(); window.close();" accesskey="&staff.patron.bill_cc_info.submit.accesskey;"/>
-		</hbox>
-	</groupbox>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+
+    <script>
+    <![CDATA[
+        function $(id) { return document.getElementById(id); }
+
+        function info_init() {
+            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+            if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+            JSAN.errorLevel = "die"; // none, warn, or die
+            JSAN.addRepository('/xul/server/');
+            JSAN.use('util.error'); g.error = new util.error();
+            g.error.sdump('D_TRACE','my_init() for patron_display.xul');
+            g.OpenILS = {}; JSAN.use('OpenILS.data'); g.OpenILS.data = new OpenILS.data();
+            g.OpenILS.data.init({'via':'stash'});
+            g.payment_blob = { 'cc_args' : {}, 'cancelled' : true };
+            g.OpenILS.data.temp = js2JSON( g.payment_blob );
+            g.OpenILS.data.stash('temp');
+
+            document.getElementById('cc_number').focus();
+        }
+
+        function info_finish() {
+            /* FIXME -- need unique temp space name */
+            delete( g.payment_blob.cancelled );
+            g.OpenILS.data.temp = js2JSON( g.payment_blob );
+            g.OpenILS.data.stash('temp');
+        }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+
+    <groupbox>
+        <caption label="&staff.patron.bill_cc_info.info.label;"/>
+        <grid>
+            <columns> <column flex="0" /> <column flex="0" /> </columns>
+            <rows>
+                <row>
+                    <label value="&staff.patron.bill_cc_info.type.label;"/>
+                    <menulist id="cc_type" oncommand="g.payment_blob.cc_args.type = this.value;">
+                        <menupopup>
+                            <menuitem label="&staff.patron.bill_cc_info.visa.label;" value="Visa"/>
+                            <menuitem label="&staff.patron.bill_cc_info.mastercard.label;" value="Mastercard"/>
+                            <menuitem label="&staff.patron.bill_cc_info.american_express.label;" value="American Express"/>
+                            <menuitem label="&staff.patron.bill_cc_info.discover.label;" value="Discover"/>
+                            <menuitem label="&staff.patron.bill_cc_info.other.label;" value="Other"/>
+                        </menupopup>
+                    </menulist>
+                </row>
+                <row>
+                    <label value="&staff.patron.bill_cc_info.cc_number.value;"/>
+                    <textbox id="cc_number" onchange="g.payment_blob.cc_args.number = event.target.value" context="clipboard"/>
+                </row>
+                <row>
+                    <label value="&staff.patron.bill_cc_info.month_expire.value;"/>
+                    <textbox id="expire_month" onchange="g.payment_blob.cc_args.expire_month = event.target.value" context="clipboard"/>
+                </row>
+                <row>
+                    <label value="&staff.patron.bill_cc_info.year_expire.value;"/>
+                    <textbox id="expire_year" onchange="g.payment_blob.cc_args.expire_year = event.target.value" context="clipboard"/>
+                </row>
+                <row>
+                    <label value="&staff.patron.bill_cc_info.approval_code.value;"/>
+                    <textbox id="approval_code" onchange="g.payment_blob.cc_args.approval_code = event.target.value" context="clipboard"/>
+                </row>
+                <row>
+                    <label value="&staff.patron.bill_cc_info.note.value;"/>
+                    <textbox id="note" onchange="g.payment_blob.note = event.target.value" multiline="true" context="clipboard"/>
+                </row>
+            </rows>
+        </grid>
+        <hbox>
+            <spacer flex="1"/>
+            <button label="&staff.patron.bill_cc_info.cancel.label;" oncommand="window.close()" accesskey="&staff.patron.bill_cc_info.cancel.accesskey;"/>
+            <button label="&staff.patron.bill_cc_info.submit.label;" oncommand="info_finish(); window.close();" accesskey="&staff.patron.bill_cc_info.submit.accesskey;"/>
+        </hbox>
+    </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_check_info.xul b/Open-ILS/xul/staff_client/server/patron/bill_check_info.xul
index db6b048d3b..668d09c344 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_check_info.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_check_info.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,70 +19,70 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="patron_bill" title="&staff.patron.bill_check_info.title;"
-	orient="vertical" style="overflow: auto"
-	onload="try{info_init(); font_helper();}catch(E){alert(E);}"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    orient="vertical" style="overflow: auto"
+    onload="try{info_init(); font_helper();}catch(E){alert(E);}"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-
-		function info_init() {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-			JSAN.errorLevel = "die"; // none, warn, or die
-			JSAN.addRepository('/xul/server/');
-			JSAN.use('util.error'); g.error = new util.error();
-			g.error.sdump('D_TRACE','my_init() for patron_display.xul');
-			g.OpenILS = {}; JSAN.use('OpenILS.data'); g.OpenILS.data = new OpenILS.data();
-			g.OpenILS.data.init({'via':'stash'});
-			g.payment_blob = { 'cancelled' : true };
-			g.OpenILS.data.temp = js2JSON( g.payment_blob );
-			g.OpenILS.data.stash('temp');
-
-			document.getElementById('check_number').focus();
-		}
-
-		function info_finish() {
-			/* FIXME -- need unique temp space name */
-			delete( g.payment_blob.cancelled );
-			g.OpenILS.data.temp = js2JSON( g.payment_blob );
-			g.OpenILS.data.stash('temp');
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
-
-	<groupbox>
-		<caption label="&staff.patron.bill_check_info.check_info.label;"/>
-		<grid>
-			<columns> <column flex="0" /> <column flex="0" /> </columns>
-			<rows>
-				<row>
-					<label value="&staff.patron.bill_check_info.check_number.value;"/>
-					<textbox id="check_number" onchange="g.payment_blob.check_number = event.target.value" context="clipboard"/>
-				</row>
-				<row>
-					<label value="&staff.patron.bill_check_info.note.value;"/>
-					<textbox id="note" onchange="g.payment_blob.note = event.target.value" multiline="true" context="clipboard"/>
-				</row>
-			</rows>
-		</grid>
-		<hbox>
-			<spacer flex="1"/>
-			<button label="&staff.patron.bill_check_info.cancel.label;" oncommand="window.close()" accesskey="&staff.patron.bill_check_info.cancel.accesskey;"/>
-			<button label="&staff.patron.bill_check_info.submit.label;" oncommand="info_finish(); window.close();" accesskey="&staff.patron.bill_check_info.submit.accesskey;"/>
-		</hbox>
-	</groupbox>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+
+    <script>
+    <![CDATA[
+        function $(id) { return document.getElementById(id); }
+
+        function info_init() {
+            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+            if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+            JSAN.errorLevel = "die"; // none, warn, or die
+            JSAN.addRepository('/xul/server/');
+            JSAN.use('util.error'); g.error = new util.error();
+            g.error.sdump('D_TRACE','my_init() for patron_display.xul');
+            g.OpenILS = {}; JSAN.use('OpenILS.data'); g.OpenILS.data = new OpenILS.data();
+            g.OpenILS.data.init({'via':'stash'});
+            g.payment_blob = { 'cancelled' : true };
+            g.OpenILS.data.temp = js2JSON( g.payment_blob );
+            g.OpenILS.data.stash('temp');
+
+            document.getElementById('check_number').focus();
+        }
+
+        function info_finish() {
+            /* FIXME -- need unique temp space name */
+            delete( g.payment_blob.cancelled );
+            g.OpenILS.data.temp = js2JSON( g.payment_blob );
+            g.OpenILS.data.stash('temp');
+        }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+
+    <groupbox>
+        <caption label="&staff.patron.bill_check_info.check_info.label;"/>
+        <grid>
+            <columns> <column flex="0" /> <column flex="0" /> </columns>
+            <rows>
+                <row>
+                    <label value="&staff.patron.bill_check_info.check_number.value;"/>
+                    <textbox id="check_number" onchange="g.payment_blob.check_number = event.target.value" context="clipboard"/>
+                </row>
+                <row>
+                    <label value="&staff.patron.bill_check_info.note.value;"/>
+                    <textbox id="note" onchange="g.payment_blob.note = event.target.value" multiline="true" context="clipboard"/>
+                </row>
+            </rows>
+        </grid>
+        <hbox>
+            <spacer flex="1"/>
+            <button label="&staff.patron.bill_check_info.cancel.label;" oncommand="window.close()" accesskey="&staff.patron.bill_check_info.cancel.accesskey;"/>
+            <button label="&staff.patron.bill_check_info.submit.label;" oncommand="info_finish(); window.close();" accesskey="&staff.patron.bill_check_info.submit.accesskey;"/>
+        </hbox>
+    </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_details.xul b/Open-ILS/xul/staff_client/server/patron/bill_details.xul
index 30d3926d9d..b24189dfab 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_details.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_details.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,59 +21,59 @@
 <?xul-overlay href="/xul/server/patron/bill_summary_overlay.xul"?>
 
 <window id="bill_details_win" width="700" height="550"
-	onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="bill_details.js"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="bill_details.js"/>
 
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
-	<vbox flex="1" class="my_overflow">
-		<label id="patron_name" class="patronNameLarge"/>
+    <vbox flex="1" class="my_overflow">
+        <label id="patron_name" class="patronNameLarge"/>
 
-		<groupbox orient="vertical" flex="1" id="summary" />
+        <groupbox orient="vertical" flex="1" id="summary" />
 
-		<splitter><grippy/></splitter>
+        <splitter><grippy/></splitter>
 
         <vbox id="copy_summary_vbox" flex="1" />
 
-		<splitter id="copy_summary_splitter"><grippy/></splitter>
+        <splitter id="copy_summary_splitter"><grippy/></splitter>
 
-			<groupbox orient="vertical" flex="2">
-				<caption label="&staff.patron.bill_details.bills.label;" style="color: red"/>
-				<tree id="bill_tree" flex="1" enableColumnDrag="true"/>
-				<hbox>
+            <groupbox orient="vertical" flex="2">
+                <caption label="&staff.patron.bill_details.bills.label;" style="color: red"/>
+                <tree id="bill_tree" flex="1" enableColumnDrag="true"/>
+                <hbox>
                     <hbox id="bill_list_actions" />
-					<spacer flex="1"/>
-					<button id="edit_bill_note" label="&staff.patron.bill_details.edit_notes.label;" disabled="true"/>
-					<button id="void" label="&staff.patron.bill_details.void_selection.label;" disabled="true"/>
-				</hbox>
-			</groupbox>
-
-			<splitter><grippy/></splitter>
-
-			<groupbox orient="vertical" flex="2">
-				<caption label="&staff.patron.bill_details.payments.label;" style="color: green"/>
-				<tree id="payment_tree" flex="1" enableColumnDrag="true"/>
-				<hbox>
+                    <spacer flex="1"/>
+                    <button id="edit_bill_note" label="&staff.patron.bill_details.edit_notes.label;" disabled="true"/>
+                    <button id="void" label="&staff.patron.bill_details.void_selection.label;" disabled="true"/>
+                </hbox>
+            </groupbox>
+
+            <splitter><grippy/></splitter>
+
+            <groupbox orient="vertical" flex="2">
+                <caption label="&staff.patron.bill_details.payments.label;" style="color: green"/>
+                <tree id="payment_tree" flex="1" enableColumnDrag="true"/>
+                <hbox>
                     <hbox id="payment_list_actions" />
-					<spacer flex="1"/>
-					<button id="edit_payment_note" label="&staff.patron.bill_details.edit_notes.label;" disabled="true"/>
-				</hbox>
-			</groupbox>
-
-		<hbox>
-			<button id="opac" label="&staff.patron.bill_details.show_in_catalog.label;" accesskey="&staff.patron.bill_details.show_in_catalog.accesskey;" hidden="true"/>
-			<spacer flex="1"/>
-			<button label="&staff.patron.bill_details.close_window.label;" oncommand="window.close()" accesskey="&staff.patron.bill_details.close_window.accesskey;"/>
-		</hbox>
-	</vbox>
+                    <spacer flex="1"/>
+                    <button id="edit_payment_note" label="&staff.patron.bill_details.edit_notes.label;" disabled="true"/>
+                </hbox>
+            </groupbox>
+
+        <hbox>
+            <button id="opac" label="&staff.patron.bill_details.show_in_catalog.label;" accesskey="&staff.patron.bill_details.show_in_catalog.accesskey;" hidden="true"/>
+            <spacer flex="1"/>
+            <button label="&staff.patron.bill_details.close_window.label;" oncommand="window.close()" accesskey="&staff.patron.bill_details.close_window.accesskey;"/>
+        </hbox>
+    </vbox>
 
 
 </window>
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 b209d3a833..613e9bd05a 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_history.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_history.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,21 +21,21 @@
 <!--<?xul-overlay href="/xul/server/patron/bill_summary_overlay.xul"?>-->
 
 <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">
+    onload="try{ my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="bill_history.js"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="bill_history.js"/>
 
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
 
-	<vbox flex="1" class="my_overflow">
+    <vbox flex="1" class="my_overflow">
         <groupbox orient="vertical" flex="1">
             <caption id="caption" label="&staff.patron.bill_history.caption.label;"/>
             <hbox>
@@ -54,7 +54,7 @@
                 <button id="details" label="&staff.patron.bill_history.full_details.label;" disabled="true" accesskey="&staff.patron.bill_history.full_details.accesskey;"/>
             </hbox>
         </groupbox>
-	</vbox>
+    </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_summary_overlay.xul b/Open-ILS/xul/staff_client/server/patron/bill_summary_overlay.xul
index dbb6da29da..39790e7ca9 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_summary_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_summary_overlay.xul
@@ -1,60 +1,60 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="bills_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-			<groupbox orient="vertical" flex="1" id="summary">
-				<caption label="Summary" />
-				<hbox>
-					<label class="header1" id="billing_location"/>
-				</hbox>
-				<grid flex="1">
-					<columns>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="2"/>
-					</columns>
-					<rows>
-						<row>
-							<label class="header" value="&staff.patron.bill_summary_overlay.bill_number.value;"/>
-							<label id="mbts_id" />
-							<label class="header" value="&staff.patron.bill_summary_overlay.total_billed.value;"/>
-							<label id="mbts_total_owed" />
-							<label class="header" id="title_label" value="&staff.patron.bill_summary_overlay.title.value;" hidden="true"/>
-							<description id="title"/>
-						</row>
-						<row>
-							<label class="header" value="&staff.patron.bill_summary_overlay.type.value;"/>
-							<label id="mbts_xact_type"/>
-							<label class="header" value="&staff.patron.bill_summary_overlay.total_paid.value;"/>
-							<label id="mbts_total_paid" />
-							<label class="header" id="checked_out_label" value="&staff.patron.bill_summary_overlay.checked_out.value;" hidden="true"/>
-							<label id="checked_out"/>
-						</row>
-						<row>
-							<label class="header" value="&staff.patron.bill_summary_overlay.start.value;"/>
-							<label id="mbts_xact_start"/>
-							<label class="header" value="&staff.patron.bill_summary_overlay.balance_owed.value;"/>
-							<label id="mbts_balance_owed" />
-							<label class="header" id="due_label" value="&staff.patron.bill_summary_overlay.due_date.value;" hidden="true"/>
-							<label id="due"/>
-						</row>
-						<row>
-							<label class="header" value="&staff.patron.bill_summary_overlay.finish.value;"/>
-							<label id="mbts_xact_finish"/>
-							<label class="header" value="&staff.patron.bill_summary_overlay.renewal.value;"/>
-							<label id="renewal"/>
-							<label class="header" id="checked_in_label" value="&staff.patron.bill_summary_overlay.checked_in.value;" hidden="true"/>
-							<label id="checked_in"/>
-						</row>
-					</rows>
-				</grid>
-			</groupbox>
+            <groupbox orient="vertical" flex="1" id="summary">
+                <caption label="Summary" />
+                <hbox>
+                    <label class="header1" id="billing_location"/>
+                </hbox>
+                <grid flex="1">
+                    <columns>
+                        <column flex="1"/>
+                        <column flex="1"/>
+                        <column flex="1"/>
+                        <column flex="1"/>
+                        <column flex="1"/>
+                        <column flex="2"/>
+                    </columns>
+                    <rows>
+                        <row>
+                            <label class="header" value="&staff.patron.bill_summary_overlay.bill_number.value;"/>
+                            <label id="mbts_id" />
+                            <label class="header" value="&staff.patron.bill_summary_overlay.total_billed.value;"/>
+                            <label id="mbts_total_owed" />
+                            <label class="header" id="title_label" value="&staff.patron.bill_summary_overlay.title.value;" hidden="true"/>
+                            <description id="title"/>
+                        </row>
+                        <row>
+                            <label class="header" value="&staff.patron.bill_summary_overlay.type.value;"/>
+                            <label id="mbts_xact_type"/>
+                            <label class="header" value="&staff.patron.bill_summary_overlay.total_paid.value;"/>
+                            <label id="mbts_total_paid" />
+                            <label class="header" id="checked_out_label" value="&staff.patron.bill_summary_overlay.checked_out.value;" hidden="true"/>
+                            <label id="checked_out"/>
+                        </row>
+                        <row>
+                            <label class="header" value="&staff.patron.bill_summary_overlay.start.value;"/>
+                            <label id="mbts_xact_start"/>
+                            <label class="header" value="&staff.patron.bill_summary_overlay.balance_owed.value;"/>
+                            <label id="mbts_balance_owed" />
+                            <label class="header" id="due_label" value="&staff.patron.bill_summary_overlay.due_date.value;" hidden="true"/>
+                            <label id="due"/>
+                        </row>
+                        <row>
+                            <label class="header" value="&staff.patron.bill_summary_overlay.finish.value;"/>
+                            <label id="mbts_xact_finish"/>
+                            <label class="header" value="&staff.patron.bill_summary_overlay.renewal.value;"/>
+                            <label id="renewal"/>
+                            <label class="header" id="checked_in_label" value="&staff.patron.bill_summary_overlay.checked_in.value;" hidden="true"/>
+                            <label id="checked_in"/>
+                        </row>
+                    </rows>
+                </grid>
+            </groupbox>
 
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul b/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
index f951c7f54f..0818a9a696 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,55 +20,55 @@
 <?xul-overlay href="/xul/server/patron/bill_summary_overlay.xul"?>
 
 <window id="patron_bill" title="&staff.patron.bill_wizard.title;"
-	orient="vertical" style="overflow: auto"
-	onload="try { patron_bill_init(); font_helper(); } catch(E) { alert(E); }" width="700" height="550"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    orient="vertical" style="overflow: auto"
+    onload="try { patron_bill_init(); font_helper(); } catch(E) { alert(E); }" width="700" height="550"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="/xul/server/patron/bill_wizard.js"/>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="/xul/server/patron/bill_wizard.js"/>
+    
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
-	<vbox flex="1">
+    <vbox flex="1">
 
-			<label id="patron_name" class="patronNameLarge"/>
+            <label id="patron_name" class="patronNameLarge"/>
 
-			<groupbox orient="vertical" flex="1" id="summary" hidden="true"/>
+            <groupbox orient="vertical" flex="1" id="summary" hidden="true"/>
 
-			<groupbox flex="1">
-				<caption label="&staff.patron.bill_wizard.create_bill.label;"/>
-				<grid>
-					<columns> <column flex="0" /> <column flex="0" /> </columns>
-					<rows id="page1_rows">
-						<row><label value="&staff.patron.bill_wizard.location.value;"/><textbox id="billing_location" disabled="true" context="clipboard" /></row>
-						<row><label value="&staff.patron.bill_wizard.transaction_type.value;"/>
-							<menulist id="xact_type">
-								<menupopup>
-									<menuitem label="&staff.patron.bill_wizard.grocery.label;" value="grocery" selected="true"/>
-									<menuitem label="&staff.patron.bill_wizard.circulation.label;" value="circulation" disabled="true"/>
-								</menupopup>
-							</menulist>
-						</row>
-						<row><label value="&staff.patron.bill_wizard.billing_type.label;"/>
-							<hbox id="menu_placeholder"/>
-						</row>
-						<row><label value="&staff.patron.bill_wizard.amount.value;"/><textbox id="bill_amount" context="clipboard" /></row>
-						<row><label value="&staff.patron.bill_wizard.note.value;"/><textbox id="bill_note" multiline="true" rows="5" context="clipboard" /></row>
-					</rows>
-				</grid>
-				<spacer flex="1"/>
-				<hbox>
-					<spacer flex="1"/>
-					<button label="&staff.patron.bill_wizard.cancel.label;" oncommand="window.close()" accesskey="&staff.patron.bill_wizard.cancel.accesskey;"/>
-					<button label="&staff.patron.bill_wizard.submit.label;" oncommand="patron_bill_finish(); window.close();" accesskey="&staff.patron.bill_wizard.submit.accesskey;"/>
-				</hbox>
-			</groupbox>
-	</vbox>
+            <groupbox flex="1">
+                <caption label="&staff.patron.bill_wizard.create_bill.label;"/>
+                <grid>
+                    <columns> <column flex="0" /> <column flex="0" /> </columns>
+                    <rows id="page1_rows">
+                        <row><label value="&staff.patron.bill_wizard.location.value;"/><textbox id="billing_location" disabled="true" context="clipboard" /></row>
+                        <row><label value="&staff.patron.bill_wizard.transaction_type.value;"/>
+                            <menulist id="xact_type">
+                                <menupopup>
+                                    <menuitem label="&staff.patron.bill_wizard.grocery.label;" value="grocery" selected="true"/>
+                                    <menuitem label="&staff.patron.bill_wizard.circulation.label;" value="circulation" disabled="true"/>
+                                </menupopup>
+                            </menulist>
+                        </row>
+                        <row><label value="&staff.patron.bill_wizard.billing_type.label;"/>
+                            <hbox id="menu_placeholder"/>
+                        </row>
+                        <row><label value="&staff.patron.bill_wizard.amount.value;"/><textbox id="bill_amount" context="clipboard" /></row>
+                        <row><label value="&staff.patron.bill_wizard.note.value;"/><textbox id="bill_note" multiline="true" rows="5" context="clipboard" /></row>
+                    </rows>
+                </grid>
+                <spacer flex="1"/>
+                <hbox>
+                    <spacer flex="1"/>
+                    <button label="&staff.patron.bill_wizard.cancel.label;" oncommand="window.close()" accesskey="&staff.patron.bill_wizard.cancel.accesskey;"/>
+                    <button label="&staff.patron.bill_wizard.submit.label;" oncommand="patron_bill_finish(); window.close();" accesskey="&staff.patron.bill_wizard.submit.accesskey;"/>
+                </hbox>
+            </groupbox>
+    </vbox>
 </window>
 
 
diff --git a/Open-ILS/xul/staff_client/server/patron/bills.xul b/Open-ILS/xul/staff_client/server/patron/bills.xul
index 9d3a204fa0..7d94411276 100644
--- a/Open-ILS/xul/staff_client/server/patron/bills.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bills.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,69 +20,69 @@
 <?xul-overlay href="/xul/server/patron/bills_overlay.xul"?>
 
 <window id="bills_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for bills.xul');
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function $(id) { return document.getElementById(id); }
+        
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for bills.xul');
 
-				JSAN.use('patron.bills'); g.bills = new patron.bills();
-				g.bills.init( 
-					{ 
-						'patron_id' : xul_param('patron_id'), 
-					} 
-				);
-				window.refresh = function(p) { g.bills.refresh(p); }
+                JSAN.use('patron.bills'); g.bills = new patron.bills();
+                g.bills.init( 
+                    { 
+                        'patron_id' : xul_param('patron_id'), 
+                    } 
+                );
+                window.refresh = function(p) { g.bills.refresh(p); }
 
-				document.getElementById('bill_payment_amount').focus();
-	
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/bills.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
+                document.getElementById('bill_payment_amount').focus();
+    
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/bills.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
 
-		function default_focus() {
-			try {
-				document.getElementById('bill_payment_amount').focus();
-			} catch(E) {
-				try { g.error.sdump('D_ERROR','bill default_focus: ' + js2JSON(E)); } catch(F) { dump(E); }
-			}
-		}
-	]]>
-	</script>
+        function default_focus() {
+            try {
+                document.getElementById('bill_payment_amount').focus();
+            } catch(E) {
+                try { g.error.sdump('D_ERROR','bill default_focus: ' + js2JSON(E)); } catch(F) { dump(E); }
+            }
+        }
+    ]]>
+    </script>
 
-	<commandset id="bills_cmds">
-		<command id="cmd_bill_wizard" />
-		<command id="cmd_bill_history" />
-		<command id="cmd_bill_apply_payment" />
-		<command id="cmd_change_to_credit" />
-		<command id="cmd_uncheck_all" />
-		<command id="cmd_check_all" />
-		<command id="cmd_print_bills" />
-		<command id="cmd_alternate_view" />
-	</commandset>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <commandset id="bills_cmds">
+        <command id="cmd_bill_wizard" />
+        <command id="cmd_bill_history" />
+        <command id="cmd_bill_apply_payment" />
+        <command id="cmd_change_to_credit" />
+        <command id="cmd_uncheck_all" />
+        <command id="cmd_check_all" />
+        <command id="cmd_print_bills" />
+        <command id="cmd_alternate_view" />
+    </commandset>
+    
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
-	<box id="bills_main" />
+    <box id="bills_main" />
 
 </window>
 
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 a73a687629..163c2d5ca6 100644
--- a/Open-ILS/xul/staff_client/server/patron/bills_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bills_overlay.xul
@@ -1,120 +1,120 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="bills_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading bills_overlay.xul\n');</script>
 
 <commandset id="bills_cmds" />
 
 <box id="bills_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="bills_top_ui" />
-	<hbox>
-		<label style="font-weight: bold;" value="&staff.patron.bills_overlay.selected_balance.value;"/><label id="selected_balance"/>
-		<label style="font-weight: bold;" value="&staff.patron.bills_overlay.unselected.value;"/><label id="unselected_balance"/>
-		<label style="font-weight: bold;" value="&staff.patron.bills_overlay.voided.value;"/><label id="voided_balance"/>
-		<spacer flex="1"/>
-		<label id="circulating_hint" hidden="true" style="background: red; color: white" value="&staff.patron.bills_overlay.still_checked_out.label;"/>
-	</hbox>
-	<listbox id="bill_list" flex="1"/>
-	<hbox>
-		<button command="cmd_uncheck_all" label="&staff.patron.bills_overlay.uncheck_all.label;"/>
-		<button command="cmd_check_all" label="&staff.patron.bills_overlay.check_all.label;"/>
-		<spacer flex="1"/>
-		<button command="cmd_print_bills" label="&staff.patron.bills_overlay.print_bills.label;"/>
-		<button command="cmd_alternate_view" label="&staff.patron.bills_overlay.alternate_view.label;" accesskey="&staff.patron.bills_overlay.alternate_view.accesskey;"/>
-	</hbox>
+    <vbox id="bills_top_ui" />
+    <hbox>
+        <label style="font-weight: bold;" value="&staff.patron.bills_overlay.selected_balance.value;"/><label id="selected_balance"/>
+        <label style="font-weight: bold;" value="&staff.patron.bills_overlay.unselected.value;"/><label id="unselected_balance"/>
+        <label style="font-weight: bold;" value="&staff.patron.bills_overlay.voided.value;"/><label id="voided_balance"/>
+        <spacer flex="1"/>
+        <label id="circulating_hint" hidden="true" style="background: red; color: white" value="&staff.patron.bills_overlay.still_checked_out.label;"/>
+    </hbox>
+    <listbox id="bill_list" flex="1"/>
+    <hbox>
+        <button command="cmd_uncheck_all" label="&staff.patron.bills_overlay.uncheck_all.label;"/>
+        <button command="cmd_check_all" label="&staff.patron.bills_overlay.check_all.label;"/>
+        <spacer flex="1"/>
+        <button command="cmd_print_bills" label="&staff.patron.bills_overlay.print_bills.label;"/>
+        <button command="cmd_alternate_view" label="&staff.patron.bills_overlay.alternate_view.label;" accesskey="&staff.patron.bills_overlay.alternate_view.accesskey;"/>
+    </hbox>
 </box>
 
 <vbox id="bills_top_ui">
-	<hbox>
-		<groupbox>
-			<caption label="&staff.patron.bills_overlay.summary.label;"/>
-			<grid>
-				<columns><column /><column /></columns>                                 
-				<rows>
-					<row>
-						<label value="&staff.patron.bills_overlay.net_balance.value;"/>
-	
-						<textbox id="bill_total_owed" value="" readonly="true"  context="clipboard"/>
-					</row>
-					<row>
-						<label value="&staff.patron.bills_overlay.payment_applied.value;"/>
-			
-						<textbox id="bill_payment_applied" readonly="true" context="clipboard"/>
-					</row>
-					<row>
-						<label value="&staff.patron.bills_overlay.new_balance.value;" 
-							style="font-family: bold" />
-	
-						<textbox id="bill_new_balance" readonly="true" context="clipboard"/>
-					</row>
-				</rows>
-			</grid>
-		</groupbox>
-		<spacer flex="2"/>
-		<groupbox>
-			<caption label="&staff.patron.bills_overlay.pay_bill.label;"/>
-			<grid>
-				<columns><column /><column /></columns>                                 
-				<rows>
-					<row>
-						<label value="&staff.patron.bills_overlay.payment_type.value;" 
-							accesskey="&staff.patron.bills_overlay.payment_type.accesskey;" control="payment_type" />
-						<menulist id="payment_type">
-							<menupopup id="payment_type_menupopup">
-								<menuitem id="payment_type_menuitem1" label="&staff.patron.bills_overlay.cash.label;" value="cash_payment"/>
-								<menuitem id="payment_type_menuitem2" label="&staff.patron.bills_overlay.check.label;" value="check_payment"/>
-								<menuitem id="payment_type_menuitem3" label="&staff.patron.bills_overlay.credit_card.label;" value="credit_card_payment"/>
-								<!--
-								<menuitem id="payment_type_menuitem4" label="Patron Credit" value="credit_payment" />
-								-->
-								<menuitem id="payment_type_menuitem5" label="&staff.patron.bills_overlay.word.label;" value="work_payment"/>
-								<menuitem id="payment_type_menuitem6" label="&staff.patron.bills_overlay.forgive.label;" value="forgive_payment"/>
-								<menuitem id="payment_type_menuitem7" label="&staff.patron.bills_overlay.goods.label;" value="goods_payment"/>
-							</menupopup>
-						</menulist>
-					</row>
-					<row>
-						<label value="&staff.patron.bills_overlay.payment_received.value;" style="font-weight: bold"
-							accesskey="&staff.patron.bills_overlay.payment_received.accesskey;" control="bill_payment_amount" />
-			
-						<textbox id="bill_payment_amount" style="border: solid thick black" context="clipboard"/>
-					</row>
-					<row>
-						<label value="&staff.patron.bills_overlay.payment_applied.value;"/>
-			
-						<textbox id="bpato" observes="bill_payment_applied"  context="clipboard"/>
-					</row>
-					<row>
-						<label value="&staff.patron.bills_overlay.change.value;" control="bill_change_amount" style="font-weight: bold" />
-	
-						<hbox>
-							<textbox id="bill_change_amount" readonly="true" context="clipboard"/>
-						</hbox>
-					</row>
-					<row class="hide_patron_credit" hidden="true">
-						<label value="&staff.patron.bills_overlay.patron_credit.value;" 
-							style="font-family: bold" />
-	
-						<textbox id="bill_credit_amount" readonly="true" context="clipboard"/>
-					</row>
-				</rows>
-			</grid>
-		</groupbox>
-	</hbox>
-	<hbox>
-		<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;" 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>
-	<label value=" "/>
+    <hbox>
+        <groupbox>
+            <caption label="&staff.patron.bills_overlay.summary.label;"/>
+            <grid>
+                <columns><column /><column /></columns>                                 
+                <rows>
+                    <row>
+                        <label value="&staff.patron.bills_overlay.net_balance.value;"/>
+    
+                        <textbox id="bill_total_owed" value="" readonly="true"  context="clipboard"/>
+                    </row>
+                    <row>
+                        <label value="&staff.patron.bills_overlay.payment_applied.value;"/>
+            
+                        <textbox id="bill_payment_applied" readonly="true" context="clipboard"/>
+                    </row>
+                    <row>
+                        <label value="&staff.patron.bills_overlay.new_balance.value;" 
+                            style="font-family: bold" />
+    
+                        <textbox id="bill_new_balance" readonly="true" context="clipboard"/>
+                    </row>
+                </rows>
+            </grid>
+        </groupbox>
+        <spacer flex="2"/>
+        <groupbox>
+            <caption label="&staff.patron.bills_overlay.pay_bill.label;"/>
+            <grid>
+                <columns><column /><column /></columns>                                 
+                <rows>
+                    <row>
+                        <label value="&staff.patron.bills_overlay.payment_type.value;" 
+                            accesskey="&staff.patron.bills_overlay.payment_type.accesskey;" control="payment_type" />
+                        <menulist id="payment_type">
+                            <menupopup id="payment_type_menupopup">
+                                <menuitem id="payment_type_menuitem1" label="&staff.patron.bills_overlay.cash.label;" value="cash_payment"/>
+                                <menuitem id="payment_type_menuitem2" label="&staff.patron.bills_overlay.check.label;" value="check_payment"/>
+                                <menuitem id="payment_type_menuitem3" label="&staff.patron.bills_overlay.credit_card.label;" value="credit_card_payment"/>
+                                <!--
+                                <menuitem id="payment_type_menuitem4" label="Patron Credit" value="credit_payment" />
+                                -->
+                                <menuitem id="payment_type_menuitem5" label="&staff.patron.bills_overlay.word.label;" value="work_payment"/>
+                                <menuitem id="payment_type_menuitem6" label="&staff.patron.bills_overlay.forgive.label;" value="forgive_payment"/>
+                                <menuitem id="payment_type_menuitem7" label="&staff.patron.bills_overlay.goods.label;" value="goods_payment"/>
+                            </menupopup>
+                        </menulist>
+                    </row>
+                    <row>
+                        <label value="&staff.patron.bills_overlay.payment_received.value;" style="font-weight: bold"
+                            accesskey="&staff.patron.bills_overlay.payment_received.accesskey;" control="bill_payment_amount" />
+            
+                        <textbox id="bill_payment_amount" style="border: solid thick black" context="clipboard"/>
+                    </row>
+                    <row>
+                        <label value="&staff.patron.bills_overlay.payment_applied.value;"/>
+            
+                        <textbox id="bpato" observes="bill_payment_applied"  context="clipboard"/>
+                    </row>
+                    <row>
+                        <label value="&staff.patron.bills_overlay.change.value;" control="bill_change_amount" style="font-weight: bold" />
+    
+                        <hbox>
+                            <textbox id="bill_change_amount" readonly="true" context="clipboard"/>
+                        </hbox>
+                    </row>
+                    <row class="hide_patron_credit" hidden="true">
+                        <label value="&staff.patron.bills_overlay.patron_credit.value;" 
+                            style="font-family: bold" />
+    
+                        <textbox id="bill_credit_amount" readonly="true" context="clipboard"/>
+                    </row>
+                </rows>
+            </grid>
+        </groupbox>
+    </hbox>
+    <hbox>
+        <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;" 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>
+    <label value=" "/>
 </vbox>
 
 
diff --git a/Open-ILS/xul/staff_client/server/patron/display.xul b/Open-ILS/xul/staff_client/server/patron/display.xul
index f4ccbc11e5..c206603831 100644
--- a/Open-ILS/xul/staff_client/server/patron/display.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,99 +20,99 @@
 <?xul-overlay href="/xul/server/patron/display_overlay.xul"?>
 
 <window id="patron_display_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<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="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="/xul/server/patron/display.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-	
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for patron_display.xul');
-
-				JSAN.use('patron.display'); g.patron = new patron.display();
-				g.patron.init( { 
-					'barcode' : xul_param('barcode'),
-					'id' : xul_param('id'),
-					'query' : xul_param('query'),
-					'doit' : xul_param('doit')
-				} );
-
-			//document.documentElement.style.setProperty('font-size-adjust','1','important');
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/display.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function default_focus() {
-			setTimeout(
-				function() {
-					try {
-						netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-						var node = g.patron.right_deck.node.selectedPanel;
-						if (node && get_contentWindow(node) && typeof get_contentWindow(node).default_focus == 'function') {
-							get_contentWindow(node).default_focus();
-						} else {
-							var node = g.patron.left_deck.node.selectedPanel;
-							if (node && get_contentWindow(node) && typeof get_contentWindow(node).default_focus == 'function') {
-								get_contentWindow(node).default_focus();
-							}
-						}
-					} catch(E) {
-						g.error.sdump('D_ERROR','default_focus(): ' + js2JSON(E));
-					}
-				}, 0
-			);
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-
-	<commandset id="patron_display_cmds">
-		<command id="cmd_patron_refresh" />
-		<command id="cmd_patron_checkout" />
-		<command id="cmd_patron_items" />
-		<command id="cmd_patron_holds" />
-		<command id="cmd_patron_bills" />
-		<command id="cmd_patron_edit" />
-		<command id="cmd_patron_info_notes" />
-		<command id="cmd_patron_info_stats" />
-		<command id="cmd_patron_info_surveys" />
-		<command id="cmd_patron_info_groups" />
-		<command id="cmd_patron_other" />
-		<command id="cmd_patron_alert" />
-		<command id="cmd_patron_exit" />
-		<command id="cmd_patron_retrieve" />
-		<command id="cmd_patron_merge" />
-		<command id="cmd_patron_toggle_summary" />
-		<command id="cmd_patron_delete" />
-		<command id="cmd_search_form" />
-		<command id="cmd_verify_credentials" />
-		<command id="cmd_perm_editor" />
-		<command id="cmd_standing_penalties" />
-	</commandset>
-
-	<box id="patron_display_main" class="my_overflow" />
+    onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <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="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="/xul/server/patron/display.js"/>
+    <script>
+    <![CDATA[
+        function $(id) { return document.getElementById(id); }
+    
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for patron_display.xul');
+
+                JSAN.use('patron.display'); g.patron = new patron.display();
+                g.patron.init( { 
+                    'barcode' : xul_param('barcode'),
+                    'id' : xul_param('id'),
+                    'query' : xul_param('query'),
+                    'doit' : xul_param('doit')
+                } );
+
+            //document.documentElement.style.setProperty('font-size-adjust','1','important');
+
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/display.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function default_focus() {
+            setTimeout(
+                function() {
+                    try {
+                        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                        var node = g.patron.right_deck.node.selectedPanel;
+                        if (node && get_contentWindow(node) && typeof get_contentWindow(node).default_focus == 'function') {
+                            get_contentWindow(node).default_focus();
+                        } else {
+                            var node = g.patron.left_deck.node.selectedPanel;
+                            if (node && get_contentWindow(node) && typeof get_contentWindow(node).default_focus == 'function') {
+                                get_contentWindow(node).default_focus();
+                            }
+                        }
+                    } catch(E) {
+                        g.error.sdump('D_ERROR','default_focus(): ' + js2JSON(E));
+                    }
+                }, 0
+            );
+        }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+
+    <commandset id="patron_display_cmds">
+        <command id="cmd_patron_refresh" />
+        <command id="cmd_patron_checkout" />
+        <command id="cmd_patron_items" />
+        <command id="cmd_patron_holds" />
+        <command id="cmd_patron_bills" />
+        <command id="cmd_patron_edit" />
+        <command id="cmd_patron_info_notes" />
+        <command id="cmd_patron_info_stats" />
+        <command id="cmd_patron_info_surveys" />
+        <command id="cmd_patron_info_groups" />
+        <command id="cmd_patron_other" />
+        <command id="cmd_patron_alert" />
+        <command id="cmd_patron_exit" />
+        <command id="cmd_patron_retrieve" />
+        <command id="cmd_patron_merge" />
+        <command id="cmd_patron_toggle_summary" />
+        <command id="cmd_patron_delete" />
+        <command id="cmd_search_form" />
+        <command id="cmd_verify_credentials" />
+        <command id="cmd_perm_editor" />
+        <command id="cmd_standing_penalties" />
+    </commandset>
+
+    <box id="patron_display_main" class="my_overflow" />
 
 </window>
 
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 157a75dc77..9bbee85d28 100644
--- a/Open-ILS/xul/staff_client/server/patron/display_horiz.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display_horiz.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,99 +20,99 @@
 <?xul-overlay href="/xul/server/patron/display_horiz_overlay.xul"?>
 
 <window id="patron_display_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<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="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="/xul/server/patron/display.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-	
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for patron_display.xul');
-
-				JSAN.use('patron.display'); g.patron = new patron.display();
-				g.patron.init( { 
-					'barcode' : xul_param('barcode'),
-					'id' : xul_param('id'),
-					'query' : xul_param('query'),
-					'doit' : xul_param('doit')
-				} );
-
-			//document.documentElement.style.setProperty('font-size-adjust','1','important');
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/display.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function default_focus() {
-			setTimeout(
-				function() {
-					try {
-						netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-						var node = g.patron.right_deck.node.selectedPanel;
-						if (node && get_contentWindow(node) && typeof get_contentWindow(node).default_focus == 'function') {
-							get_contentWindow(node).default_focus();
-						} else {
-							var node = g.patron.left_deck.node.selectedPanel;
-							if (node && get_contentWindow(node) && typeof get_contentWindow(node).default_focus == 'function') {
-								get_contentWindow(node).default_focus();
-							}
-						}
-					} catch(E) {
-						g.error.sdump('D_ERROR','default_focus(): ' + js2JSON(E));
-					}
-				}, 0
-			);
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-
-	<commandset id="patron_display_cmds">
-		<command id="cmd_patron_refresh" />
-		<command id="cmd_patron_checkout" />
-		<command id="cmd_patron_items" />
-		<command id="cmd_patron_holds" />
-		<command id="cmd_patron_bills" />
-		<command id="cmd_patron_edit" />
-		<command id="cmd_patron_info_notes" />
-		<command id="cmd_patron_info_stats" />
-		<command id="cmd_patron_info_surveys" />
-		<command id="cmd_patron_info_groups" />
-		<command id="cmd_patron_other" />
-		<command id="cmd_patron_alert" />
-		<command id="cmd_patron_exit" />
-		<command id="cmd_patron_retrieve" />
-		<command id="cmd_patron_merge" />
-		<command id="cmd_patron_toggle_summary" />
-		<command id="cmd_patron_delete" />
-		<command id="cmd_search_form" />
-		<command id="cmd_verify_credentials" />
-		<command id="cmd_perm_editor" />
-		<command id="cmd_standing_penalties" />
-	</commandset>
-
-	<box id="patron_display_main" class="my_overflow" />
+    onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <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="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="/xul/server/patron/display.js"/>
+    <script>
+    <![CDATA[
+        function $(id) { return document.getElementById(id); }
+    
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for patron_display.xul');
+
+                JSAN.use('patron.display'); g.patron = new patron.display();
+                g.patron.init( { 
+                    'barcode' : xul_param('barcode'),
+                    'id' : xul_param('id'),
+                    'query' : xul_param('query'),
+                    'doit' : xul_param('doit')
+                } );
+
+            //document.documentElement.style.setProperty('font-size-adjust','1','important');
+
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/display.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function default_focus() {
+            setTimeout(
+                function() {
+                    try {
+                        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                        var node = g.patron.right_deck.node.selectedPanel;
+                        if (node && get_contentWindow(node) && typeof get_contentWindow(node).default_focus == 'function') {
+                            get_contentWindow(node).default_focus();
+                        } else {
+                            var node = g.patron.left_deck.node.selectedPanel;
+                            if (node && get_contentWindow(node) && typeof get_contentWindow(node).default_focus == 'function') {
+                                get_contentWindow(node).default_focus();
+                            }
+                        }
+                    } catch(E) {
+                        g.error.sdump('D_ERROR','default_focus(): ' + js2JSON(E));
+                    }
+                }, 0
+            );
+        }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+
+    <commandset id="patron_display_cmds">
+        <command id="cmd_patron_refresh" />
+        <command id="cmd_patron_checkout" />
+        <command id="cmd_patron_items" />
+        <command id="cmd_patron_holds" />
+        <command id="cmd_patron_bills" />
+        <command id="cmd_patron_edit" />
+        <command id="cmd_patron_info_notes" />
+        <command id="cmd_patron_info_stats" />
+        <command id="cmd_patron_info_surveys" />
+        <command id="cmd_patron_info_groups" />
+        <command id="cmd_patron_other" />
+        <command id="cmd_patron_alert" />
+        <command id="cmd_patron_exit" />
+        <command id="cmd_patron_retrieve" />
+        <command id="cmd_patron_merge" />
+        <command id="cmd_patron_toggle_summary" />
+        <command id="cmd_patron_delete" />
+        <command id="cmd_search_form" />
+        <command id="cmd_verify_credentials" />
+        <command id="cmd_perm_editor" />
+        <command id="cmd_standing_penalties" />
+    </commandset>
+
+    <box id="patron_display_main" class="my_overflow" />
 
 </window>
 
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 91b43f83f4..577116754b 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
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="patron_display_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading patron/display_overlay.xul\n');</script>
 
@@ -11,27 +11,27 @@
 
 <box id="patron_display_main" flex="1" orient="vertical">
 <vbox id="pdm2" flex="1">
-	<hbox id="pdm2hb1">
-		<hbox>
-			<label id="patron_name" class="patronNameLarge" tooltiptext="&staff.patron_display.name.label;" value="&staff.patron.display_overlay.none_selected.value;" flex="1"/>
-		</hbox>
-		<deck id="PatronNavBar" flex="1" class="my_overflow" />
-	</hbox>
-	<hbox id="pdm2hb1a">
-		<label class="hideme barred_indicator" value="&staff.patron.display_overlay.barred.value;"/>
-		<label class="hideme expired_indicator" value="&staff.patron.display_overlay.expired.value;"/>
-		<label class="hideme inactive_indicator" value="&staff.patron.display_overlay.inactive.value;"/>
-		<label class="hideme juvenile_indicator" value="&staff.patron.display_overlay.juvenile.value;"/>
-		<label class="hideme alert_indicator" value="&staff.patron.display_overlay.alert.value;"/>
-		<label class="hideme note_indicator" value="&staff.patron.display_overlay.see_notes.value;"/>
-		<label class="hideme max_bills_indicator" value="&staff.patron.display_overlay.max_bills.value;"/>
-		<label class="hideme max_overdues_indicator" value="&staff.patron.display_overlay.max_overdues.value;"/>
-		<label class="hideme bills_indicator" value="&staff.patron.display_overlay.has_bills.value;"/>
-		<label class="hideme overdues_indicator" value="&staff.patron.display_overlay.has_overdues.value;"/>
-		<label class="hideme invalid_dob_indicator" value="&staff.patron.display_overlay.invalid_dob.value;"/>
-		<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="pdm2hb1">
+        <hbox>
+            <label id="patron_name" class="patronNameLarge" tooltiptext="&staff.patron_display.name.label;" value="&staff.patron.display_overlay.none_selected.value;" flex="1"/>
+        </hbox>
+        <deck id="PatronNavBar" flex="1" class="my_overflow" />
+    </hbox>
+    <hbox id="pdm2hb1a">
+        <label class="hideme barred_indicator" value="&staff.patron.display_overlay.barred.value;"/>
+        <label class="hideme expired_indicator" value="&staff.patron.display_overlay.expired.value;"/>
+        <label class="hideme inactive_indicator" value="&staff.patron.display_overlay.inactive.value;"/>
+        <label class="hideme juvenile_indicator" value="&staff.patron.display_overlay.juvenile.value;"/>
+        <label class="hideme alert_indicator" value="&staff.patron.display_overlay.alert.value;"/>
+        <label class="hideme note_indicator" value="&staff.patron.display_overlay.see_notes.value;"/>
+        <label class="hideme max_bills_indicator" value="&staff.patron.display_overlay.max_bills.value;"/>
+        <label class="hideme max_overdues_indicator" value="&staff.patron.display_overlay.max_overdues.value;"/>
+        <label class="hideme bills_indicator" value="&staff.patron.display_overlay.has_bills.value;"/>
+        <label class="hideme overdues_indicator" value="&staff.patron.display_overlay.has_overdues.value;"/>
+        <label class="hideme invalid_dob_indicator" value="&staff.patron.display_overlay.invalid_dob.value;"/>
+        <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" oils_persist="height"> 
             <deck id="patron_left_deck" oils_persist="height"/>
         </hbox>
@@ -39,7 +39,7 @@
         <hbox id="right_deck_vbox" flex="8" oils_persist="height">
             <deck id="patron_right_deck" oils_persist="height"/>
         </hbox>
-	</vbox>
+    </vbox>
 </vbox>
 </box>
 
@@ -50,8 +50,8 @@
 </deck>
 
 <deck id="PatronNavBar">
-	<hbox id="PatronNavBar0" flex="1"/>
-	<hbox id="PatronNavBar1" flex="1"/>
+    <hbox id="PatronNavBar0" flex="1"/>
+    <hbox id="PatronNavBar1" flex="1"/>
 </deck>
 
 <hbox id="PatronNavBar1" flex="1">
@@ -121,10 +121,10 @@
 <hbox id="PatronNavBar0" flex="1">
     <vbox flex="1">
         <hbox flex="1">
-        	<spacer flex="1"/>
-        	<button id="pnb1b2" label="&staff.patron.display_overlay.merge_patrons.label;" accesskey="&staff.patron.display_overlay.merge_patrons.accesskey;" command="cmd_patron_merge"/>
-        	<button id="pnb1b0" label="&staff.patron.display_overlay.search_form.label;" accesskey="&staff.patron.display_overlay.search_form.accesskey;" command="cmd_search_form"/>
-        	<button id="pnb1b1" label="&staff.patron.display_overlay.retrieve_patron.label;" accesskey="&staff.patron.display_overlay.retrieve_patron.accesskey;" command="cmd_patron_retrieve"/>
+            <spacer flex="1"/>
+            <button id="pnb1b2" label="&staff.patron.display_overlay.merge_patrons.label;" accesskey="&staff.patron.display_overlay.merge_patrons.accesskey;" command="cmd_patron_merge"/>
+            <button id="pnb1b0" label="&staff.patron.display_overlay.search_form.label;" accesskey="&staff.patron.display_overlay.search_form.accesskey;" command="cmd_search_form"/>
+            <button id="pnb1b1" label="&staff.patron.display_overlay.retrieve_patron.label;" accesskey="&staff.patron.display_overlay.retrieve_patron.accesskey;" command="cmd_patron_retrieve"/>
         </hbox>
         <label value=" "/>
     </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 ebaa45a40e..148d5d39b7 100644
--- a/Open-ILS/xul/staff_client/server/patron/display_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display_overlay.xul
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="patron_display_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading patron/display_overlay.xul\n');</script>
 
@@ -11,27 +11,27 @@
 
 <box id="patron_display_main" flex="1" orient="vertical">
 <vbox id="pdm2" flex="1">
-	<hbox id="pdm2hb1">
-		<hbox>
-			<label id="patron_name" class="patronNameLarge" tooltiptext="&staff.patron_display.name.label;" value="&staff.patron.display_overlay.none_selected.value;" flex="1"/>
-		</hbox>
-		<deck id="PatronNavBar" flex="1" class="my_overflow" />
-	</hbox>
-	<hbox id="pdm2hb1a">
-		<label class="hideme barred_indicator" value="&staff.patron.display_overlay.barred.value;"/>
-		<label class="hideme expired_indicator" value="&staff.patron.display_overlay.expired.value;"/>
-		<label class="hideme inactive_indicator" value="&staff.patron.display_overlay.inactive.value;"/>
-		<label class="hideme juvenile_indicator" value="&staff.patron.display_overlay.juvenile.value;"/>
-		<label class="hideme alert_indicator" value="&staff.patron.display_overlay.alert.value;"/>
-		<label class="hideme note_indicator" value="&staff.patron.display_overlay.see_notes.value;"/>
-		<label class="hideme max_bills_indicator" value="&staff.patron.display_overlay.max_bills.value;"/>
-		<label class="hideme max_overdues_indicator" value="&staff.patron.display_overlay.max_overdues.value;"/>
-		<label class="hideme bills_indicator" value="&staff.patron.display_overlay.has_bills.value;"/>
-		<label class="hideme overdues_indicator" value="&staff.patron.display_overlay.has_overdues.value;"/>
-		<label class="hideme invalid_dob_indicator" value="&staff.patron.display_overlay.invalid_dob.value;"/>
-		<label class="hideme invalid_address_indicator" value="&staff.patron.display_overlay.invalid_address.value;"/>
-	</hbox>
-	<hbox id="PatronNotNavBar" flex="1" class="my_bg">
+    <hbox id="pdm2hb1">
+        <hbox>
+            <label id="patron_name" class="patronNameLarge" tooltiptext="&staff.patron_display.name.label;" value="&staff.patron.display_overlay.none_selected.value;" flex="1"/>
+        </hbox>
+        <deck id="PatronNavBar" flex="1" class="my_overflow" />
+    </hbox>
+    <hbox id="pdm2hb1a">
+        <label class="hideme barred_indicator" value="&staff.patron.display_overlay.barred.value;"/>
+        <label class="hideme expired_indicator" value="&staff.patron.display_overlay.expired.value;"/>
+        <label class="hideme inactive_indicator" value="&staff.patron.display_overlay.inactive.value;"/>
+        <label class="hideme juvenile_indicator" value="&staff.patron.display_overlay.juvenile.value;"/>
+        <label class="hideme alert_indicator" value="&staff.patron.display_overlay.alert.value;"/>
+        <label class="hideme note_indicator" value="&staff.patron.display_overlay.see_notes.value;"/>
+        <label class="hideme max_bills_indicator" value="&staff.patron.display_overlay.max_bills.value;"/>
+        <label class="hideme max_overdues_indicator" value="&staff.patron.display_overlay.max_overdues.value;"/>
+        <label class="hideme bills_indicator" value="&staff.patron.display_overlay.has_bills.value;"/>
+        <label class="hideme overdues_indicator" value="&staff.patron.display_overlay.has_overdues.value;"/>
+        <label class="hideme invalid_dob_indicator" value="&staff.patron.display_overlay.invalid_dob.value;"/>
+        <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" oils_persist="width"> 
             <deck id="patron_left_deck" oils_persist="width"/>
         </vbox>
@@ -39,7 +39,7 @@
         <vbox id="right_deck_vbox" flex="3" oils_persist="width">
             <deck id="patron_right_deck" oils_persist="width"/>
         </vbox>
-	</hbox>
+    </hbox>
 </vbox>
 </box>
 
@@ -50,8 +50,8 @@
 </deck>
 
 <deck id="PatronNavBar">
-	<hbox id="PatronNavBar0" flex="1"/>
-	<hbox id="PatronNavBar1" flex="1"/>
+    <hbox id="PatronNavBar0" flex="1"/>
+    <hbox id="PatronNavBar1" flex="1"/>
 </deck>
 
 <hbox id="PatronNavBar1" flex="1">
@@ -121,10 +121,10 @@
 <hbox id="PatronNavBar0" flex="1">
     <vbox flex="1">
         <hbox flex="1">
-        	<spacer flex="1"/>
-        	<button id="pnb1b2" label="&staff.patron.display_overlay.merge_patrons.label;" accesskey="&staff.patron.display_overlay.merge_patrons.accesskey;" command="cmd_patron_merge"/>
-        	<button id="pnb1b0" label="&staff.patron.display_overlay.search_form.label;" accesskey="&staff.patron.display_overlay.search_form.accesskey;" command="cmd_search_form"/>
-        	<button id="pnb1b1" label="&staff.patron.display_overlay.retrieve_patron.label;" accesskey="&staff.patron.display_overlay.retrieve_patron.accesskey;" command="cmd_patron_retrieve"/>
+            <spacer flex="1"/>
+            <button id="pnb1b2" label="&staff.patron.display_overlay.merge_patrons.label;" accesskey="&staff.patron.display_overlay.merge_patrons.accesskey;" command="cmd_patron_merge"/>
+            <button id="pnb1b0" label="&staff.patron.display_overlay.search_form.label;" accesskey="&staff.patron.display_overlay.search_form.accesskey;" command="cmd_search_form"/>
+            <button id="pnb1b1" label="&staff.patron.display_overlay.retrieve_patron.label;" accesskey="&staff.patron.display_overlay.retrieve_patron.accesskey;" command="cmd_patron_retrieve"/>
         </hbox>
         <label value=" "/>
     </vbox>
diff --git a/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.xul b/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.xul
index 40056a396f..1dd512f04a 100644
--- a/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.xul
+++ b/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,21 +19,21 @@
 
 <window id="edit_penalty_win" 
     onload="try { edit_penalty_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     title="&staff.patron_display.edit_penalty_dialog.title;">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;</script>
-	<scripts id="openils_util_scripts"/>
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;</script>
+    <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="edit_standing_penalty.js"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="edit_standing_penalty.js"/>
 
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- CONTENT -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- CONTENT -->
     <dialogheader title="&staff.patron_display.edit_penalty_dialog.header;" description="&staff.patron_display.edit_penalty_dialog.description;" />
     <toolbox flex="1">
         <toolbar>
diff --git a/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul b/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
index 6ab855db3b..fdc8c61adc 100644
--- a/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
+++ b/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,21 +19,21 @@
 
 <window id="hold_cancel_win" 
     onload="try { hold_cancel_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     title="&staff.hold_list.cancel_hold_dialog.title;">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;</script>
-	<scripts id="openils_util_scripts"/>
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;</script>
+    <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="hold_cancel.js"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="hold_cancel.js"/>
 
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- CONTENT -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- CONTENT -->
     <dialogheader title="&staff.hold_list.cancel_hold_dialog.header;" description="&staff.hold_list.cancel_hold_dialog.description;" />
     <toolbox flex="1">
         <toolbar>
diff --git a/Open-ILS/xul/staff_client/server/patron/hold_details.xul b/Open-ILS/xul/staff_client/server/patron/hold_details.xul
index ab31369a0f..1d3a344d86 100644
--- a/Open-ILS/xul/staff_client/server/patron/hold_details.xul
+++ b/Open-ILS/xul/staff_client/server/patron/hold_details.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,31 +19,31 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <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">
+    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">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="hold_details.js"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="hold_details.js"/>
 
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
-	<stack hidden="true" id="notification_template" flex="1">
-		<groupbox flex="1" style="background-color: black;"/>
-		<groupbox flex="1" style="background-color: #FFDE00; -moz-border-radius-topright: 35px;" >
-			<hbox>
-				<description name="method" label="&staff.patron.hold_notices.method.label;" style="font-weight: bold"/>
-				<spacer flex="1"/>
-				<description name="notify_time" style="font-weight: bold"/>
-			</hbox>
-			<description name="note"/>
-		</groupbox>
-	</stack>
+    <stack hidden="true" id="notification_template" flex="1">
+        <groupbox flex="1" style="background-color: black;"/>
+        <groupbox flex="1" style="background-color: #FFDE00; -moz-border-radius-topright: 35px;" >
+            <hbox>
+                <description name="method" label="&staff.patron.hold_notices.method.label;" style="font-weight: bold"/>
+                <spacer flex="1"/>
+                <description name="notify_time" style="font-weight: bold"/>
+            </hbox>
+            <description name="note"/>
+        </groupbox>
+    </stack>
 
     <stack hidden="true" id="note_template" flex="1">
         <groupbox flex="1" style="background-color: black;"/>
@@ -72,7 +72,7 @@
             <tree id="holds_list" flex="1" enableColumnDrag="true" style="min-height: 4em;"/>
             <spacer/>
         </vbox>
-	</vbox>
+    </vbox>
 
     <splitter><grippy/></splitter>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/holds.xul b/Open-ILS/xul/staff_client/server/patron/holds.xul
index fbd95a98b8..f7bd81c2cb 100644
--- a/Open-ILS/xul/staff_client/server/patron/holds.xul
+++ b/Open-ILS/xul/staff_client/server/patron/holds.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,65 +20,65 @@
 <?xul-overlay href="/xul/server/patron/holds_overlay.xul"?>
 
 <window id="holds_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="/xul/server/util/network.js"/>
-	<script type="text/javascript" src="/xul/server/patron/holds.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for holds.xul');
-
-				JSAN.use('patron.holds'); g.holds = new patron.holds();
-				g.holds.init( 
-					{ 
-						'patron_id' : xul_param('patron_id'), 
-						'patron_barcode' : xul_param('patron_barcode'), 
-						'docid' : xul_param('docid'),
-						'shelf' : xul_param('shelf'),
-						'pull' : xul_param('pull'),
-					} 
-				);
-				window.refresh = function(p) { g.holds.list.clear(); g.holds.retrieve(p); }
-
-				default_focus();
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/holds.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function default_focus() { try { document.getElementById('holds_print').focus(); } catch(E) { } }
-
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale' -->/patron.properties"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="/xul/server/util/network.js"/>
+    <script type="text/javascript" src="/xul/server/patron/holds.js"/>
+    <script>
+    <![CDATA[
+        function $(id) { return document.getElementById(id); }
+        
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for holds.xul');
+
+                JSAN.use('patron.holds'); g.holds = new patron.holds();
+                g.holds.init( 
+                    { 
+                        'patron_id' : xul_param('patron_id'), 
+                        'patron_barcode' : xul_param('patron_barcode'), 
+                        'docid' : xul_param('docid'),
+                        'shelf' : xul_param('shelf'),
+                        'pull' : xul_param('pull'),
+                    } 
+                );
+                window.refresh = function(p) { g.holds.list.clear(); g.holds.retrieve(p); }
+
+                default_focus();
+
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/holds.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function default_focus() { try { document.getElementById('holds_print').focus(); } catch(E) { } }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale' -->/patron.properties"/>
 
         <commandset id="holds_cmds" />
 
-	<popupset id="holds_popupset"/>
+    <popupset id="holds_popupset"/>
 
-	<box id="holds_main" />
+    <box id="holds_main" />
 
 </window>
 
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 be22ef7fe0..86b7a18736 100644
--- a/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul
@@ -1,88 +1,88 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	  <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+      <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
           ]>
 <overlay id="holds_overlay" 
-	 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script>dump('loading holds_overlay.xul\n');</script>
 
 
     <commandset id="holds_cmds">
-	<command id="sel_mark_items_damaged" disabled="true"/>
-	<command id="sel_mark_items_missing" disabled="true"/>
-	<command id="sel_copy_details" disabled="true"/>
-	<command id="sel_patron" disabled="true"/>
-	<command id="sel_clip" />
+    <command id="sel_mark_items_damaged" disabled="true"/>
+    <command id="sel_mark_items_missing" disabled="true"/>
+    <command id="sel_copy_details" disabled="true"/>
+    <command id="sel_patron" disabled="true"/>
+    <command id="sel_clip" />
         <command id="cmd_csv_to_clipboard" />
-	<command id="cmd_csv_to_printer" />
-	<command id="cmd_csv_to_file" />
-	<command id="cmd_holds_print" />
-	<command id="cmd_show_catalog" />
-	<command id="cmd_retrieve_patron" />
-	<command id="cmd_holds_edit_pickup_lib" />
-	<command id="cmd_holds_edit_phone_notify" />
-	<command id="cmd_holds_edit_email_notify" />
-	<command id="cmd_holds_edit_thaw_date" />
-	<command id="cmd_holds_edit_expire_time" />
-	<command id="cmd_holds_activate" />
-	<command id="cmd_holds_suspend" />
-	<command id="cmd_holds_edit_selection_depth" />
-	<command id="cmd_broken" disabled="true" hidden="true"/>
-	<command id="cmd_holds_retarget"/>
-	<command id="cmd_holds_cancel" />
-	<command id="cmd_search_opac" />
-	<command id="save_columns" />
-	<command id="cmd_alt_view" />
+    <command id="cmd_csv_to_printer" />
+    <command id="cmd_csv_to_file" />
+    <command id="cmd_holds_print" />
+    <command id="cmd_show_catalog" />
+    <command id="cmd_retrieve_patron" />
+    <command id="cmd_holds_edit_pickup_lib" />
+    <command id="cmd_holds_edit_phone_notify" />
+    <command id="cmd_holds_edit_email_notify" />
+    <command id="cmd_holds_edit_thaw_date" />
+    <command id="cmd_holds_edit_expire_time" />
+    <command id="cmd_holds_activate" />
+    <command id="cmd_holds_suspend" />
+    <command id="cmd_holds_edit_selection_depth" />
+    <command id="cmd_broken" disabled="true" hidden="true"/>
+    <command id="cmd_holds_retarget"/>
+    <command id="cmd_holds_cancel" />
+    <command id="cmd_search_opac" />
+    <command id="save_columns" />
+    <command id="cmd_alt_view" />
     </commandset>
 
     <popupset id="holds_popupset">
-	<popup id="holds_actions" position="at_pointer"> 
-	    <menuitem command="sel_clip" label="&staff.circ.holds.copy_to_clipboard;" accesskey="&staff.circ.holds.copy_to_clipboard.accesskey;" />
-	    <menuitem label="&staff.circ.holds.show_in_catalog;" command="cmd_show_catalog" accesskey="&staff.circ.holds.show_in_catalog.accesskey;"/>
-	    <menuitem command="sel_copy_details" label="&staff.circ.holds.show_item_details;" accesskey="&staff.circ.holds.show_item_details.accesskey;" />
-	    <menuitem command="sel_patron" label="&staff.circ.holds.show_last_few_circulations;" accesskey="&staff.circ.holds.show_last_few_circulations.accesskey;"/>
-	    <menuseparator />
-	    <menuitem label="&staff.circ.holds.retrieve_patron;" command="cmd_retrieve_patron" accesskey="&staff.circ.holds.retrieve_patron.accesskey;"/>
-	    <menuseparator />
-	    <menuitem label="&staff.circ.holds.edit_pickup_library;" command="cmd_holds_edit_pickup_lib" accesskey="&staff.circ.holds.edit_pickup_library.accesskey;"/>
-	    <menuitem label="&staff.circ.holds.edit_phone_notification;" command="cmd_holds_edit_phone_notify" accesskey="&staff.circ.holds.edit_phone_notification.accesskey;"/>
-	    <menuitem label="&staff.circ.holds.set_email_notification;" command="cmd_holds_edit_email_notify" accesskey="&staff.circ.holds.set_email_notification.accesskey;"/>
-	    <menuitem label="&staff.circ.holds.edit_expire_time;" command="cmd_holds_edit_expire_time" accesskey="&staff.circ.holds.edit_expire_time.accesskey;"/>
-	    <menuitem label="&staff.circ.holds.edit_activation_date;" command="cmd_holds_edit_thaw_date" accesskey="&staff.circ.holds.edit_activation_date.accesskey;"/>
-	    <menuitem label="&staff.circ.holds.activate_hold;" command="cmd_holds_activate" accesskey="&staff.circ.holds.activate_hold.accesskey;"/>
-	    <menuitem label="&staff.circ.holds.suspend_hold;" command="cmd_holds_suspend" accesskey="&staff.circ.holds.suspend_hold.accesskey;"/>
-	    <menuitem label="&staff.circ.holds.edit_hold_range;" class="edit_hold_range" command="cmd_holds_edit_selection_depth" accesskey="&staff.circ.holds.edit_hold_range.accesskey;"/>
-	    <menuitem label="&staff.circ.holds.edit_hold_focus;" class="edit_hold_focus" command="cmd_broken" accesskey="&staff.circ.holds.edit_hold_focus.accesskey;"/>
-	    <menuseparator />
-	    <menuitem command="sel_mark_items_damaged" label="&staff.circ.holds.mark_item_damaged;" accesskey="&staff.circ.holds.mark_item_damaged.accesskey;"/>
-	    <menuitem command="sel_mark_items_missing" label="&staff.circ.holds.mark_item_missing;" accesskey="&staff.circ.holds.mark_item_missing.accesskey;"/>
-	    <menuitem label="&staff.circ.holds.retarget;" command="cmd_holds_retarget" accesskey="&staff.circ.holds.retarget.accesskey;"/>
-	    <menuitem label="&staff.circ.holds.cancel;" command="cmd_holds_cancel" accesskey="&staff.circ.holds.cancel.accesskey;"/>
-	    <menuseparator />
-	    <menuitem command="save_columns" label="&staff.circ.holds.save_columns;" accesskey="&staff.circ.holds.save_columns.accesskey;"/>
-	</popup>
+    <popup id="holds_actions" position="at_pointer"> 
+        <menuitem command="sel_clip" label="&staff.circ.holds.copy_to_clipboard;" accesskey="&staff.circ.holds.copy_to_clipboard.accesskey;" />
+        <menuitem label="&staff.circ.holds.show_in_catalog;" command="cmd_show_catalog" accesskey="&staff.circ.holds.show_in_catalog.accesskey;"/>
+        <menuitem command="sel_copy_details" label="&staff.circ.holds.show_item_details;" accesskey="&staff.circ.holds.show_item_details.accesskey;" />
+        <menuitem command="sel_patron" label="&staff.circ.holds.show_last_few_circulations;" accesskey="&staff.circ.holds.show_last_few_circulations.accesskey;"/>
+        <menuseparator />
+        <menuitem label="&staff.circ.holds.retrieve_patron;" command="cmd_retrieve_patron" accesskey="&staff.circ.holds.retrieve_patron.accesskey;"/>
+        <menuseparator />
+        <menuitem label="&staff.circ.holds.edit_pickup_library;" command="cmd_holds_edit_pickup_lib" accesskey="&staff.circ.holds.edit_pickup_library.accesskey;"/>
+        <menuitem label="&staff.circ.holds.edit_phone_notification;" command="cmd_holds_edit_phone_notify" accesskey="&staff.circ.holds.edit_phone_notification.accesskey;"/>
+        <menuitem label="&staff.circ.holds.set_email_notification;" command="cmd_holds_edit_email_notify" accesskey="&staff.circ.holds.set_email_notification.accesskey;"/>
+        <menuitem label="&staff.circ.holds.edit_expire_time;" command="cmd_holds_edit_expire_time" accesskey="&staff.circ.holds.edit_expire_time.accesskey;"/>
+        <menuitem label="&staff.circ.holds.edit_activation_date;" command="cmd_holds_edit_thaw_date" accesskey="&staff.circ.holds.edit_activation_date.accesskey;"/>
+        <menuitem label="&staff.circ.holds.activate_hold;" command="cmd_holds_activate" accesskey="&staff.circ.holds.activate_hold.accesskey;"/>
+        <menuitem label="&staff.circ.holds.suspend_hold;" command="cmd_holds_suspend" accesskey="&staff.circ.holds.suspend_hold.accesskey;"/>
+        <menuitem label="&staff.circ.holds.edit_hold_range;" class="edit_hold_range" command="cmd_holds_edit_selection_depth" accesskey="&staff.circ.holds.edit_hold_range.accesskey;"/>
+        <menuitem label="&staff.circ.holds.edit_hold_focus;" class="edit_hold_focus" command="cmd_broken" accesskey="&staff.circ.holds.edit_hold_focus.accesskey;"/>
+        <menuseparator />
+        <menuitem command="sel_mark_items_damaged" label="&staff.circ.holds.mark_item_damaged;" accesskey="&staff.circ.holds.mark_item_damaged.accesskey;"/>
+        <menuitem command="sel_mark_items_missing" label="&staff.circ.holds.mark_item_missing;" accesskey="&staff.circ.holds.mark_item_missing.accesskey;"/>
+        <menuitem label="&staff.circ.holds.retarget;" command="cmd_holds_retarget" accesskey="&staff.circ.holds.retarget.accesskey;"/>
+        <menuitem label="&staff.circ.holds.cancel;" command="cmd_holds_cancel" accesskey="&staff.circ.holds.cancel.accesskey;"/>
+        <menuseparator />
+        <menuitem command="save_columns" label="&staff.circ.holds.save_columns;" accesskey="&staff.circ.holds.save_columns.accesskey;"/>
+    </popup>
     </popupset>
 
 
     <box id="holds_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="cmvb1" flex="1"/>
+    <vbox id="cmvb1" flex="1"/>
     </box>
 
     <vbox id="cmvb1" flex="1">
-	<groupbox id="cmgb1" flex="1" orient="vertical">
-	    <caption label="&staff.patron_navbar.holds;" />
-	    <vbox flex="0">
-		<hbox id="holds_top_ui" />
-	    </vbox>
+    <groupbox id="cmgb1" flex="1" orient="vertical">
+        <caption label="&staff.patron_navbar.holds;" />
+        <vbox flex="0">
+        <hbox id="holds_top_ui" />
+        </vbox>
         <deck id="deck" flex="1">
             <tree id="holds_list" flex="1" enableColumnDrag="true" context="holds_actions"/>
             <browser id="hold_detail_frame" src="" flex="1" />
         </deck>
-	    <vbox flex="0">
-		<hbox id="holds_bottom_ui" />
-	    </vbox>
-	</groupbox>
+        <vbox flex="0">
+        <hbox id="holds_bottom_ui" />
+        </vbox>
+    </groupbox>
     </vbox>
 
     <hbox id="holds_top_ui" flex="1">
@@ -100,7 +100,7 @@
         </menulist>
         <vbox id="lib_menu_placeholder" hidden="true"/>
         <button id="fetch_more" label="&staff.patron.holds_overlay.fetch_more.label;" accesskey="&staff.patron.holds_overlay.fetch_more.accesskey;" hidden="true"/>
-	<spacer flex="1"/>
+    <spacer flex="1"/>
         <button id="alt_view_btn" command="cmd_alt_view" />
         <menubar>
             <menu label="&staff.patron.holds_overlay.actions_for_holds.label;" accesskey="&staff.patron.holds_overlay.actions_for_holds.accesskey;">
@@ -115,7 +115,7 @@
                     <menuitem label="&staff.circ.holds.edit_pickup_library;" command="cmd_holds_edit_pickup_lib" accesskey="&staff.circ.holds.edit_pickup_library.accesskey;"/>
                     <menuitem label="&staff.circ.holds.edit_phone_notification;" command="cmd_holds_edit_phone_notify" accesskey="&staff.circ.holds.edit_phone_notification.accesskey;"/>
                     <menuitem label="&staff.circ.holds.set_email_notification;" command="cmd_holds_edit_email_notify" accesskey="&staff.circ.holds.set_email_notification.accesskey;"/>
-		    <menuitem label="&staff.circ.holds.edit_expire_time;" command="cmd_holds_edit_expire_time" accesskey="&staff.circ.holds.edit_expire_time.accesskey;"/>
+            <menuitem label="&staff.circ.holds.edit_expire_time;" command="cmd_holds_edit_expire_time" accesskey="&staff.circ.holds.edit_expire_time.accesskey;"/>
                     <menuitem label="&staff.circ.holds.edit_activation_date;" command="cmd_holds_edit_thaw_date" accesskey="&staff.circ.holds.edit_activation_date.accesskey;"/>
                     <menuitem label="&staff.circ.holds.activate_hold;" command="cmd_holds_activate" accesskey="&staff.circ.holds.activate_hold.accesskey;"/>
                     <menuitem label="&staff.circ.holds.suspend_hold;" command="cmd_holds_suspend" accesskey="&staff.circ.holds.suspend_hold.accesskey;"/>
@@ -147,8 +147,8 @@
             </menupopup>
         </button>
 
-	<button id="holds_print" label="&staff.patron.holds_overlay.print.label;" command="cmd_holds_print" accesskey="&staff.patron.holds_overlay.print.accesskey;" />
-	<spacer flex="1"/>
+    <button id="holds_print" label="&staff.patron.holds_overlay.print.label;" command="cmd_holds_print" accesskey="&staff.patron.holds_overlay.print.accesskey;" />
+    <spacer flex="1"/>
     </hbox>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/patron/info_group.xul b/Open-ILS/xul/staff_client/server/patron/info_group.xul
index 1c2d94de90..8c461a46e0 100644
--- a/Open-ILS/xul/staff_client/server/patron/info_group.xul
+++ b/Open-ILS/xul/staff_client/server/patron/info_group.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,197 +19,197 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="patron_info_group_win" width="700" height="550"
-	onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
 
-		function $(id) { return document.getElementById(id); }
+        function $(id) { return document.getElementById(id); }
 
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
 
-				JSAN.use('util.error'); g.error = new util.error();
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('patron.util'); JSAN.use('util.functional');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+                JSAN.use('util.error'); g.error = new util.error();
+                JSAN.use('util.network'); g.network = new util.network();
+                JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('patron.util'); JSAN.use('util.functional');
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
 
-				g.error.sdump('D_TRACE','my_init() for patron_info_group.xul');
+                g.error.sdump('D_TRACE','my_init() for patron_info_group.xul');
 
-				g.patron_id = xul_param('patron_id');
+                g.patron_id = xul_param('patron_id');
 
-				tree_init();
+                tree_init();
 
-				refresh();
+                refresh();
 
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/info_group.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/info_group.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
 
-		function tree_init() {
-				JSAN.use('OpenILS.data'); g.OpenILS = {}; 
-				g.OpenILS.data = new OpenILS.data(); g.OpenILS.data.init({'via':'stash'});
+        function tree_init() {
+                JSAN.use('OpenILS.data'); g.OpenILS = {}; 
+                g.OpenILS.data = new OpenILS.data(); g.OpenILS.data.init({'via':'stash'});
                 var obscure_dob = String( g.OpenILS.data.hash.aous['circ.obscure_dob'] ) == 'true';
 
-				JSAN.use('util.list'); g.list = new util.list('patron_list');
-
-				JSAN.use('patron.util');
-				var columns = patron.util.columns(
-					{
-						'active' : { 'hidden' : 'false' },
-						'barred' : { 'hidden' : 'false' },
-						'family_name' : { 'hidden' : 'false' },
-						'first_given_name' : { 'hidden' : 'false' },
-						'second_given_name' : { 'hidden' : 'false' },
-						'dob' : { 'hidden' : obscure_dob },
-						'master_account' : { 'hidden' : 'false' },
-					}
-				);
-				g.list.init(
-					{
-						'columns' : columns,
-						'map_row_to_columns' : patron.util.std_map_row_to_columns(),
-						'retrieve_row' : function(params) {
-							var id = params.retrieve_id;
-							var au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), id );
-
-							var row = params.row;
-							if (typeof row.my == 'undefined') row.my = {};
-							row.my.au = au_obj;
-							if (typeof params.on_retrieve == 'function') {
-								params.on_retrieve(row);
-							}
-							return row;
-						},
-						'on_select' : function(ev) {
-							JSAN.use('util.functional');
-							var sel = g.list.retrieve_selection();
-							g.sel_list = util.functional.map_list(
-								sel,
-								function(o) { return o.getAttribute('retrieve_id'); }
-							);
-							if (g.sel_list.length > 0) {
-								$('retrieve_p').disabled = false;
-								$('retrieve_p').setAttribute('disabled','false');
+                JSAN.use('util.list'); g.list = new util.list('patron_list');
+
+                JSAN.use('patron.util');
+                var columns = patron.util.columns(
+                    {
+                        'active' : { 'hidden' : 'false' },
+                        'barred' : { 'hidden' : 'false' },
+                        'family_name' : { 'hidden' : 'false' },
+                        'first_given_name' : { 'hidden' : 'false' },
+                        'second_given_name' : { 'hidden' : 'false' },
+                        'dob' : { 'hidden' : obscure_dob },
+                        'master_account' : { 'hidden' : 'false' },
+                    }
+                );
+                g.list.init(
+                    {
+                        'columns' : columns,
+                        'map_row_to_columns' : patron.util.std_map_row_to_columns(),
+                        'retrieve_row' : function(params) {
+                            var id = params.retrieve_id;
+                            var au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), id );
+
+                            var row = params.row;
+                            if (typeof row.my == 'undefined') row.my = {};
+                            row.my.au = au_obj;
+                            if (typeof params.on_retrieve == 'function') {
+                                params.on_retrieve(row);
+                            }
+                            return row;
+                        },
+                        'on_select' : function(ev) {
+                            JSAN.use('util.functional');
+                            var sel = g.list.retrieve_selection();
+                            g.sel_list = util.functional.map_list(
+                                sel,
+                                function(o) { return o.getAttribute('retrieve_id'); }
+                            );
+                            if (g.sel_list.length > 0) {
+                                $('retrieve_p').disabled = false;
+                                $('retrieve_p').setAttribute('disabled','false');
                                 if (g.sel_list.length > 1) {
-								    $('merge_p').disabled = false;
-    								$('merge_p').setAttribute('disabled','false');
+                                    $('merge_p').disabled = false;
+                                    $('merge_p').setAttribute('disabled','false');
                                 }
-								$('clone').disabled = false;
-								$('clone').setAttribute('disabled','false');
-								$('remove').disabled = false;
-								$('remove').setAttribute('disabled','false');
-								$('move').disabled = false;
-								$('move').setAttribute('disabled','false');
-							} else {
-								$('retrieve_p').disabled = true;
-								$('retrieve_p').setAttribute('disabled','true');
-								$('merge_p').disabled = true;
-								$('merge_p').setAttribute('disabled','true');
-								$('clone').disabled = true;
-								$('clone').setAttribute('disabled','true');
-								$('remove').disabled = true;
-								$('remove').setAttribute('disabled','true');
-								$('move').disabled = true;
-								$('move').setAttribute('disabled','true');
-							}
-						}
-					}
-				);
-				$('retrieve_p').disabled = true;
-				$('retrieve_p').setAttribute('disabled','true');
-				$('merge_p').disabled = true;
-				$('merge_p').setAttribute('disabled','true');
-				$('clone').disabled = true;
-				$('clone').setAttribute('disabled','true');
-				$('remove').disabled = true;
-				$('remove').setAttribute('disabled','true');
-				$('move').disabled = true;
-				$('move').setAttribute('disabled','true');
-				setTimeout( function() { $('patron_list').focus(); }, 0 );
-		}
-
-		function refresh() {
-			retrieve_group_members();
-		}
-
-		function retrieve_group_members() {
-			try {
-				JSAN.use('util.functional'); JSAN.use('patron.util');
-				g.group_members = [];
-				var p = patron.util.retrieve_au_via_id(ses(),g.patron_id);
-				if ((p == null) || (typeof p.ilsevent != 'undefined') ) throw(p);
-				var robj = g.network.simple_request(
-					'FM_AU_LIST_RETRIEVE_VIA_GROUP.authoritative',
-					[ ses(), p.usrgroup() ]
-				);
-				if ((robj == null) || (typeof robj.ilsevent != 'undefined') ) throw(robj);
-				var ids = util.functional.filter_list( robj, function(o) { return o != g.patron_id; });
-
-				g.list.clear();
-
-				var funcs = [];
-
-					function gen_func(r) {
-						return function() {
-							g.list.append( { 'retrieve_id' : r, 'row' : {} } );
-						}
-					}
-
-				funcs.push( gen_func(g.patron_id) );
-				for (var i = 0; i < ids.length; i++) {
-					funcs.push( gen_func(ids[i]) );
-				}
-				JSAN.use('util.exec'); var exec = new util.exec(4);
-				exec.chain( funcs );
-
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.retrieve_group_members.failure'),E);
-			}
-		}
-
-		function retrieve_patron() {
-			try {
-				if (! g.sel_list ) return;
-				if (typeof window.xulG == 'object' && typeof window.xulG.new_patron_tab == 'function') {
-					for (var i = 0; i < g.sel_list.length; i++) {	
-						try {
-							window.xulG.new_patron_tab(
-								{ 'tab_name' : $("patronStrings").getString('staff.patron.info_group.retrieve_patron.tab_name') }, 
-								{ 
-									'id' : g.sel_list[i],
-									'url_prefix' : xulG.url_prefix,
-									'new_tab' : xulG.new_tab,
+                                $('clone').disabled = false;
+                                $('clone').setAttribute('disabled','false');
+                                $('remove').disabled = false;
+                                $('remove').setAttribute('disabled','false');
+                                $('move').disabled = false;
+                                $('move').setAttribute('disabled','false');
+                            } else {
+                                $('retrieve_p').disabled = true;
+                                $('retrieve_p').setAttribute('disabled','true');
+                                $('merge_p').disabled = true;
+                                $('merge_p').setAttribute('disabled','true');
+                                $('clone').disabled = true;
+                                $('clone').setAttribute('disabled','true');
+                                $('remove').disabled = true;
+                                $('remove').setAttribute('disabled','true');
+                                $('move').disabled = true;
+                                $('move').setAttribute('disabled','true');
+                            }
+                        }
+                    }
+                );
+                $('retrieve_p').disabled = true;
+                $('retrieve_p').setAttribute('disabled','true');
+                $('merge_p').disabled = true;
+                $('merge_p').setAttribute('disabled','true');
+                $('clone').disabled = true;
+                $('clone').setAttribute('disabled','true');
+                $('remove').disabled = true;
+                $('remove').setAttribute('disabled','true');
+                $('move').disabled = true;
+                $('move').setAttribute('disabled','true');
+                setTimeout( function() { $('patron_list').focus(); }, 0 );
+        }
+
+        function refresh() {
+            retrieve_group_members();
+        }
+
+        function retrieve_group_members() {
+            try {
+                JSAN.use('util.functional'); JSAN.use('patron.util');
+                g.group_members = [];
+                var p = patron.util.retrieve_au_via_id(ses(),g.patron_id);
+                if ((p == null) || (typeof p.ilsevent != 'undefined') ) throw(p);
+                var robj = g.network.simple_request(
+                    'FM_AU_LIST_RETRIEVE_VIA_GROUP.authoritative',
+                    [ ses(), p.usrgroup() ]
+                );
+                if ((robj == null) || (typeof robj.ilsevent != 'undefined') ) throw(robj);
+                var ids = util.functional.filter_list( robj, function(o) { return o != g.patron_id; });
+
+                g.list.clear();
+
+                var funcs = [];
+
+                    function gen_func(r) {
+                        return function() {
+                            g.list.append( { 'retrieve_id' : r, 'row' : {} } );
+                        }
+                    }
+
+                funcs.push( gen_func(g.patron_id) );
+                for (var i = 0; i < ids.length; i++) {
+                    funcs.push( gen_func(ids[i]) );
+                }
+                JSAN.use('util.exec'); var exec = new util.exec(4);
+                exec.chain( funcs );
+
+            } catch(E) {
+                g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.retrieve_group_members.failure'),E);
+            }
+        }
+
+        function retrieve_patron() {
+            try {
+                if (! g.sel_list ) return;
+                if (typeof window.xulG == 'object' && typeof window.xulG.new_patron_tab == 'function') {
+                    for (var i = 0; i < g.sel_list.length; i++) {    
+                        try {
+                            window.xulG.new_patron_tab(
+                                { 'tab_name' : $("patronStrings").getString('staff.patron.info_group.retrieve_patron.tab_name') }, 
+                                { 
+                                    'id' : g.sel_list[i],
+                                    'url_prefix' : xulG.url_prefix,
+                                    'new_tab' : xulG.new_tab,
                                     'set_tab' : xulG.set_tab
-								}
-							);
-						} catch(E) {
-							g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.retrieve_patron.failed_retrieving_patron'),E);
-						}
-					}
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.retrieve_patron.failed_retrieving_patrons'),E);
-			}
-		}
+                                }
+                            );
+                        } catch(E) {
+                            g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.retrieve_patron.failed_retrieving_patron'),E);
+                        }
+                    }
+                }
+            } catch(E) {
+                g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.retrieve_patron.failed_retrieving_patrons'),E);
+            }
+        }
 
         function merge_patrons() {
-			try {
-				if (! g.sel_list ) return;
+            try {
+                if (! g.sel_list ) return;
                 JSAN.use('patron.util'); 
                 var result = patron.util.merge(g.sel_list);
                 if (result) {
@@ -224,264 +224,264 @@
                         refresh();
                     }
                 }
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.merge_patrons.failed_merging_patrons'),E);
-			}
+            } catch(E) {
+                g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.merge_patrons.failed_merging_patrons'),E);
+            }
+        }
+
+        function clone_patron() {
+            if (! g.sel_list ) return;
+            try {
+                for (var i = 0; i < g.sel_list.length; i++) {    
+                    var loc = xulG.url_prefix( urls.XUL_REMOTE_BROWSER ); 
+                        //+ '?url=' + window.escape( urls.XUL_PATRON_EDIT + '?ses=' 
+                        //+ window.escape( ses() ) + '&clone=' + g.sel_list[i] );
+                    if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') xulG.new_tab(
+                        loc, 
+                        {}, 
+                        { 
+                            'url' : urls.XUL_PATRON_EDIT, // + '?ses=' + window.escape(ses()) + '&clone=' + g.sel_list[i],
+                            'show_print_button' : true , 
+                            'tab_name' : $("patronStrings").getString('staff.patron.info_group.clone_patron.register_clone.tab_name'),
+                            'passthru_content_params' : {
+                                'ses' : ses(),
+                                'clone' : g.sel_list[i],
+                                'spawn_search' : spawn_search,
+                                'spawn_editor' : spawn_editor,
+                                'on_save' : function() { refresh(); },
+                                'url_prefix' : xulG.url_prefix,
+                                'new_tab' : xulG.new_tab,
+                            },
+                            'url_prefix' : xulG.url_prefix,
+                            'new_tab' : xulG.new_tab,
+                        }
+                    );
+                }
+            } catch(E) {
+                g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.clone_patron.error_spawning_editors'),E);
+            }
+        }
+
+        function spawn_editor(p) {
+            var url = urls.XUL_PATRON_EDIT;
+            var passthru = {
+                'spawn_search' : spawn_search,
+                'spawn_editor' : spawn_editor,
+                'on_save' : function() { refresh(); },
+                'url_prefix' : xulG.url_prefix,
+                'new_tab' : xulG.new_tab,
+            };
+            for (var i in p) {
+                passthru[i] = p[i];
+            }
+            var loc = xulG.url_prefix( urls.XUL_REMOTE_BROWSER ); // + '?url=' + window.escape( url );
+            if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') xulG.new_tab(
+                loc, 
+                {}, 
+                { 
+                    'url' : url,
+                    'show_print_button' : true , 
+                    'tab_name' : $("patronStrings").getString('staff.patron.info_group.spwan_editor.editing_patron'),
+                    'passthru_content_params' : passthru,
+                    'url_prefix' : xulG.url_prefix,
+                    'new_tab' : xulG.new_tab,
+                }
+            );
+
+        }
+
+        function spawn_search(s) {
+            try {
+                g.error.sdump('D_TRACE', 'Editor would like to search for: ' + js2JSON(s) ); 
+                if (typeof window.xulG == 'object' && typeof window.xulG.new_patron_tab == 'function') 
+                    xulG.new_patron_tab( {}, {'doit':1,'query':s} );
+            } catch(E) {
+                g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.spwan_search'),E);
+            }
+        }
+
+        function remove_patron() {
+            if (! g.sel_list ) return;
+            var msg = '';
+            for (var i = 0 ; i < g.sel_list.length; i++)
+                if (g.sel_list[i] == g.patron_id)
+                    msg = $("patronStrings").getString('staff.patron.info_group.remove_patron.warning_message');
+                    
+            var c = window.confirm($("patronStrings").getFormattedString('staff.patron.info_group.remove_patron.warning_message_confirm', [msg]));
+            if (c) {
+                for (var i = 0; i < g.sel_list.length; i++) {    
+                    var robj = g.network.simple_request('FM_AU_NEW_USERGROUP', [ ses(), g.sel_list[i], get_db_true() ]);
+                    if (typeof robj.ilsevent != 'undefined') {
+                        g.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.info_group.remove_patron.error_removing_patron', [g.sel_list[i]]), robj);
+                    }
+                }
+                alert($("patronStrings").getString('staff.patron.info_group.remove_patron.patrons_removed_from_group')); 
+                /* FIXME - xulrunner bug if this alert comes after refresh? */
+                /* that's okay, because now that we're on a distributed database, we want human delay to mitigate race conditions */
+                refresh();
+            } else {
+                alert($("patronStrings").getString('staff.patron.info_group.remove_patron.patrons_not_removed_from_group'));
+            }
+        }
+
+        function link_patron(direction) {
+            try {
+                if (! g.sel_list ) { g.sel_list = []; g.sel_list[0] = g.patron_id; }
+                if (direction == null) throw($("patronStrings").getString('staff.patron.info_group.link_patron.null_not_allowed'));
+                var first_msg; var second_msg;
+                switch(direction) {
+                    case true:
+                        first_msg = "-->";
+                        break;
+                    case false:
+                        first_msg = "<--";
+                        break;
+                    default:
+                        throw($("patronStrings").getString('staff.patron.info_group.link_patron.invalid_parameter'));
+                        break;
+                }
+                var barcode = window.prompt($("patronStrings").getString('staff.patron.info_group.link_patron.scan_patron_barcode'),'',first_msg);
+                if (!barcode) return;
+                JSAN.use('patron.util');
+                var patron_b = patron.util.retrieve_fleshed_au_via_barcode(ses(),barcode);
+                if (typeof patron_b.ilsevent != 'undefined') throw(patron_b);
+
+                if (g.sel_list.length == 0) g.sel_list[0] = g.patron_id;
+                for (var i = 0; i < g.sel_list.length; i++) {    
+
+                    var patron_a = patron.util.retrieve_fleshed_au_via_id(ses(),g.sel_list[i]);
+                    if (typeof patron_a.ilsevent != 'undefined') throw(patron_a);
+                    switch(direction) {
+                        case true:
+                            second_msg = $("patronStrings").getFormattedString('staff.patron.info_group.link_patron.move_patron_to_new_usergroup',[patron_a.card().barcode(), patron_b.card().barcode()]);
+                            break;
+                        case false:
+                            second_msg = $("patronStrings").getFormattedString('staff.patron.info_group.link_patron.move_patron_to_new_usergroup',[patron_b.card().barcode(), patron_a.card().barcode()]);
+                            break;
+                    }
+
+                    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+                    var top_xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: auto"><description>' + second_msg + '</description>';
+                    top_xml += '<hbox><spacer flex="1"/><button label="'+$("patronStrings").getString('staff.patron.info_group.link_patron.move.label')+'"';
+                    top_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.info_group.link_patron.move.accesskey')+'" name="fancy_submit"/>';
+                    top_xml += '<button label="'+$("patronStrings").getString('staff.patron.info_group.link_patron.done.label')+'"';
+                    top_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.info_group.link_patron.done.accesskey')+'" name="fancy_cancel"/></hbox></vbox>';
+                    var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical"><hbox flex="1">';
+                    /************/
+                    xml += '<vbox flex="1">';
+                    xml += '<hbox><spacer flex="1"/>';
+                    if (direction) {
+                        xml += '<image src="/xul/server/skin/media/images/patron_right_arrow.png"/>';
+                    } else {
+                        xml += '<image src="/xul/server/skin/media/images/patron_left_arrow.png"/>';
+                    }
+                    xml += '</hbox>';
+                    xml += '<iframe style="min-height: 100px" flex="1" src="' + xulG.url_prefix( urls.XUL_PATRON_SUMMARY );
+                    xml += '?show_name=1&amp;id=' + g.sel_list[i] + '"/>';
+                    xml += '</vbox>';
+                    xml += '<vbox flex="1">';
+                    xml += '<hbox>';
+                    if (direction) {
+                        xml += '<image src="/xul/server/skin/media/images/patron_right_arrow.png"/>';
+                    } else {
+                        xml += '<image src="/xul/server/skin/media/images/patron_left_arrow.png"/>';
+                    }
+                    xml += '<spacer flex="1"/></hbox>';
+                    xml += '<iframe style="min-height: 100px" flex="1" src="' + xulG.url_prefix( urls.XUL_PATRON_SUMMARY );
+                    xml += '?show_name=1&amp;id=' + patron_b.id() + '"/>';
+                    xml += '</vbox>';
+                    /************/
+                    xml += '</hbox></vbox>';
+                    
+                    var bot_xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: auto"><hbox>';
+                    bot_xml += '</hbox></vbox>';
+        
+                    //g.data.temp_top = top_xml; g.data.stash('temp_top');
+                    //g.data.temp_mid = xml; g.data.stash('temp_mid');
+                    //g.data.temp_bot = bot_xml; g.data.stash('temp_bot');
+                    JSAN.use('util.window'); var win = new util.window();
+                    var fancy_prompt_data = win.open(
+                        urls.XUL_FANCY_PROMPT,
+                        //+ '?xml_in_stash=temp_mid'
+                        //+ '&top_xml_in_stash=temp_top'
+                        //+ '&bottom_xml_in_stash=temp_bot'
+                        //+ '&title=' + window.escape('Move Patron into a Usergroup'),
+                        'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
+                        { 'xml' : xml, 'top_xml' : top_xml, 'bottom_xml' : bot_xml, 'title' : $("patronStrings").getString('staff.patron.info_group.link_patron.move_patron_to_usergroup')}
+                    );
+                    if (fancy_prompt_data.fancy_status == 'incomplete') { continue; }
+                    else {
+                        var patron_c;
+                        switch(direction) {
+                            case true:
+                                patron_a.usrgroup( patron_b.usrgroup() );
+                                patron_a.ischanged( '1' );
+                                patron_c = patron_a;
+                            break;
+                            case false:
+                                patron_b.usrgroup( patron_a.usrgroup() );
+                                patron_b.ischanged( '1' );
+                                patron_c = patron_b;
+                            break;
+                        }
+                        var robj = g.network.simple_request('FM_AU_UPDATE',[ ses(), patron_c ]);
+                        if (typeof robj.ilsevent != 'undefined') g.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.info_group.link_patron.error_linking_patron', [g.sel_list[i]]), robj);
+                    }
+                }
+                alert($("patronStrings").getString('staff.patron.info_group.link_patron.usergroups_updated'));
+                refresh();
+            } catch(E) {
+                g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.link_patron.error_linking_patrons'),E);
+                refresh();
+            }
         }
 
-		function clone_patron() {
-			if (! g.sel_list ) return;
-			try {
-				for (var i = 0; i < g.sel_list.length; i++) {	
-					var loc = xulG.url_prefix( urls.XUL_REMOTE_BROWSER ); 
-						//+ '?url=' + window.escape( urls.XUL_PATRON_EDIT + '?ses=' 
-						//+ window.escape( ses() ) + '&clone=' + g.sel_list[i] );
-					if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') xulG.new_tab(
-						loc, 
-						{}, 
-						{ 
-							'url' : urls.XUL_PATRON_EDIT, // + '?ses=' + window.escape(ses()) + '&clone=' + g.sel_list[i],
-							'show_print_button' : true , 
-							'tab_name' : $("patronStrings").getString('staff.patron.info_group.clone_patron.register_clone.tab_name'),
-							'passthru_content_params' : {
-								'ses' : ses(),
-								'clone' : g.sel_list[i],
-								'spawn_search' : spawn_search,
-								'spawn_editor' : spawn_editor,
-								'on_save' : function() { refresh(); },
-								'url_prefix' : xulG.url_prefix,
-								'new_tab' : xulG.new_tab,
-							},
-							'url_prefix' : xulG.url_prefix,
-							'new_tab' : xulG.new_tab,
-						}
-					);
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.clone_patron.error_spawning_editors'),E);
-			}
-		}
-
-		function spawn_editor(p) {
-			var url = urls.XUL_PATRON_EDIT;
-			var passthru = {
-				'spawn_search' : spawn_search,
-				'spawn_editor' : spawn_editor,
-				'on_save' : function() { refresh(); },
-				'url_prefix' : xulG.url_prefix,
-				'new_tab' : xulG.new_tab,
-			};
-			for (var i in p) {
-				passthru[i] = p[i];
-			}
-			var loc = xulG.url_prefix( urls.XUL_REMOTE_BROWSER ); // + '?url=' + window.escape( url );
-			if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') xulG.new_tab(
-				loc, 
-				{}, 
-				{ 
-					'url' : url,
-					'show_print_button' : true , 
-					'tab_name' : $("patronStrings").getString('staff.patron.info_group.spwan_editor.editing_patron'),
-					'passthru_content_params' : passthru,
-					'url_prefix' : xulG.url_prefix,
-					'new_tab' : xulG.new_tab,
-				}
-			);
-
-		}
-
-		function spawn_search(s) {
-			try {
-				g.error.sdump('D_TRACE', 'Editor would like to search for: ' + js2JSON(s) ); 
-				if (typeof window.xulG == 'object' && typeof window.xulG.new_patron_tab == 'function') 
-					xulG.new_patron_tab( {}, {'doit':1,'query':s} );
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.spwan_search'),E);
-			}
-		}
-
-		function remove_patron() {
-			if (! g.sel_list ) return;
-			var msg = '';
-			for (var i = 0 ; i < g.sel_list.length; i++)
-				if (g.sel_list[i] == g.patron_id)
-					msg = $("patronStrings").getString('staff.patron.info_group.remove_patron.warning_message');
-					
-			var c = window.confirm($("patronStrings").getFormattedString('staff.patron.info_group.remove_patron.warning_message_confirm', [msg]));
-			if (c) {
-				for (var i = 0; i < g.sel_list.length; i++) {	
-					var robj = g.network.simple_request('FM_AU_NEW_USERGROUP', [ ses(), g.sel_list[i], get_db_true() ]);
-					if (typeof robj.ilsevent != 'undefined') {
-						g.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.info_group.remove_patron.error_removing_patron', [g.sel_list[i]]), robj);
-					}
-				}
-				alert($("patronStrings").getString('staff.patron.info_group.remove_patron.patrons_removed_from_group')); 
-				/* FIXME - xulrunner bug if this alert comes after refresh? */
-				/* that's okay, because now that we're on a distributed database, we want human delay to mitigate race conditions */
-				refresh();
-			} else {
-				alert($("patronStrings").getString('staff.patron.info_group.remove_patron.patrons_not_removed_from_group'));
-			}
-		}
-
-		function link_patron(direction) {
-			try {
-				if (! g.sel_list ) { g.sel_list = []; g.sel_list[0] = g.patron_id; }
-				if (direction == null) throw($("patronStrings").getString('staff.patron.info_group.link_patron.null_not_allowed'));
-				var first_msg; var second_msg;
-				switch(direction) {
-					case true:
-						first_msg = "-->";
-						break;
-					case false:
-						first_msg = "<--";
-						break;
-					default:
-						throw($("patronStrings").getString('staff.patron.info_group.link_patron.invalid_parameter'));
-						break;
-				}
-				var barcode = window.prompt($("patronStrings").getString('staff.patron.info_group.link_patron.scan_patron_barcode'),'',first_msg);
-				if (!barcode) return;
-				JSAN.use('patron.util');
-				var patron_b = patron.util.retrieve_fleshed_au_via_barcode(ses(),barcode);
-				if (typeof patron_b.ilsevent != 'undefined') throw(patron_b);
-
-				if (g.sel_list.length == 0) g.sel_list[0] = g.patron_id;
-				for (var i = 0; i < g.sel_list.length; i++) {	
-
-					var patron_a = patron.util.retrieve_fleshed_au_via_id(ses(),g.sel_list[i]);
-					if (typeof patron_a.ilsevent != 'undefined') throw(patron_a);
-					switch(direction) {
-						case true:
-							second_msg = $("patronStrings").getFormattedString('staff.patron.info_group.link_patron.move_patron_to_new_usergroup',[patron_a.card().barcode(), patron_b.card().barcode()]);
-							break;
-						case false:
-							second_msg = $("patronStrings").getFormattedString('staff.patron.info_group.link_patron.move_patron_to_new_usergroup',[patron_b.card().barcode(), patron_a.card().barcode()]);
-							break;
-					}
-
-					netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-					var top_xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: auto"><description>' + second_msg + '</description>';
-					top_xml += '<hbox><spacer flex="1"/><button label="'+$("patronStrings").getString('staff.patron.info_group.link_patron.move.label')+'"';
-					top_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.info_group.link_patron.move.accesskey')+'" name="fancy_submit"/>';
-					top_xml += '<button label="'+$("patronStrings").getString('staff.patron.info_group.link_patron.done.label')+'"';
-					top_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.info_group.link_patron.done.accesskey')+'" name="fancy_cancel"/></hbox></vbox>';
-					var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical"><hbox flex="1">';
-					/************/
-					xml += '<vbox flex="1">';
-					xml += '<hbox><spacer flex="1"/>';
-					if (direction) {
-						xml += '<image src="/xul/server/skin/media/images/patron_right_arrow.png"/>';
-					} else {
-						xml += '<image src="/xul/server/skin/media/images/patron_left_arrow.png"/>';
-					}
-					xml += '</hbox>';
-					xml += '<iframe style="min-height: 100px" flex="1" src="' + xulG.url_prefix( urls.XUL_PATRON_SUMMARY );
-					xml += '?show_name=1&amp;id=' + g.sel_list[i] + '"/>';
-					xml += '</vbox>';
-					xml += '<vbox flex="1">';
-					xml += '<hbox>';
-					if (direction) {
-						xml += '<image src="/xul/server/skin/media/images/patron_right_arrow.png"/>';
-					} else {
-						xml += '<image src="/xul/server/skin/media/images/patron_left_arrow.png"/>';
-					}
-					xml += '<spacer flex="1"/></hbox>';
-					xml += '<iframe style="min-height: 100px" flex="1" src="' + xulG.url_prefix( urls.XUL_PATRON_SUMMARY );
-					xml += '?show_name=1&amp;id=' + patron_b.id() + '"/>';
-					xml += '</vbox>';
-					/************/
-					xml += '</hbox></vbox>';
-					
-					var bot_xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: auto"><hbox>';
-					bot_xml += '</hbox></vbox>';
-		
-					//g.data.temp_top = top_xml; g.data.stash('temp_top');
-					//g.data.temp_mid = xml; g.data.stash('temp_mid');
-					//g.data.temp_bot = bot_xml; g.data.stash('temp_bot');
-					JSAN.use('util.window'); var win = new util.window();
-					var fancy_prompt_data = win.open(
-						urls.XUL_FANCY_PROMPT,
-						//+ '?xml_in_stash=temp_mid'
-						//+ '&top_xml_in_stash=temp_top'
-						//+ '&bottom_xml_in_stash=temp_bot'
-						//+ '&title=' + window.escape('Move Patron into a Usergroup'),
-						'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
-						{ 'xml' : xml, 'top_xml' : top_xml, 'bottom_xml' : bot_xml, 'title' : $("patronStrings").getString('staff.patron.info_group.link_patron.move_patron_to_usergroup')}
-					);
-					if (fancy_prompt_data.fancy_status == 'incomplete') { continue; }
-					else {
-						var patron_c;
-						switch(direction) {
-							case true:
-								patron_a.usrgroup( patron_b.usrgroup() );
-								patron_a.ischanged( '1' );
-								patron_c = patron_a;
-							break;
-							case false:
-								patron_b.usrgroup( patron_a.usrgroup() );
-								patron_b.ischanged( '1' );
-								patron_c = patron_b;
-							break;
-						}
-						var robj = g.network.simple_request('FM_AU_UPDATE',[ ses(), patron_c ]);
-						if (typeof robj.ilsevent != 'undefined') g.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.info_group.link_patron.error_linking_patron', [g.sel_list[i]]), robj);
-					}
-				}
-				alert($("patronStrings").getString('staff.patron.info_group.link_patron.usergroups_updated'));
-				refresh();
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.link_patron.error_linking_patrons'),E);
-				refresh();
-			}
-		}
-
-	]]>
-	</script>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-
-	<commandset id="info_group_cmds">
-		<command id="clone" accesskey="&staff.patron.info_group.clone.accesskey;" label="&staff.patron.info_group.clone.label;" oncommand="try{clone_patron();}catch(E){alert('FIXME:'+E);}"/>
-		<command id="remove" accesskey="&staff.patron.info_group.remove.accesskey;" label="&staff.patron.info_group.remove.label;" oncommand="try{remove_patron();}catch(E){alert('FIXME:'+E);}"/>
-		<command id="move" accesskey="&staff.patron.info_group.move.accesskey;" label="&staff.patron.info_group.move.label;" oncommand="try{link_patron(true);}catch(E){alert('FIXME:'+E);}"/>	
-		<command id="add" accesskey="&staff.patron.info_group.add.accesskey;" label="&staff.patron.info_group.add.label;" oncommand="try{link_patron(false);}catch(E){alert('FIXME:'+E);}"/>	
-		<command id="retrieve_p" label="&staff.patron.info_group.retrieve_p.label;" accesskey="&staff.patron.info_group.retrieve_p.accesskey;" oncommand="try{retrieve_patron();}catch(E){alert(E);}"/>
-		<command id="merge_p" label="&staff.patron.info_group.merge_patrons.label;" accesskey="&staff.patron.info_group.merge_patrons.accesskey;" oncommand="try{merge_patrons();}catch(E){alert(E);}"/>
-	</commandset>
-
-	<popupset id="info_group_popupset">
-		<popup id="info_group_actions" position="at_pointer"> 
-			<menuitem command="clone" />
-			<menuitem command="remove" />
-			<menuitem command="move" />
-			<menuitem command="add" />
-			<menuitem command="retrieve_p" />
-			<menuitem command="merge_p" />
-		</popup>
-	</popupset>
-
-	<vbox flex="1" class="my_overflow" id="group_panel">
-		<groupbox flex="1">
-			<caption label="&staff.patron.info_group.group_member.label;"/>
-			<hbox>
-				<spacer flex="1"/>
-				<menubar id="ml">
-					<menu label="&staff.patron.info_group.choose_an_action.label;" accesskey="&staff.patron.info_group.choose_an_action.accesskey;" value="0">
-						<menupopup>
-							<menuitem command="clone" />
-							<menuitem command="remove" />
-							<menuitem command="move" />
-							<menuitem command="add" />
-							<menuitem command="retrieve_p" />
-							<menuitem command="merge_p" />
-						</menupopup>
-					</menu>
-				</menubar>
-			</hbox>
-			<tree id="patron_list" flex="1" enableColumnDrag="true" seltype="multiple" context="info_group_actions"/>
-		</groupbox>
-	</vbox>
+    ]]>
+    </script>
+    
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+
+    <commandset id="info_group_cmds">
+        <command id="clone" accesskey="&staff.patron.info_group.clone.accesskey;" label="&staff.patron.info_group.clone.label;" oncommand="try{clone_patron();}catch(E){alert('FIXME:'+E);}"/>
+        <command id="remove" accesskey="&staff.patron.info_group.remove.accesskey;" label="&staff.patron.info_group.remove.label;" oncommand="try{remove_patron();}catch(E){alert('FIXME:'+E);}"/>
+        <command id="move" accesskey="&staff.patron.info_group.move.accesskey;" label="&staff.patron.info_group.move.label;" oncommand="try{link_patron(true);}catch(E){alert('FIXME:'+E);}"/>    
+        <command id="add" accesskey="&staff.patron.info_group.add.accesskey;" label="&staff.patron.info_group.add.label;" oncommand="try{link_patron(false);}catch(E){alert('FIXME:'+E);}"/>    
+        <command id="retrieve_p" label="&staff.patron.info_group.retrieve_p.label;" accesskey="&staff.patron.info_group.retrieve_p.accesskey;" oncommand="try{retrieve_patron();}catch(E){alert(E);}"/>
+        <command id="merge_p" label="&staff.patron.info_group.merge_patrons.label;" accesskey="&staff.patron.info_group.merge_patrons.accesskey;" oncommand="try{merge_patrons();}catch(E){alert(E);}"/>
+    </commandset>
+
+    <popupset id="info_group_popupset">
+        <popup id="info_group_actions" position="at_pointer"> 
+            <menuitem command="clone" />
+            <menuitem command="remove" />
+            <menuitem command="move" />
+            <menuitem command="add" />
+            <menuitem command="retrieve_p" />
+            <menuitem command="merge_p" />
+        </popup>
+    </popupset>
+
+    <vbox flex="1" class="my_overflow" id="group_panel">
+        <groupbox flex="1">
+            <caption label="&staff.patron.info_group.group_member.label;"/>
+            <hbox>
+                <spacer flex="1"/>
+                <menubar id="ml">
+                    <menu label="&staff.patron.info_group.choose_an_action.label;" accesskey="&staff.patron.info_group.choose_an_action.accesskey;" value="0">
+                        <menupopup>
+                            <menuitem command="clone" />
+                            <menuitem command="remove" />
+                            <menuitem command="move" />
+                            <menuitem command="add" />
+                            <menuitem command="retrieve_p" />
+                            <menuitem command="merge_p" />
+                        </menupopup>
+                    </menu>
+                </menubar>
+            </hbox>
+            <tree id="patron_list" flex="1" enableColumnDrag="true" seltype="multiple" context="info_group_actions"/>
+        </groupbox>
+    </vbox>
 
 
 </window>
diff --git a/Open-ILS/xul/staff_client/server/patron/info_notes.xul b/Open-ILS/xul/staff_client/server/patron/info_notes.xul
index cc0ddf4efc..65789536ae 100644
--- a/Open-ILS/xul/staff_client/server/patron/info_notes.xul
+++ b/Open-ILS/xul/staff_client/server/patron/info_notes.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,235 +19,235 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="patron_info_win" width="700" height="550"
-	onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function $(id) { return document.getElementById(id); }
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-
-				JSAN.use('util.error'); g.error = new util.error();
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('patron.util');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				g.error.sdump('D_TRACE','my_init() for patron_info.xul');
-
-				g.patron_id = xul_param('patron_id');
-
-				g.new_note = false;
-
-				refresh();
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/info_notes.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function refresh() {
-			retrieve_notes(); render_notes();
-		}
-
-		function retrieve_notes() {
-			if (g.new_note) {
-				g.notes = g.network.simple_request('FM_AUN_RETRIEVE_ALL.authoritative',[ ses(), { 'patronid' : g.patron_id } ]).reverse();
-				g.new_note = false;
-			} else {
-				g.notes = g.network.simple_request('FM_AUN_RETRIEVE_ALL.authoritative',[ ses(), { 'patronid' : g.patron_id } ]).reverse();
-			}
-		}
-
-		function apply(node,field,value) {
-			util.widgets.apply(
-				node,'name',field,
-				function(n) {
-					switch(n.nodeName) {
-						case 'description' : n.appendChild( document.createTextNode( value ) ); break;
-						case 'label' : n.value = value; break;
-						default : n.value = value; break;
-					}
-				}
-			);
-		}
-
-		function render_notes() {
-			JSAN.use('util.widgets'); util.widgets.remove_children('notes_panel');
-			var np = $('notes_panel');
-			var hbox = document.createElement('hbox'); np.appendChild(hbox);
-			var btn = document.createElement('button'); hbox.appendChild(btn);
-			btn.setAttribute('label', $("patronStrings").getString('staff.patron.info_notes.render_notes.add_new_note.label'));
-			btn.setAttribute('accesskey', $("patronStrings").getString('staff.patron.info_notes.render_notes.add_new_note.accesskey'));
-			btn.setAttribute('oncommand','new_note()');
-
-			for (var i = 0; i < g.notes.length; i++) {
-
-				/* template */
-				var node = $('note_template').cloneNode(true); np.appendChild(node); node.hidden = false;
-				apply(node,'create_date',g.notes[i].create_date().toString().substr(0,10));
-				util.widgets.apply(node,'name','create_date',
-					function(n){n.setAttribute("tooltiptext", $("patronStrings").getFormattedString('staff.patron.info_notes.render_notes.tooltiptext', [g.notes[i].id(), g.notes[i].creator()]));}
-				);
-				apply(node,'title',g.notes[i].title());
-				if (get_bool(g.notes[i].pub())) {
-					apply(node, 'pub', $("patronStrings").getString('staff.patron.info_notes.render_notes.pub.patron_visible'));
-				} else {
-					apply(node, 'pub', $("patronStrings").getString('staff.patron.info_notes.render_notes.pub.staff_only') );
-				}
-				apply(node,'value',g.notes[i].value());
-				apply(node,'id',g.notes[i].id());
-				apply(node,'creator',g.notes[i].creator());
-
-				/* button bar */
-				var hb = document.createElement('hbox');
-				np.appendChild(hb);
-				var btn1 = document.createElement('button');
-				hb.appendChild(btn1);
-				btn1.setAttribute('label',$("patronStrings").getString('staff.patron.info_notes.render_notes.btn1.delete_note.label'));
-				btn1.setAttribute('image',"/xul/server/skin/media/images/up_arrow.gif");
-
-				btn1.addEventListener(
-					'command',
-					function(id){ 
-						return function() { 
-							var r = g.error.yns_alert(
-								$("patronStrings").getFormattedString('staff.patron.info_notes.render_notes.delete_note_message',[g.notes[id].title(), g.notes[id].create_date().toString().substr(0,10)]),
-								$("patronStrings").getString('staff.patron.info_notes.render_notes.delete_note_title'),
-								$("commonStrings").getString('common.yes'),
-								$("commonStrings").getString('common.no'),
-								null,
-								$("commonStrings").getString('common.check_to_confirm')
-							); 
-							if (r == 0) {
-								g.network.simple_request('FM_AUN_DELETE',[ses(),g.notes[id].id()]);
-								setTimeout(function(){ 
-									g.new_note = true;
-									alert($("patronStrings").getString('staff.patron.info_notes.render_notes.note_deleted'));
-									refresh();
-								},0);
-							}
-						}
-					 }
-					(i), false
-					);
-					var btn2 = document.createElement('button');
-					hb.appendChild(btn2);
-					btn2.setAttribute('label',$("patronStrings").getString('staff.patron.info_notes.render_notes.btn2.print_note.label'));
-					btn2.setAttribute('image',"/xul/server/skin/media/images/up_arrow.gif");
-
-					btn2.addEventListener(
-						'command',
-						function(id){ return function() { 
-							try {
-								JSAN.use('patron.util'); 
-								var patron_obj = patron.util.retrieve_fleshed_au_via_id(ses(),g.patron_id);
-								var staff_obj = patron.util.retrieve_name_via_id( ses(), g.notes[id].creator() );
-								JSAN.use('util.print');
-								var p = new util.print();
-								p.simple(
-									'<hr/>'
-									+ '<p>'+ $("patronStrings").getString('staff.patron.info_notes.render_notes.pertaining_to') + ' ' + 
-										patron.util.format_name( patron_obj ) + ' : ' 
-									+ patron_obj.card().barcode() + '</p>'
-									+ '<p><b>"' + g.notes[id].title() + '"</b>'
-									+ $("patronStrings").getFormattedString('staff.patron.info_notes.render_notes.created_on', [g.notes[id].create_date().toString().substr(0,10), staff_obj[0], g.data.hash.aou[ staff_obj[3] ].shortname()]) 
-									+ '</p><p>'
-									+ g.notes[id].value()
-									+ '</p><hr/>'
-								);
-							} catch(E) {
-								g.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.info_notes.render_notes.printing_note_num', [g.notes[id].id()]), E);
-							}
-						}
-					}(i), false
-				);
-			}
-
-		}
-		
-		function new_note() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalBrowserWrite");
-				var xml = '<groupbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1">';
-				xml += '<caption label="'+$("patronStrings").getString('staff.patron.info_notes.new_note.label')+'"/><grid flex="1"><columns><column/><column flex="1"/></columns><rows><row>';
-				xml += '<label value="'+$("patronStrings").getString('staff.patron.info_notes.new_note.patron_visible.value')+'"/><checkbox id="pub" name="fancy_data"/></row>';
-				xml += '<row><label value="'+$("patronStrings").getString('staff.patron.info_notes.new_note.title.value')+'"/><textbox id="title" name="fancy_data" context="clipboard"/></row>';
-				xml += '<row><label value="'+$("patronStrings").getString('staff.patron.info_notes.new_note.note.value')+'"/><textbox multiline="true" id="note" name="fancy_data" context="clipboard"/></row>';
-				xml += '<row><spacer/><hbox><button label="'+$("patronStrings").getString('staff.patron.info_notes.new_note.cancel.label')+'" name="fancy_cancel"';
-				xml += ' accesskey="'+$("patronStrings").getString('staff.patron.info_notes.new_note.cancel.accesskey')+'"/>';
-				xml += '<button label="'+$("patronStrings").getString('staff.patron.info_notes.new_note.add.label')+'"';
-				xml += ' accesskey="'+$("patronStrings").getString('staff.patron.info_notes.new_note.add.accesskey')+'" name="fancy_submit"/></hbox></row></rows></grid></groupbox>';
-				//g.data.init({'via':'stash'});
-				//g.data.temp_note_xml = xml; g.data.stash('temp_note_xml');
-				JSAN.use('util.window'); var win = new util.window();
-				var fancy_prompt_data = win.open(
-					urls.XUL_FANCY_PROMPT,
-					//+ '?xml_in_stash=temp_note_xml'
-					//+ '&focus=' + window.escape('title')
-					//+ '&title=' + window.escape('Add Note'),
-					'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
-					{ 'xml' : xml, 'focus' : 'title', 'title' : $("patronStrings").getString('staff.patron.info_notes.new_note.add_note_title') }
-				);
-				if (fancy_prompt_data.fancy_status == 'complete') {
-					//alert(js2JSON(g.data.fancy_prompt_data));
-					var note = new aun();
-					note.isnew(1);
-					note.title( fancy_prompt_data.title );
-					note.value( fancy_prompt_data.note );
-					note.pub( get_bool( fancy_prompt_data.pub ) ? get_db_true() : get_db_false() );
-					note.usr( g.patron_id );
-					var r = g.network.simple_request('FM_AUN_CREATE',[ ses(), note ]);
-					if (typeof r.ilsevent != 'undefined') throw(r);
-					setTimeout(function(){
-						g.new_note = true;
-						alert($("patronStrings").getString('staff.patron.info_notes.new_note.add_note_title'));
-						refresh();
-					},0);
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_notes.new_note.note_not_created'),E);
-			}
-		}
-
-	]]>
-	</script>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-
-	<stack hidden="true" id="note_template" flex="1">
-		<groupbox flex="1" style="background-color: black;"/>
-		<groupbox flex="1" style="background-color: #FFDE00; -moz-border-radius-topright: 35px;" >
-			<hbox>
-				<description name="title" class="copyable" style="font-weight: bold"/>
-				<spacer flex="1"/>
-				<description name="create_date" class="copyable" style="font-weight: bold"/>
-				<description name="pub" class="copyable" style="font-weight: bold"/>
-			</hbox>
-			<description class="copyable" name="value"/>
-		</groupbox>
-	</stack>
-
-	<vbox flex="1" class="my_overflow" id="notes_panel">
-	</vbox>
+    onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <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="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+
+        function $(id) { return document.getElementById(id); }
+
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+
+                JSAN.use('util.error'); g.error = new util.error();
+                JSAN.use('util.network'); g.network = new util.network();
+                JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('patron.util');
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+                g.error.sdump('D_TRACE','my_init() for patron_info.xul');
+
+                g.patron_id = xul_param('patron_id');
+
+                g.new_note = false;
+
+                refresh();
+
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/info_notes.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function refresh() {
+            retrieve_notes(); render_notes();
+        }
+
+        function retrieve_notes() {
+            if (g.new_note) {
+                g.notes = g.network.simple_request('FM_AUN_RETRIEVE_ALL.authoritative',[ ses(), { 'patronid' : g.patron_id } ]).reverse();
+                g.new_note = false;
+            } else {
+                g.notes = g.network.simple_request('FM_AUN_RETRIEVE_ALL.authoritative',[ ses(), { 'patronid' : g.patron_id } ]).reverse();
+            }
+        }
+
+        function apply(node,field,value) {
+            util.widgets.apply(
+                node,'name',field,
+                function(n) {
+                    switch(n.nodeName) {
+                        case 'description' : n.appendChild( document.createTextNode( value ) ); break;
+                        case 'label' : n.value = value; break;
+                        default : n.value = value; break;
+                    }
+                }
+            );
+        }
+
+        function render_notes() {
+            JSAN.use('util.widgets'); util.widgets.remove_children('notes_panel');
+            var np = $('notes_panel');
+            var hbox = document.createElement('hbox'); np.appendChild(hbox);
+            var btn = document.createElement('button'); hbox.appendChild(btn);
+            btn.setAttribute('label', $("patronStrings").getString('staff.patron.info_notes.render_notes.add_new_note.label'));
+            btn.setAttribute('accesskey', $("patronStrings").getString('staff.patron.info_notes.render_notes.add_new_note.accesskey'));
+            btn.setAttribute('oncommand','new_note()');
+
+            for (var i = 0; i < g.notes.length; i++) {
+
+                /* template */
+                var node = $('note_template').cloneNode(true); np.appendChild(node); node.hidden = false;
+                apply(node,'create_date',g.notes[i].create_date().toString().substr(0,10));
+                util.widgets.apply(node,'name','create_date',
+                    function(n){n.setAttribute("tooltiptext", $("patronStrings").getFormattedString('staff.patron.info_notes.render_notes.tooltiptext', [g.notes[i].id(), g.notes[i].creator()]));}
+                );
+                apply(node,'title',g.notes[i].title());
+                if (get_bool(g.notes[i].pub())) {
+                    apply(node, 'pub', $("patronStrings").getString('staff.patron.info_notes.render_notes.pub.patron_visible'));
+                } else {
+                    apply(node, 'pub', $("patronStrings").getString('staff.patron.info_notes.render_notes.pub.staff_only') );
+                }
+                apply(node,'value',g.notes[i].value());
+                apply(node,'id',g.notes[i].id());
+                apply(node,'creator',g.notes[i].creator());
+
+                /* button bar */
+                var hb = document.createElement('hbox');
+                np.appendChild(hb);
+                var btn1 = document.createElement('button');
+                hb.appendChild(btn1);
+                btn1.setAttribute('label',$("patronStrings").getString('staff.patron.info_notes.render_notes.btn1.delete_note.label'));
+                btn1.setAttribute('image',"/xul/server/skin/media/images/up_arrow.gif");
+
+                btn1.addEventListener(
+                    'command',
+                    function(id){ 
+                        return function() { 
+                            var r = g.error.yns_alert(
+                                $("patronStrings").getFormattedString('staff.patron.info_notes.render_notes.delete_note_message',[g.notes[id].title(), g.notes[id].create_date().toString().substr(0,10)]),
+                                $("patronStrings").getString('staff.patron.info_notes.render_notes.delete_note_title'),
+                                $("commonStrings").getString('common.yes'),
+                                $("commonStrings").getString('common.no'),
+                                null,
+                                $("commonStrings").getString('common.check_to_confirm')
+                            ); 
+                            if (r == 0) {
+                                g.network.simple_request('FM_AUN_DELETE',[ses(),g.notes[id].id()]);
+                                setTimeout(function(){ 
+                                    g.new_note = true;
+                                    alert($("patronStrings").getString('staff.patron.info_notes.render_notes.note_deleted'));
+                                    refresh();
+                                },0);
+                            }
+                        }
+                     }
+                    (i), false
+                    );
+                    var btn2 = document.createElement('button');
+                    hb.appendChild(btn2);
+                    btn2.setAttribute('label',$("patronStrings").getString('staff.patron.info_notes.render_notes.btn2.print_note.label'));
+                    btn2.setAttribute('image',"/xul/server/skin/media/images/up_arrow.gif");
+
+                    btn2.addEventListener(
+                        'command',
+                        function(id){ return function() { 
+                            try {
+                                JSAN.use('patron.util'); 
+                                var patron_obj = patron.util.retrieve_fleshed_au_via_id(ses(),g.patron_id);
+                                var staff_obj = patron.util.retrieve_name_via_id( ses(), g.notes[id].creator() );
+                                JSAN.use('util.print');
+                                var p = new util.print();
+                                p.simple(
+                                    '<hr/>'
+                                    + '<p>'+ $("patronStrings").getString('staff.patron.info_notes.render_notes.pertaining_to') + ' ' + 
+                                        patron.util.format_name( patron_obj ) + ' : ' 
+                                    + patron_obj.card().barcode() + '</p>'
+                                    + '<p><b>"' + g.notes[id].title() + '"</b>'
+                                    + $("patronStrings").getFormattedString('staff.patron.info_notes.render_notes.created_on', [g.notes[id].create_date().toString().substr(0,10), staff_obj[0], g.data.hash.aou[ staff_obj[3] ].shortname()]) 
+                                    + '</p><p>'
+                                    + g.notes[id].value()
+                                    + '</p><hr/>'
+                                );
+                            } catch(E) {
+                                g.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.info_notes.render_notes.printing_note_num', [g.notes[id].id()]), E);
+                            }
+                        }
+                    }(i), false
+                );
+            }
+
+        }
+        
+        function new_note() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalBrowserWrite");
+                var xml = '<groupbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1">';
+                xml += '<caption label="'+$("patronStrings").getString('staff.patron.info_notes.new_note.label')+'"/><grid flex="1"><columns><column/><column flex="1"/></columns><rows><row>';
+                xml += '<label value="'+$("patronStrings").getString('staff.patron.info_notes.new_note.patron_visible.value')+'"/><checkbox id="pub" name="fancy_data"/></row>';
+                xml += '<row><label value="'+$("patronStrings").getString('staff.patron.info_notes.new_note.title.value')+'"/><textbox id="title" name="fancy_data" context="clipboard"/></row>';
+                xml += '<row><label value="'+$("patronStrings").getString('staff.patron.info_notes.new_note.note.value')+'"/><textbox multiline="true" id="note" name="fancy_data" context="clipboard"/></row>';
+                xml += '<row><spacer/><hbox><button label="'+$("patronStrings").getString('staff.patron.info_notes.new_note.cancel.label')+'" name="fancy_cancel"';
+                xml += ' accesskey="'+$("patronStrings").getString('staff.patron.info_notes.new_note.cancel.accesskey')+'"/>';
+                xml += '<button label="'+$("patronStrings").getString('staff.patron.info_notes.new_note.add.label')+'"';
+                xml += ' accesskey="'+$("patronStrings").getString('staff.patron.info_notes.new_note.add.accesskey')+'" name="fancy_submit"/></hbox></row></rows></grid></groupbox>';
+                //g.data.init({'via':'stash'});
+                //g.data.temp_note_xml = xml; g.data.stash('temp_note_xml');
+                JSAN.use('util.window'); var win = new util.window();
+                var fancy_prompt_data = win.open(
+                    urls.XUL_FANCY_PROMPT,
+                    //+ '?xml_in_stash=temp_note_xml'
+                    //+ '&focus=' + window.escape('title')
+                    //+ '&title=' + window.escape('Add Note'),
+                    'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
+                    { 'xml' : xml, 'focus' : 'title', 'title' : $("patronStrings").getString('staff.patron.info_notes.new_note.add_note_title') }
+                );
+                if (fancy_prompt_data.fancy_status == 'complete') {
+                    //alert(js2JSON(g.data.fancy_prompt_data));
+                    var note = new aun();
+                    note.isnew(1);
+                    note.title( fancy_prompt_data.title );
+                    note.value( fancy_prompt_data.note );
+                    note.pub( get_bool( fancy_prompt_data.pub ) ? get_db_true() : get_db_false() );
+                    note.usr( g.patron_id );
+                    var r = g.network.simple_request('FM_AUN_CREATE',[ ses(), note ]);
+                    if (typeof r.ilsevent != 'undefined') throw(r);
+                    setTimeout(function(){
+                        g.new_note = true;
+                        alert($("patronStrings").getString('staff.patron.info_notes.new_note.add_note_title'));
+                        refresh();
+                    },0);
+                }
+            } catch(E) {
+                g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_notes.new_note.note_not_created'),E);
+            }
+        }
+
+    ]]>
+    </script>
+    
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+
+    <stack hidden="true" id="note_template" flex="1">
+        <groupbox flex="1" style="background-color: black;"/>
+        <groupbox flex="1" style="background-color: #FFDE00; -moz-border-radius-topright: 35px;" >
+            <hbox>
+                <description name="title" class="copyable" style="font-weight: bold"/>
+                <spacer flex="1"/>
+                <description name="create_date" class="copyable" style="font-weight: bold"/>
+                <description name="pub" class="copyable" style="font-weight: bold"/>
+            </hbox>
+            <description class="copyable" name="value"/>
+        </groupbox>
+    </stack>
+
+    <vbox flex="1" class="my_overflow" id="notes_panel">
+    </vbox>
 
 
 </window>
diff --git a/Open-ILS/xul/staff_client/server/patron/info_stat_cats.xul b/Open-ILS/xul/staff_client/server/patron/info_stat_cats.xul
index bb287f2aa9..9a35d316b0 100644
--- a/Open-ILS/xul/staff_client/server/patron/info_stat_cats.xul
+++ b/Open-ILS/xul/staff_client/server/patron/info_stat_cats.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,185 +19,185 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="patron_info_stat_cats_win" width="700" height="550"
-	onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function $(id) { return document.getElementById(id); }
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-
-				JSAN.use('util.error'); g.error = new util.error();
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('patron.util'); JSAN.use('util.functional');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				g.error.sdump('D_TRACE','my_init() for patron_info_stat_cats.xul');
-
-				g.patron_id = xul_param('patron_id');
-
-				refresh();
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/info_stat_cats', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function refresh() {
-			retrieve_fleshed_patron(); render_stat_cats();
-		}
-
-		function retrieve_fleshed_patron() {
-			try {
-
-				g.patron = patron.util.retrieve_fleshed_au_via_id(ses(), g.patron_id);
-				if (g.patron.ilsevent) throw(g.patron);
-
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_stat_cats.retrieve_fleshed_patron.failed'),E);
-				g.patron = null;
-			}
-
-		}
-
-		function apply(node,field,value) {
-			util.widgets.apply(
-				node,'name',field,
-				function(n) {
-					switch(n.nodeName) {
-						case 'description' : n.appendChild( document.createTextNode( value ) ); break;
-						case 'label' : n.value = value; break;
-						default : n.value = value; break;
-					}
-				}
-			);
-		}
-
-		function render_stat_cats() {
-			JSAN.use('util.widgets'); util.widgets.remove_children('stat_cats_panel');
-			if (!g.patron) return;
-			var sp = $('stat_cats_panel');
-			var my_actsc = g.data.list.my_actsc;
-			/* I'm throwing all the patron's stat cat entry maps in here, and pruning it as we go through my_actsc.  Those left behind are "foreign" stat cats that need to pulled from the server. */
-			var scem_hash = {}; 
-			for (var i = 0; i < g.patron.stat_cat_entries().length; i++) {
-				scem_hash[ g.patron.stat_cat_entries()[i].stat_cat() ] = function(a){ return g.patron.stat_cat_entries()[a]; }(i);
-			}
-
-			for (var i = 0; i < my_actsc.length; i++) {
-
-				/* template */
-				var actsc_node = $('actsc_template').cloneNode(true);
-				sp.appendChild(actsc_node);
-				actsc_node.hidden = false;
-				apply(actsc_node,'name',my_actsc[i].name());
-				if (get_bool(my_actsc[i].opac_visible())) {
-					apply(actsc_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.opac_visible'));
-				} else {
-					apply(actsc_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.not_opac_visible'));
-				}
-				apply(actsc_node,'owner',g.data.hash.aou[my_actsc[i].owner()].shortname());
-
-				var nl = actsc_node.getElementsByAttribute('name','entry');
-				var entry_placeholder;
-				if (nl.length>0) entry_placeholder = nl[0];
-
-				if (entry_placeholder && scem_hash[ my_actsc[i].id() ]) {
-
-					/* template */
-					var actsce_node = $('actsce_template').cloneNode(true); entry_placeholder.appendChild(actsce_node); actsce_node.hidden = false;
-					var sc_id = my_actsc[i].id();
-					var scem = scem_hash[ sc_id ];
-					apply(actsce_node,'value',scem.stat_cat_entry());
-					delete scem_hash[ sc_id ];
-
-				}
-			}
-
-			for (var i in scem_hash) {
-
-				try {
-
-				var sc_id = scem_hash[i].stat_cat();
-				if (sc_id == null || sc_id == '') throw(scem_hash[i]);
-				var sc = g.network.simple_request('FM_ACTSC_RETRIEVE_BATCH', [ ses(), [ sc_id ] ]);
-				if (!sc || typeof sc.ilsevent != 'undefined') { throw(sc); continue; }
-				sc = sc[0];
-
-				/* template */
-				var actsc_node = $('actsc_template').cloneNode(true);
-				sp.appendChild(actsc_node);
-				actsc_node.hidden = false;
-
-				apply(actsc_node,'name',sc.name());
-				if (get_bool(sc.opac_visible())) {
-					apply(actsc_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.opac_visible'));
-				} else {
-					apply(actsc_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.not_opac_visible'));
-				}
-				apply(actsc_node,'owner',g.data.hash.aou[sc.owner()].shortname());
-
-				var nl = actsc_node.getElementsByAttribute('name','entry');
-				var entry_placeholder;
-				if (nl.length>0) entry_placeholder = nl[0];
-
-				if (entry_placeholder) {
-
-					/* template */
-					var actsce_node = $('actsce_template').cloneNode(true);
-					entry_placeholder.appendChild(actsce_node);
-					actsce_node.hidden = false;
-
-					var scem = scem_hash[ i ];
-					apply(actsce_node,'value',scem.stat_cat_entry());
-
-				}
-
-				} catch(E) {
-					g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.rendering_exception'),E);
-				}
-			}
-		}
-		
-	]]>
-	</script>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-
-	<stack hidden="true" id="actsc_template" flex="1">
-		<groupbox flex="1" style="background-color: black;"/>
-		<groupbox flex="1" style="background-color: #99CC66; -moz-border-radius-topright: 35px;" >
-			<hbox>
-				<description name="name" style="font-weight: bold"/>
-				<spacer flex="1"/>
-				<description name="opac" style="font-weight: bold"/>
-				<description name="owner" style="font-weight: bold"/>
-			</hbox>
-			<vbox name="entry"/>
-		</groupbox>
-	</stack>
-
-	<hbox hidden="true" id="actsce_template" flex="1">
-		<description name="value"/>
-	</hbox>
-
-	<vbox flex="1" class="my_overflow" id="stat_cats_panel">
-	</vbox>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+
+        function $(id) { return document.getElementById(id); }
+
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+
+                JSAN.use('util.error'); g.error = new util.error();
+                JSAN.use('util.network'); g.network = new util.network();
+                JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('patron.util'); JSAN.use('util.functional');
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+                g.error.sdump('D_TRACE','my_init() for patron_info_stat_cats.xul');
+
+                g.patron_id = xul_param('patron_id');
+
+                refresh();
+
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/info_stat_cats', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function refresh() {
+            retrieve_fleshed_patron(); render_stat_cats();
+        }
+
+        function retrieve_fleshed_patron() {
+            try {
+
+                g.patron = patron.util.retrieve_fleshed_au_via_id(ses(), g.patron_id);
+                if (g.patron.ilsevent) throw(g.patron);
+
+            } catch(E) {
+                g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_stat_cats.retrieve_fleshed_patron.failed'),E);
+                g.patron = null;
+            }
+
+        }
+
+        function apply(node,field,value) {
+            util.widgets.apply(
+                node,'name',field,
+                function(n) {
+                    switch(n.nodeName) {
+                        case 'description' : n.appendChild( document.createTextNode( value ) ); break;
+                        case 'label' : n.value = value; break;
+                        default : n.value = value; break;
+                    }
+                }
+            );
+        }
+
+        function render_stat_cats() {
+            JSAN.use('util.widgets'); util.widgets.remove_children('stat_cats_panel');
+            if (!g.patron) return;
+            var sp = $('stat_cats_panel');
+            var my_actsc = g.data.list.my_actsc;
+            /* I'm throwing all the patron's stat cat entry maps in here, and pruning it as we go through my_actsc.  Those left behind are "foreign" stat cats that need to pulled from the server. */
+            var scem_hash = {}; 
+            for (var i = 0; i < g.patron.stat_cat_entries().length; i++) {
+                scem_hash[ g.patron.stat_cat_entries()[i].stat_cat() ] = function(a){ return g.patron.stat_cat_entries()[a]; }(i);
+            }
+
+            for (var i = 0; i < my_actsc.length; i++) {
+
+                /* template */
+                var actsc_node = $('actsc_template').cloneNode(true);
+                sp.appendChild(actsc_node);
+                actsc_node.hidden = false;
+                apply(actsc_node,'name',my_actsc[i].name());
+                if (get_bool(my_actsc[i].opac_visible())) {
+                    apply(actsc_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.opac_visible'));
+                } else {
+                    apply(actsc_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.not_opac_visible'));
+                }
+                apply(actsc_node,'owner',g.data.hash.aou[my_actsc[i].owner()].shortname());
+
+                var nl = actsc_node.getElementsByAttribute('name','entry');
+                var entry_placeholder;
+                if (nl.length>0) entry_placeholder = nl[0];
+
+                if (entry_placeholder && scem_hash[ my_actsc[i].id() ]) {
+
+                    /* template */
+                    var actsce_node = $('actsce_template').cloneNode(true); entry_placeholder.appendChild(actsce_node); actsce_node.hidden = false;
+                    var sc_id = my_actsc[i].id();
+                    var scem = scem_hash[ sc_id ];
+                    apply(actsce_node,'value',scem.stat_cat_entry());
+                    delete scem_hash[ sc_id ];
+
+                }
+            }
+
+            for (var i in scem_hash) {
+
+                try {
+
+                var sc_id = scem_hash[i].stat_cat();
+                if (sc_id == null || sc_id == '') throw(scem_hash[i]);
+                var sc = g.network.simple_request('FM_ACTSC_RETRIEVE_BATCH', [ ses(), [ sc_id ] ]);
+                if (!sc || typeof sc.ilsevent != 'undefined') { throw(sc); continue; }
+                sc = sc[0];
+
+                /* template */
+                var actsc_node = $('actsc_template').cloneNode(true);
+                sp.appendChild(actsc_node);
+                actsc_node.hidden = false;
+
+                apply(actsc_node,'name',sc.name());
+                if (get_bool(sc.opac_visible())) {
+                    apply(actsc_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.opac_visible'));
+                } else {
+                    apply(actsc_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.not_opac_visible'));
+                }
+                apply(actsc_node,'owner',g.data.hash.aou[sc.owner()].shortname());
+
+                var nl = actsc_node.getElementsByAttribute('name','entry');
+                var entry_placeholder;
+                if (nl.length>0) entry_placeholder = nl[0];
+
+                if (entry_placeholder) {
+
+                    /* template */
+                    var actsce_node = $('actsce_template').cloneNode(true);
+                    entry_placeholder.appendChild(actsce_node);
+                    actsce_node.hidden = false;
+
+                    var scem = scem_hash[ i ];
+                    apply(actsce_node,'value',scem.stat_cat_entry());
+
+                }
+
+                } catch(E) {
+                    g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.rendering_exception'),E);
+                }
+            }
+        }
+        
+    ]]>
+    </script>
+    
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+
+    <stack hidden="true" id="actsc_template" flex="1">
+        <groupbox flex="1" style="background-color: black;"/>
+        <groupbox flex="1" style="background-color: #99CC66; -moz-border-radius-topright: 35px;" >
+            <hbox>
+                <description name="name" style="font-weight: bold"/>
+                <spacer flex="1"/>
+                <description name="opac" style="font-weight: bold"/>
+                <description name="owner" style="font-weight: bold"/>
+            </hbox>
+            <vbox name="entry"/>
+        </groupbox>
+    </stack>
+
+    <hbox hidden="true" id="actsce_template" flex="1">
+        <description name="value"/>
+    </hbox>
+
+    <vbox flex="1" class="my_overflow" id="stat_cats_panel">
+    </vbox>
 
 
 </window>
diff --git a/Open-ILS/xul/staff_client/server/patron/info_surveys.xul b/Open-ILS/xul/staff_client/server/patron/info_surveys.xul
index 3d4cace9b6..632d9974bb 100644
--- a/Open-ILS/xul/staff_client/server/patron/info_surveys.xul
+++ b/Open-ILS/xul/staff_client/server/patron/info_surveys.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,175 +19,175 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="patron_info_surveys_win" width="700" height="550"
-	onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function $(id) { return document.getElementById(id); }
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-
-				JSAN.use('util.error'); g.error = new util.error();
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('util.functional');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				g.error.sdump('D_TRACE','my_init() for patron_info_surveys.xul');
-
-				g.patron_id = xul_param('patron_id');
-
-				refresh();
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/info_surveys.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function refresh() {
-			retrieve_surveys(); render_surveys();
-		}
-
-		function retrieve_surveys() {
-			try {
-				var surveys = g.data.list.my_asv;
-				g.survey_responses = {};
-				for (var i = 0; i < surveys.length; i++) {
-					var responses = g.network.simple_request(
-						'FM_ASVR_RETRIEVE',
-						[ ses(), surveys[i].id(), g.patron_id ]
-					);
-					g.survey_responses[ surveys[i].id() ] = responses;
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_surveys.retrieve_surveys.failed'),E);
-			}
-
-		}
-
-		function apply(node,field,value) {
-			util.widgets.apply(
-				node,'name',field,
-				function(n) {
-					switch(n.nodeName) {
-						case 'description' : n.appendChild( document.createTextNode( value ) ); break;
-						case 'label' : n.value = value; break;
-						default : n.value = value; break;
-					}
-				}
-			);
-		}
-
-		function render_surveys() {
-			JSAN.use('util.widgets'); util.widgets.remove_children('surveys_panel');
-			var sp = $('surveys_panel');
-
-			for (var i in g.survey_responses) {
-
-				/* template */
-				var asv_node = $('asv_template').cloneNode(true); sp.appendChild(asv_node); asv_node.hidden = false;
-				apply(asv_node,'id',g.data.hash.asv[i].id());
-				apply(asv_node,'description',g.data.hash.asv[i].description());
-				if (g.data.hash.asv[i].required()) {
-					apply(asv_node, 'required', $("patronStrings").getString('staff.patron.info_surveys.render_surveys.required'));
-				} else {
-					apply(asv_node, 'required', $("patronStrings").getString('staff.patron.info_surveys.render_surveys.not_required'));
-				}
-				if (g.data.hash.asv[i].opac()) {
-					apply(asv_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.opac_visible'));
-				} else {
-					apply(asv_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.not_opac_visible'));
-				}
-
-				var nl = asv_node.getElementsByAttribute('name','questions');
-				var question_placeholder;
-				if (nl.length>0) question_placeholder = nl[0];
-				if (question_placeholder) {
-
-					var questions = g.data.hash.asv[i].questions();
-					for (var j = 0; j < questions.length; j++) {
-
-						/* template */
-						var asvq_node = $('asvq_template').cloneNode(true);
-						question_placeholder.appendChild(asvq_node);
-						asvq_node.hidden = false;
-
-						apply(asvq_node,'ordinal',j+1);
-						apply(asvq_node,'question',questions[j].question());
-
-						var nl2 = asvq_node.getElementsByAttribute('name','answer');
-						var answer_placeholder;
-						if (nl2.length>0) answer_placeholder = nl2[0];
-						if (answer_placeholder && g.survey_responses[i].length > 0) {
-
-							/* template */
-							var asva_node = $('asva_template').cloneNode(true); answer_placeholder.appendChild(asva_node); asva_node.hidden = false;
-
-							var last_response = g.survey_responses[i][ g.survey_responses[i].length - 1 ];
-							var date = last_response.effective_date() ? last_response.effective_date() : last_response.answer_date();
-							date = util.date.formatted_date( date, '%D' );
-							var answer = util.functional.find_id_object_in_list( questions[j].answers(), last_response.answer() );
-
-							apply(asva_node,'answer',answer.answer());
-							apply(asva_node,'date',date);
-						}
-					}
-
-				}
-
-			}
-
-		}
-		
-	]]>
-	</script>
-
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-	
-	<stack hidden="true" id="asv_template" flex="1">
-		<groupbox flex="1" style="background-color: black;"/>
-		<groupbox flex="1" style="background-color: #CC9966; -moz-border-radius-topright: 35px;" >
-			<hbox>
-				<label value="&staff.patron.info_surveys.survey_number.value;" style="font-weight: bold"/>
-				<label name="id" style="font-weight: bold"/>
-				<description name="description" style="font-weight: bold"/>
-				<spacer flex="1"/>
-				<description name="required" style="font-weight: bold"/>
-				<description name="opac" style="font-weight: bold"/>
-			</hbox>
-			<vbox name="questions"/>
-		</groupbox>
-	</stack>
-
-	<grid hidden="true" id="asvq_template" flex="1">
-		<columns><column/><column flex="1"/></columns>
-		<rows>
-			<row><label name="ordinal"/><label name="question"/></row>
-			<row><spacer /><vbox name="answer"/></row>
-		</rows>
-	</grid>
-
-	<hbox hidden="true" id="asva_template" flex="1">
-		<label value="&staff.patron.info_surveys.last_answered.value;"/><label name="date"/>
-		<label value="&staff.patron.info_surveys.answer.value;"/><description style="font-weight: bold" name="answer"/>
-	</hbox>
-
-	<vbox flex="1" class="my_overflow" id="surveys_panel">
-	</vbox>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+
+        function $(id) { return document.getElementById(id); }
+
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+
+                JSAN.use('util.error'); g.error = new util.error();
+                JSAN.use('util.network'); g.network = new util.network();
+                JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('util.functional');
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+                g.error.sdump('D_TRACE','my_init() for patron_info_surveys.xul');
+
+                g.patron_id = xul_param('patron_id');
+
+                refresh();
+
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/info_surveys.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function refresh() {
+            retrieve_surveys(); render_surveys();
+        }
+
+        function retrieve_surveys() {
+            try {
+                var surveys = g.data.list.my_asv;
+                g.survey_responses = {};
+                for (var i = 0; i < surveys.length; i++) {
+                    var responses = g.network.simple_request(
+                        'FM_ASVR_RETRIEVE',
+                        [ ses(), surveys[i].id(), g.patron_id ]
+                    );
+                    g.survey_responses[ surveys[i].id() ] = responses;
+                }
+            } catch(E) {
+                g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_surveys.retrieve_surveys.failed'),E);
+            }
+
+        }
+
+        function apply(node,field,value) {
+            util.widgets.apply(
+                node,'name',field,
+                function(n) {
+                    switch(n.nodeName) {
+                        case 'description' : n.appendChild( document.createTextNode( value ) ); break;
+                        case 'label' : n.value = value; break;
+                        default : n.value = value; break;
+                    }
+                }
+            );
+        }
+
+        function render_surveys() {
+            JSAN.use('util.widgets'); util.widgets.remove_children('surveys_panel');
+            var sp = $('surveys_panel');
+
+            for (var i in g.survey_responses) {
+
+                /* template */
+                var asv_node = $('asv_template').cloneNode(true); sp.appendChild(asv_node); asv_node.hidden = false;
+                apply(asv_node,'id',g.data.hash.asv[i].id());
+                apply(asv_node,'description',g.data.hash.asv[i].description());
+                if (g.data.hash.asv[i].required()) {
+                    apply(asv_node, 'required', $("patronStrings").getString('staff.patron.info_surveys.render_surveys.required'));
+                } else {
+                    apply(asv_node, 'required', $("patronStrings").getString('staff.patron.info_surveys.render_surveys.not_required'));
+                }
+                if (g.data.hash.asv[i].opac()) {
+                    apply(asv_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.opac_visible'));
+                } else {
+                    apply(asv_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.not_opac_visible'));
+                }
+
+                var nl = asv_node.getElementsByAttribute('name','questions');
+                var question_placeholder;
+                if (nl.length>0) question_placeholder = nl[0];
+                if (question_placeholder) {
+
+                    var questions = g.data.hash.asv[i].questions();
+                    for (var j = 0; j < questions.length; j++) {
+
+                        /* template */
+                        var asvq_node = $('asvq_template').cloneNode(true);
+                        question_placeholder.appendChild(asvq_node);
+                        asvq_node.hidden = false;
+
+                        apply(asvq_node,'ordinal',j+1);
+                        apply(asvq_node,'question',questions[j].question());
+
+                        var nl2 = asvq_node.getElementsByAttribute('name','answer');
+                        var answer_placeholder;
+                        if (nl2.length>0) answer_placeholder = nl2[0];
+                        if (answer_placeholder && g.survey_responses[i].length > 0) {
+
+                            /* template */
+                            var asva_node = $('asva_template').cloneNode(true); answer_placeholder.appendChild(asva_node); asva_node.hidden = false;
+
+                            var last_response = g.survey_responses[i][ g.survey_responses[i].length - 1 ];
+                            var date = last_response.effective_date() ? last_response.effective_date() : last_response.answer_date();
+                            date = util.date.formatted_date( date, '%D' );
+                            var answer = util.functional.find_id_object_in_list( questions[j].answers(), last_response.answer() );
+
+                            apply(asva_node,'answer',answer.answer());
+                            apply(asva_node,'date',date);
+                        }
+                    }
+
+                }
+
+            }
+
+        }
+        
+    ]]>
+    </script>
+
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    
+    <stack hidden="true" id="asv_template" flex="1">
+        <groupbox flex="1" style="background-color: black;"/>
+        <groupbox flex="1" style="background-color: #CC9966; -moz-border-radius-topright: 35px;" >
+            <hbox>
+                <label value="&staff.patron.info_surveys.survey_number.value;" style="font-weight: bold"/>
+                <label name="id" style="font-weight: bold"/>
+                <description name="description" style="font-weight: bold"/>
+                <spacer flex="1"/>
+                <description name="required" style="font-weight: bold"/>
+                <description name="opac" style="font-weight: bold"/>
+            </hbox>
+            <vbox name="questions"/>
+        </groupbox>
+    </stack>
+
+    <grid hidden="true" id="asvq_template" flex="1">
+        <columns><column/><column flex="1"/></columns>
+        <rows>
+            <row><label name="ordinal"/><label name="question"/></row>
+            <row><spacer /><vbox name="answer"/></row>
+        </rows>
+    </grid>
+
+    <hbox hidden="true" id="asva_template" flex="1">
+        <label value="&staff.patron.info_surveys.last_answered.value;"/><label name="date"/>
+        <label value="&staff.patron.info_surveys.answer.value;"/><description style="font-weight: bold" name="answer"/>
+    </hbox>
+
+    <vbox flex="1" class="my_overflow" id="surveys_panel">
+    </vbox>
 
 
 </window>
diff --git a/Open-ILS/xul/staff_client/server/patron/items.xul b/Open-ILS/xul/staff_client/server/patron/items.xul
index 06ba19123a..bff3809251 100644
--- a/Open-ILS/xul/staff_client/server/patron/items.xul
+++ b/Open-ILS/xul/staff_client/server/patron/items.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,96 +20,96 @@
 <?xul-overlay href="/xul/server/patron/items_overlay.xul"?>
 
 <window id="items_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="/xul/server/patron/items.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				try { g.error.sdump('D_TRACE','my_init() for items.xul'); } catch(E) { dump(E); }
-
-				JSAN.use('patron.items'); g.items = new patron.items();
-				g.items.init( 
-					{ 
-						'patron_id' : xul_param('patron_id'), 
-					} 
-				);
-				
-				window.refresh = function (p) { g.items.retrieve(p); }
-
-				default_focus();
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/items.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function default_focus() { try { var x = document.getElementById('noncat'); x.focus(); } catch(E) { try { g.error.sdump('D_ERROR','item.xul, default_focus: ' + E); } catch(F) { dump(E); } } }
-
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-
-	<commandset id="items_cmds">
-		<command id="save_columns" />
-		<command id="sel_bucket" disabled="true"/>
-		<command id="sel_clip" />
-		<command id="sel_copy_details"/>
-		<command id="sel_patron"/>
-		<command id="cmd_items_print" />
-		<command id="cmd_items_export" />
-		<command id="cmd_items_renew" />
-		<command id="cmd_items_renew_all" />
-		<command id="cmd_items_claimed_returned" />
-		<command id="cmd_items_checkin" />
-		<command id="cmd_items_edit" />
-		<command id="cmd_items_mark_lost" />
-		<command id="cmd_show_catalog" />
-		<command id="cmd_add_billing" />
-		<command id="sel_mark_items_damaged" disabled="true"/>
-		<command id="sel_mark_items_missing" disabled="true"/>
-		
-		<command id="cmd_show_noncats" />
-
-		<command id="save_columns2" />
-		<command id="sel_bucket2" disabled="true"/>
-		<command id="sel_clip2" />
-		<command id="sel_copy_details2"/>
-		<command id="sel_patron2"/>
-		<command id="cmd_items_print2" />
-		<command id="cmd_items_export2" />
-		<command id="cmd_items_renew2" />
-		<command id="cmd_items_claimed_returned2" />
-		<command id="cmd_items_checkin2" />
-		<command id="cmd_items_edit2" />
-		<command id="cmd_items_mark_lost2" />
-		<command id="cmd_show_catalog2" />
-		<command id="cmd_add_billing2" />
-		<command id="sel_mark_items_damaged2" disabled="true"/>
-		<command id="sel_mark_items_missing2" disabled="true"/>
-	</commandset>
-
-	<popupset id="items_popupset"/>
-
-	<box id="items_main" />
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="/xul/server/patron/items.js"/>
+    <script>
+    <![CDATA[
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                try { g.error.sdump('D_TRACE','my_init() for items.xul'); } catch(E) { dump(E); }
+
+                JSAN.use('patron.items'); g.items = new patron.items();
+                g.items.init( 
+                    { 
+                        'patron_id' : xul_param('patron_id'), 
+                    } 
+                );
+                
+                window.refresh = function (p) { g.items.retrieve(p); }
+
+                default_focus();
+
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/items.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+
+        function default_focus() { try { var x = document.getElementById('noncat'); x.focus(); } catch(E) { try { g.error.sdump('D_ERROR','item.xul, default_focus: ' + E); } catch(F) { dump(E); } } }
+
+    ]]>
+    </script>
+
+    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+
+    <commandset id="items_cmds">
+        <command id="save_columns" />
+        <command id="sel_bucket" disabled="true"/>
+        <command id="sel_clip" />
+        <command id="sel_copy_details"/>
+        <command id="sel_patron"/>
+        <command id="cmd_items_print" />
+        <command id="cmd_items_export" />
+        <command id="cmd_items_renew" />
+        <command id="cmd_items_renew_all" />
+        <command id="cmd_items_claimed_returned" />
+        <command id="cmd_items_checkin" />
+        <command id="cmd_items_edit" />
+        <command id="cmd_items_mark_lost" />
+        <command id="cmd_show_catalog" />
+        <command id="cmd_add_billing" />
+        <command id="sel_mark_items_damaged" disabled="true"/>
+        <command id="sel_mark_items_missing" disabled="true"/>
+        
+        <command id="cmd_show_noncats" />
+
+        <command id="save_columns2" />
+        <command id="sel_bucket2" disabled="true"/>
+        <command id="sel_clip2" />
+        <command id="sel_copy_details2"/>
+        <command id="sel_patron2"/>
+        <command id="cmd_items_print2" />
+        <command id="cmd_items_export2" />
+        <command id="cmd_items_renew2" />
+        <command id="cmd_items_claimed_returned2" />
+        <command id="cmd_items_checkin2" />
+        <command id="cmd_items_edit2" />
+        <command id="cmd_items_mark_lost2" />
+        <command id="cmd_show_catalog2" />
+        <command id="cmd_add_billing2" />
+        <command id="sel_mark_items_damaged2" disabled="true"/>
+        <command id="sel_mark_items_missing2" disabled="true"/>
+    </commandset>
+
+    <popupset id="items_popupset"/>
+
+    <box id="items_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/items_overlay.xul b/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
index 4669680014..85b408e197 100644
--- a/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
@@ -1,142 +1,142 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="items_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading items_overlay.xul\n');</script>
 
 <commandset id="items_cmds" />
 
 <popupset id="items_popupset">
-	<popup id="items_actions" position="at_pointer"> 
-		<menuitem command="sel_clip" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;"/>
-		<menuitem command="sel_bucket" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
-		<menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog" />
-		<menuitem command="sel_copy_details" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
-		<menuitem command="sel_patron" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
-		<menuseparator />
-		<menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit" />
-		<menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost" />
-		<menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned" />
-		<menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew" />
-		<menuitem label="&staff.patron.items_overlay.items_renew_all.label;" command="cmd_items_renew_all" hidden="false"/>
-		<menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin" />
-		<menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing" />
-		<menuseparator />
-		<menuitem command="save_columns" label="&staff.patron.items_overlay.save_columns.label;"/>
-	</popup>
-	<popup id="items_actions2" position="at_pointer"> 
-		<menuitem command="sel_clip2" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;" />
-		<menuitem command="sel_bucket2" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
-		<menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog2" />
-		<menuitem command="sel_copy_details2" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
-		<menuitem command="sel_patron2" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
-		<menuseparator />
-		<menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit2" />
-		<menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost2" />
-		<menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned2" />
-		<menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew2" />
-		<menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin2" />
-		<menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing2" />
-		<menuseparator />
-		<menuitem command="save_columns2" label="&staff.patron.items_overlay.save_columns.label;"/>
-	</popup>
+    <popup id="items_actions" position="at_pointer"> 
+        <menuitem command="sel_clip" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;"/>
+        <menuitem command="sel_bucket" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
+        <menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog" />
+        <menuitem command="sel_copy_details" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
+        <menuitem command="sel_patron" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
+        <menuseparator />
+        <menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit" />
+        <menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost" />
+        <menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned" />
+        <menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew" />
+        <menuitem label="&staff.patron.items_overlay.items_renew_all.label;" command="cmd_items_renew_all" hidden="false"/>
+        <menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin" />
+        <menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing" />
+        <menuseparator />
+        <menuitem command="save_columns" label="&staff.patron.items_overlay.save_columns.label;"/>
+    </popup>
+    <popup id="items_actions2" position="at_pointer"> 
+        <menuitem command="sel_clip2" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;" />
+        <menuitem command="sel_bucket2" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
+        <menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog2" />
+        <menuitem command="sel_copy_details2" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
+        <menuitem command="sel_patron2" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
+        <menuseparator />
+        <menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit2" />
+        <menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost2" />
+        <menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned2" />
+        <menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew2" />
+        <menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin2" />
+        <menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing2" />
+        <menuseparator />
+        <menuitem command="save_columns2" label="&staff.patron.items_overlay.save_columns.label;"/>
+    </popup>
 
 </popupset>
 
 
 <box id="items_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="cmvb1" flex="1"/>
+    <vbox id="cmvb1" flex="1"/>
 </box>
 
 <vbox id="cmvb1" flex="1">
-	<groupbox id="cmgb1" flex="1">
-		<caption label="&staff.patron_navbar.items;" />
-		<vbox flex="0">
-			<hbox id="items_top_ui" />
-		</vbox>
-		<vbox id="renew_msgs" />
-		<tree id="items_list" flex="1" enableColumnDrag="true" context="items_actions"/>
-		<vbox flex="0">
-			<hbox id="items_bottom_ui" />
-		</vbox>
-	</groupbox>
-	<splitter><grippy/></splitter>
-	<groupbox flex="1">
-		<caption label="&staff.patron_navbar.items.problem_items.caption;" />
-		<vbox flex="0">
-			<hbox id="items_top_ui2" />
-		</vbox>
-		<tree id="items_list2" flex="1" enableColumnDrag="true" context="items_actions2"/>
-		<vbox flex="0">
-			<hbox id="items_bottom_ui2" />
-		</vbox>
-	</groupbox>
+    <groupbox id="cmgb1" flex="1">
+        <caption label="&staff.patron_navbar.items;" />
+        <vbox flex="0">
+            <hbox id="items_top_ui" />
+        </vbox>
+        <vbox id="renew_msgs" />
+        <tree id="items_list" flex="1" enableColumnDrag="true" context="items_actions"/>
+        <vbox flex="0">
+            <hbox id="items_bottom_ui" />
+        </vbox>
+    </groupbox>
+    <splitter><grippy/></splitter>
+    <groupbox flex="1">
+        <caption label="&staff.patron_navbar.items.problem_items.caption;" />
+        <vbox flex="0">
+            <hbox id="items_top_ui2" />
+        </vbox>
+        <tree id="items_list2" flex="1" enableColumnDrag="true" context="items_actions2"/>
+        <vbox flex="0">
+            <hbox id="items_bottom_ui2" />
+        </vbox>
+    </groupbox>
 </vbox>
 
 <hbox id="items_top_ui" flex="1">
-	<spacer id="pcii3s" flex="1"/>
-	<menubar>
-		<menu label="&staff.patron.items_overlay.actions_for_selected_items.label;" accesskey="&staff.patron.items_overlay.actions_for_selected_items.accesskey;">
-			<menupopup>
-				<menuitem command="sel_clip" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;"/>
-				<menuitem command="sel_bucket" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
-				<menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog" />
-				<menuitem command="sel_copy_details" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
-				<menuitem command="sel_patron" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
-				<menuseparator />
-				<menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit" />
-				<menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost" />
-				<menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned" />
-				<menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew" />
-				<menuitem label="&staff.patron.items_overlay.items_renew_all.label;" command="cmd_items_renew_all" hidden="false"/>
-				<menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin" />
-				<menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing" />
-				<menuseparator />
-				<menuitem command="save_columns" label="&staff.patron.items_overlay.save_columns.label;"/>
-			</menupopup>
-		</menu>
-	</menubar>
+    <spacer id="pcii3s" flex="1"/>
+    <menubar>
+        <menu label="&staff.patron.items_overlay.actions_for_selected_items.label;" accesskey="&staff.patron.items_overlay.actions_for_selected_items.accesskey;">
+            <menupopup>
+                <menuitem command="sel_clip" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;"/>
+                <menuitem command="sel_bucket" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
+                <menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog" />
+                <menuitem command="sel_copy_details" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
+                <menuitem command="sel_patron" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
+                <menuseparator />
+                <menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit" />
+                <menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost" />
+                <menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned" />
+                <menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew" />
+                <menuitem label="&staff.patron.items_overlay.items_renew_all.label;" command="cmd_items_renew_all" hidden="false"/>
+                <menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin" />
+                <menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing" />
+                <menuseparator />
+                <menuitem command="save_columns" label="&staff.patron.items_overlay.save_columns.label;"/>
+            </menupopup>
+        </menu>
+    </menubar>
 </hbox>
 
 <hbox id="items_top_ui2" flex="1">
-	<spacer id="pcii3s2" flex="1"/>
-	<menubar>
-		<menu label="&staff.patron.items_overlay.actions_for_selected_items.label;" old_accesskey="&staff.patron.items_overlay.actions_for_selected_items.accesskey;">
-			<menupopup>
-				<menuitem command="sel_clip2" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;" />
-				<menuitem command="sel_bucket2" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
-				<menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog2" />
-				<menuitem command="sel_copy_details2" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
-				<menuitem command="sel_patron2" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
-				<menuseparator />
-				<menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit2" />
-				<menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost2" />
-				<menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned2" />
-				<menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew2" />
-				<menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin2" />
-				<menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing2" />
-				<menuseparator />
-				<menuitem command="save_columns2" label="&staff.patron.items_overlay.save_columns.label;"/>
-			</menupopup>
-		</menu>
-	</menubar>
+    <spacer id="pcii3s2" flex="1"/>
+    <menubar>
+        <menu label="&staff.patron.items_overlay.actions_for_selected_items.label;" old_accesskey="&staff.patron.items_overlay.actions_for_selected_items.accesskey;">
+            <menupopup>
+                <menuitem command="sel_clip2" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;" />
+                <menuitem command="sel_bucket2" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
+                <menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog2" />
+                <menuitem command="sel_copy_details2" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
+                <menuitem command="sel_patron2" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
+                <menuseparator />
+                <menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit2" />
+                <menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost2" />
+                <menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned2" />
+                <menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew2" />
+                <menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin2" />
+                <menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing2" />
+                <menuseparator />
+                <menuitem command="save_columns2" label="&staff.patron.items_overlay.save_columns.label;"/>
+            </menupopup>
+        </menu>
+    </menubar>
 </hbox>
 
 
 <hbox id="items_bottom_ui" flex="1">
-	<button id="noncat" label="&staff.patron.items_overlay.show_noncats.label;" command="cmd_show_noncats" accesskey="&staff.patron.items_overlay.show_noncats.accesskey;"/>
-	<spacer flex="1"/>
-	<button id="items_print" label="&staff.patron_display.items.print_receipt.label;" command="cmd_items_print" accesskey="&staff.patron_display.items.print_receipt.accesskey;" />
-	<button id="items_export" label="&staff.patron.items_overlay.items_export.label;" command="cmd_items_export" accesskey=""/>
+    <button id="noncat" label="&staff.patron.items_overlay.show_noncats.label;" command="cmd_show_noncats" accesskey="&staff.patron.items_overlay.show_noncats.accesskey;"/>
+    <spacer flex="1"/>
+    <button id="items_print" label="&staff.patron_display.items.print_receipt.label;" command="cmd_items_print" accesskey="&staff.patron_display.items.print_receipt.accesskey;" />
+    <button id="items_export" label="&staff.patron.items_overlay.items_export.label;" command="cmd_items_export" accesskey=""/>
 </hbox>
 
 <hbox id="items_bottom_ui2" flex="1">
-	<spacer flex="1"/>
-	<button id="items_print2" label="&staff.patron_display.items.print_receipt.label;" command="cmd_items_print2" old_accesskey="&staff.patron_display.items.print_receipt.accesskey;" />
-	<button id="items_export2" label="&staff.patron.items_overlay.items_export.label;" command="cmd_items_export2" accesskey=""/>
+    <spacer flex="1"/>
+    <button id="items_print2" label="&staff.patron_display.items.print_receipt.label;" command="cmd_items_print2" old_accesskey="&staff.patron_display.items.print_receipt.accesskey;" />
+    <button id="items_export2" label="&staff.patron.items_overlay.items_export.label;" command="cmd_items_export2" accesskey=""/>
 </hbox>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.xul b/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.xul
index 6227c28b4f..e576b8d79c 100644
--- a/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.xul
+++ b/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,21 +19,21 @@
 
 <window id="new_penalty_win" 
     onload="try { new_penalty_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     title="&staff.patron_display.apply_penalty_dialog.title;">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;</script>
-	<scripts id="openils_util_scripts"/>
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;</script>
+    <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="new_standing_penalty.js"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="new_standing_penalty.js"/>
 
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- CONTENT -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- CONTENT -->
     <dialogheader title="&staff.patron_display.apply_penalty_dialog.header;" description="&staff.patron_display.apply_penalty_dialog.description;" />
     <toolbox flex="1">
         <toolbar>
diff --git a/Open-ILS/xul/staff_client/server/patron/search_form.xul b/Open-ILS/xul/staff_client/server/patron/search_form.xul
index f7e0776e99..d02a182ab5 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_form.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_form.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,78 +20,78 @@
 <?xul-overlay href="/xul/server/patron/search_form_overlay.xul"?>
 
 <window id="patron_search_form_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for patron_search_form.xul');
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function $(id) { return document.getElementById(id); }
+        
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for patron_search_form.xul');
 
-				g.cgi = new CGI();
-				var keys = g.cgi.keys();
-				var query = {};
-				for (var i = 0; i < keys.length; i++) {
-					query[keys[i]] = g.cgi.param(keys[i]);
-				}
-				if (xulG.query) {
-					for (var i in xulG.query) {
+                g.cgi = new CGI();
+                var keys = g.cgi.keys();
+                var query = {};
+                for (var i = 0; i < keys.length; i++) {
+                    query[keys[i]] = g.cgi.param(keys[i]);
+                }
+                if (xulG.query) {
+                    for (var i in xulG.query) {
                         if (typeof xulG.query[i] == 'object') { xulG.query[i] = xulG.query[i].value; }
-						query[i] = xulG.query[i];
-					}
-				}
+                        query[i] = xulG.query[i];
+                    }
+                }
 
-				JSAN.use('patron.search_form'); g.search_form = new patron.search_form();
-				g.search_form.init( { 'query' : query } );
+                JSAN.use('patron.search_form'); g.search_form = new patron.search_form();
+                g.search_form.init( { 'query' : query } );
 
-				if (g.cgi.param('doit')||xulG.doit) {
-					g.search_form.submit();
-				}
-	
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/search_form.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-		
-		function default_focus() {
-			setTimeout(
-				function() {
-					try {
-						netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-						document.getElementById('family_name').focus();
-					} catch(E) {
-						g.error.sdump('D_ERROR','default_focus(): ' + js2JSON(E));
-					}
-				}, 0
-			);
-		}
+                if (g.cgi.param('doit')||xulG.doit) {
+                    g.search_form.submit();
+                }
+    
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/search_form.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+        
+        function default_focus() {
+            setTimeout(
+                function() {
+                    try {
+                        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                        document.getElementById('family_name').focus();
+                    } catch(E) {
+                        g.error.sdump('D_ERROR','default_focus(): ' + js2JSON(E));
+                    }
+                }, 0
+            );
+        }
 
 
-	]]>
-	</script>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    ]]>
+    </script>
+    
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
-	<commandset id="patron_search_form_cmds">
-	</commandset>
+    <commandset id="patron_search_form_cmds">
+    </commandset>
 
-	<box id="patron_search_form_main" />
+    <box id="patron_search_form_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/search_form_horiz.xul b/Open-ILS/xul/staff_client/server/patron/search_form_horiz.xul
index 245f4b5e82..7f726d1192 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_form_horiz.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_form_horiz.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,78 +20,78 @@
 <?xul-overlay href="/xul/server/patron/search_form_horiz_overlay.xul"?>
 
 <window id="patron_search_form_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for patron_search_form.xul');
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function $(id) { return document.getElementById(id); }
+        
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for patron_search_form.xul');
 
-				g.cgi = new CGI();
-				var keys = g.cgi.keys();
-				var query = {};
-				for (var i = 0; i < keys.length; i++) {
-					query[keys[i]] = g.cgi.param(keys[i]);
-				}
-				if (xulG.query) {
-					for (var i in xulG.query) {
+                g.cgi = new CGI();
+                var keys = g.cgi.keys();
+                var query = {};
+                for (var i = 0; i < keys.length; i++) {
+                    query[keys[i]] = g.cgi.param(keys[i]);
+                }
+                if (xulG.query) {
+                    for (var i in xulG.query) {
                         if (typeof xulG.query[i] == 'object') { xulG.query[i] = xulG.query[i].value; }
-						query[i] = xulG.query[i];
-					}
-				}
+                        query[i] = xulG.query[i];
+                    }
+                }
 
-				JSAN.use('patron.search_form'); g.search_form = new patron.search_form();
-				g.search_form.init( { 'query' : query } );
+                JSAN.use('patron.search_form'); g.search_form = new patron.search_form();
+                g.search_form.init( { 'query' : query } );
 
-				if (g.cgi.param('doit')||xulG.doit) {
-					g.search_form.submit();
-				}
-	
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/search_form_horiz.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-		
-		function default_focus() {
-			setTimeout(
-				function() {
-					try {
-						netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-						document.getElementById('family_name').focus();
-					} catch(E) {
-						g.error.sdump('D_ERROR','default_focus(): ' + js2JSON(E));
-					}
-				}, 0
-			);
-		}
+                if (g.cgi.param('doit')||xulG.doit) {
+                    g.search_form.submit();
+                }
+    
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/search_form_horiz.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+        
+        function default_focus() {
+            setTimeout(
+                function() {
+                    try {
+                        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                        document.getElementById('family_name').focus();
+                    } catch(E) {
+                        g.error.sdump('D_ERROR','default_focus(): ' + js2JSON(E));
+                    }
+                }, 0
+            );
+        }
 
 
-	]]>
-	</script>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    ]]>
+    </script>
+    
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
-	<commandset id="patron_search_form_cmds">
-	</commandset>
+    <commandset id="patron_search_form_cmds">
+    </commandset>
 
-	<box id="patron_search_form_main" />
+    <box id="patron_search_form_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/search_form_horiz_overlay.xul b/Open-ILS/xul/staff_client/server/patron/search_form_horiz_overlay.xul
index 3ccb7c7af5..b619df0630 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_form_horiz_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_form_horiz_overlay.xul
@@ -6,18 +6,18 @@
 
 
 <overlay id="patron_search_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading patron/search_overlay.xul\n');</script>
 
 <commandset id="patron_search_form_cmds">
-	<command id="cmd_patron_search_submit" />
-	<command id="cmd_patron_search_clear" />
+    <command id="cmd_patron_search_submit" />
+    <command id="cmd_patron_search_clear" />
 </commandset>
 
 <box id="patron_search_form_main" orient="vertical" class="my_overflow">
-	<groupbox id="psgf_gb">
-		<caption id="psgf_gbc" label='&staff.patron_search_form.caption;' />
+    <groupbox id="psgf_gb">
+        <caption id="psgf_gbc" label='&staff.patron_search_form.caption;' />
         <hbox>
             <hbox>
                 <label control="inactive" accesskey="&staff.patron.search_form_overlay.inactive.accesskey;" value="&staff.patron.search_form_overlay.inactive.value;"/>
@@ -39,88 +39,88 @@
                     command="cmd_patron_search_clear"/>
             </vbox>
         </hbox>
-	</groupbox>
+    </groupbox>
 </box>
 
 <!-- group 0 = user  group 1 = address  group 2 = phone, ident -->
 
 <grid id="psg">
-	<columns id="psc">
-		<column id="psc1"/>
-		<column id="psc2" flex="1"/>
-		<column id="psc3"/>
-		<column id="psc4" flex="1"/>
-		<column id="psc5"/>
-		<column id="psc6" flex="1"/>
-		<column id="psc7"/>
-		<column id="psc8" flex="1"/>
-	</columns>
-	<rows id="psr">
-		<row id="psr1">
-			<label id="psl1" control="family_name" 
-				value="&staff.patron_search_form.family_name.label;" 
-				accesskey="&staff.patron_search_form.family_name.accesskey;"/>
-			<textbox id="family_name" group="0" context="clipboard"/>
-			<label id="psl7" control="street1" 
-				value="&staff.patron_search_form.street1.label;" 
-				accesskey="&staff.patron_search_form.street1.accesskey;"/>
-			<textbox id="street1" group="1" context="clipboard"/>
-			<label id="psl5" control="phone" 
-				value="&staff.patron_search_form.phone.label;" 
-				accesskey="&staff.patron_search_form.phone.accesskey;"/>
-			<textbox id="phone" group="2" context="clipboard"/>
-			<label id="psl6c" control="card" 
-				value="&staff.patron_search_form.card.label;" 
-				accesskey="&staff.patron_search_form.card.accesskey;"/>
-			<textbox id="card" group="0" context="clipboard"/>
-		</row>
-		<row id="psr2">
-			<label id="psl2" control="first_given_name" 
-				value="&staff.patron_search_form.first_given_name.label;" 
-				accesskey="&staff.patron_search_form.first_given_name.accesskey;"/>
-			<textbox id="first_given_name" group="0" context="clipboard"/>
-			<label id="psl8" control="street2" 
-				value="&staff.patron_search_form.street2.label;" 
-				accesskey="&staff.patron_search_form.street2.accesskey;"/>
-			<textbox id="street2" group="1" context="clipboard"/>
-			<label id="psl4" control="email" 
-				value="&staff.patron_search_form.email.label;" 
-				accesskey="&staff.patron_search_form.email.accesskey;"/>
-			<textbox id="email" group="0" context="clipboard"/>
-			<label id="psl6b" control="usrname" 
-				value="&staff.patron_search_form.usrname.label;" 
-				accesskey="&staff.patron_search_form.usrname.accesskey;"/>
-			<textbox id="usrname" group="0" context="clipboard"/>
-		</row>
-		<row id="psr3">
-			<label id="psl3" control="second_given_name" 
-				value="&staff.patron_search_form.second_given_name.label;" 
-				accesskey="&staff.patron_search_form.second_given_name.accesskey;"/>
-			<textbox id="second_given_name" group="0" context="clipboard"/>
-			<label id="psl9" control="city" 
-				value="&staff.patron_search_form.city.label;" 
-				accesskey="&staff.patron_search_form.city.accesskey;"/>
-			<textbox id="city" group="1" context="clipboard"/>
-			<label id="psl10" control="state" 
-				value="&staff.patron_search_form.state.label;" 
-				accesskey="&staff.patron_search_form.state.accesskey;"/>
-			<textbox id="state" group="1" context="clipboard"/>
-			<label id="psl6" control="ident" 
-				value="&staff.patron_search_form.ident.label;" 
-				accesskey="&staff.patron_search_form.ident.accesskey;"/>
-			<textbox id="ident" group="2" context="clipboard"/>
-		</row>
-		<row id="psr14">
-			<label id="psl14" control="alias" 
-				value="&staff.patron_search_form.alias.label;" 
-				accesskey="&staff.patron_search_form.alias.accesskey;"/>
-			<textbox id="alias" group="0" context="clipboard"/>
-			<label id="psl11" control="post_code" 
-				value="&staff.patron_search_form.post_code.label;" 
-				accesskey="&staff.patron_search_form.post_code.accesskey;"/>
-			<textbox id="post_code" group="1" context="clipboard"/>
-		</row>
-	</rows>
+    <columns id="psc">
+        <column id="psc1"/>
+        <column id="psc2" flex="1"/>
+        <column id="psc3"/>
+        <column id="psc4" flex="1"/>
+        <column id="psc5"/>
+        <column id="psc6" flex="1"/>
+        <column id="psc7"/>
+        <column id="psc8" flex="1"/>
+    </columns>
+    <rows id="psr">
+        <row id="psr1">
+            <label id="psl1" control="family_name" 
+                value="&staff.patron_search_form.family_name.label;" 
+                accesskey="&staff.patron_search_form.family_name.accesskey;"/>
+            <textbox id="family_name" group="0" context="clipboard"/>
+            <label id="psl7" control="street1" 
+                value="&staff.patron_search_form.street1.label;" 
+                accesskey="&staff.patron_search_form.street1.accesskey;"/>
+            <textbox id="street1" group="1" context="clipboard"/>
+            <label id="psl5" control="phone" 
+                value="&staff.patron_search_form.phone.label;" 
+                accesskey="&staff.patron_search_form.phone.accesskey;"/>
+            <textbox id="phone" group="2" context="clipboard"/>
+            <label id="psl6c" control="card" 
+                value="&staff.patron_search_form.card.label;" 
+                accesskey="&staff.patron_search_form.card.accesskey;"/>
+            <textbox id="card" group="0" context="clipboard"/>
+        </row>
+        <row id="psr2">
+            <label id="psl2" control="first_given_name" 
+                value="&staff.patron_search_form.first_given_name.label;" 
+                accesskey="&staff.patron_search_form.first_given_name.accesskey;"/>
+            <textbox id="first_given_name" group="0" context="clipboard"/>
+            <label id="psl8" control="street2" 
+                value="&staff.patron_search_form.street2.label;" 
+                accesskey="&staff.patron_search_form.street2.accesskey;"/>
+            <textbox id="street2" group="1" context="clipboard"/>
+            <label id="psl4" control="email" 
+                value="&staff.patron_search_form.email.label;" 
+                accesskey="&staff.patron_search_form.email.accesskey;"/>
+            <textbox id="email" group="0" context="clipboard"/>
+            <label id="psl6b" control="usrname" 
+                value="&staff.patron_search_form.usrname.label;" 
+                accesskey="&staff.patron_search_form.usrname.accesskey;"/>
+            <textbox id="usrname" group="0" context="clipboard"/>
+        </row>
+        <row id="psr3">
+            <label id="psl3" control="second_given_name" 
+                value="&staff.patron_search_form.second_given_name.label;" 
+                accesskey="&staff.patron_search_form.second_given_name.accesskey;"/>
+            <textbox id="second_given_name" group="0" context="clipboard"/>
+            <label id="psl9" control="city" 
+                value="&staff.patron_search_form.city.label;" 
+                accesskey="&staff.patron_search_form.city.accesskey;"/>
+            <textbox id="city" group="1" context="clipboard"/>
+            <label id="psl10" control="state" 
+                value="&staff.patron_search_form.state.label;" 
+                accesskey="&staff.patron_search_form.state.accesskey;"/>
+            <textbox id="state" group="1" context="clipboard"/>
+            <label id="psl6" control="ident" 
+                value="&staff.patron_search_form.ident.label;" 
+                accesskey="&staff.patron_search_form.ident.accesskey;"/>
+            <textbox id="ident" group="2" context="clipboard"/>
+        </row>
+        <row id="psr14">
+            <label id="psl14" control="alias" 
+                value="&staff.patron_search_form.alias.label;" 
+                accesskey="&staff.patron_search_form.alias.accesskey;"/>
+            <textbox id="alias" group="0" context="clipboard"/>
+            <label id="psl11" control="post_code" 
+                value="&staff.patron_search_form.post_code.label;" 
+                accesskey="&staff.patron_search_form.post_code.accesskey;"/>
+            <textbox id="post_code" group="1" context="clipboard"/>
+        </row>
+    </rows>
 </grid>
 
 
diff --git a/Open-ILS/xul/staff_client/server/patron/search_form_overlay.xul b/Open-ILS/xul/staff_client/server/patron/search_form_overlay.xul
index b2b820b4bf..58f54d03e9 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_form_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_form_overlay.xul
@@ -6,138 +6,138 @@
 
 
 <overlay id="patron_search_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading patron/search_overlay.xul\n');</script>
 
 <commandset id="patron_search_form_cmds">
-	<command id="cmd_patron_search_submit" />
-	<command id="cmd_patron_search_clear" />
+    <command id="cmd_patron_search_submit" />
+    <command id="cmd_patron_search_clear" />
 </commandset>
 
 <box id="patron_search_form_main" orient="vertical" class="my_overflow">
-	<groupbox id="psgf_gb">
-		<caption id="psgf_gbc" label='&staff.patron_search_form.caption;' />
-		<grid id="psg" />
-	</groupbox>
+    <groupbox id="psgf_gb">
+        <caption id="psgf_gbc" label='&staff.patron_search_form.caption;' />
+        <grid id="psg" />
+    </groupbox>
 </box>
 
 <!-- group 0 = user  group 1 = address  group 2 = phone, ident -->
 
 <grid id="psg">
-	<columns id="psc">
-		<column id="psc1"/>
-		<column id="psc2" flex="1"/>
-	</columns>
-	<rows id="psr">
-		<row>
-			<label control="inactive" accesskey="&staff.patron.search_form_overlay.inactive.accesskey;" value="&staff.patron.search_form_overlay.inactive.value;"/>
-			<checkbox id="inactive" />
+    <columns id="psc">
+        <column id="psc1"/>
+        <column id="psc2" flex="1"/>
+    </columns>
+    <rows id="psr">
+        <row>
+            <label control="inactive" accesskey="&staff.patron.search_form_overlay.inactive.accesskey;" value="&staff.patron.search_form_overlay.inactive.value;"/>
+            <checkbox id="inactive" />
         </row>
         <row>
-			<label control="search_range_menu" value="&staff.patron.search_form_overlay.search_range_menu.value;"/>
+            <label control="search_range_menu" value="&staff.patron.search_form_overlay.search_range_menu.value;"/>
             <hbox id="search_depth" />
-		</row>
-		<row id="psr1">
-			<label id="psl1" control="family_name" 
-				value="&staff.patron_search_form.family_name.label;" 
-				accesskey="&staff.patron_search_form.family_name.accesskey;"/>
-			<textbox id="family_name" group="0" context="clipboard"/>
-		</row>
-		<row id="psr2">
-			<label id="psl2" control="first_given_name" 
-				value="&staff.patron_search_form.first_given_name.label;" 
-				accesskey="&staff.patron_search_form.first_given_name.accesskey;"/>
-			<textbox id="first_given_name" group="0" context="clipboard"/>
-		</row>
-		<row id="psr3">
-			<label id="psl3" control="second_given_name" 
-				value="&staff.patron_search_form.second_given_name.label;" 
-				accesskey="&staff.patron_search_form.second_given_name.accesskey;"/>
-			<textbox id="second_given_name" group="0" context="clipboard"/>
-		</row>
-		<row id="psr14">
-			<label id="psl14" control="alias" 
-				value="&staff.patron_search_form.alias.label;" 
-				accesskey="&staff.patron_search_form.alias.accesskey;"/>
-			<textbox id="alias" group="0" context="clipboard"/>
-		</row>
-		<row id="psr4">
-			<label id="psl4" control="email" 
-				value="&staff.patron_search_form.email.label;" 
-				accesskey="&staff.patron_search_form.email.accesskey;"/>
-			<textbox id="email" group="0" context="clipboard"/>
-		</row>
-		<row id="psr5">
-			<label id="psl5" control="phone" 
-				value="&staff.patron_search_form.phone.label;" 
-				accesskey="&staff.patron_search_form.phone.accesskey;"/>
-			<textbox id="phone" group="2" context="clipboard"/>
-		</row>
-		<row id="psr6">
-			<label id="psl6" control="ident" 
-				value="&staff.patron_search_form.ident.label;" 
-				accesskey="&staff.patron_search_form.ident.accesskey;"/>
-			<textbox id="ident" group="2" context="clipboard"/>
-		</row>
-		<row id="psr6b">
-			<label id="psl6b" control="usrname" 
-				value="&staff.patron_search_form.usrname.label;" 
-				accesskey="&staff.patron_search_form.usrname.accesskey;"/>
-			<textbox id="usrname" group="0" context="clipboard"/>
-		</row>
-		<row id="psr6c">
-			<label id="psl6c" control="card" 
-				value="&staff.patron_search_form.card.label;" 
-				accesskey="&staff.patron_search_form.card.accesskey;"/>
-			<textbox id="card" group="0" context="clipboard"/>
-		</row>
-		<row id="psr6a">
-			<label id="psl6a" value=" "/>
-		</row>
-		<row id="psr7">
-			<label id="psl7" control="street1" 
-				value="&staff.patron_search_form.street1.label;" 
-				accesskey="&staff.patron_search_form.street1.accesskey;"/>
-			<textbox id="street1" group="1" context="clipboard"/>
-		</row>
-		<row id="psr8">
-			<label id="psl8" control="street2" 
-				value="&staff.patron_search_form.street2.label;" 
-				accesskey="&staff.patron_search_form.street2.accesskey;"/>
-			<textbox id="street2" group="1" context="clipboard"/>
-		</row>
-		<row id="psr9">
-			<label id="psl9" control="city" 
-				value="&staff.patron_search_form.city.label;" 
-				accesskey="&staff.patron_search_form.city.accesskey;"/>
-			<textbox id="city" group="1" context="clipboard"/>
-		</row>
-		<row id="psr10" hidden="true">
-			<label id="psl10" control="state" 
-				value="&staff.patron_search_form.state.label;" 
-				accesskey="&staff.patron_search_form.state.accesskey;"/>
-			<textbox id="state" group="1" context="clipboard"/>
-		</row>
-		<row id="psr11">
-			<label id="psl11" control="post_code" 
-				value="&staff.patron_search_form.post_code.label;" 
-				accesskey="&staff.patron_search_form.post_code.accesskey;"/>
-			<textbox id="post_code" group="1" context="clipboard"/>
-		</row>
-		<row id="psr12">
-			<spacer id="pss12"/>
-			<button id="search" label="&staff.patron_search_form.search.label;" 
-				accesskey="&staff.patron_search_form.search.accesskey;"
-				command="cmd_patron_search_submit"/>
-		</row>
-		<row id="psr13">
-			<spacer id="pss13"/>
-			<button id="clear" label="&staff.patron_search_form.clear.label;" 
-				accesskey="&staff.patron_search_form.clear.accesskey;"
-				command="cmd_patron_search_clear"/>
-		</row>
-	</rows>
+        </row>
+        <row id="psr1">
+            <label id="psl1" control="family_name" 
+                value="&staff.patron_search_form.family_name.label;" 
+                accesskey="&staff.patron_search_form.family_name.accesskey;"/>
+            <textbox id="family_name" group="0" context="clipboard"/>
+        </row>
+        <row id="psr2">
+            <label id="psl2" control="first_given_name" 
+                value="&staff.patron_search_form.first_given_name.label;" 
+                accesskey="&staff.patron_search_form.first_given_name.accesskey;"/>
+            <textbox id="first_given_name" group="0" context="clipboard"/>
+        </row>
+        <row id="psr3">
+            <label id="psl3" control="second_given_name" 
+                value="&staff.patron_search_form.second_given_name.label;" 
+                accesskey="&staff.patron_search_form.second_given_name.accesskey;"/>
+            <textbox id="second_given_name" group="0" context="clipboard"/>
+        </row>
+        <row id="psr14">
+            <label id="psl14" control="alias" 
+                value="&staff.patron_search_form.alias.label;" 
+                accesskey="&staff.patron_search_form.alias.accesskey;"/>
+            <textbox id="alias" group="0" context="clipboard"/>
+        </row>
+        <row id="psr4">
+            <label id="psl4" control="email" 
+                value="&staff.patron_search_form.email.label;" 
+                accesskey="&staff.patron_search_form.email.accesskey;"/>
+            <textbox id="email" group="0" context="clipboard"/>
+        </row>
+        <row id="psr5">
+            <label id="psl5" control="phone" 
+                value="&staff.patron_search_form.phone.label;" 
+                accesskey="&staff.patron_search_form.phone.accesskey;"/>
+            <textbox id="phone" group="2" context="clipboard"/>
+        </row>
+        <row id="psr6">
+            <label id="psl6" control="ident" 
+                value="&staff.patron_search_form.ident.label;" 
+                accesskey="&staff.patron_search_form.ident.accesskey;"/>
+            <textbox id="ident" group="2" context="clipboard"/>
+        </row>
+        <row id="psr6b">
+            <label id="psl6b" control="usrname" 
+                value="&staff.patron_search_form.usrname.label;" 
+                accesskey="&staff.patron_search_form.usrname.accesskey;"/>
+            <textbox id="usrname" group="0" context="clipboard"/>
+        </row>
+        <row id="psr6c">
+            <label id="psl6c" control="card" 
+                value="&staff.patron_search_form.card.label;" 
+                accesskey="&staff.patron_search_form.card.accesskey;"/>
+            <textbox id="card" group="0" context="clipboard"/>
+        </row>
+        <row id="psr6a">
+            <label id="psl6a" value=" "/>
+        </row>
+        <row id="psr7">
+            <label id="psl7" control="street1" 
+                value="&staff.patron_search_form.street1.label;" 
+                accesskey="&staff.patron_search_form.street1.accesskey;"/>
+            <textbox id="street1" group="1" context="clipboard"/>
+        </row>
+        <row id="psr8">
+            <label id="psl8" control="street2" 
+                value="&staff.patron_search_form.street2.label;" 
+                accesskey="&staff.patron_search_form.street2.accesskey;"/>
+            <textbox id="street2" group="1" context="clipboard"/>
+        </row>
+        <row id="psr9">
+            <label id="psl9" control="city" 
+                value="&staff.patron_search_form.city.label;" 
+                accesskey="&staff.patron_search_form.city.accesskey;"/>
+            <textbox id="city" group="1" context="clipboard"/>
+        </row>
+        <row id="psr10" hidden="true">
+            <label id="psl10" control="state" 
+                value="&staff.patron_search_form.state.label;" 
+                accesskey="&staff.patron_search_form.state.accesskey;"/>
+            <textbox id="state" group="1" context="clipboard"/>
+        </row>
+        <row id="psr11">
+            <label id="psl11" control="post_code" 
+                value="&staff.patron_search_form.post_code.label;" 
+                accesskey="&staff.patron_search_form.post_code.accesskey;"/>
+            <textbox id="post_code" group="1" context="clipboard"/>
+        </row>
+        <row id="psr12">
+            <spacer id="pss12"/>
+            <button id="search" label="&staff.patron_search_form.search.label;" 
+                accesskey="&staff.patron_search_form.search.accesskey;"
+                command="cmd_patron_search_submit"/>
+        </row>
+        <row id="psr13">
+            <spacer id="pss13"/>
+            <button id="clear" label="&staff.patron_search_form.clear.label;" 
+                accesskey="&staff.patron_search_form.clear.accesskey;"
+                command="cmd_patron_search_clear"/>
+        </row>
+    </rows>
 </grid>
 
 
diff --git a/Open-ILS/xul/staff_client/server/patron/search_result.xul b/Open-ILS/xul/staff_client/server/patron/search_result.xul
index a2c9c0b056..b1a870ab49 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_result.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_result.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,69 +20,69 @@
 <?xul-overlay href="/xul/server/patron/search_result_overlay.xul"?>
 
 <window id="patron_search_result_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
-	<scripts id="openils_util_scripts"/>
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for patron_search_result.xul');
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function $(id) { return document.getElementById(id); }
+        
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for patron_search_result.xul');
 
-				g.cgi = new CGI();
-				var keys = g.cgi.keys();
-				var query = {};
-				for (var i = 0; i < keys.length; i++) {
-					query[keys[i]] = g.cgi.param(keys[i]);
-				}
-				if (typeof xulG != 'undefined') if (xulG.query) {
-					for (var i in xulG.query) {
-						query[i] = xulG.query[i];
-					}
-				}
+                g.cgi = new CGI();
+                var keys = g.cgi.keys();
+                var query = {};
+                for (var i = 0; i < keys.length; i++) {
+                    query[keys[i]] = g.cgi.param(keys[i]);
+                }
+                if (typeof xulG != 'undefined') if (xulG.query) {
+                    for (var i in xulG.query) {
+                        query[i] = xulG.query[i];
+                    }
+                }
 
-				JSAN.use('patron.search_result'); g.search_result = new patron.search_result();
-				g.search_result.init( { 'query' : query, 'search_limit' : xulG.search_limit, 'search_sort' : xulG.search_sort } );
-	
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/search_result.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
+                JSAN.use('patron.search_result'); g.search_result = new patron.search_result();
+                g.search_result.init( { 'query' : query, 'search_limit' : xulG.search_limit, 'search_sort' : xulG.search_sort } );
+    
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/search_result.xul', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
 
-	]]>
-	</script>
+    ]]>
+    </script>
 
-	<commandset id="patron_search_result_cmds">
-		<command id="cmd_patron_refresh" />
-		<command id="cmd_patron_checkout" />
-		<command id="cmd_patron_items" />
-		<command id="cmd_patron_holds" />
-		<command id="cmd_patron_bills" />
-		<command id="cmd_patron_edit" />
-		<command id="cmd_patron_info" />
-		<command id="cmd_search_print" />
-		<command id="cmd_sel_clip" disabled="true"/>
-		<command id="cmd_save_cols" />
-	</commandset>
+    <commandset id="patron_search_result_cmds">
+        <command id="cmd_patron_refresh" />
+        <command id="cmd_patron_checkout" />
+        <command id="cmd_patron_items" />
+        <command id="cmd_patron_holds" />
+        <command id="cmd_patron_bills" />
+        <command id="cmd_patron_edit" />
+        <command id="cmd_patron_info" />
+        <command id="cmd_search_print" />
+        <command id="cmd_sel_clip" disabled="true"/>
+        <command id="cmd_save_cols" />
+    </commandset>
 
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
-	<box id="patron_search_result_main" />
+    <box id="patron_search_result_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/search_result_overlay.xul b/Open-ILS/xul/staff_client/server/patron/search_result_overlay.xul
index 3e9680c2d8..8299cc7137 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_result_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_result_overlay.xul
@@ -1,24 +1,24 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="patron_search_result_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading patron/search_result_overlay.xul\n');</script>
 
 <commandset id="patron_search_result_cmds" />
 
-	<box id="patron_search_result_main" flex="1">
-		<vbox flex="1">
-			<tree id="patron_list" flex="1" enableColumnDrag="true" seltype="multiple"/>
-			<hbox>
-				<spacer flex="1"/>
-				<button label="&staff.patron.search_result_overlay.save_cols.label;" command="cmd_save_cols"/>
-				<button label="&staff.patron.search_result_overlay.copy_to_clipboard.label;" command="cmd_sel_clip"/>
-				<button label="&staff.patron.search_result_overlay.print.label;" command="cmd_search_print" />
-			</hbox>
-		</vbox>
-	</box>
+    <box id="patron_search_result_main" flex="1">
+        <vbox flex="1">
+            <tree id="patron_list" flex="1" enableColumnDrag="true" seltype="multiple"/>
+            <hbox>
+                <spacer flex="1"/>
+                <button label="&staff.patron.search_result_overlay.save_cols.label;" command="cmd_save_cols"/>
+                <button label="&staff.patron.search_result_overlay.copy_to_clipboard.label;" command="cmd_sel_clip"/>
+                <button label="&staff.patron.search_result_overlay.print.label;" command="cmd_search_print" />
+            </hbox>
+        </vbox>
+    </box>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/patron/standing_penalties.xul b/Open-ILS/xul/staff_client/server/patron/standing_penalties.xul
index 44d3af7973..bcf2ae51cf 100644
--- a/Open-ILS/xul/staff_client/server/patron/standing_penalties.xul
+++ b/Open-ILS/xul/staff_client/server/patron/standing_penalties.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -18,34 +18,34 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="penalty_win" onload="try { penalty_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;</script>
-	<scripts id="openils_util_scripts"/>
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
+    <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;</script>
+    <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="standing_penalties.js"/>
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script type="text/javascript" src="standing_penalties.js"/>
 
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
-	<commandset id="penalty_cmds">
-		<command id="cmd_apply_penalty" />
-		<command id="cmd_remove_penalty" disabled="true"/>
-		<command id="cmd_edit_penalty" disabled="true"/>
-		<command id="cmd_archive_penalty" disabled="true"/>
-		<command id="cmd_retrieve_archived_penalties" />
-		<command id="cmd_show_all" />
-		<command id="cmd_show_note" />
-		<command id="cmd_show_alert" />
-		<command id="cmd_show_block" />
-	</commandset>
+    <commandset id="penalty_cmds">
+        <command id="cmd_apply_penalty" />
+        <command id="cmd_remove_penalty" disabled="true"/>
+        <command id="cmd_edit_penalty" disabled="true"/>
+        <command id="cmd_archive_penalty" disabled="true"/>
+        <command id="cmd_retrieve_archived_penalties" />
+        <command id="cmd_show_all" />
+        <command id="cmd_show_note" />
+        <command id="cmd_show_alert" />
+        <command id="cmd_show_block" />
+    </commandset>
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- CONTENT -->
-	<groupbox id="penalty_groupbox" flex="1" class="my_overflow">
-		<caption id="penalty_caption" label="&staff.patron_display.penalty.caption;"/>
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- CONTENT -->
+    <groupbox id="penalty_groupbox" flex="1" class="my_overflow">
+        <caption id="penalty_caption" label="&staff.patron_display.penalty.caption;"/>
         <vbox flex="0">
             <hbox flex="1">
                 <toolbox flex="1">
@@ -83,10 +83,10 @@
             </hbox>
         </vbox>
         <tree id="ausp_list" flex="1" enableColumnDrag="true" context="ausp_actions" />
-	</groupbox>
+    </groupbox>
     <splitter id="list_splitter" collapse="after" oils_persist="state hidden"><grippy id="splitter_grippy"/></splitter>
-	<groupbox id="archived_penalty_groupbox" flex="1" class="my_overflow">
-		<caption id="penalty_caption" label="&staff.patron_display.archived_penalty.caption;"/>
+    <groupbox id="archived_penalty_groupbox" flex="1" class="my_overflow">
+        <caption id="penalty_caption" label="&staff.patron_display.archived_penalty.caption;"/>
         <vbox flex="0">
             <toolbox flex="1">
                 <toolbar>
@@ -109,7 +109,7 @@
             </toolbox>
         </vbox>
         <tree id="archived_ausp_list" flex="1" enableColumnDrag="true" />
-	</groupbox>
+    </groupbox>
 
     <popupset id="csp_popupset">
         <popup id="ausp_actions" position="at_pointer">
diff --git a/Open-ILS/xul/staff_client/server/patron/summary.xul b/Open-ILS/xul/staff_client/server/patron/summary.xul
index ec033192c0..01672702da 100644
--- a/Open-ILS/xul/staff_client/server/patron/summary.xul
+++ b/Open-ILS/xul/staff_client/server/patron/summary.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,61 +20,61 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="patron_summary_win" 
-	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">
+    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">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <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="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		
-		var observer;
-		function myObserver() { this.register(); }
-		myObserver.prototype = {
-			register: function() {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
-				observerService.addObserver(this, "xul-overlay-merged", false);
-			},
-			unregister: function() {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
-				observerService.removeObserver(this, "xul-overlay-merged");
-			},
-			observe: function(subject,topic,data) {
-				dump('observe: <'+subject+','+topic+','+data+'>\n');
-				// setTimeout is needed here for xulrunner 1.8
-				setTimeout( function() { try { post_overlay(); } catch(E) { alert(E); } }, 0 );
-			}
-		}
-				
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for patron_summary.xul');
-				
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
-				
-				var horizontal_interface = String( g.data.hash.aous['ui.circ.patron_summary.horizontal'] ) == 'true';
-				var url = horizontal_interface ? '/xul/server/patron/summary_overlay_horiz.xul' : '/xul/server/patron/summary_overlay.xul';
-				
-				observer = new myObserver();
-				document.loadOverlay(location.protocol + '//' + location.hostname + url,observer)
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/summary.xul:my_init()', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        function $(id) { return document.getElementById(id); }
+        
+        var observer;
+        function myObserver() { this.register(); }
+        myObserver.prototype = {
+            register: function() {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
+                observerService.addObserver(this, "xul-overlay-merged", false);
+            },
+            unregister: function() {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
+                observerService.removeObserver(this, "xul-overlay-merged");
+            },
+            observe: function(subject,topic,data) {
+                dump('observe: <'+subject+','+topic+','+data+'>\n');
+                // setTimeout is needed here for xulrunner 1.8
+                setTimeout( function() { try { post_overlay(); } catch(E) { alert(E); } }, 0 );
+            }
+        }
+                
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for patron_summary.xul');
+                
+                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
+                
+                var horizontal_interface = String( g.data.hash.aous['ui.circ.patron_summary.horizontal'] ) == 'true';
+                var url = horizontal_interface ? '/xul/server/patron/summary_overlay_horiz.xul' : '/xul/server/patron/summary_overlay.xul';
+                
+                observer = new myObserver();
+                document.loadOverlay(location.protocol + '//' + location.hostname + url,observer)
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/summary.xul:my_init()', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
 
         function copy_mailing_address() {
             var a = g.summary.patron.mailing_address();
@@ -101,38 +101,38 @@
                 (a.country() ? a.country() : "")
             );
         }
-	
-		function post_overlay() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    
+        function post_overlay() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-				var patron_id = xul_param('id'); 
-				var patron_bc = xul_param('barcode'); 
+                var patron_id = xul_param('id'); 
+                var patron_bc = xul_param('barcode'); 
 
-				JSAN.use('patron.summary'); g.summary = new patron.summary();
-				g.summary.init( { 
-					'barcode' : patron_bc,
-					'id' : patron_id,
-					'show_name' : xul_param('show_name'),
-				} );
+                JSAN.use('patron.summary'); g.summary = new patron.summary();
+                g.summary.init( { 
+                    'barcode' : patron_bc,
+                    'id' : patron_id,
+                    'show_name' : xul_param('show_name'),
+                } );
 
-				window.refresh = function () { g.summary.retrieve(); }
-				font_helper();
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/summary.xul:post_overlay()', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-	]]>
-	</script>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+                window.refresh = function () { g.summary.retrieve(); }
+                font_helper();
+            } catch(E) {
+                var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/summary.xul:post_overlay()', E]);
+                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+                alert(err_msg);
+            }
+        }
+    ]]>
+    </script>
+    
+    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
-	<commandset id="patron_summary_cmds">
-	</commandset>
+    <commandset id="patron_summary_cmds">
+    </commandset>
 
-	<box id="patron_summary_main" />
+    <box id="patron_summary_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul b/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
index 2dead6573a..2371a8cd91 100644
--- a/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
@@ -1,212 +1,212 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="patron_summary_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading patron/summary_overlay.xul\n');</script>
 
 <commandset id="patron_summary_cmds" />
 
 <box id="patron_summary_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="patron_info_sidebar" />
+    <vbox id="patron_info_sidebar" />
 </box>
 
 <vbox id="patron_info_sidebar" flex="1">
-	<description id="patron_name" hidden="true" class="copyable patronNameLarge"/>
-	<groupbox id="PatronSummaryAlert_groupbox" flex="0" hidden="true" class="alert">
-		<caption id="psagbc" label="&staff.patron.summary_overlay.psagbc.alert.label;" class="shrinkable_groupbox"/>
-		<description id="patron_alert"/>
-	</groupbox>
-	<groupbox id="PatronSummaryStatus_groupbox" flex="0" class="status"/>
-	<!--
-	<groupbox id="PatronSummarySurvey_groupbox" flex="0">
-		<caption id="pdsgbc" label="Surveys" class="shrinkable_groupbox"/>
-		<vbox id="patron_surveys" />
-	</groupbox>
-	-->
-	<groupbox id="PatronSummaryContact_groupbox" flex="0" class="contact"/>
+    <description id="patron_name" hidden="true" class="copyable patronNameLarge"/>
+    <groupbox id="PatronSummaryAlert_groupbox" flex="0" hidden="true" class="alert">
+        <caption id="psagbc" label="&staff.patron.summary_overlay.psagbc.alert.label;" class="shrinkable_groupbox"/>
+        <description id="patron_alert"/>
+    </groupbox>
+    <groupbox id="PatronSummaryStatus_groupbox" flex="0" class="status"/>
+    <!--
+    <groupbox id="PatronSummarySurvey_groupbox" flex="0">
+        <caption id="pdsgbc" label="Surveys" class="shrinkable_groupbox"/>
+        <vbox id="patron_surveys" />
+    </groupbox>
+    -->
+    <groupbox id="PatronSummaryContact_groupbox" flex="0" class="contact"/>
 </vbox>
 
 <groupbox id="PatronSummaryStatus_groupbox" orient="vertical">
-	<caption label="&staff.patron_display.status.caption;" class="shrinkable_groupbox" />
-	<grid style="border: solid thin"><columns><column/></columns><rows>
-		<row hidden="true">
-			<description id="patron_standing" />
-		</row>
-		<row id="pdsgr1">
-			<description id="patron_profile" class="copyable profile value"/>
-		</row>
-		<row id="pdsgr5">
-			<description id="patron_library" class="copyable homelib value"/>
-		</row>
-		<row id="pdsgr5a">
-			<description id="patron_net_access" class="copyable net_access value"/>
-		</row>
-		<row id="pdsgr5aa">
-			<description id="patron_date_of_exp" class="copyable expire_date value"/>
-		</row>
-	</rows></grid>
-	<grid id="PatronSummaryStatus_grid" flex="1"/>
+    <caption label="&staff.patron_display.status.caption;" class="shrinkable_groupbox" />
+    <grid style="border: solid thin"><columns><column/></columns><rows>
+        <row hidden="true">
+            <description id="patron_standing" />
+        </row>
+        <row id="pdsgr1">
+            <description id="patron_profile" class="copyable profile value"/>
+        </row>
+        <row id="pdsgr5">
+            <description id="patron_library" class="copyable homelib value"/>
+        </row>
+        <row id="pdsgr5a">
+            <description id="patron_net_access" class="copyable net_access value"/>
+        </row>
+        <row id="pdsgr5aa">
+            <description id="patron_date_of_exp" class="copyable expire_date value"/>
+        </row>
+    </rows></grid>
+    <grid id="PatronSummaryStatus_grid" flex="1"/>
 
 </groupbox>
 
 <grid id="PatronSummaryStatus_grid">
-	<columns id="pdsgc">
-		<column id="pdsgc1" />
-		<column id="pdsgc2" />
-		<column id="pdsgc3" />
-		<column id="pdsgc4" />
-	</columns>
-	<rows id="pdsgr" flex="1">
-		<row id="pdsgr4">
-			<label id="PatronSummaryStatus_holds_label" class="copyable text_left holds label"
-				value="&staff.patron_display.holds.label;" />
-			<description id="patron_holds" class="copyable holds value"/>
-		</row><row>
-			<label id="PatronSummaryStatus_holds_available_label" class="copyable text_right holds_ready label subgroup"
-				value="&staff.patron_display.holds_available.label;"  />
-			<description id="patron_holds_available" class="copyable holds_ready value subgroup" />
-		</row>
-		<row id="pdsgr2" class="hide_patron_credit" hidden="true">
-			<label id="PatronSummaryStatus_credit_label" class="copyable text_left credit label"
-				value="&staff.patron_display.credit.label;" />
-			<description id="patron_credit" class="copyable credit value"/>
-		</row><row>
-			<label id="PatronSummaryStatus_bills_label" class="copyable text_left bill label"
-				value="&staff.patron_display.bills.label;" />
-			<description id="patron_bill" class="copyable bill value"/>
-		</row>
-		<row id="pdsgr3">
-			<label id="PatronSummaryStatus_checkouts_label" class="copyable text_left items_out label"
-				value="&staff.patron_display.checkouts.label;" />
-			<description id="patron_checkouts" class="copyable items_out value"/>
-		</row>
-		<row>
-			<label id="PatronSummaryStatus_checkouts_overdue_label" class="copyable text_right items_overdue label subgroup"
-				value="&staff.patron_display.checkouts_overdue.label;" />
-			<description id="patron_overdue" class="copyable items_overdue value subgroup" />
-		</row>
-		<row id="pdsgr5">
-			<label id="PatronSummaryStatus_long_overdue_label" value="&staff.patron.summary_overlay.overdue.value;" class="copyable text_right items_long_overdue label subgroup" />
-			<description id="patron_long_overdue" class="copyable items_long_overdue value subgroup" />
-		</row>
-		<row id="pdsgr7">
-			<label id="PatronSummaryStatus_claimed_returned_label" value="&staff.patron.summary_overlay.claimed_returned.value;" class="copyable text_right items_long_overdue label subgroup" />
-			<description id="patron_claimed_returned" class="copyable items_claimed_returned value subgroup" />
-		</row>
-		<row id="pdsgr6">
-			<label id="PatronSummaryStatus_lost_label" value="&staff.patron.summary_overlay.lost_label.value;" class="copyable text_left items_lost label"/>
-			<description id="patron_lost" class="copyable items_lost value"/>
-		</row>
-		<row id="pdsgr6a">
-			<label id="PatronSummaryStatus_noncat_label" value="&staff.patron.summary_overlay.noncat_label.value;" class="copyable text_left items_noncat label"/>
-			<description id="patron_noncat" class="copyable items_noncat value"/>
-		</row>
-	</rows>
+    <columns id="pdsgc">
+        <column id="pdsgc1" />
+        <column id="pdsgc2" />
+        <column id="pdsgc3" />
+        <column id="pdsgc4" />
+    </columns>
+    <rows id="pdsgr" flex="1">
+        <row id="pdsgr4">
+            <label id="PatronSummaryStatus_holds_label" class="copyable text_left holds label"
+                value="&staff.patron_display.holds.label;" />
+            <description id="patron_holds" class="copyable holds value"/>
+        </row><row>
+            <label id="PatronSummaryStatus_holds_available_label" class="copyable text_right holds_ready label subgroup"
+                value="&staff.patron_display.holds_available.label;"  />
+            <description id="patron_holds_available" class="copyable holds_ready value subgroup" />
+        </row>
+        <row id="pdsgr2" class="hide_patron_credit" hidden="true">
+            <label id="PatronSummaryStatus_credit_label" class="copyable text_left credit label"
+                value="&staff.patron_display.credit.label;" />
+            <description id="patron_credit" class="copyable credit value"/>
+        </row><row>
+            <label id="PatronSummaryStatus_bills_label" class="copyable text_left bill label"
+                value="&staff.patron_display.bills.label;" />
+            <description id="patron_bill" class="copyable bill value"/>
+        </row>
+        <row id="pdsgr3">
+            <label id="PatronSummaryStatus_checkouts_label" class="copyable text_left items_out label"
+                value="&staff.patron_display.checkouts.label;" />
+            <description id="patron_checkouts" class="copyable items_out value"/>
+        </row>
+        <row>
+            <label id="PatronSummaryStatus_checkouts_overdue_label" class="copyable text_right items_overdue label subgroup"
+                value="&staff.patron_display.checkouts_overdue.label;" />
+            <description id="patron_overdue" class="copyable items_overdue value subgroup" />
+        </row>
+        <row id="pdsgr5">
+            <label id="PatronSummaryStatus_long_overdue_label" value="&staff.patron.summary_overlay.overdue.value;" class="copyable text_right items_long_overdue label subgroup" />
+            <description id="patron_long_overdue" class="copyable items_long_overdue value subgroup" />
+        </row>
+        <row id="pdsgr7">
+            <label id="PatronSummaryStatus_claimed_returned_label" value="&staff.patron.summary_overlay.claimed_returned.value;" class="copyable text_right items_long_overdue label subgroup" />
+            <description id="patron_claimed_returned" class="copyable items_claimed_returned value subgroup" />
+        </row>
+        <row id="pdsgr6">
+            <label id="PatronSummaryStatus_lost_label" value="&staff.patron.summary_overlay.lost_label.value;" class="copyable text_left items_lost label"/>
+            <description id="patron_lost" class="copyable items_lost value"/>
+        </row>
+        <row id="pdsgr6a">
+            <label id="PatronSummaryStatus_noncat_label" value="&staff.patron.summary_overlay.noncat_label.value;" class="copyable text_left items_noncat label"/>
+            <description id="patron_noncat" class="copyable items_noncat value"/>
+        </row>
+    </rows>
 </grid>
 
 <groupbox id="PatronSummaryContact_groupbox" orient="vertical">
-	<!--
-	<caption label="&staff.patron_display.contact.caption;"/>
-	-->
-	<caption id="PatronSummaryContact_caption" label="&staff.patron.summary_overlay.summary_contact.label;" class="shrinkable_groupbox" />
-	<hbox id="pdcgbhb1">
-		<grid id="PatronSummaryContact_grid" />
-		<spacer id="pdcgbhbs1" flex="1"/>
-		<image id="patron_photo_url" />
-	</hbox>
-	<grid id="PatronSummaryContact_grid_phone" />
-	<groupbox id="PatronSummaryContact_mailing_address" class="mailing_address"/>
-	<groupbox id="PatronSummaryContact_physical_address" class="physical_address"/>
+    <!--
+    <caption label="&staff.patron_display.contact.caption;"/>
+    -->
+    <caption id="PatronSummaryContact_caption" label="&staff.patron.summary_overlay.summary_contact.label;" class="shrinkable_groupbox" />
+    <hbox id="pdcgbhb1">
+        <grid id="PatronSummaryContact_grid" />
+        <spacer id="pdcgbhbs1" flex="1"/>
+        <image id="patron_photo_url" />
+    </hbox>
+    <grid id="PatronSummaryContact_grid_phone" />
+    <groupbox id="PatronSummaryContact_mailing_address" class="mailing_address"/>
+    <groupbox id="PatronSummaryContact_physical_address" class="physical_address"/>
 </groupbox>
 
 <grid id="PatronSummaryContact_grid">
-	<columns id="pdsgc">
-		<column id="pdsgc1" />
-		<column id="pdsgc2" />
-	</columns>
-	<rows id="pdsgr" flex="1">
-		<row id="pdsgr0">
-			<label id="PatronSummaryContact_library_card_label" class="copyable text_left card label"
-				value="&staff.patron_display.library_card.label;"/>
-			<description id="patron_card" class="copyable card value click_link" onclick="try { copy_to_clipboard(event); } catch(E) { alert(E); }"/>
-		</row>
-		<row id="pdsgr1">
-			<label id="PatronSummaryContact_ident_label" class="copyable text_left"
-				value="&staff.patron_display.ident1.label;"/>
-			<vbox id="pdsgr0h">
-				<description id="patron_ident_type_1" class="copyable ident ident_type ident1 value"/>
-				<description id="patron_ident_value_1" class="copyable ident ident_value ident1 value"/>
-			</vbox>
-		</row>
-		<row id="pdsgr2">
-			<label id="PatronSummaryContact_ident_label2" class="copyable text_left"
-				value="&staff.patron_display.ident2.label;"/>
-			<vbox id="pdsgr0ah">
-				<description id="patron_ident_type_2" class="copyable ident ident_type ident2 value"/>
-				<description id="patron_ident_value_2" class="copyable ident ident_value ident2 value"/>
-			</vbox>
-		</row>
+    <columns id="pdsgc">
+        <column id="pdsgc1" />
+        <column id="pdsgc2" />
+    </columns>
+    <rows id="pdsgr" flex="1">
+        <row id="pdsgr0">
+            <label id="PatronSummaryContact_library_card_label" class="copyable text_left card label"
+                value="&staff.patron_display.library_card.label;"/>
+            <description id="patron_card" class="copyable card value click_link" onclick="try { copy_to_clipboard(event); } catch(E) { alert(E); }"/>
+        </row>
+        <row id="pdsgr1">
+            <label id="PatronSummaryContact_ident_label" class="copyable text_left"
+                value="&staff.patron_display.ident1.label;"/>
+            <vbox id="pdsgr0h">
+                <description id="patron_ident_type_1" class="copyable ident ident_type ident1 value"/>
+                <description id="patron_ident_value_1" class="copyable ident ident_value ident1 value"/>
+            </vbox>
+        </row>
+        <row id="pdsgr2">
+            <label id="PatronSummaryContact_ident_label2" class="copyable text_left"
+                value="&staff.patron_display.ident2.label;"/>
+            <vbox id="pdsgr0ah">
+                <description id="patron_ident_type_2" class="copyable ident ident_type ident2 value"/>
+                <description id="patron_ident_value_2" class="copyable ident ident_value ident2 value"/>
+            </vbox>
+        </row>
         <row>
             <label id="PatronSummaryContact_hold_alias_label" class="copyable text_left" value="&staff.patron_display.hold_alias.label;"/>
             <description id="patron_hold_alias" class="copyable hold_alias value" />
         </row>
-		<row id="pdsgr3">
+        <row id="pdsgr3">
             <label id="PatronSummaryContact_date_of_birth_label" click_to_hide_dob="true" class="copyable text_left dob label click_link" value="&staff.patron_display.date_of_birth.label;"/>
             <description id="patron_date_of_birth" class="copyable dob value" hide_value="true" oils_persist="hide_value"/>
-		</row>
-		<row id="pdsgr4"><label id="pdsgr4l" value=" "/></row>
-	</rows>
+        </row>
+        <row id="pdsgr4"><label id="pdsgr4l" value=" "/></row>
+    </rows>
 </grid>
 
 <grid id="PatronSummaryContact_grid_phone">
-	<columns id="pdcgpc">
-		<column id="pdcgpc1" />
-		<column id="pdcgpc2" />
-	</columns>
-	<rows id="pdcgpr" flex="1">
-		<row id="pdcgpr1">
-			<label id="PatronSummaryContact_day_phone_label" class="copyable text_left phone label day_phone"
-				value="&staff.patron_display.day_phone.label;" />
-			<description id="patron_day_phone" class="copyable phone value day_phone"/> 
-		</row>
-		<row id="pdcgpr2">
-			<label id="PatronSummaryContact_evening_phone_label" class="copyable text_left phone label evening_phone"
-				value="&staff.patron_display.evening_phone.label;" />
-			<description id="patron_evening_phone" class="copyable phone value evening_phone"/>
-		</row>
-		<row id="pdcgpr3">
-			<label id="PatronSummaryContact_other_phone_label" class="copyable text_left phone label other_phone"
-				value="&staff.patron_display.other_phone.label;" />
-			<description id="patron_other_phone" class="copyable phone value other_phone"/> 
-		</row>
-		<row id="pdsgpr4"><label id="pdsgpr4l" value=" "/></row>
-		<row id="pdsgpr4a">
-			<label id="PatronSummaryContact_usrname_label" class="copyable text_left usrname label"
-				value="&staff.patron.summary_overlay.opac_login.value;" />
-			<description id="patron_usrname" class="copyable usrname value"/>
-		</row>
-		<row id="pdcgpr5">
-			<label id="PatronSummaryContact_email_label" class="copyable text_left email label"
-				value="&staff.patron_display.email.label;" />
-			<description id="patron_email" class="copyable email value" style="text-decoration: underline; color: blue; -moz-user-focus: normal;" onclick="copy_to_clipboard(event)"/>
-		</row>
-		<row id="pdsgpr6"><label id="pdsgpr6l" value=" "/></row>
+    <columns id="pdcgpc">
+        <column id="pdcgpc1" />
+        <column id="pdcgpc2" />
+    </columns>
+    <rows id="pdcgpr" flex="1">
+        <row id="pdcgpr1">
+            <label id="PatronSummaryContact_day_phone_label" class="copyable text_left phone label day_phone"
+                value="&staff.patron_display.day_phone.label;" />
+            <description id="patron_day_phone" class="copyable phone value day_phone"/> 
+        </row>
+        <row id="pdcgpr2">
+            <label id="PatronSummaryContact_evening_phone_label" class="copyable text_left phone label evening_phone"
+                value="&staff.patron_display.evening_phone.label;" />
+            <description id="patron_evening_phone" class="copyable phone value evening_phone"/>
+        </row>
+        <row id="pdcgpr3">
+            <label id="PatronSummaryContact_other_phone_label" class="copyable text_left phone label other_phone"
+                value="&staff.patron_display.other_phone.label;" />
+            <description id="patron_other_phone" class="copyable phone value other_phone"/> 
+        </row>
+        <row id="pdsgpr4"><label id="pdsgpr4l" value=" "/></row>
+        <row id="pdsgpr4a">
+            <label id="PatronSummaryContact_usrname_label" class="copyable text_left usrname label"
+                value="&staff.patron.summary_overlay.opac_login.value;" />
+            <description id="patron_usrname" class="copyable usrname value"/>
+        </row>
+        <row id="pdcgpr5">
+            <label id="PatronSummaryContact_email_label" class="copyable text_left email label"
+                value="&staff.patron_display.email.label;" />
+            <description id="patron_email" class="copyable email value" style="text-decoration: underline; color: blue; -moz-user-focus: normal;" onclick="copy_to_clipboard(event)"/>
+        </row>
+        <row id="pdsgpr6"><label id="pdsgpr6l" value=" "/></row>
 
-	</rows>
+    </rows>
 </grid>
 
 <groupbox id="PatronSummaryContact_mailing_address" orient="vertical">
-	<caption id="pdcmac" label="&staff.patron_display.mailing_address;" class="shrinkable_groupbox"/>
-	<description id="patron_mailing_address_street1" tooltiptext="&staff.patron_display.mailing.street1.label;" class="copyable address street street1 mailing value"/>
-	<description id="patron_mailing_address_street2" tooltiptext="&staff.patron_display.mailing.street2.label;" class="copyable address street street2 mailing value"/>
-	<hbox id="pdcmah">
-		<description id="patron_mailing_address_city" tooltiptext="&staff.patron_display.mailing.city.label;" class="copyable address city mailing value"/>
-		<description id="patron_mailing_address_state" tooltiptext="&staff.patron_display.mailing.state.label;" class="copyable address state mailing value"/>
-		<description id="patron_mailing_address_post_code" tooltiptext="&staff.patron_display.mailing.post_code.label;" class="copyable address post_code mailing value"/>
-	</hbox>
+    <caption id="pdcmac" label="&staff.patron_display.mailing_address;" class="shrinkable_groupbox"/>
+    <description id="patron_mailing_address_street1" tooltiptext="&staff.patron_display.mailing.street1.label;" class="copyable address street street1 mailing value"/>
+    <description id="patron_mailing_address_street2" tooltiptext="&staff.patron_display.mailing.street2.label;" class="copyable address street street2 mailing value"/>
+    <hbox id="pdcmah">
+        <description id="patron_mailing_address_city" tooltiptext="&staff.patron_display.mailing.city.label;" class="copyable address city mailing value"/>
+        <description id="patron_mailing_address_state" tooltiptext="&staff.patron_display.mailing.state.label;" class="copyable address state mailing value"/>
+        <description id="patron_mailing_address_post_code" tooltiptext="&staff.patron_display.mailing.post_code.label;" class="copyable address post_code mailing value"/>
+    </hbox>
     <hbox>
         <spacer flex="1" />
         <label value="&staff.patron_display.mailing.copy;" onclick="copy_mailing_address();" class="copyable click_link"/>
@@ -214,14 +214,14 @@
 </groupbox>
 
 <groupbox id="PatronSummaryContact_physical_address" orient="vertical">
-	<caption id="pdcpac" label="&staff.patron_display.physical_address;" class="shrinkable_groupbox"/>
-	<description id="patron_physical_address_street1" tooltiptext="&staff.patron_display.physical.street1.label;" class="copyable address street street1 physical value" />
-	<description id="patron_physical_address_street2" tooltiptext="&staff.patron_display.physical.street2.label;"  class="copyable address street street2 physical value"/>
-	<hbox id="pdcpah">
-		<description id="patron_physical_address_city" tooltiptext="&staff.patron_display.physical.city.label;" class="copyable address city physical value"/>
-		<description id="patron_physical_address_state" tooltiptext="&staff.patron_display.physical.state.label;" class="copyable address state physical value"/>
-		<description id="patron_physical_address_post_code" tooltiptext="&staff.patron_display.physical.post_code.label;" class="copyable address post_code physical value"/>
-	</hbox>
+    <caption id="pdcpac" label="&staff.patron_display.physical_address;" class="shrinkable_groupbox"/>
+    <description id="patron_physical_address_street1" tooltiptext="&staff.patron_display.physical.street1.label;" class="copyable address street street1 physical value" />
+    <description id="patron_physical_address_street2" tooltiptext="&staff.patron_display.physical.street2.label;"  class="copyable address street street2 physical value"/>
+    <hbox id="pdcpah">
+        <description id="patron_physical_address_city" tooltiptext="&staff.patron_display.physical.city.label;" class="copyable address city physical value"/>
+        <description id="patron_physical_address_state" tooltiptext="&staff.patron_display.physical.state.label;" class="copyable address state physical value"/>
+        <description id="patron_physical_address_post_code" tooltiptext="&staff.patron_display.physical.post_code.label;" class="copyable address post_code physical value"/>
+    </hbox>
     <hbox>
         <spacer flex="1" />
         <label value="&staff.patron_display.physical.copy;" onclick="copy_billing_address();" class="copyable click_link"/>
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 ab59f8bd64..260ccaceb6 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
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="patron_summary_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading patron/summary_overlay.xul\n');</script>
 
 <commandset id="patron_summary_cmds" />
 
 <box id="patron_summary_main" flex="1" orient="vertical" class="my_overflow">
-	<hbox id="patron_info_sidebar" flex="1"/>
+    <hbox id="patron_info_sidebar" flex="1"/>
 </box>
 
 <hbox id="patron_info_sidebar">
-	<image id="patron_photo_url" />
-	<vbox id="patron_info" flex="1">
+    <image id="patron_photo_url" />
+    <vbox id="patron_info" flex="1">
         <groupbox flex="1">
             <caption label="Patron Info"/>
             <description id="patron_name" />
@@ -53,7 +53,7 @@
             <spacer/><!-- bug workaround.. for some reason.. maybe timing with the overlay inserting children.. the patron_name label shows up beneath the grid when rendered -->
         </groupbox>
     </vbox>
-	<vbox id="contact_info" flex="1">
+    <vbox id="contact_info" flex="1">
         <groupbox flex="1">
             <caption>
                 <button id="contact_info_btn" label="Mailing Address" type="menu">
@@ -66,19 +66,19 @@
                 </button>
             </caption>
             <deck id="contact_info_deck">
-    		    <vbox id="PatronSummaryContact_mailing_address" orient="vertical"/>
+                <vbox id="PatronSummaryContact_mailing_address" orient="vertical"/>
                 <vbox id="PatronSummaryContact_physical_address" orient="vertical"/>
                 <grid id="PatronSummaryContact_grid_phone" />
-		        <grid id="PatronSummaryContact_grid" flex="1"/>
+                <grid id="PatronSummaryContact_grid" flex="1"/>
             </deck>
         </groupbox>
-	</vbox>
+    </vbox>
     <vbox>
         <groupbox flex="1">
             <caption label="Circ Info"/>
-        	<grid id="PatronSummaryStatus_grid" flex="1"/>
+            <grid id="PatronSummaryStatus_grid" flex="1"/>
         </groupbox>
-	</vbox>
+    </vbox>
     <vbox>
         <groupbox flex="1">
             <caption label="Account Info"/>
@@ -102,132 +102,132 @@
                 </rows>
             </grid>
         </groupbox>
-	</vbox>
+    </vbox>
 </hbox>
 
 <grid id="PatronSummaryStatus_grid">
-	<columns id="pdsgc">
-		<column id="pdsgc1" />
-		<column id="pdsgc2" />
-		<column id="pdsgc3" />
-		<column id="pdsgc4" />
-	</columns>
-	<rows id="pdsgr" flex="1">
-		<row id="pdsgr4">
-			<label id="PatronSummaryStatus_holds_label" class="copyable text_left holds label"
-				value="&staff.patron_display.holds.label;" />
+    <columns id="pdsgc">
+        <column id="pdsgc1" />
+        <column id="pdsgc2" />
+        <column id="pdsgc3" />
+        <column id="pdsgc4" />
+    </columns>
+    <rows id="pdsgr" flex="1">
+        <row id="pdsgr4">
+            <label id="PatronSummaryStatus_holds_label" class="copyable text_left holds label"
+                value="&staff.patron_display.holds.label;" />
             <hbox>
-    			<description id="patron_holds_available" class="copyable holds_ready value" />
+                <description id="patron_holds_available" class="copyable holds_ready value" />
                 <label value="/" class="copyable holds" /> <!-- Would it be better to consolidate this into one label and use .getFormattedString? -->
-    			<description id="patron_holds" class="copyable holds value"/>
+                <description id="patron_holds" class="copyable holds value"/>
             </hbox>
-		</row>
-		<row id="pdsgr2" class="hide_patron_credit" hidden="true">
-			<label id="PatronSummaryStatus_credit_label" class="copyable text_left credit label"
-				value="&staff.patron_display.credit.label;" />
-			<description id="patron_credit" class="copyable credit value"/>
-		</row><row>
-			<label id="PatronSummaryStatus_bills_label" class="copyable text_left bill label"
-				value="&staff.patron_display.bills.label;" />
-			<description id="patron_bill" class="copyable bill value"/>
-		</row>
-		<row id="pdsgr3">
-			<label id="PatronSummaryStatus_checkouts_label" class="copyable text_left items_out label"
-				value="&staff.patron_display.checkouts.label;" />
-			<description id="patron_checkouts" class="copyable items_out value"/>
-		</row>
-		<row>
+        </row>
+        <row id="pdsgr2" class="hide_patron_credit" hidden="true">
+            <label id="PatronSummaryStatus_credit_label" class="copyable text_left credit label"
+                value="&staff.patron_display.credit.label;" />
+            <description id="patron_credit" class="copyable credit value"/>
+        </row><row>
+            <label id="PatronSummaryStatus_bills_label" class="copyable text_left bill label"
+                value="&staff.patron_display.bills.label;" />
+            <description id="patron_bill" class="copyable bill value"/>
+        </row>
+        <row id="pdsgr3">
+            <label id="PatronSummaryStatus_checkouts_label" class="copyable text_left items_out label"
+                value="&staff.patron_display.checkouts.label;" />
+            <description id="patron_checkouts" class="copyable items_out value"/>
+        </row>
+        <row>
             <hbox>
-    			<label id="PatronSummaryStatus_checkouts_overdue_label" class="copyable text_right items_overdue label" value="&staff.patron_display.checkouts_overdue.label;" />
+                <label id="PatronSummaryStatus_checkouts_overdue_label" class="copyable text_right items_overdue label" value="&staff.patron_display.checkouts_overdue.label;" />
                 <label value="/"/>
-			    <label id="PatronSummaryStatus_long_overdue_label" value="&staff.patron.summary_overlay.overdue.value;" class="copyable text_right items_long_overdue label" />
+                <label id="PatronSummaryStatus_long_overdue_label" value="&staff.patron.summary_overlay.overdue.value;" class="copyable text_right items_long_overdue label" />
             </hbox>
             <hbox>
-    			<description id="patron_overdue" class="copyable items_overdue value" />
+                <description id="patron_overdue" class="copyable items_overdue value" />
                 <label value="/"/>
-			    <description id="patron_long_overdue" class="copyable items_long_overdue value" />
+                <description id="patron_long_overdue" class="copyable items_long_overdue value" />
             </hbox>
-		</row>
-		<row id="pdsgr7">
+        </row>
+        <row id="pdsgr7">
             <hbox>
-    			<label id="PatronSummaryStatus_claimed_returned_label" value="&staff.patron.summary_overlay.claimed_returned.value;" class="copyable text_right items_long_overdue label" />
+                <label id="PatronSummaryStatus_claimed_returned_label" value="&staff.patron.summary_overlay.claimed_returned.value;" class="copyable text_right items_long_overdue label" />
                 <label value="/"/>
-    			<label id="PatronSummaryStatus_lost_label" value="&staff.patron.summary_overlay.lost_label.value;" class="copyable text_left items_lost label"/>
+                <label id="PatronSummaryStatus_lost_label" value="&staff.patron.summary_overlay.lost_label.value;" class="copyable text_left items_lost label"/>
             </hbox>
             <hbox>
-    			<description id="patron_claimed_returned" class="copyable items_claimed_returned value" />
+                <description id="patron_claimed_returned" class="copyable items_claimed_returned value" />
                 <label value="/"/>
-    			<description id="patron_lost" class="copyable items_lost value"/>
+                <description id="patron_lost" class="copyable items_lost value"/>
             </hbox>
-		</row>
-		<row id="pdsgr6a">
-			<label id="PatronSummaryStatus_noncat_label" value="&staff.patron.summary_overlay.noncat_label.value;" class="copyable text_left items_noncat label"/>
-			<description id="patron_noncat" class="copyable items_noncat value"/>
-		</row>
-	</rows>
+        </row>
+        <row id="pdsgr6a">
+            <label id="PatronSummaryStatus_noncat_label" value="&staff.patron.summary_overlay.noncat_label.value;" class="copyable text_left items_noncat label"/>
+            <description id="patron_noncat" class="copyable items_noncat value"/>
+        </row>
+    </rows>
 </grid>
 
 <grid id="PatronSummaryContact_grid">
-	<columns id="pdsgc">
-		<column id="pdsgc1" />
-		<column id="pdsgc2" />
-	</columns>
-	<rows id="pdsgr" flex="1">
-		<row id="pdsgr1">
-			<label id="PatronSummaryContact_ident_label" class="copyable text_left"
-				value="&staff.patron_display.ident1.label;"/>
-			<vbox id="pdsgr0h">
-				<description id="patron_ident_type_1" class="copyable ident ident_type ident1 value"/>
-				<description id="patron_ident_value_1" class="copyable ident ident_value ident1 value"/>
-			</vbox>
-		</row>
-		<row id="pdsgr2">
-			<label id="PatronSummaryContact_ident_label2" class="copyable text_left"
-				value="&staff.patron_display.ident2.label;"/>
-			<vbox id="pdsgr0ah">
-				<description id="patron_ident_type_2" class="copyable ident ident_type ident2 value"/>
-				<description id="patron_ident_value_2" class="copyable ident ident_value ident2 value"/>
-			</vbox>
-		</row>
-		<row id="pdsgr4"><label id="pdsgr4l" value=" "/></row>
-	</rows>
+    <columns id="pdsgc">
+        <column id="pdsgc1" />
+        <column id="pdsgc2" />
+    </columns>
+    <rows id="pdsgr" flex="1">
+        <row id="pdsgr1">
+            <label id="PatronSummaryContact_ident_label" class="copyable text_left"
+                value="&staff.patron_display.ident1.label;"/>
+            <vbox id="pdsgr0h">
+                <description id="patron_ident_type_1" class="copyable ident ident_type ident1 value"/>
+                <description id="patron_ident_value_1" class="copyable ident ident_value ident1 value"/>
+            </vbox>
+        </row>
+        <row id="pdsgr2">
+            <label id="PatronSummaryContact_ident_label2" class="copyable text_left"
+                value="&staff.patron_display.ident2.label;"/>
+            <vbox id="pdsgr0ah">
+                <description id="patron_ident_type_2" class="copyable ident ident_type ident2 value"/>
+                <description id="patron_ident_value_2" class="copyable ident ident_value ident2 value"/>
+            </vbox>
+        </row>
+        <row id="pdsgr4"><label id="pdsgr4l" value=" "/></row>
+    </rows>
 </grid>
 
 <grid id="PatronSummaryContact_grid_phone">
-	<columns id="pdcgpc">
-		<column id="pdcgpc1" />
-		<column id="pdcgpc2" />
-	</columns>
-	<rows id="pdcgpr" flex="1">
-		<row id="pdcgpr1">
-			<label id="PatronSummaryContact_day_phone_label" class="copyable text_left phone label day_phone"
-				value="&staff.patron_display.day_phone.label;" />
-			<description id="patron_day_phone" class="copyable phone value day_phone"/> 
-		</row>
-		<row id="pdcgpr2">
-			<label id="PatronSummaryContact_evening_phone_label" class="copyable text_left phone label evening_phone"
-				value="&staff.patron_display.evening_phone.label;" />
-			<description id="patron_evening_phone" class="copyable phone value evening_phone"/>
-		</row>
-		<row id="pdcgpr3">
-			<label id="PatronSummaryContact_other_phone_label" class="copyable text_left phone label other_phone"
-				value="&staff.patron_display.other_phone.label;" />
-			<description id="patron_other_phone" class="copyable phone value other_phone"/> 
-		</row>
-		<row id="pdsgpr4"><label id="pdsgpr4l" value=" "/></row>
-		<row id="pdsgpr6"><label id="pdsgpr6l" value=" "/></row>
+    <columns id="pdcgpc">
+        <column id="pdcgpc1" />
+        <column id="pdcgpc2" />
+    </columns>
+    <rows id="pdcgpr" flex="1">
+        <row id="pdcgpr1">
+            <label id="PatronSummaryContact_day_phone_label" class="copyable text_left phone label day_phone"
+                value="&staff.patron_display.day_phone.label;" />
+            <description id="patron_day_phone" class="copyable phone value day_phone"/> 
+        </row>
+        <row id="pdcgpr2">
+            <label id="PatronSummaryContact_evening_phone_label" class="copyable text_left phone label evening_phone"
+                value="&staff.patron_display.evening_phone.label;" />
+            <description id="patron_evening_phone" class="copyable phone value evening_phone"/>
+        </row>
+        <row id="pdcgpr3">
+            <label id="PatronSummaryContact_other_phone_label" class="copyable text_left phone label other_phone"
+                value="&staff.patron_display.other_phone.label;" />
+            <description id="patron_other_phone" class="copyable phone value other_phone"/> 
+        </row>
+        <row id="pdsgpr4"><label id="pdsgpr4l" value=" "/></row>
+        <row id="pdsgpr6"><label id="pdsgpr6l" value=" "/></row>
 
-	</rows>
+    </rows>
 </grid>
 
 <vbox id="PatronSummaryContact_mailing_address">
-	<description id="patron_mailing_address_street1" tooltiptext="&staff.patron_display.mailing.street1.label;" class="copyable address street street1 mailing value"/>
-	<description id="patron_mailing_address_street2" tooltiptext="&staff.patron_display.mailing.street2.label;" class="copyable address street street2 mailing value"/>
-	<hbox id="pdcmah">
-		<description id="patron_mailing_address_city" tooltiptext="&staff.patron_display.mailing.city.label;" class="copyable address city mailing value"/>
-		<description id="patron_mailing_address_state" tooltiptext="&staff.patron_display.mailing.state.label;" class="copyable address state mailing value"/>
-		<description id="patron_mailing_address_post_code" tooltiptext="&staff.patron_display.mailing.post_code.label;" class="copyable address post_code mailing value"/>
-	</hbox>
+    <description id="patron_mailing_address_street1" tooltiptext="&staff.patron_display.mailing.street1.label;" class="copyable address street street1 mailing value"/>
+    <description id="patron_mailing_address_street2" tooltiptext="&staff.patron_display.mailing.street2.label;" class="copyable address street street2 mailing value"/>
+    <hbox id="pdcmah">
+        <description id="patron_mailing_address_city" tooltiptext="&staff.patron_display.mailing.city.label;" class="copyable address city mailing value"/>
+        <description id="patron_mailing_address_state" tooltiptext="&staff.patron_display.mailing.state.label;" class="copyable address state mailing value"/>
+        <description id="patron_mailing_address_post_code" tooltiptext="&staff.patron_display.mailing.post_code.label;" class="copyable address post_code mailing value"/>
+    </hbox>
     <hbox>
         <spacer flex="1" />
         <label value="&staff.patron_display.mailing.copy;" onclick="copy_mailing_address();" class="copyable click_link"/>
@@ -235,13 +235,13 @@
 </vbox>
 
 <vbox id="PatronSummaryContact_physical_address">
-	<description id="patron_physical_address_street1" tooltiptext="&staff.patron_display.physical.street1.label;" class="copyable address street street1 physical value" />
-	<description id="patron_physical_address_street2" tooltiptext="&staff.patron_display.physical.street2.label;"  class="copyable address street street2 physical value"/>
-	<hbox id="pdcpah">
-		<description id="patron_physical_address_city" tooltiptext="&staff.patron_display.physical.city.label;" class="copyable address city physical value"/>
-		<description id="patron_physical_address_state" tooltiptext="&staff.patron_display.physical.state.label;" class="copyable address state physical value"/>
-		<description id="patron_physical_address_post_code" tooltiptext="&staff.patron_display.physical.post_code.label;" class="copyable address post_code physical value"/>
-	</hbox>
+    <description id="patron_physical_address_street1" tooltiptext="&staff.patron_display.physical.street1.label;" class="copyable address street street1 physical value" />
+    <description id="patron_physical_address_street2" tooltiptext="&staff.patron_display.physical.street2.label;"  class="copyable address street street2 physical value"/>
+    <hbox id="pdcpah">
+        <description id="patron_physical_address_city" tooltiptext="&staff.patron_display.physical.city.label;" class="copyable address city physical value"/>
+        <description id="patron_physical_address_state" tooltiptext="&staff.patron_display.physical.state.label;" class="copyable address state physical value"/>
+        <description id="patron_physical_address_post_code" tooltiptext="&staff.patron_display.physical.post_code.label;" class="copyable address post_code physical value"/>
+    </hbox>
     <hbox>
         <spacer flex="1" />
         <label value="&staff.patron_display.physical.copy;" onclick="copy_billing_address();" class="copyable click_link"/>
diff --git a/Open-ILS/xul/staff_client/server/patron/ue.xhtml b/Open-ILS/xul/staff_client/server/patron/ue.xhtml
index 468423f5f5..96d308de05 100644
--- a/Open-ILS/xul/staff_client/server/patron/ue.xhtml
+++ b/Open-ILS/xul/staff_client/server/patron/ue.xhtml
@@ -1,1009 +1,1009 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
-	<!ENTITY nbsp " "> <!-- calendar needs this entity -->
+    "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!ENTITY nbsp " "> <!-- calendar needs this entity -->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>&ev.staff.patron.ue_xhtml.ev_user_editor.label;</title>
-		<script language='javascript' src='/opac/common/js/utils.js'> </script>
-		<script language='javascript' src='/opac/common/js//config.js'> </script> 
-		<script language='javascript' src='/opac/common/js/CGI.js'> </script>
-	
-		<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmall.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
-		<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
-		<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/init.js'> </script>
-		<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-
-
-
-		<!--
-		<script language='javascript' src='/opac/common/js/date.js'> </script>
-		-->
-		<script language='javascript' src='../admin/adminlib.js'> </script>
-		<script language='javascript' src='ue_config.js'> </script>
-		<script language='javascript' src='ue_ui.js'> </script>
-		<script language='javascript' src='ue.js'> </script>
-		<link type='text/css' rel='stylesheet' href='../admin/admin.css'/>
+    <head>
+        <title>&ev.staff.patron.ue_xhtml.ev_user_editor.label;</title>
+        <script language='javascript' src='/opac/common/js/utils.js'> </script>
+        <script language='javascript' src='/opac/common/js//config.js'> </script> 
+        <script language='javascript' src='/opac/common/js/CGI.js'> </script>
+    
+        <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
+        <script language='javascript' src='/opac/common/js/fmall.js'> </script>
+        <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
+        <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
+        <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
+        <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
+        <script language='javascript' src='/opac/common/js/org_utils.js'> </script>
+        <script language='javascript' src='/opac/common/js/init.js'> </script>
+        <script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
+
+
+
+        <!--
+        <script language='javascript' src='/opac/common/js/date.js'> </script>
+        -->
+        <script language='javascript' src='../admin/adminlib.js'> </script>
+        <script language='javascript' src='ue_config.js'> </script>
+        <script language='javascript' src='ue_ui.js'> </script>
+        <script language='javascript' src='ue.js'> </script>
+        <link type='text/css' rel='stylesheet' href='../admin/admin.css'/>
   
-		<link rel="stylesheet" type="text/css" media="all" 
-			href="/opac/common/js/jscalendar/calendar-brown.css" title="win2k-cold-1" />
-		<script type="text/javascript" src="/opac/common/js/jscalendar/calendar.js"></script>
-		<script type="text/javascript" src="/opac/common/js/jscalendar/lang/calendar-en.js"></script>
-		<script type="text/javascript" src="/opac/common/js/jscalendar/calendar-setup.js"></script>
-
-
-		<style type='text/css'>
-			.messagecatalog { -moz-binding: url( /xul/server/main/bindings.xml#messagecatalog ) }
-			.main_table { width: 98%; border-collapse: collapse;}
-			.main_table td { border: 1px solid #E0F0E0; text-align: center; padding: 4px;}
-			#uedit_nav_bar { border: 2px solid #E0F0E0; padding: 6px;}
-			.nav_link { padding-left: 90px; padding-right: 90px; }
-			.main_nav_link { -moz-border-radius: 7px; height: 13%;}
-			/*
-			.main_div { height: 480px; padding-left: 15px; 
-				text-align: center; vertical-align: middle; overflow: auto;}
-				*/
-
-			.main_div { min-height: 450px; padding-left: 15px; 
-				text-align: center; vertical-align: middle; }
-
-			.nav_link_table { height: 480px;}
-			.label_active { background: #E0F0E0; }
-			.right { text-align: right; padding-right: 3px;}
-			.left { text-align: left; padding-left: 3px;}
-			.wide { width: 98%;}
-			.pad { padding-left: 3px; padding-right: 3px; }
-			.no_border td { border: none; }
-			.uedit_table { width: 80% }
-			.address_table { -moz-border-radius: 4px; border: 4px solid #E0E0F0; padding: 4px; }
-			.shared_address { background : #E0F0F0; }
-			.address_table td { border: none; width: auto; padding: 1px; }
-			.addr_info_checked { -moz-border-radius: 6px; background: #F0E0E0; }
-			.button_row { width: 95%; text-align: center; margin-top: 7px; border: 1px solid #E0E0E0; }
-			/*.required_field { background: #F0E0E0; }*/
-			.invalid_value { background: red; }
-
-			/* all text inputs that don't have the .invalid_value 
-				class applied and are currently focused */
-			input:focus:not(.invalid_value) { background: #E0F0E0; color: darkblue;}
-
-			.deleted { background: #FF6666; }
-
-			.dup_link { padding-left: 5px; color: red; }
-
-
-		</style>
-	</head>
-	
-	<div class="messagecatalog" id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
-
-	<body onload='uEditInit();'>
-
-	<center>
-
-		<h2>&ev.staff.patron.ue_xhtml.ev_user_editor.label;</h2>
-
-		<div style='position:absolute; top: 5px; right: 5px;'>
-			<span>&ev.staff.patron.ue_xhtml.welcome.label;</span><b><span id='uedit_user'/></b>
-		</div>
-
-		<hr/><br/>
-
-		<div id='main_div_container'>
-
-		<table style='margin-bottom: 5px; width:100%;'>
-			<tbody>
-				<tr>
-					<td align='left' width='80%'>
-						<b>
-							<span>&staff.patron.ue.interface_note.label;</span>
-						</b>
-					</td>
-					<td align='right' width='20%'>
-						<a class='hide_me' id='ue_errors' href='javascript:void(0);' 
-							style='color: red; font-size: 12pt; font-weight: bold' onclick='uEditAlertErrors();'>
-							&ev.staff.patron.ue_xhtml.view_errors.label;
-						</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-
-		<table class='main_table'>
-			<tbody>
-				<tr>
-					<td width='15%' valign='top'>
-						<!-- ************************************************************** -->
-						<!--  Top Navigation Links -->
-						<!-- ************************************************************** -->
-						<table height='100%' class='nav_link_table'>
-							<tbody>
-								<tr>
-									<td id='uedit_userid_label' class='main_nav_link'>
-										<a href='javascript:uEditShowPage("uedit_userid");'>&ev.staff.patron.ue_xhtml.user_id.label;</a>
-									</td>
-								</tr>
-								<tr>
-									<td id='uedit_contact_info_label' class='main_nav_link'>	
-										<a href='javascript:uEditShowPage("uedit_contact_info");'>&ev.staff.patron.ue_xhtml.contact_info.label;</a>
-									</td>
-								</tr>
-								<tr>
-									<td id='uedit_addresses_label' class='main_nav_link'>		
-										<a href='javascript:uEditShowPage("uedit_addresses");'>&ev.staff.patron.ue_xhtml.addresses.label;</a>
-									</td>
-								</tr>
-								<tr>
-									<td id='uedit_groups_label' class='main_nav_link'>			
-										<a href='javascript:uEditShowPage("uedit_groups");'>&ev.staff.patron.ue_xhtml.groups_permissions.label;</a>
-									</td>
-								</tr>
-								<tr>
-									<td id='uedit_stat_cats_label' class='main_nav_link'>		
-										<a href='javascript:uEditShowPage("uedit_stat_cats");'>&ev.staff.patron.ue_xhtml.statistical_categories.label;</a>
-									</td>
-								</tr>
-								<tr>
-									<td id='uedit_surveys_label' class='main_nav_link'>			
-										<a href='javascript:uEditShowPage("uedit_surveys");'>&ev.staff.patron.ue_xhtml.surveys.label;</a>
-									</td>
-								</tr>
-								<tr>
-									<td id='uedit_finalize_label' class='main_nav_link'>			
-										<a href='javascript:uEditShowPage("uedit_finalize");'>&ev.staff.patron.ue_xhtml.finish.label;</a>
-									</td>
-								</tr>
-							</tbody>
-						</table>
-					</td>
-
-					<td width='85%' id='uedit_loading'>
-						<div class='main_div has_color' 
-							style='padding: 50px; vertical-align: middle;'>
-							<b>&ev.staff.patron.ue_xhtml.loading_data.label;</b>
-						</div>
-					</td>
-
-
-					<td width='85%' id='ue_maintd' class='hide_me'>
-
-						<div id='dup_div_container'>
-							<div id='dup_div' name='dup_div'>
-								<a name='link' class='dup_link hide_me'
-									href='javascript:void(0);' onclick='uEditShowSearch(this);'>
-									&ev.staff.patron.ue_xhtml.found_duplicate_patron.label; <b name='count'/>
-									<b name='data'/>
-								</a>
-							</div>
-						</div>
-
-
-						<!-- ************************************************************** -->
-						<!--  Identification Pane -->
-						<!-- ************************************************************** -->
-						<div id='uedit_userid' class='main_div'>
-							<table class='uedit_table'>
-								<tbody>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.barcode.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input type='text' id='ue_barcode' />
-													<!--
-													onblur=' 
-														var node = uEditFindFieldByWId("ue_username");
-														if(!node.widget.node.value) {
-															node.widget.node.value = this.value;
-															node.widget.node.onchange();
-														}'
-														/> -->
-														<button style='padding-left: 5px;' class='hide_me' id='ue_mark_card_lost'
-													onclick='uEditMarkCardLost();'>&ev.staff.patron.ue_xhtml.mark_lost.label;</button>
-											</div>
-										</td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.username.label;</div></td>
-										<td><div class='wide left'><input type='text' id='ue_username'/></div></td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.password.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input type='password' id='ue_password1'/>
-												<button class='hide_me' onclick='uEditResetPw();' id='ue_reset_pw'>&ev.staff.patron.ue_xhtml.reset.label;</button>
-												<span style='padding-left: 10px;' class='hide_me' id='ue_password_gen'>
-													&ev.staff.patron.ue_xhtml.re_password.label;
-													<span style='text-decoration:underline;' id='ue_password_plain'/>
-												</span>
-											</div>
-										</td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.verify_password.label;</div></td>
-										<td><div class='wide left'><input type='password' id='ue_password2'/></div></td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.first_name.label;</div></td>
-										<td><div class='wide left'><input type='text' id='ue_firstname'/></div></td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.middle_name.label;</div></td>
-										<td><div class='wide left'><input type='text' id='ue_middlename'/></div></td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.last_name.label;</div></td>
-										<td><div class='wide left'><input type='text' id='ue_lastname'/></div></td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.suffix.label;</div></td>
-										<td><div class='wide left'>
-											<input type='text' id='ue_suffix'/>
-											<select id='ue_suffix_selector' style='width: 6em;'
-												onclick='$("ue_suffix").value = this.options[this.selectedIndex].value;$("ue_suffix").onchange();'
-												onchange='$("ue_suffix").value = this.options[this.selectedIndex].value;$("ue_suffix").onchange();'>
-												<option value=''>&ev.staff.patron.ue_xhtml.pick_suffix.label;</option>
-												<option value='Jr'>Jr</option>
-												<option value='Sr'>Sr</option>
-												<option value='II'>II</option>
-												<option value='III'>III</option>
-												<option value='AA'>AA</option>
-												<option value='AS'>AS</option>
-												<option value='AAS'>AAS</option>
-												<option value='BA'>BA</option>
-												<option value='BS'>BS</option>
-												<option value='CFPIM'>CFPIM</option>
-												<option value='CPA'>CPA</option>
-												<option value='CPIM'>CPIM</option>
-												<option value='CPM'>CPM</option>
-												<option value='CXE'>CXE</option>
-												<option value='DC'>DC</option>
-												<option value='DDS'>DDS</option>
-												<option value='DO '>DO</option>
-												<option value='DPM'>DPM</option>
-												<option value='DVM'>DVM</option>
-												<option value='Esq'>Esq</option>
-												<option value='FACAAI'>FACAAI</option>
-												<option value='FACP'>FACP</option>
-												<option value='FACS'>FACS</option>
-												<option value='FACEP'>FACEP</option>
-												<option value='FCP'>FCP</option>
-												<option value='FICS'>FICS</option>
-												<option value='GYN'>GYN</option>
-												<option value='JD'>JD</option>
-												<option value='LPN'>LPN</option>
-												<option value='MA'>MA</option>
-												<option value='MCSE'>MCSE</option>
-												<option value='MD'>MD</option>
-												<option value='MS'>MS</option>
-												<option value='NMD'>NMD</option>
-												<option value='OB'>OB</option>
-												<option value='PhD'>PhD</option>
-												<option value='RN'>RN</option>
-											</select>
-										</div></td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.alias.label;</div></td>
-										<td><div class='wide left'><input type='text' id='ue_alias'/></div></td>
-									</tr>
-
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.dob.label;</div></td>
-										<td>
-											<div class='wide left'>
-	
-												<input type='text' id='ue_dob' size='10' maxlength='10' 
-													onfocus='/*$("ue_dob_trigger").onclick(event);*/'>1980-01-01</input>
-	
-												<button style='padding: 0px;' id='ue_dob_trigger'>
-													<img src="/opac/common/js/jscalendar/img.gif" 
-														style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
-														title="Date selector"
-														onmouseover="this.style.background='red';" 
-														onmouseout="this.style.background=''" />
-												</button>
-
-												<span class='pad' style='font-size: 8pt;'>(YYYY-MM-DD)</span>
-	
-												<script type="text/javascript">
-													Calendar.setup({
-														inputField	: "ue_dob",				// id of the input field
-														ifFormat		: "%Y-%m-%d",			// format of the input field
-														button		: "ue_dob_trigger",  // trigger for the calendar (button ID)
-														align			: "Tl",					// alignment (defaults to "Bl")
-														singleClick	: true
-													});
-												</script>
-	
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.juvenile.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input id='ue_juvenile' type='checkbox'/>
-											</div>
-										</td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.primary_id_type.label;</div></td>
-										<td><div class='wide left'>
-												<select id='ue_primary_ident_type'>
-													<option value=''>&ev.staff.patron.ue_xhtml.required.label;</option>
-												</select>
-											</div>
-										</td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.primary_id.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input type='text' id='ue_primary_ident'/>
-												<span id='primary_ident_ssn_help' 
-													style='padding-left: 2px; font-size: 8pt;' class='hide_me'>
-													&ev.staff.patron.ue_xhtml.primary_ident_ssn_help.label;
-												</span>
-												<span id='primary_ident_dl_help' 
-													style='padding-left: 2px; font-size: 8pt;' class='hide_me'>
-													&ev.staff.patron.ue_xhtml.primary_ident_dl_help.label;	
-												</span>
-											</div>
-										</td>
-									</tr>
-									<!--
-									<tr>
-										<td><div class='wide right'>Secondary Identification Type</div></td>
-										<td><div class='wide left'>
-												<select id='ue_secondary_ident_type'>
-													<option value=''>  None Selected  </option>
-												</select>
-											</div>
-										</td>
-									</tr>
-									-->
-									<tr class='hide_me'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.parent_guardian.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input type='text' id='ue_secondary_ident'/>
-											</div>
-										</td>
-									</tr>
-									<!--
-									<tr class='hide_me' id='ue_guardian_row'>
-										<td><div class='wide right'><b>Parent / Guardian</b></div></td>
-										<td>
-											<div class='wide left'>
-												<span id='ue_guardian_field'/>
-											</div>
-										</td>
-									</tr>
-									-->
-								</tbody>
-							</table>
-						</div>
-
-						<!-- ************************************************************** -->
-						<!-- Contact Info Pane -->
-						<!-- ************************************************************** -->
-						<div id='uedit_contact_info' class='main_div hide_me'>
-
-							<table class='uedit_table'>
-								<tbody>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.email_address.label;</div></td>
-										<td><div class='wide left'><input type='text' id='ue_email' size='32'/></div></td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.daytime_phone.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input class='pad' type='text' id='ue_day_phone' size='18'/>
-												<span style='font-size: 9pt;'>&ev.staff.patron.ue_xhtml.phone_example;</span>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.evening_phone.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input class='pad' type='text' id='ue_night_phone' size='18'/>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.other_phone.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input class='pad' type='text' id='ue_other_phone' size='18'/>
-											</div>
-										</td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.home_library.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<select style='width: 20em;' id='ue_org_selector'/>
-											</div>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-						</div>
-	
-						<!-- ************************************************************** -->
-						<!-- Addresses Pane -->
-						<!-- ************************************************************** -->
-						<div id='uedit_addresses' class='main_div hide_me' >
-							<table class='uedit_table' style='width: 98%; padding: 1px;'>
-								<thead>
-									<tr>
-										<td>&ev.staff.patron.ue_xhtml.address.label;</td>
-										<td>&ev.staff.patron.ue_xhtml.in_city_limits.label;</td>
-										<td>&ev.staff.patron.ue_xhtml.valid.label;</td>
-										<td>&ev.staff.patron.ue_xhtml.mailing_address.label;</td>
-										<td>&ev.staff.patron.ue_xhtml.physical_address.label;</td>
-									</tr>
-								</thead>
-								<tbody id='ue_address_tbody'>
-									<tr id='ue_address_template'>
-										<td>
-											<table class='address_table'>
-												<tbody>
-													<tr name='shared_row' class='hide_me'>
-														<td colspan='6'>
-															<div style='padding: 8px;'>
-																<span style='color:red;'>*</span>
-																&ev.staff.patron.ue_xhtml.address_owned_by.label;
-																<span name='addr_owner_name'/>
-																<span name='owner_link_div'>
-																	(<a name='addr_owner' href='javascript:void(0);'>&ev.staff.patron.ue_xhtml.edit.label;</a>)
-																</span>
-															</div>
-														</td>
-													</tr>
-													<tr>
-														<td><div class='wide right'>&ev.staff.patron.ue_xhtml.label.label;</div></td>
-														<td colspan='3'>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_label' id='ue_addr_label'/>
-															</div>
-														</td>
-														<td><div class='wide right'>&ev.staff.patron.ue_xhtml.zip.label;</div></td>
-														<td>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_zip' size='10' maxlength='10'/>
-															</div>
-														</td>
-													</tr>
-													<tr>
-														<td><div class='wide right'>&ev.staff.patron.ue_xhtml.street1.label;</div></td>
-														<td colspan='5'>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_street1' size='42'/>
-															</div>
-														</td>
-													</tr>
-													<tr>
-														<td><div class='wide right'>&ev.staff.patron.ue_xhtml.street2.label;</div></td>
-														<td colspan='5'>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_street2' size='42'/>
-															</div>
-														</td>
-													</tr>
-													<tr>
-														<td><div class='wide right'>&ev.staff.patron.ue_xhtml.city.label;</div></td>
-														<td colspan='3'>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_city' size='17'/>
-															</div>
-														</td>
-														<td><div class='wide right'>&ev.staff.patron.ue_xhtml.conuty.label;</div></td>
-														<td>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_county' size='17'/>
-															</div>
-														</td>
-													</tr>
-													<tr>
-														<td><div class='wide right'>&ev.staff.patron.ue_xhtml.state.label;</div></td>
-														<td colspan='3'>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_state' size='2' maxlength='2'/>
-															</div>
-														</td>
-														<!--
-														<td><div class='wide right'>Zip</div></td>
-														<td>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_zip' size='6' maxlength='6'/>
-															</div>
-														</td>
-														-->
-														<td><div class='wide right'>&ev.staff.patron.ue_xhtml.country.label;</div></td>
-														<td>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_country' size='6'/>
-															</div>
-														</td>
-													</tr>
-													<tr>
-														<td colspan='6'>
-															<div class='button_row'>
-																<input type='submit' name='ue_addr_delete' 
-																	value='&ev.staff.patron.ue_xhtml.ue_addr_delete.label;'/>
-																<span style='padding-left: 10px;'> </span>
-																<input type='submit' name='ue_addr_detach' 
-																	value='&ev.staff.patron.ue_xhtml.ue_addr_detach.label;' class='hide_me'/>
-																<input type='submit' name='ue_addr_approve' 
-																	value='&ev.staff.patron.ue_xhtml.ue_addr_approve.label;' class='hide_me'/>
-															</div>
-														</td>
-													</tr>
-													<tr class='hide_me' name='ue_addr_replaced_row'>
-														<td colspan='6'>
-															<div class='button_row' name='ue_addr_replaced_div'>
+        <link rel="stylesheet" type="text/css" media="all" 
+            href="/opac/common/js/jscalendar/calendar-brown.css" title="win2k-cold-1" />
+        <script type="text/javascript" src="/opac/common/js/jscalendar/calendar.js"></script>
+        <script type="text/javascript" src="/opac/common/js/jscalendar/lang/calendar-en.js"></script>
+        <script type="text/javascript" src="/opac/common/js/jscalendar/calendar-setup.js"></script>
+
+
+        <style type='text/css'>
+            .messagecatalog { -moz-binding: url( /xul/server/main/bindings.xml#messagecatalog ) }
+            .main_table { width: 98%; border-collapse: collapse;}
+            .main_table td { border: 1px solid #E0F0E0; text-align: center; padding: 4px;}
+            #uedit_nav_bar { border: 2px solid #E0F0E0; padding: 6px;}
+            .nav_link { padding-left: 90px; padding-right: 90px; }
+            .main_nav_link { -moz-border-radius: 7px; height: 13%;}
+            /*
+            .main_div { height: 480px; padding-left: 15px; 
+                text-align: center; vertical-align: middle; overflow: auto;}
+                */
+
+            .main_div { min-height: 450px; padding-left: 15px; 
+                text-align: center; vertical-align: middle; }
+
+            .nav_link_table { height: 480px;}
+            .label_active { background: #E0F0E0; }
+            .right { text-align: right; padding-right: 3px;}
+            .left { text-align: left; padding-left: 3px;}
+            .wide { width: 98%;}
+            .pad { padding-left: 3px; padding-right: 3px; }
+            .no_border td { border: none; }
+            .uedit_table { width: 80% }
+            .address_table { -moz-border-radius: 4px; border: 4px solid #E0E0F0; padding: 4px; }
+            .shared_address { background : #E0F0F0; }
+            .address_table td { border: none; width: auto; padding: 1px; }
+            .addr_info_checked { -moz-border-radius: 6px; background: #F0E0E0; }
+            .button_row { width: 95%; text-align: center; margin-top: 7px; border: 1px solid #E0E0E0; }
+            /*.required_field { background: #F0E0E0; }*/
+            .invalid_value { background: red; }
+
+            /* all text inputs that don't have the .invalid_value 
+                class applied and are currently focused */
+            input:focus:not(.invalid_value) { background: #E0F0E0; color: darkblue;}
+
+            .deleted { background: #FF6666; }
+
+            .dup_link { padding-left: 5px; color: red; }
+
+
+        </style>
+    </head>
+    
+    <div class="messagecatalog" id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+
+    <body onload='uEditInit();'>
+
+    <center>
+
+        <h2>&ev.staff.patron.ue_xhtml.ev_user_editor.label;</h2>
+
+        <div style='position:absolute; top: 5px; right: 5px;'>
+            <span>&ev.staff.patron.ue_xhtml.welcome.label;</span><b><span id='uedit_user'/></b>
+        </div>
+
+        <hr/><br/>
+
+        <div id='main_div_container'>
+
+        <table style='margin-bottom: 5px; width:100%;'>
+            <tbody>
+                <tr>
+                    <td align='left' width='80%'>
+                        <b>
+                            <span>&staff.patron.ue.interface_note.label;</span>
+                        </b>
+                    </td>
+                    <td align='right' width='20%'>
+                        <a class='hide_me' id='ue_errors' href='javascript:void(0);' 
+                            style='color: red; font-size: 12pt; font-weight: bold' onclick='uEditAlertErrors();'>
+                            &ev.staff.patron.ue_xhtml.view_errors.label;
+                        </a>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+
+        <table class='main_table'>
+            <tbody>
+                <tr>
+                    <td width='15%' valign='top'>
+                        <!-- ************************************************************** -->
+                        <!--  Top Navigation Links -->
+                        <!-- ************************************************************** -->
+                        <table height='100%' class='nav_link_table'>
+                            <tbody>
+                                <tr>
+                                    <td id='uedit_userid_label' class='main_nav_link'>
+                                        <a href='javascript:uEditShowPage("uedit_userid");'>&ev.staff.patron.ue_xhtml.user_id.label;</a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td id='uedit_contact_info_label' class='main_nav_link'>    
+                                        <a href='javascript:uEditShowPage("uedit_contact_info");'>&ev.staff.patron.ue_xhtml.contact_info.label;</a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td id='uedit_addresses_label' class='main_nav_link'>        
+                                        <a href='javascript:uEditShowPage("uedit_addresses");'>&ev.staff.patron.ue_xhtml.addresses.label;</a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td id='uedit_groups_label' class='main_nav_link'>            
+                                        <a href='javascript:uEditShowPage("uedit_groups");'>&ev.staff.patron.ue_xhtml.groups_permissions.label;</a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td id='uedit_stat_cats_label' class='main_nav_link'>        
+                                        <a href='javascript:uEditShowPage("uedit_stat_cats");'>&ev.staff.patron.ue_xhtml.statistical_categories.label;</a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td id='uedit_surveys_label' class='main_nav_link'>            
+                                        <a href='javascript:uEditShowPage("uedit_surveys");'>&ev.staff.patron.ue_xhtml.surveys.label;</a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td id='uedit_finalize_label' class='main_nav_link'>            
+                                        <a href='javascript:uEditShowPage("uedit_finalize");'>&ev.staff.patron.ue_xhtml.finish.label;</a>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </td>
+
+                    <td width='85%' id='uedit_loading'>
+                        <div class='main_div has_color' 
+                            style='padding: 50px; vertical-align: middle;'>
+                            <b>&ev.staff.patron.ue_xhtml.loading_data.label;</b>
+                        </div>
+                    </td>
+
+
+                    <td width='85%' id='ue_maintd' class='hide_me'>
+
+                        <div id='dup_div_container'>
+                            <div id='dup_div' name='dup_div'>
+                                <a name='link' class='dup_link hide_me'
+                                    href='javascript:void(0);' onclick='uEditShowSearch(this);'>
+                                    &ev.staff.patron.ue_xhtml.found_duplicate_patron.label; <b name='count'/>
+                                    <b name='data'/>
+                                </a>
+                            </div>
+                        </div>
+
+
+                        <!-- ************************************************************** -->
+                        <!--  Identification Pane -->
+                        <!-- ************************************************************** -->
+                        <div id='uedit_userid' class='main_div'>
+                            <table class='uedit_table'>
+                                <tbody>
+                                    <tr class='required_field'>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.barcode.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <input type='text' id='ue_barcode' />
+                                                    <!--
+                                                    onblur=' 
+                                                        var node = uEditFindFieldByWId("ue_username");
+                                                        if(!node.widget.node.value) {
+                                                            node.widget.node.value = this.value;
+                                                            node.widget.node.onchange();
+                                                        }'
+                                                        /> -->
+                                                        <button style='padding-left: 5px;' class='hide_me' id='ue_mark_card_lost'
+                                                    onclick='uEditMarkCardLost();'>&ev.staff.patron.ue_xhtml.mark_lost.label;</button>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr class='required_field'>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.username.label;</div></td>
+                                        <td><div class='wide left'><input type='text' id='ue_username'/></div></td>
+                                    </tr>
+                                    <tr class='required_field'>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.password.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <input type='password' id='ue_password1'/>
+                                                <button class='hide_me' onclick='uEditResetPw();' id='ue_reset_pw'>&ev.staff.patron.ue_xhtml.reset.label;</button>
+                                                <span style='padding-left: 10px;' class='hide_me' id='ue_password_gen'>
+                                                    &ev.staff.patron.ue_xhtml.re_password.label;
+                                                    <span style='text-decoration:underline;' id='ue_password_plain'/>
+                                                </span>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr class='required_field'>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.verify_password.label;</div></td>
+                                        <td><div class='wide left'><input type='password' id='ue_password2'/></div></td>
+                                    </tr>
+                                    <tr class='required_field'>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.first_name.label;</div></td>
+                                        <td><div class='wide left'><input type='text' id='ue_firstname'/></div></td>
+                                    </tr>
+                                    <tr>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.middle_name.label;</div></td>
+                                        <td><div class='wide left'><input type='text' id='ue_middlename'/></div></td>
+                                    </tr>
+                                    <tr class='required_field'>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.last_name.label;</div></td>
+                                        <td><div class='wide left'><input type='text' id='ue_lastname'/></div></td>
+                                    </tr>
+                                    <tr>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.suffix.label;</div></td>
+                                        <td><div class='wide left'>
+                                            <input type='text' id='ue_suffix'/>
+                                            <select id='ue_suffix_selector' style='width: 6em;'
+                                                onclick='$("ue_suffix").value = this.options[this.selectedIndex].value;$("ue_suffix").onchange();'
+                                                onchange='$("ue_suffix").value = this.options[this.selectedIndex].value;$("ue_suffix").onchange();'>
+                                                <option value=''>&ev.staff.patron.ue_xhtml.pick_suffix.label;</option>
+                                                <option value='Jr'>Jr</option>
+                                                <option value='Sr'>Sr</option>
+                                                <option value='II'>II</option>
+                                                <option value='III'>III</option>
+                                                <option value='AA'>AA</option>
+                                                <option value='AS'>AS</option>
+                                                <option value='AAS'>AAS</option>
+                                                <option value='BA'>BA</option>
+                                                <option value='BS'>BS</option>
+                                                <option value='CFPIM'>CFPIM</option>
+                                                <option value='CPA'>CPA</option>
+                                                <option value='CPIM'>CPIM</option>
+                                                <option value='CPM'>CPM</option>
+                                                <option value='CXE'>CXE</option>
+                                                <option value='DC'>DC</option>
+                                                <option value='DDS'>DDS</option>
+                                                <option value='DO '>DO</option>
+                                                <option value='DPM'>DPM</option>
+                                                <option value='DVM'>DVM</option>
+                                                <option value='Esq'>Esq</option>
+                                                <option value='FACAAI'>FACAAI</option>
+                                                <option value='FACP'>FACP</option>
+                                                <option value='FACS'>FACS</option>
+                                                <option value='FACEP'>FACEP</option>
+                                                <option value='FCP'>FCP</option>
+                                                <option value='FICS'>FICS</option>
+                                                <option value='GYN'>GYN</option>
+                                                <option value='JD'>JD</option>
+                                                <option value='LPN'>LPN</option>
+                                                <option value='MA'>MA</option>
+                                                <option value='MCSE'>MCSE</option>
+                                                <option value='MD'>MD</option>
+                                                <option value='MS'>MS</option>
+                                                <option value='NMD'>NMD</option>
+                                                <option value='OB'>OB</option>
+                                                <option value='PhD'>PhD</option>
+                                                <option value='RN'>RN</option>
+                                            </select>
+                                        </div></td>
+                                    </tr>
+                                    <tr>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.alias.label;</div></td>
+                                        <td><div class='wide left'><input type='text' id='ue_alias'/></div></td>
+                                    </tr>
+
+                                    <tr class='required_field'>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.dob.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+    
+                                                <input type='text' id='ue_dob' size='10' maxlength='10' 
+                                                    onfocus='/*$("ue_dob_trigger").onclick(event);*/'>1980-01-01</input>
+    
+                                                <button style='padding: 0px;' id='ue_dob_trigger'>
+                                                    <img src="/opac/common/js/jscalendar/img.gif" 
+                                                        style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
+                                                        title="Date selector"
+                                                        onmouseover="this.style.background='red';" 
+                                                        onmouseout="this.style.background=''" />
+                                                </button>
+
+                                                <span class='pad' style='font-size: 8pt;'>(YYYY-MM-DD)</span>
+    
+                                                <script type="text/javascript">
+                                                    Calendar.setup({
+                                                        inputField    : "ue_dob",                // id of the input field
+                                                        ifFormat        : "%Y-%m-%d",            // format of the input field
+                                                        button        : "ue_dob_trigger",  // trigger for the calendar (button ID)
+                                                        align            : "Tl",                    // alignment (defaults to "Bl")
+                                                        singleClick    : true
+                                                    });
+                                                </script>
+    
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.juvenile.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <input id='ue_juvenile' type='checkbox'/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr class='required_field'>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.primary_id_type.label;</div></td>
+                                        <td><div class='wide left'>
+                                                <select id='ue_primary_ident_type'>
+                                                    <option value=''>&ev.staff.patron.ue_xhtml.required.label;</option>
+                                                </select>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr class='required_field'>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.primary_id.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <input type='text' id='ue_primary_ident'/>
+                                                <span id='primary_ident_ssn_help' 
+                                                    style='padding-left: 2px; font-size: 8pt;' class='hide_me'>
+                                                    &ev.staff.patron.ue_xhtml.primary_ident_ssn_help.label;
+                                                </span>
+                                                <span id='primary_ident_dl_help' 
+                                                    style='padding-left: 2px; font-size: 8pt;' class='hide_me'>
+                                                    &ev.staff.patron.ue_xhtml.primary_ident_dl_help.label;    
+                                                </span>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <!--
+                                    <tr>
+                                        <td><div class='wide right'>Secondary Identification Type</div></td>
+                                        <td><div class='wide left'>
+                                                <select id='ue_secondary_ident_type'>
+                                                    <option value=''>  None Selected  </option>
+                                                </select>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    -->
+                                    <tr class='hide_me'>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.parent_guardian.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <input type='text' id='ue_secondary_ident'/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <!--
+                                    <tr class='hide_me' id='ue_guardian_row'>
+                                        <td><div class='wide right'><b>Parent / Guardian</b></div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <span id='ue_guardian_field'/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    -->
+                                </tbody>
+                            </table>
+                        </div>
+
+                        <!-- ************************************************************** -->
+                        <!-- Contact Info Pane -->
+                        <!-- ************************************************************** -->
+                        <div id='uedit_contact_info' class='main_div hide_me'>
+
+                            <table class='uedit_table'>
+                                <tbody>
+                                    <tr>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.email_address.label;</div></td>
+                                        <td><div class='wide left'><input type='text' id='ue_email' size='32'/></div></td>
+                                    </tr>
+                                    <tr>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.daytime_phone.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <input class='pad' type='text' id='ue_day_phone' size='18'/>
+                                                <span style='font-size: 9pt;'>&ev.staff.patron.ue_xhtml.phone_example;</span>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.evening_phone.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <input class='pad' type='text' id='ue_night_phone' size='18'/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.other_phone.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <input class='pad' type='text' id='ue_other_phone' size='18'/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr class='required_field'>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.home_library.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <select style='width: 20em;' id='ue_org_selector'/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+    
+                        <!-- ************************************************************** -->
+                        <!-- Addresses Pane -->
+                        <!-- ************************************************************** -->
+                        <div id='uedit_addresses' class='main_div hide_me' >
+                            <table class='uedit_table' style='width: 98%; padding: 1px;'>
+                                <thead>
+                                    <tr>
+                                        <td>&ev.staff.patron.ue_xhtml.address.label;</td>
+                                        <td>&ev.staff.patron.ue_xhtml.in_city_limits.label;</td>
+                                        <td>&ev.staff.patron.ue_xhtml.valid.label;</td>
+                                        <td>&ev.staff.patron.ue_xhtml.mailing_address.label;</td>
+                                        <td>&ev.staff.patron.ue_xhtml.physical_address.label;</td>
+                                    </tr>
+                                </thead>
+                                <tbody id='ue_address_tbody'>
+                                    <tr id='ue_address_template'>
+                                        <td>
+                                            <table class='address_table'>
+                                                <tbody>
+                                                    <tr name='shared_row' class='hide_me'>
+                                                        <td colspan='6'>
+                                                            <div style='padding: 8px;'>
+                                                                <span style='color:red;'>*</span>
+                                                                &ev.staff.patron.ue_xhtml.address_owned_by.label;
+                                                                <span name='addr_owner_name'/>
+                                                                <span name='owner_link_div'>
+                                                                    (<a name='addr_owner' href='javascript:void(0);'>&ev.staff.patron.ue_xhtml.edit.label;</a>)
+                                                                </span>
                                                             </div>
                                                         </td>
                                                     </tr>
-												</tbody>
-											</table>
-										</td>
-										<td><input type='checkbox' name='ue_addr_inc_yes' checked='checked'/></td>
-										<td><input type='checkbox' name='ue_addr_valid_yes' checked='checked'/></td>
-										<td>
-											<div style='width: 100%; -moz-border-radius: 8px;'>
-												<input type='radio' name='ue_addr_mailing_yes'
-													onchange='uEditAddrTypeClick(this, "mailing");'
-													onclick='uEditAddrTypeClick(this, "mailing");'/>
-											</div>
-										</td>
-										<td>
-											<div style='width: 100%; -moz-border-radius: 8px;'>
-												<input type='radio' name='ue_addr_billing_yes'
-													onchange='uEditAddrTypeClick(this, "billing");'
-													onclick='uEditAddrTypeClick(this, "billing");'/>
-											</div>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-
-							<div class='button_row' style='margin-top: 20px;'>
-								<!--
-								<input type='submit' value='Create a New Address' id='ue_address_new'/>
-								-->
-								<input type='submit' value='&staff.patron.ue.create_address.label;' onclick='uEditCreateNewAddr();'/>
-							</div>
-						</div>
-	
-						<!-- ************************************************************** -->
-						<!-- Groups Pane -->
-						<!-- ************************************************************** -->
-						<div id='uedit_groups' class='main_div hide_me'>
-							<table class='uedit_table'>
-								<tbody>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.profile_group.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<select id='ue_profile' class='select_big'>
-													<option value=''>&ev.staff.patron.ue_xhtml.required.label;</option>
-												</select>
-											</div>
-										</td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.account_expiration_date.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input type='text' id='ue_expire' size='10' maxlength='10'/>
-	
-												<button style='padding: 0px;' id='ue_expire_trigger'>
-													<img src="/opac/common/js/jscalendar/img.gif" 
-														style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
-														title="&ev.staff.patron.ue_xhtml.date_selector.label;"
-														onmouseover="this.style.background='red';" 
-														onmouseout="this.style.background=''" />
-												</button>
-
-												<span class='pad' style='font-size: 8pt;'>(YYYY-MM-DD)</span>
-												<script type="text/javascript">
-													Calendar.setup({
-														inputField	: "ue_expire",				// id of the input field
-														ifFormat		: "%Y-%m-%d",				// format of the input field
-														button		: "ue_expire_trigger",  // trigger for the calendar (button ID)
-														align			: "Tl",						// alignment (defaults to "Bl")
-														singleClick	: true
-													});
-												</script>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.net_access_level.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<select id='ue_net_level'>
-												</select>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.active.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input id='ue_active' type='checkbox' checked='checked'/>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.barred.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input id='ue_barred' type='checkbox'/>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.set_family_group_lead_account.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input id='ue_group_lead' type='checkbox'/>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.claims_returned_count.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input id='ue_claims_returned' type='text' disabled='disabled' size='6'/>
-												<script>
-													$('ue_claims_returned').value = 0;
-													$('ue_claims_returned').disabled = true;
-												</script>
-												<input class='pad' id='ue_claims_returned_reset' type='submit' value='&ev.staff.patron.ue_xhtml.reset.label;' 
-													onclick="
-														if( confirmId('ue_claims_return_confirm') ) {
-															$('ue_claims_returned').value = 0;
-															$('ue_claims_returned').onchange();
-														}
-													"/>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.alert_message.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<textarea wrap='soft' cols='30' rows='4' id='ue_alert_message'/>
-												<input class='pad' id='ue_alert_message_reset' 
-													type='submit' value='&ev.staff.patron.ue_xhtml.alert_message_reset.value;' 
-														onclick='
-														var node = $("ue_alert_message");
-														node.value = "";
-														if(node.onchange) node.onchange();'/>
-											</div>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-						</div>
-	
-						<!-- ************************************************************** -->
-						<!-- Stat Cats Pane -->
-						<!-- ************************************************************** -->
-						<div id='uedit_stat_cats' class='main_div hide_me'>
-							<table class='uedit_table' style='width: 98%'>
-								<thead>
-									<tr style='font-weight: bold;'>
-										<td>&ev.staff.patron.ue_xhtml.stat_cat_name.label;</td>
-										<td>&ev.staff.patron.ue_xhtml.owner.label;</td>
-										<td>&ev.staff.patron.ue_xhtml.value.label;</td>
-									</tr>
-								</thead>
-								<tbody id='ue_stat_cat_tbody'>
-									<tr id='ue_stat_cat_row'>
-										<td><div class='wide right' name='ue_stat_cat_name'/></td>
-										<td><div class='wide right' style='font-size: 8pt' name='ue_stat_cat_owner'/></td>
-										<td>
-											<div class='wide left'>
-												<select name='ue_stat_cat_selector'>
-													<option value=''>&ev.staff.patron.ue_xhtml.none_selected.label;</option>
-												</select>
-												<span class='pad'> or </span>
-												<input class='pad' type='text' name='ue_stat_cat_newval'/>
-											</div>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-
-						</div>
-	
-						<!-- ************************************************************** -->
-						<!-- Surveys Pane -->
-						<!-- ************************************************************** -->
-						<div id='uedit_surveys' class='main_div hide_me'>
-							<div id='uedit_no_surveys' class='hide_me'>
-								<b>&ev.staff.patron.ue_xhtml.no_surveys_for_location.label;</b>
-							</div>
-							<table id='ue_survey_table' 
-								class='uedit_table data_grid' style='width: 95%; margin-top: 17px;'>
-								<thead>
-									<tr>
-										<td colspan='2' style='text-align: left; padding-left: 20px;'>
-											<span class='pad' name='ue_survey_name' style='font-weight: bold;'/>
-											<span class='pad' name='ue_survey_desc'> : </span>
-										</td>
-									</tr>
-								</thead>
-								<tbody name='ue_survey_tbody'>
-									<tr name='ue_survey_row'>
-										<td name='ue_survey_question' 
-											style='width: 60%; text-align: left; padding-left: 40px;'/>
-										<td>
-											<select name='ue_survey_answer'>
-												<option value=''>&ev.staff.patron.ue_xhtml.none_selected.label;</option>
-											</select>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-						</div>
-
-						<!-- ************************************************************** -->
-						<!-- Finish Up -->
-						<!-- ************************************************************** -->
-						<div id='uedit_finalize' class='main_div hide_me'>
-							<div class='has_color' style='width: 95%; margin-top: 40px; text-align: center'>
-								<div style='padding: 5px;'>
-									&ev.staff.patron.ue_xhtml.finishing_message.label;
-								</div>
-								<br/>
-								<div style='margin-bottom: 15px;'>
-									<a style='margin-right: 30px;' id='ue_view_summary' 
-										href='javascript:uEditShowSummary();'>View Summary</a>
-								</div>
-								<input style='margin-left: 5px; margin-right: 5px;' id='ue_save'
-									type='submit' value='&ev.staff.patron.ue_xhtml.save_user.value;' onclick='uEditSaveUser();'/>
-								<input style='margin-left: 5px; margin-right: 5px;' id='ue_save_clone'
-									type='submit' value='&ev.staff.patron.ue_xhtml.save_clone_user.value;' onclick='uEditSaveUser(true);'/>
-								<button style='margin-left: 5px; margin-right: 5px;' 
-									onclick='if(confirm($("ue_cancel_confirm").innerHTML)) uEditCancel();'>&ev.staff.patron.ue_xhtml.cancel.value;</button>
-							</div>
-						</div>
-					</td>
-				</tr>
-
-				<tr>
-					<td colspan='2'>
-						<!-- ************************************************************** -->
-						<!-- Bottom Navigation Links -->
-						<!-- ************************************************************** -->
-						<table width='100%' class='no_border'>
-							<tbody>
-								<tr id='uedit_nav_bar'>
-									<td width='10%'/>
-									<td width='40%'>
-										<a id='ue_back' class='nav_link hide_me' 
-											href='javascript:uEditPrev()'>&#x2190;&ev.staff.patron.ue_xhtml.back.label;</a>
-									</td>
-									<td width='40%'>
-										<a id='ue_fwd' class='nav_link' 
-											href='javascript:uEditNext()'>&ev.staff.patron.ue_xhtml.forward.label;&#x2192;</a>
-									</td>
-									<td width='10%'/>
-								</tr>
-							</tbody>
-						</table>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-	</div>
-
-	</center>
-
-	<div id='summary_div_container' class='hide_me'>
-
-	<div id='ue_summary_page'>
-		<table id='ue_summary_table' class='data_grid' width='55%'>
-			<thead>
-				<tr>
-					<td colspan='2'>
-						<span>&staff.patron.ue.user_summary.label;</span>
-					</td>
-				</tr>
-			</thead>
-			<tbody name='ue_summary_page_tbody'>
-
-				<tr>
-
-					<td colspan='2' align='center'>
-						<input style='margin-right: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.print_page.label;' onclick='window.print();'/>
-						<input style='margin-left: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.return_to_editor.label;' 
-							onclick=' unHideMe($("main_div_container")); 
-								hideMe($("summary_div_container"));'/>
-					</td>
-				</tr>
-
-				<tr><td>&ev.staff.patron.ue_xhtml.barcode.label;</td><td id='ue_summary_barcode'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.username.label;</td><td id='ue_summary_usrname'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.first_name.label;</td><td id='ue_summary_first_given_name'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.middle_name.label;</td><td id='ue_summary_second_given_name'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.last_name.label;</td><td id='ue_summary_family_name'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.alias.label;</td><td id='ue_summary_alias'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.suffix.label;</td><td id='ue_summary_suffix'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.dob.label;</td><td id='ue_summary_dob'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.primary_id_type.label;</td><td id='ue_summary_ident_type'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.primary_id.label;</td><td id='ue_summary_ident_value'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.secondary_id_type.label;</td><td id='ue_summary_ident_type2'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.secondary_id.label;</td><td id='ue_summary_ident_value2'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.email_address.label;</td><td id='ue_summary_email'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.daytime_phone.label;</td><td id='ue_summary_day_phone'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.evening_phone.label;</td><td id='ue_summary_evening_phone'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.other_phone.label;</td><td id='ue_summary_other_phone'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.home_library.label;</td><td id='ue_summary_home_ou'/></tr>
-
-				<tr>
-					<td colspan='2'>
-						<table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
-							<thead><tr><td>&ev.staff.patron.ue_xhtml.addresses.label;</td></tr></thead>
-							<tbody name='ue_summary_addr_tbody'>
-								<tr name='ue_summary_addr_row'>
-									<td>
-										<table name='ue_summary_addr_table' width='100%'>
-											<thead><tr><td colspan='4'/><span> </span></tr></thead>
-											<tbody>
-												<tr>
-													<td><b>&ev.staff.patron.ue_xhtml.address_label.label;</b></td><td name='label'/>
-													<td><b>&ev.staff.patron.ue_xhtml.zip.label;</b></td><td name='zip'/>
-												</tr>
-												<tr>
-													<td><b>&ev.staff.patron.ue_xhtml.street1.label;</b></td><td name='street1'/>
-													<td><b>&ev.staff.patron.ue_xhtml.country.label;</b></td><td name='country'/>
-												</tr>
-												<tr>
-													<td><b>&ev.staff.patron.ue_xhtml.street2.label;</b></td><td name='street2'/>
-													<td><b>&ev.staff.patron.ue_xhtml.mailing.label;</b></td><td name='mailing'/>
-												</tr>
-												<tr>
-													<td><b>&ev.staff.patron.ue_xhtml.city.label;</b></td><td name='city'/>
-													<td><b>&ev.staff.patron.ue_xhtml.billing.label;</b></td><td name='billing'/>
-												</tr>
-												<tr>
-													<td><b>&ev.staff.patron.ue_xhtml.county.label;</b></td><td name='county'/>
-													<td><b>&ev.staff.patron.ue_xhtml.valid.label;</b></td><td name='valid'/>
-												</tr>
-												<tr>
-													<td><b>&ev.staff.patron.ue_xhtml.state.label;</b></td><td name='state'/>
-													<td><b>&ev.staff.patron.ue_xhtml.in_city_limits.label;</b></td><td name='incorporated'/>
-												</tr>
-											</tbody>
-										</table>
-									</td>
-								</tr>
-							</tbody>
-						</table>
-					</td>
-				</tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.profile.label;</td><td id='ue_summary_profile'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.active.label;</td><td id='ue_summary_active'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.barred.label;</td><td id='ue_summary_barred'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.expire_date.label;</td><td id='ue_summary_expire_date'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.family_lead_account.label;</td><td id='ue_summary_master_account'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.claims_returned_count.label;</td><td id='ue_summary_claims_returned_count'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.alert_message.label;</td><td id='ue_summary_alert_message'/></tr>
-				<tr name='ue_summary_stat_cat_td'>
-					<td colspan='2' >
-						<table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
-							<thead><tr><td colspan='2'>&ev.staff.patron.ue_xhtml.stat_categories.label;</td></tr></thead>
-							<tbody name='ue_summary_stats_tbody'>
-								<tr name='ue_summary_stats_row'>
-									<td name='ue_summary_stat_name'/><td name='ue_summary_stat_value'/>
-								</tr>
-							</tbody>
-						</table>
-					</td>
-				</tr>
-				<tr name='ue_summary_survey_td'>
-					<td colspan='2'>
-						<table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
-							<thead>
-								<tr>
-									<td>&ev.staff.patron.ue_xhtml.survey.label;</td>
-									<td>&ev.staff.patron.ue_xhtml.question.label;</td>
-									<td>&ev.staff.patron.ue_xhtml.answer.label;</td>
-								</tr>
-							</thead>
-							<tbody name='ue_summary_survey_tbody'>
-								<tr name='ue_summary_survey_row'>
-									<td name='ue_summary_survey_name'/>
-									<td name='ue_summary_survey_question'/>
-									<td name='ue_summary_survey_answer'/>
-								</tr>
-							</tbody>
-						</table>
-					</td>
-				</tr>
-				<tr>
-					<td colspan='2' align='center'>
-						<input style='margin-right: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.print_page.label;' onclick='window.print();'/>
-						<input style='margin-left: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.return_to_editor.label;' 
-							onclick=' unHideMe($("main_div_container")); 
-								hideMe($("summary_div_container"));'/>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-	</div>
-	</div>
-
-
-	<!-- ************************************************************** -->
-	<!-- This holds all of the strings we may have to alert to the user -->
-	<!-- ************************************************************** -->
-	<div class='hide_me'>
-		<span id='ue_bad_dob'>&staff.patron.ue.bad_dob.label;</span>
-		<span id='ue_bad_username'>&staff.patron.ue.bad_username.label;</span>
-		<span id='ue_bad_password'>&staff.patron.ue.bad_passwords.label;</span>
-		<span id='ue_bad_firstname'>&staff.patron.ue.bad_firstname.label;</span>
-		<span id='ue_bad_middlename'>&staff.patron.ue.bad_middlename.label;</span>
-		<span id='ue_bad_lastname'>&staff.patron.ue.bad_lastname.label;</span>
-		<span id='ue_bad_barcode'>&staff.patron.ue.bad_barcode.label;</span>
-		<span id='ue_duplicate_barcode'>&staff.patron.ue.duplicate_barcode.label;</span>
-		<span id='ue_new_barcode_warn'>&staff.patron.ue.new_barcode_warn.label;</span>
-		<span id='ue_no_ident'>&staff.patron.ue.no_ident.label;</span>
-		<span id='ue_bad_ident_dl'>&staff.patron.ue.bad_ident_dl.label;</span>
-		<span id='ue_bad_ident_ssn'>&staff.patron.ue.bad_ident_ssn.label;</span>
-		<span id='ue_bad_email'>&staff.patron.ue.bad_email.label;</span>
-		<span id='ue_bad_phone'>&staff.patron.ue.bad_phone.label;</span>
-		<span id='ue_no_profile'>&staff.patron.ue.no_profile.label;</span>
-		<span id='ue_bad_expire'>&staff.patron.ue.bad_expire.label;</span>
-		<span id='ue_bad_claims_returned'>&staff.patron.ue.bad_claims_returned.label;</span>
-		<span id='ue_no_profile'>&ev.staff.patron.ue_xhtml.no_profile.label;</span>
-		<span id='ue_unknown_error'>&staff.patron.ue.unknown_error.label;</span>
-		<span id='ue_bad_addr_label'>&staff.patron.ue.bad_addr_label.label;</span>
-		<span id='ue_bad_addr_street'>&staff.patron.ue.bad_addr_street.label;</span>
-		<span id='ue_bad_addr_city'>&staff.patron.ue.bad_addr_city.label;</span>
-		<span id='ue_bad_addr_county'>&staff.patron.ue.bad_addr_county.label;</span>
-		<span id='ue_bad_addr_state'>&staff.patron.ue.bad_addr_state.label;</span>
-		<span id='ue_bad_addr_country'>&staff.patron.ue.bad_addr_country.label;</span>
-		<span id='ue_bad_addr_zip'>&staff.patron.ue.bad_addr_zip.label;</span>
-		<span id='ue_bad_survey'>&staff.patron.ue.bad_survey.label;</span>
-		<span id='ue_delete_addr_warn'>&staff.patron.ue.delete_addr_warn.label;</span>
-		<span id='yes'>&staff.patron.ue.yes.label;</span>
-		<span id='no'>&staff.patron.ue.no.label;</span>
-		<span id='ue_summary_window'>&staff.patron.ue.summary_window.label;</span>
-		<span id='ue_success'>&staff.patron.ue.success.label;</span>
-		<span id='ue_dup_ident1'>&staff.patron.ue.dup_ident1.label;</span>
-		<span id='ue_dup_username'>&staff.patron.ue.dup_username.label;</span>
-		<span id='ue_dup_barcode'>&staff.patron.ue.dup_barcode.label;</span>
-		<span class='hide_me' id='ue_cancel_confirm'>&staff.patron.ue.cancel_confirm.label;</span>
-		<span class='hide_me' id='ue_juv_guardian'>&staff.patron.ue.juv_guardian.label;</span>
-		<span class='hide_me' id='ue_bad_date'>&staff.patron.ue.bad_date.label;</span>
-		<span class='hide_me' id='ue_made_barred'>&staff.patron.ue.made_barred.label;</span>
-		<span class='hide_me' id='ue_claims_return_confirm'>&ev.staff.patron.ue_xhtml.claims_return_confirm.label;</span>
-		<span class='hide_me' id='ue_unsaved_changes'>&ev.staff.patron.ue_xhtml.unsaved_changes.label;</span>
-		<span class='hide_me' id='ue_xact_collision'>&ev.staff.patron.ue_xhtml.xact_collision.label;</span>
-		<span class='hide_me' id='ue_add_approve_confirm'>&ev.staff.patron.ue_xhtml.ue_addr_approve_confirm.label;</span>
-	</div>
-
-	</body>
+                                                    <tr>
+                                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.label.label;</div></td>
+                                                        <td colspan='3'>
+                                                            <div class='wide left'>
+                                                                <input type='text' name='ue_addr_label' id='ue_addr_label'/>
+                                                            </div>
+                                                        </td>
+                                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.zip.label;</div></td>
+                                                        <td>
+                                                            <div class='wide left'>
+                                                                <input type='text' name='ue_addr_zip' size='10' maxlength='10'/>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.street1.label;</div></td>
+                                                        <td colspan='5'>
+                                                            <div class='wide left'>
+                                                                <input type='text' name='ue_addr_street1' size='42'/>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.street2.label;</div></td>
+                                                        <td colspan='5'>
+                                                            <div class='wide left'>
+                                                                <input type='text' name='ue_addr_street2' size='42'/>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.city.label;</div></td>
+                                                        <td colspan='3'>
+                                                            <div class='wide left'>
+                                                                <input type='text' name='ue_addr_city' size='17'/>
+                                                            </div>
+                                                        </td>
+                                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.conuty.label;</div></td>
+                                                        <td>
+                                                            <div class='wide left'>
+                                                                <input type='text' name='ue_addr_county' size='17'/>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.state.label;</div></td>
+                                                        <td colspan='3'>
+                                                            <div class='wide left'>
+                                                                <input type='text' name='ue_addr_state' size='2' maxlength='2'/>
+                                                            </div>
+                                                        </td>
+                                                        <!--
+                                                        <td><div class='wide right'>Zip</div></td>
+                                                        <td>
+                                                            <div class='wide left'>
+                                                                <input type='text' name='ue_addr_zip' size='6' maxlength='6'/>
+                                                            </div>
+                                                        </td>
+                                                        -->
+                                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.country.label;</div></td>
+                                                        <td>
+                                                            <div class='wide left'>
+                                                                <input type='text' name='ue_addr_country' size='6'/>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan='6'>
+                                                            <div class='button_row'>
+                                                                <input type='submit' name='ue_addr_delete' 
+                                                                    value='&ev.staff.patron.ue_xhtml.ue_addr_delete.label;'/>
+                                                                <span style='padding-left: 10px;'> </span>
+                                                                <input type='submit' name='ue_addr_detach' 
+                                                                    value='&ev.staff.patron.ue_xhtml.ue_addr_detach.label;' class='hide_me'/>
+                                                                <input type='submit' name='ue_addr_approve' 
+                                                                    value='&ev.staff.patron.ue_xhtml.ue_addr_approve.label;' class='hide_me'/>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                    <tr class='hide_me' name='ue_addr_replaced_row'>
+                                                        <td colspan='6'>
+                                                            <div class='button_row' name='ue_addr_replaced_div'>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </td>
+                                        <td><input type='checkbox' name='ue_addr_inc_yes' checked='checked'/></td>
+                                        <td><input type='checkbox' name='ue_addr_valid_yes' checked='checked'/></td>
+                                        <td>
+                                            <div style='width: 100%; -moz-border-radius: 8px;'>
+                                                <input type='radio' name='ue_addr_mailing_yes'
+                                                    onchange='uEditAddrTypeClick(this, "mailing");'
+                                                    onclick='uEditAddrTypeClick(this, "mailing");'/>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <div style='width: 100%; -moz-border-radius: 8px;'>
+                                                <input type='radio' name='ue_addr_billing_yes'
+                                                    onchange='uEditAddrTypeClick(this, "billing");'
+                                                    onclick='uEditAddrTypeClick(this, "billing");'/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+
+                            <div class='button_row' style='margin-top: 20px;'>
+                                <!--
+                                <input type='submit' value='Create a New Address' id='ue_address_new'/>
+                                -->
+                                <input type='submit' value='&staff.patron.ue.create_address.label;' onclick='uEditCreateNewAddr();'/>
+                            </div>
+                        </div>
+    
+                        <!-- ************************************************************** -->
+                        <!-- Groups Pane -->
+                        <!-- ************************************************************** -->
+                        <div id='uedit_groups' class='main_div hide_me'>
+                            <table class='uedit_table'>
+                                <tbody>
+                                    <tr class='required_field'>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.profile_group.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <select id='ue_profile' class='select_big'>
+                                                    <option value=''>&ev.staff.patron.ue_xhtml.required.label;</option>
+                                                </select>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr class='required_field'>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.account_expiration_date.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <input type='text' id='ue_expire' size='10' maxlength='10'/>
+    
+                                                <button style='padding: 0px;' id='ue_expire_trigger'>
+                                                    <img src="/opac/common/js/jscalendar/img.gif" 
+                                                        style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
+                                                        title="&ev.staff.patron.ue_xhtml.date_selector.label;"
+                                                        onmouseover="this.style.background='red';" 
+                                                        onmouseout="this.style.background=''" />
+                                                </button>
+
+                                                <span class='pad' style='font-size: 8pt;'>(YYYY-MM-DD)</span>
+                                                <script type="text/javascript">
+                                                    Calendar.setup({
+                                                        inputField    : "ue_expire",                // id of the input field
+                                                        ifFormat        : "%Y-%m-%d",                // format of the input field
+                                                        button        : "ue_expire_trigger",  // trigger for the calendar (button ID)
+                                                        align            : "Tl",                        // alignment (defaults to "Bl")
+                                                        singleClick    : true
+                                                    });
+                                                </script>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.net_access_level.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <select id='ue_net_level'>
+                                                </select>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.active.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <input id='ue_active' type='checkbox' checked='checked'/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.barred.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <input id='ue_barred' type='checkbox'/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.set_family_group_lead_account.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <input id='ue_group_lead' type='checkbox'/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.claims_returned_count.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <input id='ue_claims_returned' type='text' disabled='disabled' size='6'/>
+                                                <script>
+                                                    $('ue_claims_returned').value = 0;
+                                                    $('ue_claims_returned').disabled = true;
+                                                </script>
+                                                <input class='pad' id='ue_claims_returned_reset' type='submit' value='&ev.staff.patron.ue_xhtml.reset.label;' 
+                                                    onclick="
+                                                        if( confirmId('ue_claims_return_confirm') ) {
+                                                            $('ue_claims_returned').value = 0;
+                                                            $('ue_claims_returned').onchange();
+                                                        }
+                                                    "/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td><div class='wide right'>&ev.staff.patron.ue_xhtml.alert_message.label;</div></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <textarea wrap='soft' cols='30' rows='4' id='ue_alert_message'/>
+                                                <input class='pad' id='ue_alert_message_reset' 
+                                                    type='submit' value='&ev.staff.patron.ue_xhtml.alert_message_reset.value;' 
+                                                        onclick='
+                                                        var node = $("ue_alert_message");
+                                                        node.value = "";
+                                                        if(node.onchange) node.onchange();'/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+    
+                        <!-- ************************************************************** -->
+                        <!-- Stat Cats Pane -->
+                        <!-- ************************************************************** -->
+                        <div id='uedit_stat_cats' class='main_div hide_me'>
+                            <table class='uedit_table' style='width: 98%'>
+                                <thead>
+                                    <tr style='font-weight: bold;'>
+                                        <td>&ev.staff.patron.ue_xhtml.stat_cat_name.label;</td>
+                                        <td>&ev.staff.patron.ue_xhtml.owner.label;</td>
+                                        <td>&ev.staff.patron.ue_xhtml.value.label;</td>
+                                    </tr>
+                                </thead>
+                                <tbody id='ue_stat_cat_tbody'>
+                                    <tr id='ue_stat_cat_row'>
+                                        <td><div class='wide right' name='ue_stat_cat_name'/></td>
+                                        <td><div class='wide right' style='font-size: 8pt' name='ue_stat_cat_owner'/></td>
+                                        <td>
+                                            <div class='wide left'>
+                                                <select name='ue_stat_cat_selector'>
+                                                    <option value=''>&ev.staff.patron.ue_xhtml.none_selected.label;</option>
+                                                </select>
+                                                <span class='pad'> or </span>
+                                                <input class='pad' type='text' name='ue_stat_cat_newval'/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+
+                        </div>
+    
+                        <!-- ************************************************************** -->
+                        <!-- Surveys Pane -->
+                        <!-- ************************************************************** -->
+                        <div id='uedit_surveys' class='main_div hide_me'>
+                            <div id='uedit_no_surveys' class='hide_me'>
+                                <b>&ev.staff.patron.ue_xhtml.no_surveys_for_location.label;</b>
+                            </div>
+                            <table id='ue_survey_table' 
+                                class='uedit_table data_grid' style='width: 95%; margin-top: 17px;'>
+                                <thead>
+                                    <tr>
+                                        <td colspan='2' style='text-align: left; padding-left: 20px;'>
+                                            <span class='pad' name='ue_survey_name' style='font-weight: bold;'/>
+                                            <span class='pad' name='ue_survey_desc'> : </span>
+                                        </td>
+                                    </tr>
+                                </thead>
+                                <tbody name='ue_survey_tbody'>
+                                    <tr name='ue_survey_row'>
+                                        <td name='ue_survey_question' 
+                                            style='width: 60%; text-align: left; padding-left: 40px;'/>
+                                        <td>
+                                            <select name='ue_survey_answer'>
+                                                <option value=''>&ev.staff.patron.ue_xhtml.none_selected.label;</option>
+                                            </select>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+
+                        <!-- ************************************************************** -->
+                        <!-- Finish Up -->
+                        <!-- ************************************************************** -->
+                        <div id='uedit_finalize' class='main_div hide_me'>
+                            <div class='has_color' style='width: 95%; margin-top: 40px; text-align: center'>
+                                <div style='padding: 5px;'>
+                                    &ev.staff.patron.ue_xhtml.finishing_message.label;
+                                </div>
+                                <br/>
+                                <div style='margin-bottom: 15px;'>
+                                    <a style='margin-right: 30px;' id='ue_view_summary' 
+                                        href='javascript:uEditShowSummary();'>View Summary</a>
+                                </div>
+                                <input style='margin-left: 5px; margin-right: 5px;' id='ue_save'
+                                    type='submit' value='&ev.staff.patron.ue_xhtml.save_user.value;' onclick='uEditSaveUser();'/>
+                                <input style='margin-left: 5px; margin-right: 5px;' id='ue_save_clone'
+                                    type='submit' value='&ev.staff.patron.ue_xhtml.save_clone_user.value;' onclick='uEditSaveUser(true);'/>
+                                <button style='margin-left: 5px; margin-right: 5px;' 
+                                    onclick='if(confirm($("ue_cancel_confirm").innerHTML)) uEditCancel();'>&ev.staff.patron.ue_xhtml.cancel.value;</button>
+                            </div>
+                        </div>
+                    </td>
+                </tr>
+
+                <tr>
+                    <td colspan='2'>
+                        <!-- ************************************************************** -->
+                        <!-- Bottom Navigation Links -->
+                        <!-- ************************************************************** -->
+                        <table width='100%' class='no_border'>
+                            <tbody>
+                                <tr id='uedit_nav_bar'>
+                                    <td width='10%'/>
+                                    <td width='40%'>
+                                        <a id='ue_back' class='nav_link hide_me' 
+                                            href='javascript:uEditPrev()'>&#x2190;&ev.staff.patron.ue_xhtml.back.label;</a>
+                                    </td>
+                                    <td width='40%'>
+                                        <a id='ue_fwd' class='nav_link' 
+                                            href='javascript:uEditNext()'>&ev.staff.patron.ue_xhtml.forward.label;&#x2192;</a>
+                                    </td>
+                                    <td width='10%'/>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+
+    </center>
+
+    <div id='summary_div_container' class='hide_me'>
+
+    <div id='ue_summary_page'>
+        <table id='ue_summary_table' class='data_grid' width='55%'>
+            <thead>
+                <tr>
+                    <td colspan='2'>
+                        <span>&staff.patron.ue.user_summary.label;</span>
+                    </td>
+                </tr>
+            </thead>
+            <tbody name='ue_summary_page_tbody'>
+
+                <tr>
+
+                    <td colspan='2' align='center'>
+                        <input style='margin-right: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.print_page.label;' onclick='window.print();'/>
+                        <input style='margin-left: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.return_to_editor.label;' 
+                            onclick=' unHideMe($("main_div_container")); 
+                                hideMe($("summary_div_container"));'/>
+                    </td>
+                </tr>
+
+                <tr><td>&ev.staff.patron.ue_xhtml.barcode.label;</td><td id='ue_summary_barcode'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.username.label;</td><td id='ue_summary_usrname'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.first_name.label;</td><td id='ue_summary_first_given_name'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.middle_name.label;</td><td id='ue_summary_second_given_name'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.last_name.label;</td><td id='ue_summary_family_name'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.alias.label;</td><td id='ue_summary_alias'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.suffix.label;</td><td id='ue_summary_suffix'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.dob.label;</td><td id='ue_summary_dob'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.primary_id_type.label;</td><td id='ue_summary_ident_type'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.primary_id.label;</td><td id='ue_summary_ident_value'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.secondary_id_type.label;</td><td id='ue_summary_ident_type2'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.secondary_id.label;</td><td id='ue_summary_ident_value2'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.email_address.label;</td><td id='ue_summary_email'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.daytime_phone.label;</td><td id='ue_summary_day_phone'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.evening_phone.label;</td><td id='ue_summary_evening_phone'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.other_phone.label;</td><td id='ue_summary_other_phone'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.home_library.label;</td><td id='ue_summary_home_ou'/></tr>
+
+                <tr>
+                    <td colspan='2'>
+                        <table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
+                            <thead><tr><td>&ev.staff.patron.ue_xhtml.addresses.label;</td></tr></thead>
+                            <tbody name='ue_summary_addr_tbody'>
+                                <tr name='ue_summary_addr_row'>
+                                    <td>
+                                        <table name='ue_summary_addr_table' width='100%'>
+                                            <thead><tr><td colspan='4'/><span> </span></tr></thead>
+                                            <tbody>
+                                                <tr>
+                                                    <td><b>&ev.staff.patron.ue_xhtml.address_label.label;</b></td><td name='label'/>
+                                                    <td><b>&ev.staff.patron.ue_xhtml.zip.label;</b></td><td name='zip'/>
+                                                </tr>
+                                                <tr>
+                                                    <td><b>&ev.staff.patron.ue_xhtml.street1.label;</b></td><td name='street1'/>
+                                                    <td><b>&ev.staff.patron.ue_xhtml.country.label;</b></td><td name='country'/>
+                                                </tr>
+                                                <tr>
+                                                    <td><b>&ev.staff.patron.ue_xhtml.street2.label;</b></td><td name='street2'/>
+                                                    <td><b>&ev.staff.patron.ue_xhtml.mailing.label;</b></td><td name='mailing'/>
+                                                </tr>
+                                                <tr>
+                                                    <td><b>&ev.staff.patron.ue_xhtml.city.label;</b></td><td name='city'/>
+                                                    <td><b>&ev.staff.patron.ue_xhtml.billing.label;</b></td><td name='billing'/>
+                                                </tr>
+                                                <tr>
+                                                    <td><b>&ev.staff.patron.ue_xhtml.county.label;</b></td><td name='county'/>
+                                                    <td><b>&ev.staff.patron.ue_xhtml.valid.label;</b></td><td name='valid'/>
+                                                </tr>
+                                                <tr>
+                                                    <td><b>&ev.staff.patron.ue_xhtml.state.label;</b></td><td name='state'/>
+                                                    <td><b>&ev.staff.patron.ue_xhtml.in_city_limits.label;</b></td><td name='incorporated'/>
+                                                </tr>
+                                            </tbody>
+                                        </table>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </td>
+                </tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.profile.label;</td><td id='ue_summary_profile'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.active.label;</td><td id='ue_summary_active'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.barred.label;</td><td id='ue_summary_barred'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.expire_date.label;</td><td id='ue_summary_expire_date'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.family_lead_account.label;</td><td id='ue_summary_master_account'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.claims_returned_count.label;</td><td id='ue_summary_claims_returned_count'/></tr>
+                <tr><td>&ev.staff.patron.ue_xhtml.alert_message.label;</td><td id='ue_summary_alert_message'/></tr>
+                <tr name='ue_summary_stat_cat_td'>
+                    <td colspan='2' >
+                        <table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
+                            <thead><tr><td colspan='2'>&ev.staff.patron.ue_xhtml.stat_categories.label;</td></tr></thead>
+                            <tbody name='ue_summary_stats_tbody'>
+                                <tr name='ue_summary_stats_row'>
+                                    <td name='ue_summary_stat_name'/><td name='ue_summary_stat_value'/>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </td>
+                </tr>
+                <tr name='ue_summary_survey_td'>
+                    <td colspan='2'>
+                        <table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
+                            <thead>
+                                <tr>
+                                    <td>&ev.staff.patron.ue_xhtml.survey.label;</td>
+                                    <td>&ev.staff.patron.ue_xhtml.question.label;</td>
+                                    <td>&ev.staff.patron.ue_xhtml.answer.label;</td>
+                                </tr>
+                            </thead>
+                            <tbody name='ue_summary_survey_tbody'>
+                                <tr name='ue_summary_survey_row'>
+                                    <td name='ue_summary_survey_name'/>
+                                    <td name='ue_summary_survey_question'/>
+                                    <td name='ue_summary_survey_answer'/>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan='2' align='center'>
+                        <input style='margin-right: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.print_page.label;' onclick='window.print();'/>
+                        <input style='margin-left: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.return_to_editor.label;' 
+                            onclick=' unHideMe($("main_div_container")); 
+                                hideMe($("summary_div_container"));'/>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+    </div>
+
+
+    <!-- ************************************************************** -->
+    <!-- This holds all of the strings we may have to alert to the user -->
+    <!-- ************************************************************** -->
+    <div class='hide_me'>
+        <span id='ue_bad_dob'>&staff.patron.ue.bad_dob.label;</span>
+        <span id='ue_bad_username'>&staff.patron.ue.bad_username.label;</span>
+        <span id='ue_bad_password'>&staff.patron.ue.bad_passwords.label;</span>
+        <span id='ue_bad_firstname'>&staff.patron.ue.bad_firstname.label;</span>
+        <span id='ue_bad_middlename'>&staff.patron.ue.bad_middlename.label;</span>
+        <span id='ue_bad_lastname'>&staff.patron.ue.bad_lastname.label;</span>
+        <span id='ue_bad_barcode'>&staff.patron.ue.bad_barcode.label;</span>
+        <span id='ue_duplicate_barcode'>&staff.patron.ue.duplicate_barcode.label;</span>
+        <span id='ue_new_barcode_warn'>&staff.patron.ue.new_barcode_warn.label;</span>
+        <span id='ue_no_ident'>&staff.patron.ue.no_ident.label;</span>
+        <span id='ue_bad_ident_dl'>&staff.patron.ue.bad_ident_dl.label;</span>
+        <span id='ue_bad_ident_ssn'>&staff.patron.ue.bad_ident_ssn.label;</span>
+        <span id='ue_bad_email'>&staff.patron.ue.bad_email.label;</span>
+        <span id='ue_bad_phone'>&staff.patron.ue.bad_phone.label;</span>
+        <span id='ue_no_profile'>&staff.patron.ue.no_profile.label;</span>
+        <span id='ue_bad_expire'>&staff.patron.ue.bad_expire.label;</span>
+        <span id='ue_bad_claims_returned'>&staff.patron.ue.bad_claims_returned.label;</span>
+        <span id='ue_no_profile'>&ev.staff.patron.ue_xhtml.no_profile.label;</span>
+        <span id='ue_unknown_error'>&staff.patron.ue.unknown_error.label;</span>
+        <span id='ue_bad_addr_label'>&staff.patron.ue.bad_addr_label.label;</span>
+        <span id='ue_bad_addr_street'>&staff.patron.ue.bad_addr_street.label;</span>
+        <span id='ue_bad_addr_city'>&staff.patron.ue.bad_addr_city.label;</span>
+        <span id='ue_bad_addr_county'>&staff.patron.ue.bad_addr_county.label;</span>
+        <span id='ue_bad_addr_state'>&staff.patron.ue.bad_addr_state.label;</span>
+        <span id='ue_bad_addr_country'>&staff.patron.ue.bad_addr_country.label;</span>
+        <span id='ue_bad_addr_zip'>&staff.patron.ue.bad_addr_zip.label;</span>
+        <span id='ue_bad_survey'>&staff.patron.ue.bad_survey.label;</span>
+        <span id='ue_delete_addr_warn'>&staff.patron.ue.delete_addr_warn.label;</span>
+        <span id='yes'>&staff.patron.ue.yes.label;</span>
+        <span id='no'>&staff.patron.ue.no.label;</span>
+        <span id='ue_summary_window'>&staff.patron.ue.summary_window.label;</span>
+        <span id='ue_success'>&staff.patron.ue.success.label;</span>
+        <span id='ue_dup_ident1'>&staff.patron.ue.dup_ident1.label;</span>
+        <span id='ue_dup_username'>&staff.patron.ue.dup_username.label;</span>
+        <span id='ue_dup_barcode'>&staff.patron.ue.dup_barcode.label;</span>
+        <span class='hide_me' id='ue_cancel_confirm'>&staff.patron.ue.cancel_confirm.label;</span>
+        <span class='hide_me' id='ue_juv_guardian'>&staff.patron.ue.juv_guardian.label;</span>
+        <span class='hide_me' id='ue_bad_date'>&staff.patron.ue.bad_date.label;</span>
+        <span class='hide_me' id='ue_made_barred'>&staff.patron.ue.made_barred.label;</span>
+        <span class='hide_me' id='ue_claims_return_confirm'>&ev.staff.patron.ue_xhtml.claims_return_confirm.label;</span>
+        <span class='hide_me' id='ue_unsaved_changes'>&ev.staff.patron.ue_xhtml.unsaved_changes.label;</span>
+        <span class='hide_me' id='ue_xact_collision'>&ev.staff.patron.ue_xhtml.xact_collision.label;</span>
+        <span class='hide_me' id='ue_add_approve_confirm'>&ev.staff.patron.ue_xhtml.ue_addr_approve_confirm.label;</span>
+    </div>
+
+    </body>
 </html>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/user_buckets.xul b/Open-ILS/xul/staff_client/server/patron/user_buckets.xul
index 5146020201..0d1842dd65 100644
--- a/Open-ILS/xul/staff_client/server/patron/user_buckets.xul
+++ b/Open-ILS/xul/staff_client/server/patron/user_buckets.xul
@@ -10,7 +10,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -18,49 +18,49 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="example_template_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+    <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+    <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+        var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+    </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		var patronStrings;
+    <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+    <script>
+    <![CDATA[
+        var patronStrings;
 
-		function $(id) { return document.getElementById(id); }
-		
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+        function $(id) { return document.getElementById(id); }
+        
+        function my_init() {
+            try {
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-				/* load translatable strings for patron interfaces */
+                /* load translatable strings for patron interfaces */
                 patronStrings = document.getElementById('patronStrings');
 
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for patron/user_buckets.xul');
+                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+                JSAN.errorLevel = "die"; // none, warn, or die
+                JSAN.addRepository('/xul/server/');
+                JSAN.use('util.error'); g.error = new util.error();
+                g.error.sdump('D_TRACE','my_init() for patron/user_buckets.xul');
 
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name(patronStrings.getString('staff.patron.user_buckets.tab_name')); } catch(E) { alert(E); }
-				}
+                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+                    try { window.xulG.set_tab_name(patronStrings.getString('staff.patron.user_buckets.tab_name')); } catch(E) { alert(E); }
+                }
 
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('patron/user_buckets.xul',E); } catch(F) { alert(E); }
-			}
-		}
+            } catch(E) {
+                try { g.error.standard_unexpected_error_alert('patron/user_buckets.xul',E); } catch(F) { alert(E); }
+            }
+        }
 
-	]]>
-	</script>
+    ]]>
+    </script>
 
-	<label value="&staff.patron.user_buckets.stub_not_implemented;"/>
+    <label value="&staff.patron.user_buckets.stub_not_implemented;"/>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml b/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml
index 06975e00c7..bbb09fd0de 100644
--- a/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml
+++ b/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml
@@ -3,7 +3,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+    <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -28,136 +28,136 @@
                 <script language='javascript' src='user_edit.js'> </script>
 
 
-		<style>
+        <style>
 
-			.messagecatalog { -moz-binding: url( /xul/server/main/bindings.xml#messagecatalog ) }
+            .messagecatalog { -moz-binding: url( /xul/server/main/bindings.xml#messagecatalog ) }
 
-			.stay_hidden {		visibility: hidden;
-						display: none;
+            .stay_hidden {        visibility: hidden;
+                        display: none;
 
-			}
+            }
 
-			.hideme {		visibility: hidden;
-						display: none;
-			}
+            .hideme {        visibility: hidden;
+                        display: none;
+            }
 
-			table {		border-collapse: collapse;
-					margin-bottom: 10px;
-					margin-top: 10px;
-			}
+            table {        border-collapse: collapse;
+                    margin-bottom: 10px;
+                    margin-top: 10px;
+            }
 
-			th {		
-					white-space: nowrap;
-					padding-top: 15px;
-					padding-bottom: 10px;
-					text-align: center;
-					border-top: solid black 1px;
-			}
+            th {        
+                    white-space: nowrap;
+                    padding-top: 15px;
+                    padding-bottom: 10px;
+                    text-align: center;
+                    border-top: solid black 1px;
+            }
 
-			td.odd {	background-color: lightcyan; }
+            td.odd {    background-color: lightcyan; }
 
-			td.label {	text-align: right;
-					padding-right: 10px;
-			}
+            td.label {    text-align: right;
+                    padding-right: 10px;
+            }
 
-			td.value {	text-align: left;
-					padding-left: 10px;
-			}
+            td.value {    text-align: left;
+                    padding-left: 10px;
+            }
 
-			input[disabled='true'] { color: black; }
+            input[disabled='true'] { color: black; }
 
-		</style>
+        </style>
         </head>
 
-	<div class="messagecatalog" id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
-
-	<body onload="try { init_editor() } catch(E) { alert(js2JSON(E)); }">
-		<form method="GET" name="editor" id="editor" >
-
-		<table width="100%">
-			<tr>
-				<td class="label">&staff.patron.user_edit.user_name.label;</td>
-				<td class="value"><input disabled="true" type="text" name="user.usrname" id="user.usrname"/></td>
-				<td class="label">&staff.patron.user_edit.barcode.label;</td>
-				<td class="value"><input type="text" name="user.card.barcode" id="user.card.barcode" disabled="true"/></td>
-			</tr>
-			<tr>
-				<td class="label">&staff.patron.user_edit.firstname.label;</td>
-				<td class="value"><input disabled="true" type="text" name="user.first_given_name" id="user.first_given_name"/></td>
-				<td class="label">&staff.patron.user_edit.middlename.label;</td>
-				<td class="value"><input disabled="true" type="text" name="user.second_given_name" id="user.second_given_name"/></td>
-				<td class="label">&staff.patron.user_edit.lastname.label;</td>
-				<td class="value"><input disabled="true" type="text" name="user.family_name" id="user.family_name"/></td>
-			</tr>
-			<tr class='advanced hideme'>
-				<td class="value" colspan="6">
-					<table width="100%">
-						<thead>
-							<tr>
-								<th></th>
-								<th>&staff.patron.user_edit.working_location.label;</th>
-							</tr>
-						</thead>
-						<tbody id="work_ous" name="work_ous"/>
-					</table>
-				</td>
-			</tr>
-			<tr class='advanced hideme'>
-				<td class="value" colspan="6">
-					<table width="100%">
-						<thead>
-							<tr>
-								<th>&staff.patron.user_edit.permission.label;</th>
-								<th>&staff.patron.user_edit.applied.label;</th>
-								<th>&staff.patron.user_edit.depth.label;</th>
-								<th>&staff.patron.user_edit.grantable.label;</th>
-							</tr>
-						</thead>
-						<tbody id="permissions" name="permissions"/>
-					</table>
-				</td>
-			</tr>
-
-		</table>
-
-		<button onclick="save_user(); return false;">&staff.patron.user_edit.save.label;</button>
-		</form>
-
-
-		<div class='hideme' id="permission-tmpl">
-			<table>
-				<tr name='prow'>
-					<td class="value" name='plabel'>
-						<span name="p.code"/>
-					</td>
-					<td class="value" name='papply'>
-						<input type="checkbox" name="p.id" onclick="set_perm(this.parentNode.parentNode);"/>
-					</td>
-					<td class="value" name='pdepth'>
-						<select onchange="set_perm(this.parentNode.parentNode);" name="p.depth"/>
-					</td>
-					<td class="value" name='pgrant'>
-						<input type="checkbox" name="p.grantable" onclick="set_perm(this.parentNode.parentNode);"/>
-					</td>
-				</tr>
-			</table>
-		</div>
-
-
-		<div class='hideme' id="work_ou-tmpl">
-			<table>
-				<tr name='wrow'>
-					<td class="value" name='wapply'>
-						<input type="checkbox" name="a.id" onclick="set_work_ou(this.parentNode.parentNode);"/>
-					</td>
-					<td class="value" name='label'>
-						<span name="a.name"/>
-						(<span name="a.shortname"/>)
-					</td>
-				</tr>
-			</table>
-		</div>
-
-	</body>
+    <div class="messagecatalog" id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+
+    <body onload="try { init_editor() } catch(E) { alert(js2JSON(E)); }">
+        <form method="GET" name="editor" id="editor" >
+
+        <table width="100%">
+            <tr>
+                <td class="label">&staff.patron.user_edit.user_name.label;</td>
+                <td class="value"><input disabled="true" type="text" name="user.usrname" id="user.usrname"/></td>
+                <td class="label">&staff.patron.user_edit.barcode.label;</td>
+                <td class="value"><input type="text" name="user.card.barcode" id="user.card.barcode" disabled="true"/></td>
+            </tr>
+            <tr>
+                <td class="label">&staff.patron.user_edit.firstname.label;</td>
+                <td class="value"><input disabled="true" type="text" name="user.first_given_name" id="user.first_given_name"/></td>
+                <td class="label">&staff.patron.user_edit.middlename.label;</td>
+                <td class="value"><input disabled="true" type="text" name="user.second_given_name" id="user.second_given_name"/></td>
+                <td class="label">&staff.patron.user_edit.lastname.label;</td>
+                <td class="value"><input disabled="true" type="text" name="user.family_name" id="user.family_name"/></td>
+            </tr>
+            <tr class='advanced hideme'>
+                <td class="value" colspan="6">
+                    <table width="100%">
+                        <thead>
+                            <tr>
+                                <th></th>
+                                <th>&staff.patron.user_edit.working_location.label;</th>
+                            </tr>
+                        </thead>
+                        <tbody id="work_ous" name="work_ous"/>
+                    </table>
+                </td>
+            </tr>
+            <tr class='advanced hideme'>
+                <td class="value" colspan="6">
+                    <table width="100%">
+                        <thead>
+                            <tr>
+                                <th>&staff.patron.user_edit.permission.label;</th>
+                                <th>&staff.patron.user_edit.applied.label;</th>
+                                <th>&staff.patron.user_edit.depth.label;</th>
+                                <th>&staff.patron.user_edit.grantable.label;</th>
+                            </tr>
+                        </thead>
+                        <tbody id="permissions" name="permissions"/>
+                    </table>
+                </td>
+            </tr>
+
+        </table>
+
+        <button onclick="save_user(); return false;">&staff.patron.user_edit.save.label;</button>
+        </form>
+
+
+        <div class='hideme' id="permission-tmpl">
+            <table>
+                <tr name='prow'>
+                    <td class="value" name='plabel'>
+                        <span name="p.code"/>
+                    </td>
+                    <td class="value" name='papply'>
+                        <input type="checkbox" name="p.id" onclick="set_perm(this.parentNode.parentNode);"/>
+                    </td>
+                    <td class="value" name='pdepth'>
+                        <select onchange="set_perm(this.parentNode.parentNode);" name="p.depth"/>
+                    </td>
+                    <td class="value" name='pgrant'>
+                        <input type="checkbox" name="p.grantable" onclick="set_perm(this.parentNode.parentNode);"/>
+                    </td>
+                </tr>
+            </table>
+        </div>
+
+
+        <div class='hideme' id="work_ou-tmpl">
+            <table>
+                <tr name='wrow'>
+                    <td class="value" name='wapply'>
+                        <input type="checkbox" name="a.id" onclick="set_work_ou(this.parentNode.parentNode);"/>
+                    </td>
+                    <td class="value" name='label'>
+                        <span name="a.name"/>
+                        (<span name="a.shortname"/>)
+                    </td>
+                </tr>
+            </table>
+        </div>
+
+    </body>
 </html>
 
diff --git a/Open-ILS/xul/staff_client/server/skin/global.css b/Open-ILS/xul/staff_client/server/skin/global.css
index 22c405eae9..823605b82e 100644
--- a/Open-ILS/xul/staff_client/server/skin/global.css
+++ b/Open-ILS/xul/staff_client/server/skin/global.css
@@ -68,13 +68,13 @@ Enable for the windows build.  This slows linux down too much.
 */
 
 .nav { 
-	-moz-appearance: none;
-	margin: 0px;
-	min-width: 6.3em;
-	color: #000000;
-	font-family: arial, san-serif;
-	font-weight: bold;
-	height: 26px;
+    -moz-appearance: none;
+    margin: 0px;
+    min-width: 6.3em;
+    color: #000000;
+    font-family: arial, san-serif;
+    font-weight: bold;
+    height: 26px;
 }
 
 .my_overflow { overflow: auto; }
-- 
2.11.0