had the OrgTree going in the wrong place. A stale copy must have hid the problem

git-svn-id: svn://svn.open-ils.org/ILS/trunk@2036 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Evergreen/staff_client/Makefile b/Evergreen/staff_client/Makefile
index 4b09647..dbd6209 100644 (file)
--- a/Evergreen/staff_client/Makefile
+++ b/Evergreen/staff_client/Makefile
@@ -38,7 +38,7 @@ generated:
        @echo
        @echo These things are installation specific.  The staff client is the last thing you should try to build.
        #(cd chrome/content/evergreen/util ; ${RETRIEVE_FIELDMAPPER} );
-       (cd chrome/content/evergreen/util ; ${RETRIEVE_ORG_TREE} );
+       (cd chrome/content/evergreen/Open-ILS/util/ ; ${RETRIEVE_ORG_TREE} );
        (cd chrome/content/evergreen/conf ; ${RETRIEVE_CLIENT_CONFIG} );
        (cd chrome/content/evergreen/Open-ILS/util/ ; ${RETRIEVE_FM_ALL} );
 

diff --git a/Evergreen/staff_client/chrome/content/evergreen/auth/auth_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/auth/auth_overlay.xul
index 9f9aa22..b949fe6 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/auth/auth_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/auth/auth_overlay.xul
@@ -29,10 +29,8 @@
                <iframe id="print_frame" flex="1"/>
                <iframe id="scratch_pad" flex="1"/>
        </deck>
-       <!--
        <button label="Console" accesskey="C" oncommand="try {mw.spawn_javascript_console(mw.document,'new_window','',{}); } catch(E) { alert(E); }"/>
        <button label="FConsole" accesskey="F" oncommand="try {mw.spawn_filter_console(mw.document,'new_window','',{}); } catch(E) { alert(E); }"/>
-       -->
 </box>
 
 <groupbox id="main_groupbox" flex="1">