From 3ef152fdcf964d2d63ac09db2c771286d01c5e1b Mon Sep 17 00:00:00 2001
From: Jason Etheridge <jason@esilibrary.com>
Date: Fri, 20 May 2011 05:30:55 -0400
Subject: [PATCH] align the batch edit menus in the vol creator.  mostly
 aesthetic, but can save horizontal real estate, so usability as well for
 horizontal vol/copy editor.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
---
 .../server/cat/volume_copy_creator.js         |  4 ++
 .../server/cat/volume_copy_creator.xul        | 57 ++++++++++++++-----
 Open-ILS/xul/staff_client/server/skin/cat.css |  2 +-
 3 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
index dcaac78175..d9c2b2ce7a 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
@@ -417,15 +417,18 @@ g.render_callnumber_copy_count_entry = function(row,ou_id,count) {
             var classification_column_box = document.createElement('vbox');
             classification_column_box.setAttribute('class','cn_class');
             r.appendChild(classification_column_box);
+            classification_column_box.width = $('batch_class').parentNode.boxObject.width;
 
             /**** PREFIX COLUMN ****/
             var prefix_column_box = document.createElement('vbox');
             prefix_column_box.setAttribute('class','cn_prefix');
             r.appendChild(prefix_column_box);
+            prefix_column_box.width = $('batch_prefix').parentNode.boxObject.width;
 
             /**** CALLNUMBER COLUMN ****/
             var call_number_column_box = document.createElement('vbox');
             r.appendChild(call_number_column_box);
+            call_number_column_box.width = $('marc_cn').parentNode.boxObject.width;
                 var call_number_column_textbox = document.createElement('textbox');
                 call_number_column_box.appendChild(call_number_column_textbox);
                     if (g.use_defaults && $('marc_cn').firstChild) {
@@ -482,6 +485,7 @@ g.render_callnumber_copy_count_entry = function(row,ou_id,count) {
             var suffix_column_box = document.createElement('vbox');
             suffix_column_box.setAttribute('class','cn_suffix');
             r.appendChild(suffix_column_box);
+            suffix_column_box.width = $('batch_suffix').parentNode.boxObject.width;
                 var suffix_column_menulist = g.render_suffix_menu(call_number_column_textbox);
                 suffix_column_menulist.addEventListener(
                     'command',
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 f48695a07e..5cfc111c9b 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
@@ -49,24 +49,51 @@
     <vbox id="main" oils_persist="height" flex="1">
         <groupbox flex="1" class="my_overflow">
             <caption id="caption" label="&staff.cat.volume_copy_creator.label;"/>
-            <hbox flex="0">
-                <hbox id="batch_bar" flex="1">
-                    <label value="&staff.cat.volume_copy_creator.batch_bar;"/>
-                    <label class="cn_class" value="&staff.cat.volume_copy_creator.batch_bar.call_number.classification;"/>
-                    <hbox class="cn_class" id="batch_class"/>
-                    <label class="cn_prefix" value="&staff.cat.volume_copy_creator.batch_bar.call_number.prefix;"/>
-                    <hbox class="cn_prefix" id="batch_prefix"/>
-                    <label value="&staff.cat.volume_copy_creator.batch_bar.call_number.label.label;"
-                        accesskey="&staff.cat.volume_copy_creator.batch_bar.call_number.label.accesskey;" control="marc_cn_menulist"/>
-                    <hbox id="marc_cn"/>
-                    <label class="cn_suffix" value="&staff.cat.volume_copy_creator.batch_bar.call_number.suffix;"/>
-                    <hbox class="cn_suffix" id="batch_suffix"/>
-                    <hbox id="batch_button_box"/>
-                </hbox>
-            </hbox>
             <grid flex="1">
                 <columns> <column flex="0"/> <column flex="0"/> <column flex="1"/> </columns>
                 <rows id="rows">
+                    <row id="batch_bar">
+                        <spacer />
+                        <spacer />
+                        <grid flex="1">
+                            <columns>
+                                <column/>
+                                <column/>
+                                <column/>
+                                <column/>
+                            </columns>
+                            <rows>
+                                <row>
+                                    <vbox class="cn_class">
+                                        <label value="&staff.cat.volume_copy_creator.batch_bar.call_number.classification;"
+                                            class="header"/>
+                                        <hbox id="batch_class"/>
+                                    </vbox>
+                                    <vbox class="cn_prefix">
+                                        <label value="&staff.cat.volume_copy_creator.batch_bar.call_number.prefix;"
+                                            class="header"/>
+                                        <hbox id="batch_prefix"/>
+                                    </vbox>
+                                    <vbox>
+                                        <label
+                                            value="&staff.cat.volume_copy_creator.batch_bar.call_number.label.label;"
+                                            accesskey="&staff.cat.volume_copy_creator.batch_bar.call_number.label.accesskey;"
+                                            control="marc_cn_menulist" class="header"/>
+                                        <hbox id="marc_cn"/>
+                                    </vbox>
+                                    <vbox class="cn_suffix">
+                                        <label value="&staff.cat.volume_copy_creator.batch_bar.call_number.suffix;"
+                                            class="header"/>
+                                        <hbox id="batch_suffix"/>
+                                    </vbox>
+                                    <vbox>
+                                        <label class="header" value="&staff.cat.volume_copy_creator.batch_bar;"/>
+                                        <hbox id="batch_button_box"/>
+                                    </vbox>
+                                </row>
+                            </rows>
+                        </grid>
+                    </row>
                     <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"/>
diff --git a/Open-ILS/xul/staff_client/server/skin/cat.css b/Open-ILS/xul/staff_client/server/skin/cat.css
index d17d0df589..3fc7a30449 100644
--- a/Open-ILS/xul/staff_client/server/skin/cat.css
+++ b/Open-ILS/xul/staff_client/server/skin/cat.css
@@ -8,7 +8,7 @@
 .copy_editor_field_changed { background: lightgreen; }
 .copy_editor_field_required { border: solid thin red; }
 
-hbox#batch_bar { background-color: gray; }
+row#batch_bar { background-color: gray; }
 
 /* How you might hide the classification, affix, and parts columns in the volume creator/editor */
 /*
-- 
2.43.2