From 9fb561476e82653af5e554ab80222a3399745b02 Mon Sep 17 00:00:00 2001
From: Jason Etheridge <jason@esilibrary.com>
Date: Fri, 11 Mar 2011 04:16:40 -0500
Subject: [PATCH] layout changes toward batch application menus. splitter
 tweaks for persistance/usability

---
 .../server/cat/volume_copy_creator.xul             | 82 +++++++++++++++-------
 .../staff_client/server/cat/volume_copy_editor.xul | 17 +++--
 2 files changed, 68 insertions(+), 31 deletions(-)

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 4a819163de..7d4dee4219 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
@@ -36,34 +36,62 @@
     <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"/>
-    <hbox>
-        <hbox id="marc_cn"/>
-        <spacer flex="1" />
-        <button id="generate_barcodes" label="&staff.cat.volume_copy_creator.generate_barcodes.label;" oncommand="g.generate_barcodes();" accesskey="&staff.cat.volume_copy_creator.generate_barcodes.accesskey;"/>
-        <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;"/>
-    </hbox>
-    <groupbox flex="1" class="my_overflow">
-        <caption id="caption" label="&staff.cat.volume_copy_creator.label;"/>
-        <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>
-    <hbox style="border-bottom: solid black thin">
-        <spacer flex="1"/>
-        <hbox id="non_unified_buttons">
-            <button id="CreateWithDefaults" disabled="true" oncommand="g.stash_and_close('noedit');"/>
-            <button id="EditThenCreate" disabled="true" oncommand="g.stash_and_close('edit');"/>
+    <vbox id="summary_box" oils_persist="height"/>
+    <splitter
+        collapse="before"
+        resize_before="flex"
+        resize_after="flex"
+        oils_persist="state hidden"
+        oils_persist_peers="summary_box main">
+        <grippy/>
+    </splitter>
+    <vbox id="main" oils_persist="height" flex="1">
+        <hbox flex="0">
+            <hbox id="batch_bar">
+                <label value="Batch:"/>
+                <hbox id="batch_class"/>
+                <hbox id="batch_prefix"/>
+                <hbox id="marc_cn"/>
+                <hbox id="batch_suffix"/>
+                <hbox id="batch_button"/>
+            </hbox>
+            <spacer flex="1" />
         </hbox>
-        <button id="Create" disabled="true" oncommand="g.stash_and_close('unified_interface');"/>
-    </hbox>
+        <groupbox flex="1" class="my_overflow">
+            <caption id="caption" label="&staff.cat.volume_copy_creator.label;"/>
+            <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>
+        <hbox style="border-bottom: solid black thin" flex="0">
+            <hbox id="misc_control_bar">
+                <button id="generate_barcodes"
+                    label="&staff.cat.volume_copy_creator.generate_barcodes.label;"
+                    oncommand="g.generate_barcodes();"
+                    accesskey="&staff.cat.volume_copy_creator.generate_barcodes.accesskey;"/>
+                <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;"/>
+            </hbox>
+            <spacer flex="1"/>
+            <hbox id="non_unified_buttons">
+                <button id="CreateWithDefaults" disabled="true" oncommand="g.stash_and_close('noedit');"/>
+                <button id="EditThenCreate" disabled="true" oncommand="g.stash_and_close('edit');"/>
+            </hbox>
+            <button id="Create" disabled="true" oncommand="g.stash_and_close('unified_interface');"/>
+        </hbox>
+    </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_editor.xul b/Open-ILS/xul/staff_client/server/cat/volume_copy_editor.xul
index f69355b475..2e42a888bc 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_editor.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_editor.xul
@@ -32,10 +32,19 @@
     <script type="text/javascript" src="volume_copy_editor.js"/>
 
     <vbox flex="1">
-        <hbox id="template_bar_holder"/>
-        <browser id="volume_pane" flex="1" />
-        <splitter resizeafter="flex" resizebefore="flex"><grippy/></splitter>
-        <browser id="item_pane" flex="1" />
+        <vbox id="top_pane" flex="1" oils_persist="height">
+            <hbox id="template_bar_holder"/>
+            <browser id="volume_pane" flex="1" />
+        </vbox>
+        <splitter
+            collapse="after"
+            resizeafter="flex"
+            resizebefore="flex"
+            oils_persist="state hidden"
+            oils_persist_peers="top_pane item_pane">
+            <grippy/>
+        </splitter>
+        <browser id="item_pane" flex="1" oils_persist="height"/>
     </vbox>
 
 </window>
-- 
2.11.0