From 06c7d6c6c91ff99d504893b901374300f09a5bbf Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 24 May 2006 19:02:57 +0000
Subject: [PATCH] local vs remote fix, and accesskey tweak

git-svn-id: svn://svn.open-ils.org/ILS/trunk@4380 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/xul/staff_client/chrome/content/main/menu.js        | 4 ++--
 .../staff_client/chrome/content/main/menu_frame_menus.xul    | 2 +-
 Open-ILS/xul/staff_client/chrome/content/util/browser.xul    | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu.js b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
index 5d5c484a55..da524e20b0 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
@@ -282,7 +282,7 @@ main.menu.prototype = {
 				['oncommand'],
 				function() { 
 					//obj.set_tab(obj.url_prefix(urls.XUL_LOCAL_ADMIN)+'?ses='+window.escape(ses())+'&session='+window.escape(ses()),{},{});
-					var loc = urls.XUL_BROWSER + '?url=' + window.escape(
+					var loc = urls.XUL_REMOTE_BROWSER + '?url=' + window.escape(
 						urls.XUL_LOCAL_ADMIN+'?ses='+window.escape(ses())+'&session='+window.escape(ses())
 					);
 					obj.set_tab( 
@@ -445,7 +445,7 @@ main.menu.prototype = {
 			'cmd_public_opac' : [
 				['oncommand'],
 				function() {
-					var loc = urls.XUL_BROWSER + '?url=' + window.escape(
+					var loc = urls.XUL_REMOTE_BROWSER + '?url=' + window.escape(
 						urls.remote
 					);
 					obj.set_tab( 
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 8642bd8dcb..b6fa379e18 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
@@ -206,7 +206,7 @@
 		<menuitem label="Receipt Template Editor" accesskey="R" command="cmd_print_list_template_edit"/>
 		<menuitem label="Survey Wizard" accesskey="S" command="cmd_survey_wizard"/>
 		<menuseparator />
-		<menu id="main.menu.admin.sub" label="For developers...">
+		<menu id="main.menu.admin.sub" accesskey="-" label="For developers...">
 			<menupopup id="main.menu.admin.sub.popup">
 				<menuitem label="Statistical Category Editor" accesskey="C" command="cmd_stat_cat_edit"/>
 				<menuitem label="Non-Cataloged Type Editor" accesskey="n" command="cmd_non_cat_type_edit"/>
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 71ea096856..5cc3054b87 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/browser.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/util/browser.xul
@@ -13,7 +13,7 @@
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- OVERLAYS -->
-<?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
+<?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay.xul"?>
 
 <window id="util_browser_win" 
 	onload="my_init()"
@@ -68,6 +68,9 @@
 				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 );
 
-- 
2.43.2