LP2000482 Bootstrap 5: Form select and input group text classes

Signed-off-by: Stephanie Leary <stephanie.leary@equinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/share/date-select/date-select.component.html b/Open-ILS/src/eg2/src/app/share/date-select/date-select.component.html
index 9511091..795f528 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/date-select/date-select.component.html
+++ b/Open-ILS/src/eg2/src/app/share/date-select/date-select.component.html
@@ -21,7 +21,7 @@
       (ngModelChange)="inputChanged($event)"
       (keyup.enter)="onDateEnter()"
       (dateSelect)="onDateSelect($event)"/>
-    <div class="input-group-append">
+    <div class="input-group-text">
       <button class="btn btn-outline-secondary" [disabled]="disabled"
         (click)="datePicker.toggle()" type="button">
         <span title="Select Date" i18n-title class="material-icons">event</span>

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html
index 9edc9f5..c1a3e64 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html
@@ -70,7 +70,7 @@
           <div ngbDropdownMenu class="eg-grid-filter-menu">
             <div class="dropdown-item">
               <div>
-                <select class="custom-select" [(ngModel)]="col.filterValue"
+                <select class="form-select" [(ngModel)]="col.filterValue"
                   (change)="applyFilterCommon(col)"
                   [disabled]="col.filterInputDisabled || context.dataSource.requestingData">
                   <option value="" i18n>Any</option>

diff --git a/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.component.html b/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.component.html
index 3ec4167..cb8575e 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.component.html
+++ b/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.component.html
@@ -1,5 +1,5 @@
 <form class="d-flex" [formGroup]="familySelectors">
-  <div class="input-group-prepend">
+  <div class="input-group-text">
     <span class="input-group-text">{{labelText}}</span>
   </div>
   <eg-org-select [domId]="domId"

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/asn/receive.component.html b/Open-ILS/src/eg2/src/app/staff/acq/asn/receive.component.html
index 15d70ab..81f127a 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/asn/receive.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/asn/receive.component.html
@@ -4,13 +4,13 @@
 <div class="row">
   <div class="col-lg-6">
     <div class="input-group">
-      <div class="input-group-prepend">
+      <div class="input-group-text">
         <span class="input-group-text" i18n>Container Barcode:</span>
       </div>
       <input type='text' id='barcode-search-input' class="form-control" 
         (keyup.enter)="findContainer()" placeholder="Barcode..." 
         i18n-placeholder [(ngModel)]="barcode"/>
-      <div class="input-group-append">
+      <div class="input-group-text">
         <button class="btn btn-outline-secondary" 
           (click)="findContainer()" i18n>Submit</button>
       </div>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html
index d21a808..65ab9ed 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html
@@ -345,7 +345,7 @@
             <!-- w-auto allows the input group to stick to the right 
                  as the status label grows -->
             <div class="input-group w-auto me-2">
-              <div class="input-group-prepend">
+              <div class="input-group-text">
                 <span *ngIf="identOptions(li).length > 1" class="text-danger me-1"
                   i18n-title title="Multiple Order Identifier Options" i18n>
                   ({{identOptions(li).length}})

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/cash-reports.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/cash-reports.component.html
index 45e6590..51acd1f 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/cash-reports.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/cash-reports/cash-reports.component.html
@@ -5,19 +5,19 @@
   <div>
     <div class="row">
       <div class="input-group col-lg-3">
-        <div class="input-group-prepend">
+        <div class="input-group-text">
           <div class="input-group-text" i18n>Start Date</div> 
           <eg-date-select [initialDate]="today" (onChangeAsYmd)="onStartDateChange($event)"></eg-date-select>
         </div>
       </div>
       <div class="input-group col-lg-3">
-        <div class="input-group-prepend">
+        <div class="input-group-text">
           <div class="input-group-text" i18n>End Date</div> 
           <eg-date-select [initialDate]="today" (onChangeAsYmd)="onEndDateChange($event)"></eg-date-select>
         </div>
       </div>
       <div class="input-group col-lg-4">
-        <div class="input-group-prepend">
+        <div class="input-group-text">
           <div class="input-group-text" i18n>View reports for</div>
         </div>
         <eg-org-select [applyDefault]="true" [disableOrgs]="disabledOrgs" (onChange)="onOrgChange($event)"></eg-org-select>

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html
index ca2536b..f8d4689 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html
@@ -36,7 +36,7 @@
               <div class="row" [ngClass]="isDialog() ? '' : 'mt-3'">
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12'">
                   <div class="input-group">
-                    <div class="input-group-prepend">
+                    <div class="input-group-text">
                       <label for="associate-item-barcode" class="input-group-text" i18n>Barcode</label>
                     </div>
                     <input type="text" class="flex-grow-1" id="associate-item-barcode"
@@ -47,7 +47,7 @@
                 </div>
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12 mt-3'">
                   <div class="input-group">
-                    <div class="input-group-prepend">
+                    <div class="input-group-text">
                       <label for="associate-item-relationship" class="input-group-text" i18n>Relationship</label>
                     </div>
                     <input type="text" [(ngModel)]="relationshipInput" id="associate-item-relationship"
@@ -66,7 +66,7 @@
               <div class="row mt-3">
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12'">
                   <div class="input-group">
-                    <div class="input-group-prepend">
+                    <div class="input-group-text">
                       <div class="input-group-text">
                         <label for="associate-item-temp-call-number" i18n>Call Number</label>
                       </div>
@@ -74,7 +74,7 @@
                     <input type="text" [(ngModel)]="tempCallNumber" id="associate-item-temp-call-number"
                       [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'"
                       (input)="isModifyingCallNumber = true" class="flex-grow-1" />
-                    <div class="input-group-append">
+                    <div class="input-group-text">
                       <div class="input-group-text">
                         <input type="checkbox" [(ngModel)]="isModifyingCallNumber"
                           [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'"
@@ -85,7 +85,7 @@
                 </div>
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12 mt-3'">
                   <div class="input-group">
-                    <div class="input-group-prepend">
+                    <div class="input-group-text">
                       <div class="input-group-text">
                         <label for="temp-circ-mod" i18n>Circulation Modifier</label>
                       </div>
@@ -96,7 +96,7 @@
                       domId="temp-circ-mod"
                       (onChange)="tempCircMod = $event.id; isModifyingCircMod = true">
                     </eg-combobox>
-                    <div class="input-group-append">
+                    <div class="input-group-text">
                       <div class="input-group-text">
                         <input type="checkbox" [(ngModel)]="isModifyingCircMod"
                           [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'"
@@ -109,7 +109,7 @@
               <div class="row mt-3">
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12'">
                   <div class="input-group">
-                    <div class="input-group-prepend">
+                    <div class="input-group-text">
                       <div class="input-group-text">
                         <label for="temp-item-status" i18n>Item Status</label>
                       </div>
@@ -120,7 +120,7 @@
                       domId="temp-item-status"
                       (onChange)="tempStatus = $event.id; isModifyingStatus = true">
                     </eg-combobox>
-                    <div class="input-group-append">
+                    <div class="input-group-text">
                       <div class="input-group-text">
                         <input type="checkbox" [(ngModel)]="isModifyingStatus"
                           [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'"
@@ -131,7 +131,7 @@
                 </div>
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12 mt-3'">
                   <div class="input-group">
-                    <div class="input-group-prepend">
+                    <div class="input-group-text">
                       <div class="input-group-text">
                         <label for="temp-location" i18n>Shelving Location</label>
                       </div>
@@ -140,7 +140,7 @@
                       [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'" [(ngModel)]="tempLocation"
                       (valueChange)="isModifyingLocation = true">
                     </eg-item-location-select>
-                    <div class="input-group-append">
+                    <div class="input-group-text">
                       <div class="input-group-text">
                         <input type="checkbox" [(ngModel)]="isModifyingLocation"
                           [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'"
@@ -165,7 +165,7 @@
             <ng-template ngbNavContent>
               <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12 mt-3'">
                 <div class="input-group">
-                  <div class="input-group-prepend">
+                  <div class="input-group-text">
                     <label class="input-group-text" for="brief-relationship" i18n>Relationship</label>
                   </div>
                   <input type="text" [(ngModel)]="relationshipInput" id="brief-relationship"
@@ -197,7 +197,7 @@
               <div class="row" [ngClass]="isDialog() ? '' : 'mt-3'">
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12 mt-3'">
                   <div class="input-group">
-                    <div class="input-group-prepend">
+                    <div class="input-group-text">
                       <label for="bib-id" class="input-group-text" i18n>Bibliographic Record ID</label>
                     </div>
                     <input type="text" [(ngModel)]="bibId" id="bib-id"
@@ -206,7 +206,7 @@
                 </div>
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12 mt-3'">
                   <div class="input-group">
-                    <div class="input-group-prepend">
+                    <div class="input-group-text">
                       <label class="input-group-text" for="electronic-relationship" i18n>Relationship</label>
                     </div>
                     <input type="text" [(ngModel)]="relationshipInput" id="electronic-relationship"

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.html
index 7571b14..c82d08e 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.html
@@ -23,7 +23,7 @@
       <div class="row" [ngClass]="isDialog() ? '' : 'mt-3'">
         <div class="d-flex"  [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12'">
           <div class="input-group">
-            <div class="input-group-prepend">
+            <div class="input-group-text">
               <label for="associate-user-barcode" class="input-group-text" i18n>Patron Barcode</label>
             </div>
             <input type="text" class="flex-grow-1" id="associate-user-barcode"
@@ -39,7 +39,7 @@
         </div>
         <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12 mt-3'">
           <div class="input-group">
-            <div class="input-group-prepend">
+            <div class="input-group-text">
               <label for="associate-user-role" class="input-group-text" i18n>Role</label>
             </div>
             <eg-combobox idlClass="acmr" [(ngModel)]="userRoleInput"

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/field-documentation/field-documentation.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/field-documentation/field-documentation.component.html
index 5f9902a..e151678 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/field-documentation/field-documentation.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/field-documentation/field-documentation.component.html
@@ -4,7 +4,7 @@
 <div class="row mt-3">
   <div class="col-md-3">
     <div class="input-group">
-      <div class="input-group-prepend">
+      <div class="input-group-text">
         <div class="input-group-text" i18n>Class</div>
         <!-- IDL Selector -->
         <eg-combobox [allowFreeText]="true"

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html
index 3493643..94fc6db 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html
@@ -18,7 +18,7 @@
     <div class="row mt-3">
         <div class="col-md-6">
             <div class="input-group">
-                <div class="input-group-prepend">
+                <div class="input-group-text">
                     <div class="input-group-text" i18n>Context</div>
                     <eg-org-select [initialOrg]="entryContext"
                       (onChange)="entryContext = $event"></eg-org-select>
@@ -32,7 +32,7 @@
 
               <ng-container *ngSwitchCase="'integer'">
                 <div class="input-group">
-                  <div class="input-group-prepend">
+                  <div class="input-group-text">
                     <div class="input-group-text" i18n>Value</div>
                     <input
                       class="form-control" type="number"
@@ -45,7 +45,7 @@
               </ng-container>
               <ng-container *ngSwitchCase="'currency'">
                 <div class="input-group">
-                  <div class="input-group-prepend">
+                  <div class="input-group-text">
                     <div class="input-group-text" i18n>Value</div>
                     <div class="input-group-text" i18n>$</div>
                     <input
@@ -60,7 +60,7 @@
               </ng-container>
               <ng-container *ngSwitchCase="'string'">
                 <div class="input-group">
-                  <div class="input-group-prepend">
+                  <div class="input-group-text">
                     <div class="input-group-text" i18n>Value</div>
                     <input
                       class="form-control" type="text"
@@ -73,7 +73,7 @@
               </ng-container>
               <ng-container *ngSwitchCase="'interval'">
                 <div class="input-group">
-                  <div class="input-group-prepend">
+                  <div class="input-group-text">
                     <div class="input-group-text" i18n>Value</div>
                     <input
                       class="form-control" type="text"
@@ -86,10 +86,10 @@
               </ng-container>
               <ng-container *ngSwitchCase="'bool'">
                 <div class="input-group">
-                  <div class="input-group-prepend">
+                  <div class="input-group-text">
                     <div class="input-group-text" i18n>Value</div>
                     <select
-                      class="custom-select" name="entryValue"
+                      class="form-select" name="entryValue"
                       placeholder="True or False" i18n-placeholder
                       [(ngModel)]="entryValue">
                       <option value='true' i18n>True</option>
@@ -100,7 +100,7 @@
               </ng-container>
               <ng-container *ngSwitchCase="'array'">
                 <div class="input-group">
-                  <div class="input-group-prepend">
+                  <div class="input-group-text">
                     <div class="input-group-text" i18n>Value</div>
                     <input
                       class="form-control" type="text"
@@ -113,7 +113,7 @@
               </ng-container>
               <ng-container *ngSwitchCase="'link'">
                 <div class="input-group">
-                  <div class="input-group-prepend">
+                  <div class="input-group-text">
                     <div class="input-group-text" i18n>Value</div>
                       <ng-container [ngSwitch]="entry.fmClass">
                         <ng-container *ngSwitchCase="'acpl'">

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.component.html
index b472fbc..2475c8c 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.component.html
@@ -16,7 +16,7 @@
 <div class="row mt-3">
   <div class="col-md-3">
     <div class="input-group">
-      <div class="input-group-prepend">
+      <div class="input-group-text">
         <div class="input-group-text" i18n>Context Location</div>
         <eg-org-select [initialOrg]="contextOrg"
           (onChange)="contextOrgChanged($event)">

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/survey/survey-edit.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/survey/survey-edit.component.html
index 473fef3..51a378c 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/survey/survey-edit.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/survey/survey-edit.component.html
@@ -35,7 +35,7 @@
                         </label>
                         <input type="text" [(ngModel)]="question.words" class="form-control"
                             name="question-{{questionIndex}}">
-                        <span class="input-group-append">
+                        <span class="input-group-text">
                             <button class="ms-2 btn btn-info" 
                                 (click)="updateQuestion(question)" i18n>
                                 Save
@@ -51,7 +51,7 @@
                         <input class="form-control" type="text" 
                             [(ngModel)]="answer.words"
                             name="answer-{{questionIndex}}-{{answerIndex}}">
-                        <span class="input-group-append">
+                        <span class="input-group-text">
                             <button class="ms-2 btn btn-info" 
                                 (click)="updateAnswer(answer, question, questionIndex, answerIndex)"
                                 i18n>
@@ -67,7 +67,7 @@
                         <input class="form-control" type="text" 
                             [(ngModel)]="newAnswerArray[questionIndex].inputText"
                                 value="">
-                        <span class="input-group-append">
+                        <span class="input-group-text">
                             <button class="ms-2 btn btn-info" 
                                 (click)="createAnswer(newAnswerArray[questionIndex].inputText, question)"
                                 i18n>
@@ -85,7 +85,7 @@
                         type="text" 
                         [(ngModel)]="newQuestionText"
                         name="question-new" value="">
-                    <span class="input-group-append">
+                    <span class="input-group-text">
                         <button class="ms-2 btn btn-info"
                             (click)="createQuestion(newQuestionText)" i18n>
                             Save Question & Add Answer

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit.component.html
index a372bc3..993341c 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit.component.html
@@ -103,7 +103,7 @@
                 <div class="row">
                   <div class="col-lg-12">
                     <div class="input-group">
-                      <div class="input-group-prepend">
+                      <div class="input-group-text">
                         <div class="input-group-text" i18n>Note: </div>
                       </div>
                       <input class="form-control" type='text'

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/print-template.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/print-template.component.html
index b470c46..7bb1a2d 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/print-template.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/print-template.component.html
@@ -25,7 +25,7 @@
   </div>
   <div class="col-lg-3">
     <div class="input-group">
-      <div class="input-group-prepend">
+      <div class="input-group-text">
         <span class="input-group-text" i18n>Template</span>
       </div>
       <ng-template #entryTemplate let-r="result" let-owner="getOwnerName">
@@ -39,7 +39,7 @@
   </div>
   <div class="col-lg-3" *ngIf="localeEntries.length > 0">
     <div class="input-group">
-      <div class="input-group-prepend">
+      <div class="input-group-text">
         <span class="input-group-text" i18n>Locale</span>
       </div>
       <eg-combobox [entries]="localeEntries"

diff --git a/Open-ILS/src/eg2/src/app/staff/booking/capture.component.html b/Open-ILS/src/eg2/src/app/staff/booking/capture.component.html
index b840f41..2099c2b 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/booking/capture.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/capture.component.html
@@ -9,7 +9,7 @@
 <form [formGroup]="findResource" class="row">
   <div class="col-md-4">
     <div class="input-group flex-nowrap">
-      <div class="input-group-prepend">
+      <div class="input-group-text">
         <label class="input-group-text" for="resource-barcode" i18n>Resource barcode</label>
         <input type="text" id="resource-barcode" class="form-control" formControlName="resourceBarcode">
       </div>

diff --git a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html
index c881afd..c1c5430 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html
@@ -6,7 +6,7 @@
     <div class="row">
       <div class="col">
         <div class="input-group">
-          <div class="input-group-prepend">
+          <div class="input-group-text">
             <label class="input-group-text" for="ideal-reservation-type" i18n>Reservation type</label>
           </div>
           <select class="form-control" id="ideal-reservation-type" formControlName="reservationType">
@@ -16,7 +16,7 @@
       </div>
       <div class="col">
         <div class="input-group">
-          <div class="input-group-prepend">
+          <div class="input-group-text">
             <label class="input-group-text" for="ideal-reservation-date" i18n>Reservation date</label>
           </div>
           <eg-date-select *ngIf="!multiday" #dateLimiter domId="ideal-reservation-date" formControlName="idealDate"></eg-date-select>
@@ -37,7 +37,7 @@
           <div ngbPanelContent class="row">
             <div class="col">
               <div class="input-group">
-                <div class="input-group-prepend">
+                <div class="input-group-text">
                   <label class="input-group-text" for="ideal-resource-type" i18n>Search by resource type</label>
                 </div>
                 <eg-combobox
@@ -65,7 +65,7 @@
           <div ngbPanelContent class="row">
             <div class="col">
               <div class="input-group">
-                <div class="input-group-prepend">
+                <div class="input-group-text">
                   <label class="input-group-text" for="ideal-resource-barcode" i18n>Search by resource barcode</label>
                 </div>
                 <input type="text" id="ideal-resource-barcode" class="form-control" formControlName="resourceBarcode">
@@ -84,7 +84,7 @@
           <ul class="list-group list-group-flush" formArrayName="selectedAttributes">
             <li *ngFor="let attribute of attributes; let i = index" class="list-group-item">
               <span class="input-group">
-                <span class="input-group-prepend">
+                <span class="input-group-text">
                   <label class="input-group-text" for="attribute-{{attribute.id()}}" i18n>{{attribute.name()}}</label>
                 </span>
                 <eg-combobox [formControlName]="i">
@@ -107,7 +107,7 @@
           <ul class="list-group list-group-flush">
             <li class="list-group-item">
               <span class="input-group">
-                <span class="input-group-prepend">
+                <span class="input-group-text">
                   <label class="input-group-text" for="start-time" i18n>Start time</label>
                 </span>
                 <ngb-timepicker formControlName="startOfDay" [minuteStep]="minuteStep()" [meridian]="true"></ngb-timepicker>
@@ -115,7 +115,7 @@
             </li>
             <li class="list-group-item">
               <span class="input-group">
-                <span class="input-group-prepend">
+                <span class="input-group-text">
                   <label class="input-group-text" for="end-time" i18n>End time</label>
                 </span>
                 <ngb-timepicker formControlName="endOfDay" [minuteStep]="minuteStep()" [meridian]="true"></ngb-timepicker>
@@ -129,7 +129,7 @@
             </li>
             <li class="list-group-item">
               <span class="input-group">
-                <span class="input-group-prepend">
+                <span class="input-group-text">
                   <label class="input-group-text" for="granularity" i18n>Granularity</label>
                 </span>
                 <eg-combobox (onChange)="changeGranularity($event)" [startId]="granularity ? granularity : 30">

diff --git a/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html b/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html
index fab4245..b52b003 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html
@@ -18,7 +18,7 @@
           <ng-template ngbNavContent>
             <div class="m-2">
               <div class="input-group m-2">
-                <div class="input-group-prepend">
+                <div class="input-group-text">
                   <label class="input-group-text" for="patron-barcode-value" i18n>Patron barcode</label>
                 </div>
                 <input type="text" id="patron-barcode-value" class="form-control" formControlName="patronBarcode">
@@ -36,7 +36,7 @@
           <ng-template ngbNavContent>
             <div class="m-2">
               <div class="input-group m-2">
-                <div class="input-group-prepend">
+                <div class="input-group-text">
                   <label class="input-group-text" for="resource-barcode-value" i18n>Resource barcode</label>
                 </div>
                 <input type="text" id="resource-barcode-value" class="form-control" formControlName="resourceBarcode">
@@ -54,7 +54,7 @@
           <ng-template ngbNavContent>
             <div class="m-2">
               <div class="input-group m-2">
-                <div class="input-group-prepend">
+                <div class="input-group-text">
                   <label class="input-group-text" for="resource-type-value" i18n>Resource type</label>
                 </div>
                 <eg-combobox domId="resource-type-value" formControlName="resourceType" idlClass="brt" [asyncSupportsEmptyTermClick]="true"></eg-combobox>

diff --git a/Open-ILS/src/eg2/src/app/staff/booking/pickup.component.html b/Open-ILS/src/eg2/src/app/staff/booking/pickup.component.html
index 7cd8c40..926058c 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/booking/pickup.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/pickup.component.html
@@ -5,7 +5,7 @@
 <form [formGroup]="findPatron" class="row">
   <div class="col-md-4">
     <div class="input-group flex-nowrap">
-      <div class="input-group-prepend">
+      <div class="input-group-text">
         <label class="input-group-text" for="patron-barcode" i18n>Patron barcode</label>
         <input type="text" id="patron-barcode" class="form-control" formControlName="patronBarcode">
       </div>

diff --git a/Open-ILS/src/eg2/src/app/staff/booking/pull-list.component.html b/Open-ILS/src/eg2/src/app/staff/booking/pull-list.component.html
index 233e033..c2f6c83 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/booking/pull-list.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/pull-list.component.html
@@ -5,7 +5,7 @@
 <form [formGroup]="pullListCriteria" class="row">
   <div class="col-md-4">
     <div class="input-group">
-      <div class="input-group-prepend">
+      <div class="input-group-text">
         <label for="ou" class="input-group-text" i18n>Library:</label>
       </div>
       <eg-org-select domId="ou" [applyDefault]="true"
@@ -16,7 +16,7 @@
   </div>
   <div class="col-md-4">
     <div class="input-group">
-      <div class="input-group-prepend">
+      <div class="input-group-text">
         <label for="days-hence" class="input-group-text" i18n>Number of days to fetch:</label>
       </div>
       <input type="number" min="1" class="form-control" formControlName="daysHence">

diff --git a/Open-ILS/src/eg2/src/app/staff/booking/return.component.html b/Open-ILS/src/eg2/src/app/staff/booking/return.component.html
index ca6c8a4..2d19162 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/booking/return.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/return.component.html
@@ -11,7 +11,7 @@
         <div class="row">
           <div class="col-md-4">
             <div class="input-group flex-nowrap">
-              <div class="input-group-prepend">
+              <div class="input-group-text">
                 <label class="input-group-text" for="patron-barcode" i18n>Patron barcode</label>
                 <input type="text" id="patron-barcode" class="form-control" i18n-placeholder placeholder="Patron barcode" formControlName="patronBarcode">
               </div>
@@ -31,7 +31,7 @@
       <a i18n ngbNavLink role="tab">By resource</a>
       <ng-template ngbNavContent>
         <div class="input-group flex-nowrap">
-          <div class="input-group-prepend">
+          <div class="input-group-text">
             <label class="input-group-text" for="resource-barcode" i18n>Resource barcode</label>
             <input type="text" id="resource-barcode" class="form-control" i18n-placeholder placeholder="Resource barcode" formControlName="resourceBarcode">
           </div>

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.html b/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.html
index bdf3809..9bb2abe 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.html
@@ -8,7 +8,7 @@
 <div class="row form-inline mb-3">
   <div class="col-lg-3">
     <div class="input-group">
-      <div class="input-group-prepend">
+      <div class="input-group-text">
         <span class="input-group-text" id="search-term" i18n>Search Term</span>
       </div>
       <input type="text" class="form-control" placeholder="Search Term" 
@@ -19,7 +19,7 @@
   </div>
   <div class="col-lg-5">
     <div class="input-group">
-      <div class="input-group-prepend">
+      <div class="input-group-text">
         <span class="input-group-text" id="auth-axis" i18n>Authority Type</span>
       </div>
       <eg-combobox #axisCbox [(ngModel)]="authorityAxis" 

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/authority/marc-edit.component.html b/Open-ILS/src/eg2/src/app/staff/cat/authority/marc-edit.component.html
index e563e3a..f1f5492 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/cat/authority/marc-edit.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/authority/marc-edit.component.html
@@ -7,7 +7,7 @@
   <div class="row">
     <div class="col-lg-6 form-inline">
       <div class="input-group">
-        <div class="input-group-prepend">
+        <div class="input-group-text">
           <span class="input-group-text" i18n>Authorty Record Id</span>
         </div>
         <input type="text" class="form-control" 

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html
index b60e78d..da1ec71 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html
@@ -2,7 +2,7 @@
 <div class="row form-validated mt-5">
   <div class="col-lg-6 form-inline">
     <div class="input-group">
-      <div class="input-group-prepend">
+      <div class="input-group-text">
         <span class="input-group-text" id="bib-ident-label">
           <ng-container *ngIf="identType === 'id'" i18n>Record ID:</ng-container>
           <ng-container *ngIf="identType === 'tcn'" i18n>Record TCN:</ng-container>

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/item/missing-pieces.component.html b/Open-ILS/src/eg2/src/app/staff/cat/item/missing-pieces.component.html
index 0550ce0..8f68619 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/cat/item/missing-pieces.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/item/missing-pieces.component.html
@@ -6,7 +6,7 @@
 <div class="row">
   <div class="col-lg-12 form-inline">
     <div class="input-group">
-      <div class="input-group-prepend">
+      <div class="input-group-text">
         <span class="input-group-text" id='barcode-label' i18n>Barcode</span>
       </div>
       <input type="text" class="form-control" id="item-barcode-input" 

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-list.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-list.component.html
index fd4a9d4..8c3cd4d 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-list.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-list.component.html
@@ -2,7 +2,7 @@
 <div class="d-flex mb-3">
   <div>
     <div class="input-group">
-      <div class="input-group-prepend">
+      <div class="input-group-text">
         <span class="input-group-text">Owner</span>
       </div>
       <eg-org-select

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/recent-imports.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/recent-imports.component.html
index d645b19..214922a 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/recent-imports.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/recent-imports.component.html
@@ -1,7 +1,7 @@
 <div class="row mb-2">
   <div class="col-lg-6">
     <div class="input-group">
-      <div class="input-group-prepend">
+      <div class="input-group-text">
         <span class="input-group-text" i18n>Show Sessions Since: </span>
       </div>
       <eg-date-select 

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.html
index 7099b4c..db04e35 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.html
@@ -66,7 +66,7 @@
               (ngModelChange)="debounceUserBarcodeLookup($event)"
               (paste)="debounceUserBarcodeLookup($event)"
               [(ngModel)]="userBarcode"/>
-            <div class="input-group-append">
+            <div class="input-group-text">
               <button class="btn btn-outline-dark" (click)="userBarcodeChanged()">Submit</button>
             </div>
           </div>
@@ -144,7 +144,7 @@
             </div>
             <div class="flex-1">
               <div class="input-group">
-                <div class="input-group-prepend">
+                <div class="input-group-text">
                   <label for="userEmail" class="input-group-text" i18n>Email Address</label>
                 </div>
                 <input type="text" class="form-control" name="userEmail"
@@ -164,7 +164,7 @@
             </div>
             <div class="flex-1">
               <div class="input-group">
-                <div class="input-group-prepend">
+                <div class="input-group-text">
                   <label for="phoneValue" class="input-group-text" i18n>Phone Number</label>
                 </div>
                 <input type="text" class="form-control" [disabled]="!notifyPhone"
@@ -182,7 +182,7 @@
             </div>
             <div class="flex-1">
               <div class="input-group">
-                <div class="input-group-prepend">
+                <div class="input-group-text">
                   <label for="smsValue" class="input-group-text" i18n>SMS Number</label>
                 </div>
                 <input type="text" class="form-control" [disabled]="!notifySms"

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.html
index e249057..4916ff3 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.html
@@ -4,7 +4,7 @@
 <div class="row mt-3">
   <div class="col-lg-4">
     <div class="input-group">
-      <div class="input-group-prepend">
+      <div class="input-group-text">
         <div class="input-group-text" i18n>Holdings Maintenance</div>
       </div>
       <eg-org-select [initialOrg]="contextOrg"

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html b/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html
index 897c26b..547d6b5 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html
@@ -85,13 +85,13 @@
   <div class="col-lg-12 d-flex">
     <div class="form-inline">
       <div class="input-group">
-        <div class="input-group-prepend">
+        <div class="input-group-text">
           <span class="input-group-text" i18n>Barcode</span>
         </div>
         <input type="text" class="form-control" id="barcode-input"
           placeholder="Barcode..." i18n-placeholder [(ngModel)]="barcode"
           i18n-aria-label aria-label="Barcode Input" (keydown.enter)="checkin()" />
-        <div class="input-group-append">
+        <div class="input-group-text">
           <button class="btn btn-outline-dark" (keydown.enter)="checkin()" 
             (click)="checkin()" i18n>Submit</button>
         </div>

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch.component.html
index 8f97db1..7371820 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch.component.html
@@ -5,13 +5,13 @@
 <div class="row">
   <div class="col-lg-4">
     <div class="input-group">
-      <div class="input-group-prepend">
+      <div class="input-group-text">
         <span class="input-group-text" i18n>Patron Barcode:</span>
       </div>
       <input type='text' id='barcode-search-input' class="form-control" 
         placeholder="Barcode" i18n-placeholder [(ngModel)]='barcode'
         (keydown.enter)="findUser()"/>
-      <div class="input-group-append">
+      <div class="input-group-text">
         <button class="btn btn-outline-secondary" 
           (click)="findUser()" i18n>Submit</button>
       </div>

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/bills.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/bills.component.html
index fd9ff41..1c76e5a 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/bills.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/bills.component.html
@@ -350,7 +350,7 @@
     </div>
     <div class="form-inline ms-2">
       <div class="input-group">
-        <div class="input-group-prepend">
+        <div class="input-group-text">
           <span class="input-group-text" i18n># Receipts</span>
         </div>
         <input type="number" class="form-control num-receipts" [(ngModel)]="numReceipts"/>

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html
index 11dda4c..de86ac5 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html
@@ -17,7 +17,7 @@
   <div class="col-lg-12 d-flex">
     <div class="form-inline">
       <div class="input-group">
-        <div class="input-group-prepend">
+        <div class="input-group-text">
           <div ngbDropdown>
             <button ngbDropdownToggle class="btn btn-outline-dark" id="checkout-button">
               <ng-container *ngIf="!checkoutNoncat" i18n>Barcode</ng-container>
@@ -37,7 +37,7 @@
           [placeholder]="checkoutNoncat ? '' : 'Barcode...'" i18n-placeholder
           [(ngModel)]="checkoutBarcode" [disabled]="checkoutNoncat !== null"
           i18n-aria-label aria-label="Barcode Input" (keydown.enter)="checkout()" />
-        <div class="input-group-append">
+        <div class="input-group-text">
           <button class="btn btn-outline-dark" (keydown.enter)="checkout()" 
             (click)="checkout()" i18n>Submit</button>
         </div>
@@ -167,7 +167,7 @@
         <button class="btn btn-outline-dark" (click)="quickReceipt()" i18n>
           Quick Receipt
         </button>
-        <div class="input-group-append">
+        <div class="input-group-text">
           <div ngbDropdown>
             <button ngbDropdownToggle class="btn btn-outline-dark">
             </button>
@@ -185,7 +185,7 @@
         <button class="btn btn-outline-dark" (click)="doneAutoReceipt()" i18n>
           Done
         </button>
-        <div class="input-group-append">
+        <div class="input-group-text">
           <div ngbDropdown>
             <button ngbDropdownToggle class="btn btn-outline-dark">
             </button>

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.html b/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.html
index 16837dc..c2707be 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.html
@@ -14,13 +14,13 @@
   <div class="col-lg-12 d-flex">
     <div class="form-inline">
       <div class="input-group">
-        <div class="input-group-prepend">
+        <div class="input-group-text">
           <span class="input-group-text" i18n>Barcode</span>
         </div>
         <input type="text" class="form-control" id="barcode-input"
           placeholder="Barcode..." i18n-placeholder [(ngModel)]="barcode"
           i18n-aria-label aria-label="Barcode Input" (keydown.enter)="renew()" />
-        <div class="input-group-append">
+        <div class="input-group-text">
           <button class="btn btn-outline-dark" (keydown.enter)="renew()" 
             (click)="renew()" i18n>Submit</button>
         </div>

diff --git a/Open-ILS/src/eg2/src/app/staff/hopeless/hopeless.component.html b/Open-ILS/src/eg2/src/app/staff/hopeless/hopeless.component.html
index 4a3d862..9d63f42 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/hopeless/hopeless.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/hopeless/hopeless.component.html
@@ -4,7 +4,7 @@
 <eg-title i18n-prefix prefix="Hopeless Holds">
 </eg-title>
 
-<div class="input-group"><div class="input-group-prepend">
+<div class="input-group"><div class="input-group-text">
   <div class="input-group-text" i18n>Hopeless Date, Start Range:</div>
   <eg-date-select [initialIso]="startDate" (onChangeAsDate)="changeStartDate($event)">
   </eg-date-select>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html
index 846c219..475a8c3 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html
@@ -44,7 +44,7 @@
     <div class="row" *ngIf="!hidePickupLibFilter">
       <div class="col-lg-5">
         <div class="input-group">
-          <div class="input-group-prepend">
+          <div class="input-group-text">
             <div class="input-group-text" i18n>Pickup Library</div>
           </div>
           <eg-org-select [persistKey]="persistKey" [fallbackOrg]="pickupLib"
@@ -57,7 +57,7 @@
     <div class="row" *ngIf="pullListOrg">
       <div class="col-lg-4 mb-2">
         <div class="input-group">
-          <div class="input-group-prepend">
+          <div class="input-group-text">
             <div class="input-group-text" i18n>View Pull List For:</div>
           </div>
           <eg-org-select [initialOrgId]="pullListOrg"