From 25c1fa9b0c3cc60a6234f0a574a82e60fe455ad8 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Sat, 30 Jun 2018 12:08:43 -0400
Subject: [PATCH] LP#1779158 Angular vandelay more import form

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../app/staff/cat/vandelay/import.component.html   | 43 +++++++++++++---------
 .../src/app/staff/cat/vandelay/import.component.ts |  3 +-
 .../app/staff/cat/vandelay/vandelay.component.html |  7 +++-
 3 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html
index b0a9ee6721..40bf0d51ca 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html
@@ -1,11 +1,11 @@
 
 <eg-progress-dialog #progressDialog></eg-progress-dialog>
 
-<div class="pl-4 pr-4">
+<div class="import-form">
   <h2 i18n>MARC File Upload</h2>
-  <div class="row pb-2">
+  <div class="row">
     <div class="col-lg-3">
-      <label class="font-weight-bold" i18n>Record Type</label>
+      <label i18n>Record Type</label>
     </div>
     <div class="col-lg-3">
       <select class="form-control" [(ngModel)]="recordType">
@@ -16,41 +16,50 @@
     </div>
   </div>
   <div class="row">
-    <div class="col-lg-3 pb-2">
-      <label class="font-weight-bold" i18n>Create a New Upload Queue</label>
+    <div class="col-lg-3">
+      <label i18n>Create a New Upload Queue</label>
     </div>
     <div class="col-lg-3">
-      <input type="text" class="form-control" [(ngModel)]="newQueueName"/>
+      <input type="text" class="form-control" 
+        placeholder="Create a new queue..." i18n-placeholder
+        [(ngModel)]="newQueueName"/>
     </div>
     <div class="col-lg-3">
-      <label class="font-weight-bold" i18n>or Add to an Existing Queue</label>
+      <label i18n>or Add to an Existing Queue</label>
     </div>
     <div class="col-lg-3">
-      <eg-typeahead [entries]="formatEntries('activeQueues')"></eg-typeahead>
+      <eg-typeahead [entries]="formatEntries('activeQueues')"
+        placeholder="Select a Queue..." i18n-placeholder>
+      </eg-typeahead>
     </div>
   </div>
-  <div class="row pb-2">
+  <div class="row">
     <div class="col-lg-3">
-      <label class="font-weight-bold" i18n>Record Match Set</label>
+      <label i18n>Record Match Set</label>
     </div>
     <div class="col-lg-3">
-      <eg-typeahead [entries]="formatEntries('matchSets')"></eg-typeahead>
+      <eg-typeahead [entries]="formatEntries('matchSets')" 
+        placeholder="Match Set..." i18n-placeholder></eg-typeahead>
     </div>
   </div>
-  <div class="row pb-2">
+  <div class="row">
     <div class="col-lg-3">
-      <label class="font-weight-bold" i18n>Holdings Import Profile</label>
+      <label i18n>Holdings Import Profile</label>
     </div>
     <div class="col-lg-3"> <!-- TODO disable for authority -->
-      <eg-typeahead [entries]="formatEntries('importItemDefs')"></eg-typeahead>
+      <eg-typeahead [entries]="formatEntries('importItemDefs')"
+        placeholder="Holdings Import Profile..." i18n-placeholder>
+      </eg-typeahead>
     </div>
   </div>
-  <div class="row pb-2">
+  <div class="row">
     <div class="col-lg-3">
-      <label class="font-weight-bold" i18n>Select a Record Source</label>
+      <label i18n>Select a Record Source</label>
     </div>
     <div class="col-lg-3">
-      <eg-typeahead [entries]="formatEntries('bibSources')"></eg-typeahead>
+      <eg-typeahead [entries]="formatEntries('bibSources')"
+        placeholder="Record Source..." i18n-placeholder>
+      </eg-typeahead>
     </div>
   </div>
 </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts
index 4a7cb2e0a6..0d125a7957 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts
@@ -6,7 +6,8 @@ import {VandelayService} from './vandelay.service';
 import {ProgressDialogComponent} from '@eg/share/dialog/progress.component';
 
 @Component({
-  templateUrl: 'import.component.html'
+  templateUrl: 'import.component.html',
+  styleUrls: ['import.component.css']
 })
 export class ImportComponent implements OnInit, AfterViewInit {
 
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html
index e399b43206..6f5935a096 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html
@@ -1,7 +1,12 @@
+<!--  
+Do we need this?  I think it's fairly obvious what page we're on and
+it takes up a good bit of vertical space which is needed by the large
+import form.
 <eg-staff-banner bannerText="MARC Record Import/Export" i18n-bannerText>
 </eg-staff-banner>
+-->
 
-<ul class="nav nav-pills nav-fill p-3">
+<ul class="nav nav-pills nav-fill pb-4">
   <li class="nav-item">
     <a class="nav-link" [ngClass]="{active: tab=='export'}" 
       routerLink="/staff/cat/vandelay/export" i18n>Export</a>
-- 
2.11.0