From 7b333e56c9604b8e8c54eb95577c9664e8ca6d15 Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 22 Aug 2005 17:55:41 +0000
Subject: [PATCH] first attempt at reconciling staff client code with Bill's
 CVS layout changes

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1689 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Evergreen/staff_client/Makefile                             | 6 +++---
 .../chrome/content/evergreen/util/util_overlay.xul          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Evergreen/staff_client/Makefile b/Evergreen/staff_client/Makefile
index 7c23642869..f725594a9a 100644
--- a/Evergreen/staff_client/Makefile
+++ b/Evergreen/staff_client/Makefile
@@ -42,9 +42,9 @@ generated:
 
 open-ils:
 	cp ../../OpenSRF/src/javascript/*.js chrome/content/evergreen/OpenSRF/
-	cp ../../Open-ILS/src/javascript/util/*.js chrome/content/evergreen/Open-ILS/util/
-	cp ../../Open-ILS/src/javascript/widgets/*.js chrome/content/evergreen/Open-ILS/widgets/
-	cp ../../Open-ILS/src/javascript/widgets/menu/*.js chrome/content/evergreen/Open-ILS/widgets/menu/
+	cp ../../Open-ILS/web/opac/common/js/*.js chrome/content/evergreen/Open-ILS/util/
+	#cp ../../Open-ILS/src/javascript/widgets/*.js chrome/content/evergreen/Open-ILS/widgets/
+	#cp ../../Open-ILS/src/javascript/widgets/menu/*.js chrome/content/evergreen/Open-ILS/widgets/menu/
 
 patron:
 	(cat chrome/content/evergreen/main/paged_tree_overlay.xul | sed s/paged_tree/patron_items/g | sed s/PagedTree/PatronItems/g > chrome/content/evergreen/patron/patron_items_overlay.xul )
diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul
index 5e6b037bae..fb11fb7256 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul
@@ -22,9 +22,9 @@
 	<script src="fieldmapper.js" /> <!-- our Objects for things like patrons, books, etc.  This is generated. -->
 	<script src="OrgTree.js" />	<!-- our Organization Hierarchy.  This is generated. -->
 
-	<script src="chrome://evergreen/content/Open-ILS/util/webutils.js" />		<!-- Bill's grab bag of useful functions.  want to eliminate overlap -->
+	<script src="chrome://evergreen/content/Open-ILS/util/utils.js" />		<!-- Bill's grab bag of useful functions.  want to eliminate overlap -->
 	<script src="chrome://evergreen/content/Open-ILS/util/RemoteRequest.js" />	<!-- XMLHttpRequest -->
-	<script src="chrome://evergreen/content/Open-ILS/util/ex.js" />			<!-- error/exception handling -->
+	<script src="chrome://evergreen/content/Open-ILS/util/opac_utils.js" />			<!-- error/exception handling -->
 
 	<script src="ses.js" />		<!-- my wrapper over the OpenSRF communication layer.. Jabber and XMLHttpRequest -->
 	<script src="explode.js" />	<!-- original attempt at linking widgets to data.  Want to use something more OO -->
-- 
2.43.2