More Vandelay text and style cleanup

* More consistent use of the word "match"
* Make upload input more obvious w/ a border
* Move some strings into DTD

diff --git a/Open-ILS/web/opac/locale/en-US/vandelay.dtd b/Open-ILS/web/opac/locale/en-US/vandelay.dtd
index 7928620..68eb92e 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/vandelay.dtd
+++ b/Open-ILS/web/opac/locale/en-US/vandelay.dtd
@@ -1,7 +1,8 @@
 <!ENTITY vandelay.add.existing.queue "or Add to an Existing Queue">
 <!ENTITY vandelay.auth.attrs "Authority attributes">
 <!ENTITY vandelay.auth.records "Authority Records">
-<!ENTITY vandelay.auto.import.noncolliding "Import Non-Colliding Records">
+<!ENTITY vandelay.import.actions "Record Import Actions">
+<!ENTITY vandelay.auto.import.noncolliding "Import Non-Matching Records">
 <!ENTITY vandelay.auto.import.auto_overlay_exact "Merge On Exact Match (901c)">
 <!ENTITY vandelay.auto.import.auto_overlay_1match "Merge On Single Match">
 <!ENTITY vandelay.auto.import.auto_overlay_best "Merge On Best Match">

diff --git a/Open-ILS/web/templates/default/vandelay/inc/upload.tt2 b/Open-ILS/web/templates/default/vandelay/inc/upload.tt2
index f742104..40aae32 100644 (file)
--- a/Open-ILS/web/templates/default/vandelay/inc/upload.tt2
+++ b/Open-ILS/web/templates/default/vandelay/inc/upload.tt2
@@ -44,7 +44,9 @@
                     dojoType='dijit.form.FilteringSelect' labelAttr='source' searchAttr='source'/>
             </td>
         </tr>
-        <tr><td colspan='2' style='margin-top:10px;border-bottom:1px solid #888;border-top:1px solid #888'><b>Import Actions</b></td></tr>
+        <tr><td colspan='2' style='margin-top:10px;border-bottom:1px solid #888;border-top:2px solid #888'>
+            <b>&vandelay.import.actions;</b>
+        </td></tr>
         <tr>
             <td>&vandelay.auto.import.merge_profile;</td>
             <td colspan='4'>
@@ -80,13 +82,13 @@
                 <span style='padding-left: 10px; font-size:90%'>(&vandelay.auto.import.auto_overlay_best_ratio.desc;)</span>
             </td>
         </tr>
-
-        <tr><td colspan='2' style='border-bottom:1px solid #888'></td></tr>
+        <tr><td colspan='2' style='border-bottom:2px solid #888;'></td></tr>
+        <tr><td colspan='2' style='padding-bottom: 10px;'></td></tr>
         <tr>
             <td colspan='5'>
                 <span id="vl-file-label">&vandelay.file.to.upload;</span>
-                <input size='48' type="file" name="marc_upload"/>
-                <span style='margin-left:10px;'><button dojoType="dijit.form.Button" onclick="batchUpload()">&vandelay.upload;</button></span>
+                <input size='48' style='border:1px solid #888;' type="file" name="marc_upload"/>
+                <span style='margin-left:10px;'><button onclick="batchUpload()">&vandelay.upload;</button></span>
             </td>
         </tr>
     </table>