Acq li_table main actions dropdown - logical reordering

and minor s/Lineitem/Line Item/ in labels here and there

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

diff --git a/Open-ILS/src/templates/acq/common/li_table.tt2 b/Open-ILS/src/templates/acq/common/li_table.tt2
index ac6278b..2dbb7e4 100644 (file)
--- a/Open-ILS/src/templates/acq/common/li_table.tt2
+++ b/Open-ILS/src/templates/acq/common/li_table.tt2
@@ -5,7 +5,7 @@
 <div id='acq-lit-table-container'>
     <div id='acq-lit-table-div' class='hidden'>
 
-        <!-- Lineitem (bib record) list -->
+        <!-- Line Item (bib record) list -->
         <table id='acq-lit-table' class='oils-generic-table'>
             <thead>
                 <tr>
@@ -22,18 +22,20 @@
                                             <option mask='*'  value='delete_selected'>[% l('Delete Selected Items') %]</option>
                                             <option mask='*'  value='add_brief_record'>[% l('Add Brief Record') %]</option>
                                             <option mask='*'  value='export_attr_list'>[% l('Export Single Attribute List') %]</option>
-                                            <option mask='*'  value='batch_apply_funds'>[% l('Apply Funds to Selected Items') %]</option>
                                             <option mask='po' value='' disabled='disabled'>[% l('----PO----') %]</option>
                                             <option mask='sr|pl' value='create_order'>[% l('Create Purchase Order') %]</option>
-                                            <option mask='po' value='create_assets'>[% l('Load Bibs and Items') %]</option>
-                                            <option mask='po' value='cancel_lineitems'>[% l('Cancel Selected Lineitems') %]</option>
-                                            <option mask='po' value='change_claim_policy'>[% l('Change Claim Policy') %]</option>
-                                            <option mask='po' value='receive_po' id='receive_po' disabled='disabled'>[% l('Mark Purchase Order as Received') %]</option>
-                                            <option mask='po' value='rollback_receive_po' id='rollback_receive_po' disabled='disabled'>[% l('Un-Receive Purchase Order') %]</option>
+                                            <option mask='sr|pl' value='add_to_order'>[% l('Add to Purchase Order') %]</option>
                                             <option mask='po' value='print_po'>[% l('Print Purchase Order') %]</option>
                                             <option mask='po' value='po_history'>[% l('View PO History') %]</option>
-                                            <option mask='po' value='batch_create_invoice'>[% l('Create Invoice From Selected Lineitems') %]</option>
-                                            <option mask='po' value='batch_link_invoice'>[% l('Link To Invoice for Selected Lineitems') %]</option>
+                                            <option mask='po' value='create_assets'>[% l('Load Bibs and Items') %]</option>
+                                            <!-- <option mask='*'  value='batch_apply_funds'>[% l('Apply Funds to Selected Items') %]</option> XXX moving to batch updater -->
+                                            <option mask='po' value='cancel_lineitems'>[% l('Cancel Selected Line Items') %]</option>
+                                            <option mask='po' value='apply_claim_policy'>[% l('Apply Claim Policy to Selected Line Items') %]</option><!-- can the functionality desired here be covered by the next thing? -->
+                                            <option mask='po' value='change_claim_policy'>[% l('Change Claim Policy for Selected Line Items') %]</option>
+                                            <option mask='po' value='receive_lineitems' id='receive_lineitems' disabled='disabled'>[% l('Mark Selected Line Items as Received') %]</option>
+                                            <option mask='po' value='rollback_receive_lineitems' id='rollback_receive_lineitems' disabled='disabled'>[% l('Un-Receive Selected Line Items') %]</option>
+                                            <option mask='po' value='batch_create_invoice'>[% l('Create Invoice From Selected Line Items') %]</option>
+                                            <option mask='po' value='batch_link_invoice'>[% l('Link Selected Line Items to Invoice') %]</option>
                                         </select>
                                         <span id="acq-lit-export-attr-holder" class="hidden">
                                             <input dojoType="dijit.form.FilteringSelect" id="acq-lit-export-attr" jsId="acqLitExportAttrSelector" labelAttr="description" searchAttr="description" />
@@ -197,10 +199,10 @@
         </table>
     </div>
 
-    <!-- Bib record / Lineitem info table -->
+    <!-- Bib record / Line Item info table -->
     [% INCLUDE "acq/common/info.tt2" which = "Lit" %]
 
-    <!-- Lineitem notes table -->
+    <!-- Line Item notes table -->
     [% INCLUDE "acq/common/notes.tt2" which = "Lit" %]
 
     <!-- Copies table -->
@@ -409,11 +411,11 @@
                     <td><input id="acq-lit-po-prepay" name="prepayment_required" dojoType="dijit.form.CheckBox"/></td>
                 </tr>
                 <tr>
-                    <td>[% l('All Lineitems') %]</td>
+                    <td>[% l('All Line Items') %]</td>
                     <td><input checked='checked' name='create_from' value='all' dojoType='dijit.form.RadioButton'/></td>
                 </tr>
                 <tr>
-                    <td>[% l('Selected Lineitems') %]</td>
+                    <td>[% l('Selected Line Items') %]</td>
                     <td><input name='create_from' value='selected' dojoType='dijit.form.RadioButton'/></td>
                 </tr>
                 <tr>