acq vandelay : UI bits

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/templates/acq/common/vlagent.tt2 b/Open-ILS/src/templates/acq/common/vlagent.tt2
index 55e7d6e..ee5890b 100644 (file)
--- a/Open-ILS/src/templates/acq/common/vlagent.tt2
+++ b/Open-ILS/src/templates/acq/common/vlagent.tt2
@@ -1,4 +1,12 @@
 <tr>
+    <td>[% l('Upload to Queue') %]</td>
+    <td><div id='acq_vl:existing_queue'></div></td>
+    <td>
+        <span>[% l('Or create a new queue') %]</span>
+        <input dojoType='dijit.form.TextBox' id='acq_vl:queue_name' size='32'></input>
+    </td>
+</tr>
+<tr>
     <td>[% l('Record Match Set') %]</td>
     <td><div id='acq_vl:match_set'></div></td>
 </tr>
@@ -9,10 +17,7 @@
 <tr>
     <td>[% l('Import Non-Matching Records') %]</td>
     <td><input dojoType='dijit.form.CheckBox' id='acq_vl:import_no_match'></input></td>
-</tr>
-<tr>
-    <td>[% l('Select a Record Source') %]</td>
-    <td><div id='acq_vl:bib_source'></div></td>
+    <td><span style='padding-right:10px;'>[% l('Record Source') %]</span> <div id='acq_vl:bib_source'></div></td>
 </tr>
 <tr>
     <td>[% l('Merge On Exact Match (901c)') %]</td>
@@ -37,12 +42,4 @@
     <td>[% l('Insufficient Quality Fall-Through Profile') %]</td>
     <td><div id='acq_vl:fall_through_merge_profile'></div></td>
 </tr>
-<tr>
-    <td>[% l('Upload to Queue') %]</td>
-    <td><div id='acq_vl:existing_queue'></div></td>
-    <td>
-        <span>[% l('Or create a new queue') %]</span>
-        <input dojoType='dijit.form.TextBox' id='acq_vl:queue_name' size='32'></input>
-    </td>
-</tr>
 

diff --git a/Open-ILS/src/templates/acq/picklist/upload.tt2 b/Open-ILS/src/templates/acq/picklist/upload.tt2
index a1d19bf..742133f 100644 (file)
--- a/Open-ILS/src/templates/acq/picklist/upload.tt2
+++ b/Open-ILS/src/templates/acq/picklist/upload.tt2
@@ -85,6 +85,7 @@
                     <tr><td colspan='2'>Upload Complete!</td></tr>
                     <tr><td colspan='2'><a id='acq-pl-upload-complete-po'>View Purchase Order</a></td></tr>
                     <tr><td colspan='2'><a id='acq-pl-upload-complete-pl'>View Selection List</a></td></tr>
+                    <tr><td colspan='2'><a id='acq-pl-upload-complete-q'></a></td></tr>
                 </tbody>
             </table>
         </div>

diff --git a/Open-ILS/web/js/ui/default/acq/picklist/upload.js b/Open-ILS/web/js/ui/default/acq/picklist/upload.js
index b56fe09..eb1bb50 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/picklist/upload.js
+++ b/Open-ILS/web/js/ui/default/acq/picklist/upload.js
@@ -120,6 +120,7 @@ function acqHandlePostUpload(key) {
                 if(resp.complete) {
                     openils.Util.hide('acq-pl-upload-complete-pl');
                     openils.Util.hide('acq-pl-upload-complete-po');
+                    openils.Util.hide('acq-pl-upload-complete-q');
                     openils.Util.hide('acq-pl-upload-progress-bar');
                     openils.Util.show('acq-pl-upload-complete');
 
@@ -134,6 +135,13 @@ function acqHandlePostUpload(key) {
                         dojo.byId('acq-pl-upload-complete-po').setAttribute(
                             'href', oilsBasePath + '/acq/po/view/' + resp.purchase_order.id());
                     }
+
+                    if (resp.queue) {
+                        link = dojo.byId('acq-pl-upload-complete-q');
+                        openils.Util.show(link);
+                        link.setAttribute('href', oilsBasePath + '/vandelay/vandelay?qtype=bib&qid=' + resp.queue.id());
+                        link.innerHTML = resp.queue.name();
+                    }
                 }
             },
         }