LH#12 various styling improvements

- clean up how the hide search form and new provider column flows
- add a bit of padding below the Set Default View button
- change the label of the Owning Library search input to Owner
- keep the Owner label and OU search input on same line for narrower screens

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.html b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.html
index af3373a..7028f42 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.html
@@ -1,50 +1,48 @@
 <div id="acq-provider-search-form" class="pl-3 pr-3 pt-3 pb-3 mb-3">
 <form>
   <div class="row mb-1">
-    <div class="col-lg-2">
+    <div class="col-lg">
       <input i18n-placeholder placeholder="Provider Name" [ngModelOptions]="{standalone: true}" [(ngModel)]="providerName" type="text" class="form-control" />
     </div>
-    <div class="col-lg-2">
+    <div class="col-lg">
       <input i18n-placeholder placeholder="Code" [ngModelOptions]="{standalone: true}" [(ngModel)]="providerCode" type="text" class="form-control" />
     </div>
-    <div class="col-lg-2">
-      <eg-org-family-select i18n-labelText labelText="Owning Library" [ngModelOptions]="{standalone: true}" [(ngModel)]="providerOwners"></eg-org-family-select>
+    <div class="col-lg-4">
+      <eg-org-family-select i18n-labelText labelText="Owner" [ngModelOptions]="{standalone: true}" [(ngModel)]="providerOwners"></eg-org-family-select>
     </div>
-    <div class="col-lg-2">
-      <button class="btn btn-primary" (click)="submitSearch()" type="submit" i18n>Search</button>
-    </div>
-    <div class="col-lg-2">
+    <div class="col-lg-2 text-right">
+      <button class="btn btn-primary mr-1" (click)="submitSearch()" type="submit" i18n>Search</button>
       <button class="btn btn-secondary" (click)="clearSearch()" type="button" i18n>Reset Form</button>
     </div>
   </div>
 
   <div class="row mb-1">
-    <div class="col-lg-2">
+    <div class="col-lg">
       <input i18n-placeholder placeholder="Contact Name" [ngModelOptions]="{standalone: true}" [(ngModel)]="contactName" type="text" class="form-control" />
     </div>
-    <div class="col-lg-2">
+    <div class="col-lg">
       <input i18n-placeholder placeholder="Provider Email" [ngModelOptions]="{standalone: true}" [(ngModel)]="providerEmail" type="text" class="form-control" />
     </div>
-    <div class="col-lg-2">
+    <div class="col-lg">
       <input i18n-placeholder placeholder="Provider Phone" [ngModelOptions]="{standalone: true}" [(ngModel)]="providerPhone" type="text" class="form-control" />
     </div>
-    <div class="col-lg-2">
+    <div class="col-lg">
       <eg-combobox i18n-placeholder placeholder="Currency" idlClass="acqct" (onChange)="providerCurrencyType = $event ? $event.id : null" [asyncSupportsEmptyTermClick]="true"></eg-combobox>
     </div>
   </div>
 
   <div class="row mb-1">
-    <div class="col-lg-2">
+    <div class="col-lg">
       <input i18n-placeholder placeholder="SAN" [ngModelOptions]="{standalone: true}" [(ngModel)]="providerSAN" type="text" class="form-control" />
     </div>
-    <div class="col-lg-2">
+    <div class="col-lg">
       <!-- edi default account link -->
       <eg-combobox i18n-placeholder placeholder="EDI Default" idlClass="acqedi" (onChange)="providerEDIDefault = $event ? $event.id : null"></eg-combobox>
     </div>
-    <div class="col-lg-2">
+    <div class="col-lg">
       <input i18n-placeholder placeholder="URL" [ngModelOptions]="{standalone: true}" [(ngModel)]="providerURL" type="text" class="form-control" />
     </div>
-    <div class="col-lg-2 form-group">
+    <div class="col-lg form-group">
       <label for="acqproIsActive" i18n>Active?</label>
       <select class="form-control" id="acqproIsActive" [ngModelOptions]="{standalone: true}" [(ngModel)]="providerIsActive">
         <option i18n value="active">Yes</option>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider.component.html b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider.component.html
index b5d3677..3caf5b6 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider.component.html
@@ -13,10 +13,10 @@
 
 <div class="col">
 <div class="row mb-2">
-  <div class="col-lg-2">
+  <div class="col-lg">
     <h3 i18n *ngIf="id">{{providerRecord.currentProvider.record.name()}} ({{providerRecord.currentProvider.record.code()}})</h3>
   </div>
-  <div class="col-lg-2 offset-lg-8">
+  <div class="col-lg-auto">
     <div class="btn-toolbar" role="toolbar">
       <div class="button-grp mr-2">
         <button class="btn btn-primary" [hidden]="showSearchForm" (click)="showSearchForm = !showSearchForm" i18n>Show Search Form</button>
@@ -39,7 +39,7 @@
       <ngb-tab title="Provider" i18n-title id="details" [disabled]="!id">
         <ng-template ngbTabContent>
           <div class="row mt-3">
-            <div class="col-lg-12 text-right">
+            <div class="col-lg-12 text-right pb-1">
               <button class="btn btn-secondary btn-sm" [disabled]="activeTab == defaultTabType"
                 (click)="setDefaultTab()" i18n>Set Default View</button>
             </div>
@@ -50,7 +50,7 @@
       <ngb-tab title="Addresses" i18n-title id="addresses" [disabled]="!id">
         <ng-template ngbTabContent>
           <div class="row mt-3">
-            <div class="col-lg-12 text-right">
+            <div class="col-lg-12 text-right pb-1">
               <button class="btn btn-secondary btn-sm" [disabled]="activeTab == defaultTabType"
                 (click)="setDefaultTab()" i18n>Set Default View</button>
             </div>
@@ -61,7 +61,7 @@
       <ngb-tab title="Contacts" i18n-title id="contacts" [disabled]="!id">
         <ng-template ngbTabContent>
           <div class="row mt-3">
-            <div class="col-lg-12 text-right">
+            <div class="col-lg-12 text-right pb-1">
               <button class="btn btn-secondary btn-sm" [disabled]="activeTab == defaultTabType"
                 (click)="setDefaultTab()" i18n>Set Default View</button>
             </div>
@@ -72,7 +72,7 @@
       <ngb-tab title="Attribute Definitions" i18n-title id="attributes" [disabled]="!id">
         <ng-template ngbTabContent>
           <div class="row mt-3">
-            <div class="col-lg-12 text-right">
+            <div class="col-lg-12 text-right pb-1">
               <button class="btn btn-secondary btn-sm" [disabled]="activeTab == defaultTabType"
                 (click)="setDefaultTab()" i18n>Set Default View</button>
             </div>
@@ -83,7 +83,7 @@
       <ngb-tab title="Holdings Definitions" i18n-title id="holdings" [disabled]="!id">
         <ng-template ngbTabContent>
           <div class="row mt-3">
-            <div class="col-lg-12 text-right">
+            <div class="col-lg-12 text-right pb-1">
               <button class="btn btn-secondary btn-sm" [disabled]="activeTab == defaultTabType"
                 (click)="setDefaultTab()" i18n>Set Default View</button>
             </div>
@@ -94,7 +94,7 @@
       <ngb-tab title="EDI" i18n-title id="edi_accounts" [disabled]="!id">
         <ng-template ngbTabContent>
           <div class="row mt-3">
-            <div class="col-lg-12 text-right">
+            <div class="col-lg-12 text-right pb-1">
               <button class="btn btn-secondary btn-sm" [disabled]="activeTab == defaultTabType"
                 (click)="setDefaultTab()" i18n>Set Default View</button>
             </div>
@@ -105,7 +105,7 @@
       <ngb-tab title="Invoices" i18n-title id="invoices" [disabled]="!id">
         <ng-template ngbTabContent>
           <div class="row mt-3">
-            <div class="col-lg-12 text-right">
+            <div class="col-lg-12 text-right pb-1">
               <button class="btn btn-secondary btn-sm" [disabled]="activeTab == defaultTabType"
                 (click)="setDefaultTab()" i18n>Set Default View</button>
             </div>
@@ -116,7 +116,7 @@
       <ngb-tab title="POs" i18n-title id="purchase_orders" [disabled]="!id">
         <ng-template ngbTabContent>
           <div class="row mt-3">
-            <div class="col-lg-12 text-right">
+            <div class="col-lg-12 text-right pb-1">
               <button class="btn btn-secondary btn-sm" [disabled]="activeTab == defaultTabType"
                 (click)="setDefaultTab()" i18n>Set Default View</button>
             </div>