Lineitem copies page layout changes

Move the Distribution Formula selector above the batch editor widgets
mainly so the batch editor widgets sit closer to batch edit target copy
grid.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>

diff --git a/Open-ILS/web/css/skin/default/acq.css b/Open-ILS/web/css/skin/default/acq.css
index 91fceb4..6d03933 100644 (file)
--- a/Open-ILS/web/css/skin/default/acq.css
+++ b/Open-ILS/web/css/skin/default/acq.css
@@ -146,7 +146,8 @@ label[for="attr_search_type_scalar"] { vertical-align: top; }
 .acq-lit-po-heading td span a[attr="name"] { font-weight: bold; }
 #acq-lit-info-tbody td {padding:5px;}
 #acq-lit-info-related { margin-top: 10px; }
-#acq-lit-li-details-table {margin-top:5px;}
+#acq-lit-distrib-formula-table { margin-top: 10px; margin-bottom: 5px;}
+#acq-lit-li-details-table {margin-top:5px; border-top;}
 #acq-lit-li-details-table td {padding:0px 3px 1px 3px;}
 #acq-lit-li-details-table th {padding:0px 3px 1px 3px; font-weight:bold;}
 #acq-lit-li-details-table .dijit {width:130px;}

diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js
index d3dad87..bc0c0a8 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/common/li_table.js
+++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js
@@ -1118,7 +1118,7 @@ function AcqLiTable() {
 
         if (!self.distribForms) {
             // no formulas, hide the form
-            openils.Util.hide('acq-lit-distrib-formula-tbody');
+            openils.Util.hide('acq-lit-distrib-formula-table');
             return;
         }
 

diff --git a/Open-ILS/web/templates/default/acq/common/li_table.tt2 b/Open-ILS/web/templates/default/acq/common/li_table.tt2
index 6f4606c..28ef757 100644 (file)
--- a/Open-ILS/web/templates/default/acq/common/li_table.tt2
+++ b/Open-ILS/web/templates/default/acq/common/li_table.tt2
@@ -161,9 +161,7 @@
                                 constraints="{min:0,max:1000,places:0}" style='width:40px' value='0'></input> 
                             <div dojoType='dijit.form.Button' jsId='acqLitAddCopyCount' scrollOnFocus='false'>Go</div>
                         </span>
-                    </td>
-                    <td class="acq-lit-li-menu-right">
-                        <span>
+                        <span style='margin-left:10px;padding-left:10px;border-left:2px solid #aaa;'>
                             <div dojoType='dijit.form.Button' jsId='acqLitSaveCopies' scrollOnFocus='false'>Save Changes</div>
                         </span>
                         <span id='acq-lit-update-copies-progress' class='hidden'>
@@ -175,6 +173,29 @@
         </div>
 
         <hr/>
+        <table id='acq-lit-distrib-formula-table'>
+            <tbody id='acq-lit-distrib-formula-tbody'>
+                <tr id='acq-lit-distrib-form-row'>
+                    <td colspan='0'>
+                        <span>Distribution Formulas</span>
+                        <div name='selector'></div>
+                        <div name='set_button'></div>
+                        <div name="reset_button"></div>
+                    </td>
+                </tr>
+            </tbody>
+            <tbody id="acq-lit-distrib-applied-tbody" class="hidden">
+                <tr>
+                    <td colspan="5" id="acq-lit-distrib-applied-heading">
+                        Distribution formulas applied to this lineitem:
+                    </td>
+                </tr>
+                <tr id="acq-lit-distrib-applied-row" class="acq-lit-distrib-applied-row">
+                    <th></th>
+                    <td colspan="4"></td>
+                </tr>
+            </tbody>
+        <table>
 
         <table id='acq-lit-li-details-table'>
             <tbody><tr><td class='acq-lit-table-spacer' colspan='0'/></tr></tbody>
@@ -203,31 +224,6 @@
                 </tr>
             </tbody>
 
-            <tbody><tr><td class='acq-lit-table-spacer' colspan='0'/></tr></tbody>
-
-            <tbody id='acq-lit-distrib-formula-tbody'>
-                <tr id='acq-lit-distrib-form-row'>
-                    <td colspan='0'>
-                        <span>Distribution Formulas</span>
-                        <div name='selector'></div>
-                        <div name='set_button'></div>
-                        <div name="reset_button"></div>
-                    </td>
-                </tr>
-            </tbody>
-
-            <tbody><tr><td class='acq-lit-table-spacer' colspan='0'/></tr></tbody>
-            <tbody id="acq-lit-distrib-applied-tbody" class="hidden">
-                <tr>
-                    <td colspan="5" id="acq-lit-distrib-applied-heading">
-                        Distribution formulas applied to this lineitem:
-                    </td>
-                </tr>
-                <tr id="acq-lit-distrib-applied-row" class="acq-lit-distrib-applied-row">
-                    <th></th>
-                    <td colspan="4"></td>
-                </tr>
-            </tbody>
 
             <tbody><tr><td class='acq-lit-table-spacer' colspan='0'></td></tr></tbody>
             <tbody style='font-weight:bold;'>