overlay insertion points.. wrong overlay

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

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_status_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_status_overlay.xul
index ad93e27..0c210d9 100755 (executable)
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_status_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_status_overlay.xul
@@ -14,19 +14,22 @@
 
 <!-- main widget for patron_display_status -->
 <box id="PatronDisplayStatus_main" flex="1" orient="vertical">
+       <hbox id="PatronDisplayStatus_insert1"/>
        <groupbox id="PatronDisplayStatus_groupbox" flex="1"/>
+       <hbox id="PatronDisplayStatus_insert5"/>
 </box>
 
 <groupbox id="PatronDisplayStatus_groupbox" orient="vertical">
        <caption label="&patron_display.status.caption;"/>
-       <hbox id="PatronSearch_DisplayStatus_insert1"/>
+       <hbox id="PatronDisplayStatus_insert2"/>
        <label id="PatronDisplayStatus_home_ou"
                tooltiptext="&patron_display.home_ou.label;"
                value=" "
                render="true" fm_class="au" 
                render_value="patron_get_home_ou_name($$)" />
+       <hbox id="PatronDisplayStatus_insert3"/>
        <grid id="PatronDisplayStatus_grid" flex="1"/>
-       <hbox id="PatronSearch_DisplayStatus_insert2"/>
+       <hbox id="PatronDisplayStatus_insert4"/>
        <label bug="without this here, the label and grid get swapped in the display"/>
 </groupbox>
 

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_form_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_form_overlay.xul
index f3ec05b..b1efde2 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_form_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_form_overlay.xul
@@ -14,12 +14,14 @@
 
 <!-- main widget for patron_search_form -->
 <box id="PatronSearchForm_main" flex="1" orient="vertical">
-
+       <box id="PatronSearchForm_insert1"/>
        <groupbox id="psgf_gb">
                <caption id="psgf_gbc" label='&patron_search_form.caption;' />
+               <box id="PatronSearchForm_insert2"/>
                <grid id="psg" />
+               <box id="PatronSearchForm_insert3"/>
        </groupbox>
-       <groupbox id="PatronDisplayStatus_groupbox" name="selection_canvas"/>
+       <box id="PatronSearchForm_insert4"/>
 </box>
 
 <!-- group 0 = user  group 1 = address  group 2 = phone, ident -->

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_overlay.xul
index 8ff185a..5799cd4 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_overlay.xul
@@ -6,7 +6,7 @@
        <script>mw.sdump('D_TRACE','Loading patron_search_overlay.xul\n');</script>
 
        <?xul-overlay href="chrome://evergreen/content/main/clam_shell_overlay.xul"?>
-       <?xul-overlay href="chrome://evergreen/content/patron/patron_display_status.xul"?>
+       <?xul-overlay href="chrome://evergreen/content/patron/patron_display_status_overlay.xul"?> 
        <?xul-overlay href="chrome://evergreen/content/patron/patron_search_form_overlay.xul"?>
        <?xul-overlay href="chrome://evergreen/content/patron/patron_search_results_overlay.xul"?>
 
@@ -30,15 +30,16 @@
        <box id="PatronSearchResults_main"/>
 </deck>
 
-<hbox id="PatronSearch_DisplayStatus_insert1">
+<hbox id="PatronDisplayStatus_insert2">
        <label id="PatronSearch_patron_name" class="patronNameMedium"
                tooltiptext="&patron_display.name.label;"
                value=" "
                render="true" fm_class="au" 
                render_value="patron_get_full_name($$)" />
 </hbox>
-<hbox id="PatronSearch_DisplayStatus_insert2">
+<hbox id="PatronDisplayStatus_insert4">
        <button id="PatronSearch_retrieve_button" 
+               disabled="true"
                label="&patron_navbar.retrieve;" 
                accesskey="&patron_navbar.retrieve.accesskey;"/>
 </hbox>