From e433b431052ba4106dbe573391baf75132c6d1a1 Mon Sep 17 00:00:00 2001
From: Stephanie Leary <stephanie.leary@equinoxoli.org>
Date: Thu, 9 Mar 2023 15:38:02 +0000
Subject: [PATCH] LP2000482 Bootstrap 5: redundant input-group-text

Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org>
---
 .../local/cash-reports/cash-reports.component.html |  6 -----
 .../course-associate-material.component.html       | 21 ++++-------------
 .../course-associate-users.component.html          |  2 --
 .../field-documentation.component.html             |  2 --
 .../edit-org-unit-setting-dialog.component.html    | 26 +++++-----------------
 .../org-unit-settings.component.html               |  2 --
 .../app/staff/admin/server/org-unit.component.html |  4 +---
 .../admin/server/print-template.component.html     |  8 ++-----
 .../src/app/staff/booking/capture.component.html   |  2 --
 .../booking/create-reservation.component.html      | 26 +++++-----------------
 .../booking/manage-reservations.component.html     |  7 ------
 .../src/app/staff/booking/pickup.component.html    |  2 --
 .../src/app/staff/booking/pull-list.component.html |  4 ----
 .../src/app/staff/booking/return.component.html    |  4 ----
 .../app/staff/cat/authority/browse.component.html  |  8 ++-----
 .../staff/cat/authority/marc-edit.component.html   |  4 +---
 .../src/app/staff/cat/bib-by-ident.component.html  |  2 --
 .../staff/cat/item/missing-pieces.component.html   |  4 +---
 .../cat/vandelay/match-set-list.component.html     |  4 +---
 .../cat/vandelay/recent-imports.component.html     |  2 +-
 .../src/app/staff/catalog/hold/hold.component.html | 12 +++-------
 .../staff/catalog/record/holdings.component.html   |  4 +---
 .../app/staff/circ/checkin/checkin.component.html  |  4 +---
 .../app/staff/circ/patron/bcsearch.component.html  |  4 +---
 .../src/app/staff/circ/patron/bills.component.html |  4 +---
 .../src/app/staff/circ/renew/renew.component.html  |  4 +---
 .../src/app/staff/share/holds/grid.component.html  |  8 ++-----
 27 files changed, 33 insertions(+), 147 deletions(-)

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 51acd1f6ab..251fc936c3 100644
--- 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,21 +5,15 @@
   <div>
     <div class="row">
       <div class="input-group col-lg-3">
-        <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-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-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>
       </div>
       <div class="col-lg-2">
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 719e21ae0d..a926206ace 100644
--- 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,9 +36,6 @@
               <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-text">
-                      <label for="associate-item-barcode" class="form-label input-group-text" i18n>Barcode</label>
-                    </div>
                     <input type="text" class="flex-grow-1" id="associate-item-barcode"
                       [(ngModel)]="barcodeInput" (click)="$event.target.select()"
                       [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'"
@@ -47,9 +44,7 @@
                 </div>
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12 mt-3'">
                   <div class="input-group">
-                    <div class="input-group-text">
-                      <label for="associate-item-relationship" class="form-label input-group-text" i18n>Relationship</label>
-                    </div>
+                    <label for="associate-item-relationship" class="form-label input-group-text" i18n>Relationship</label>
                     <input type="text" [(ngModel)]="relationshipInput" id="associate-item-relationship"
                       [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'" placeholder-i18n
                       placeholder="e.g. Required" class="flex-grow-1" />
@@ -72,20 +67,16 @@
                     <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-text">
                       <div class="input-group-text">
                         <input type="checkbox" [(ngModel)]="isModifyingCallNumber"
                           [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'"
                           aria-label="Checkbox for setting a temporary Call Number" />
-                      </div>
                     </div>
                   </div>
                 </div>
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12 mt-3'">
                   <div class="input-group">
-                    <div class="input-group-text">
-                        <label class="form-label" for="temp-circ-mod" i18n>Circulation Modifier</label>
-                    </div>
+                    <label class="form-label input-group-text" for="temp-circ-mod" i18n>Circulation Modifier</label>
                     <eg-combobox i18n-placeholder placeholder="Circulation Modifier..." idlClass="ccm" idlField="name"
                       [displayTemplate]="idlClassLabel" [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'"
                       [asyncSupportsEmptyTermClick]="true" class="flex-grow-1"
@@ -103,9 +94,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-text">
-                        <label class="form-label" for="temp-item-status" i18n>Item Status</label>
-                    </div>
+                    <label class="form-label input-group-text" for="temp-item-status" i18n>Item Status</label>
                     <eg-combobox i18n-placeholder placeholder="Item Status..." idlClass="ccs" idlField="name"
                       [displayTemplate]="idlClassLabel" [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'"
                       [asyncSupportsEmptyTermClick]="true" class="flex-grow-1"
@@ -121,9 +110,7 @@
                 </div>
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12 mt-3'">
                   <div class="input-group">
-                    <div class="input-group-text">
-                        <label class="form-label" for="temp-location" i18n>Shelving Location</label>
-                    </div>
+                    <label class="form-label input-group-text" for="temp-location" i18n>Shelving Location</label>
                     <eg-item-location-select permFilter="MANAGE_RESERVES" class="flex-grow-1" domId="temp-location"
                       [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'" [(ngModel)]="tempLocation"
                       (valueChange)="isModifyingLocation = true">
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 3e0f093a0f..6566f17084 100644
--- 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,9 +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-text">
               <label for="associate-user-barcode"  class="form-label input-group-text" i18n>Patron Barcode</label>
-            </div>
             <input type="text" class="flex-grow-1" id="associate-user-barcode"
               [(ngModel)]="userBarcode" (click)="$event.target.select()"
               [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'"
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 e1516781e2..af47caf0a9 100644
--- 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,14 +4,12 @@
 <div class="row mt-3">
   <div class="col-md-3">
     <div class="input-group">
-      <div class="input-group-text">
         <div class="input-group-text" i18n>Class</div>
         <!-- IDL Selector -->
         <eg-combobox [allowFreeText]="true"
           [entries]="idlEntries" [(ngModel)]="selectedClass"
           (ngModelChange)="setGrid()">
         </eg-combobox>
-      </div>
     </div>
   </div>
   <div class="col-md-3">
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 94fc6db62c..b929ac80b0 100644
--- 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,11 +18,9 @@
     <div class="row mt-3">
         <div class="col-md-6">
             <div class="input-group">
-                <div class="input-group-text">
-                    <div class="input-group-text" i18n>Context</div>
-                    <eg-org-select [initialOrg]="entryContext"
-                      (onChange)="entryContext = $event"></eg-org-select>
-                </div>
+              <div class="input-group-text" i18n>Context</div>
+              <eg-org-select [initialOrg]="entryContext"
+                  (onChange)="entryContext = $event"></eg-org-select>
             </div>
         </div>
     </div>
@@ -32,20 +30,17 @@
 
               <ng-container *ngSwitchCase="'integer'">
                 <div class="input-group">
-                  <div class="input-group-text">
-                    <div class="input-group-text" i18n>Value</div>
+                    <label class="form-label input-group-text" for="entryValue" i18n>Value</label>
                     <input
                       class="form-control" type="number"
-                      name="entryValue"
+                      name="entryValue" id="entryValue"
                       placeholder="Input a numerical value"
                       i18n-placeholder
                       [(ngModel)]="entryValue"/>
-                  </div>
                 </div>
               </ng-container>
               <ng-container *ngSwitchCase="'currency'">
                 <div class="input-group">
-                  <div class="input-group-text">
                     <div class="input-group-text" i18n>Value</div>
                     <div class="input-group-text" i18n>$</div>
                     <input
@@ -55,12 +50,10 @@
                       placeholder="Input a monetary value"
                       i18n-placeholder
                       [(ngModel)]="entryValue"/>
-                  </div>
                 </div>
               </ng-container>
               <ng-container *ngSwitchCase="'string'">
                 <div class="input-group">
-                  <div class="input-group-text">
                     <div class="input-group-text" i18n>Value</div>
                     <input
                       class="form-control" type="text"
@@ -68,12 +61,10 @@
                       placeholder="Input a value"
                       i18n-placeholder
                       [(ngModel)]="entryValue"/>
-                  </div>
                 </div>
               </ng-container>
               <ng-container *ngSwitchCase="'interval'">
                 <div class="input-group">
-                  <div class="input-group-text">
                     <div class="input-group-text" i18n>Value</div>
                     <input
                       class="form-control" type="text"
@@ -81,12 +72,10 @@
                       placeholder="e.g. 1 day, 4 months"
                       i18n-placeholder
                       [(ngModel)]="entryValue"/>
-                  </div>
                 </div>
               </ng-container>
               <ng-container *ngSwitchCase="'bool'">
                 <div class="input-group">
-                  <div class="input-group-text">
                     <div class="input-group-text" i18n>Value</div>
                     <select
                       class="form-select" name="entryValue"
@@ -95,12 +84,10 @@
                       <option value='true' i18n>True</option>
                       <option value='false' i18n>False</option>
                     </select>
-                  </div>
                 </div>
               </ng-container>
               <ng-container *ngSwitchCase="'array'">
                 <div class="input-group">
-                  <div class="input-group-text">
                     <div class="input-group-text" i18n>Value</div>
                     <input
                       class="form-control" type="text"
@@ -108,12 +95,10 @@
                       placeholder="Input a comma-separated list..."
                       i18n-placeholder
                       [(ngModel)]="entryValue"/>
-                  </div>
                 </div>
               </ng-container>
               <ng-container *ngSwitchCase="'link'">
                 <div class="input-group">
-                  <div class="input-group-text">
                     <div class="input-group-text" i18n>Value</div>
                       <ng-container [ngSwitch]="entry.fmClass">
                         <ng-container *ngSwitchCase="'acpl'">
@@ -128,7 +113,6 @@
                           </eg-combobox>
                         </ng-container>
                       </ng-container><!-- fmClass ngSwitch -->
-                  </div>
                 </div>
               </ng-container>
 
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 2475c8c2c2..51c83df134 100644
--- 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,12 +16,10 @@
 <div class="row mt-3">
   <div class="col-md-3">
     <div class="input-group">
-      <div class="input-group-text">
         <div class="input-group-text" i18n>Context Location</div>
         <eg-org-select [initialOrg]="contextOrg"
           (onChange)="contextOrgChanged($event)">
         </eg-org-select>
-      </div>
     </div>
   </div>
   <div class="col-md-6">
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 fc303d72f2..43cb86c89f 100644
--- 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,9 +103,7 @@
                 <div class="row">
                   <div class="col-lg-12">
                     <div class="input-group">
-                      <div class="input-group-text">
-                        <div class="input-group-text" i18n>Note: </div>
-                      </div>
+                      <div class="input-group-text" i18n>Note: </div>
                       <input class="form-control" type='text'
                         [ngModel]="getNote(dow)" 
                         (ngModelChange)="setNote(dow, $event)"
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 4175a70f05..e348856274 100644
--- 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,9 +25,7 @@
   </div>
   <div class="col-lg-3">
     <div class="input-group">
-      <div class="input-group-text">
-        <span class="input-group-text" i18n>Template</span>
-      </div>
+      <span class="input-group-text" i18n>Template</span>
       <ng-template #entryTemplate let-r="result" let-owner="getOwnerName">
         {{r.label}} ({{getOwnerName(r.id)}})
       </ng-template>
@@ -39,9 +37,7 @@
   </div>
   <div class="col-lg-3" *ngIf="localeEntries.length > 0">
     <div class="input-group">
-      <div class="input-group-text">
-        <span class="input-group-text" i18n>Locale</span>
-      </div>
+      <span class="input-group-text" i18n>Locale</span>
       <eg-combobox [entries]="localeEntries"
         [startId]="localeCode"
         (onChange)="localeOnChange($event ? $event.id : null)">
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 ddd78368a4..e52da0df23 100644
--- 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,10 +9,8 @@
 <form [formGroup]="findResource" class="row">
   <div class="col-md-4">
     <div class="input-group flex-nowrap">
-      <div class="input-group-text">
         <label class="form-label input-group-text" for="resource-barcode" i18n>Resource barcode</label>
         <input type="text" id="resource-barcode" class="form-control" formControlName="resourceBarcode">
-      </div>
     </div>
   </div>
 </form>
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 f91a86d328..f6d896db63 100644
--- 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,9 +6,7 @@
     <div class="row">
       <div class="col">
         <div class="input-group">
-          <div class="input-group-text">
-            <label class="form-label input-group-text" for="ideal-reservation-type" i18n>Reservation type</label>
-          </div>
+          <label class="form-label input-group-text" for="ideal-reservation-type" i18n>Reservation type</label>
           <select class="form-select" id="ideal-reservation-type" formControlName="reservationType">
             <option *ngFor="let type of reservationTypes" [ngValue]="type" i18n>{{type.name}}</option>
           </select>
@@ -16,9 +14,7 @@
       </div>
       <div class="col">
         <div class="input-group">
-          <div class="input-group-text">
-            <label class="form-label input-group-text" for="ideal-reservation-date" i18n>Reservation date</label>
-          </div>
+          <label class="form-label input-group-text" for="ideal-reservation-date" i18n>Reservation date</label>
           <eg-date-select *ngIf="!multiday" #dateLimiter domId="ideal-reservation-date" formControlName="idealDate"></eg-date-select>
           <eg-daterange-select *ngIf="multiday" formControlName="idealDateRange"></eg-daterange-select>
         </div>
@@ -37,9 +33,7 @@
           <div ngbPanelContent class="row">
             <div class="col">
               <div class="input-group">
-                <div class="input-group-text">
-                  <label class="form-label input-group-text" for="ideal-resource-type" i18n>Search by resource type</label>
-                </div>
+                <label class="form-label input-group-text" for="ideal-resource-type" i18n>Search by resource type</label>
                 <eg-combobox
                   formControlName="resourceType"
                   domId="ideal-resource-type"
@@ -65,9 +59,7 @@
           <div ngbPanelContent class="row">
             <div class="col">
               <div class="input-group">
-                <div class="input-group-text">
-                  <label class="form-label input-group-text" for="ideal-resource-barcode" i18n>Search by resource barcode</label>
-                </div>
+                <label class="form-label input-group-text" for="ideal-resource-barcode" i18n>Search by resource barcode</label>
                 <input type="text" id="ideal-resource-barcode" class="form-control" formControlName="resourceBarcode">
               </div>
             </div>
@@ -84,9 +76,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-text">
-                  <label class="form-label input-group-text" for="attribute-{{attribute.id()}}" i18n>{{attribute.name()}}</label>
-                </span>
+                <label class="form-label input-group-text" for="attribute-{{attribute.id()}}" i18n>{{attribute.name()}}</label>
                 <eg-combobox [formControlName]="i">
                   <eg-combobox-entry *ngFor="let value of attribute.valid_values()"
                     [entryId]="value.id()" [entryLabel]="value.valid_value()">
@@ -107,17 +97,13 @@
           <ul class="list-group list-group-flush">
             <li class="list-group-item">
               <span class="input-group">
-                <span class="input-group-text">
                   <label class="form-label input-group-text" for="start-time" i18n>Start time</label>
-                </span>
                 <ngb-timepicker formControlName="startOfDay" [minuteStep]="minuteStep()" [meridian]="true"></ngb-timepicker>
               </span>
             </li>
             <li class="list-group-item">
               <span class="input-group">
-                <span class="input-group-text">
                   <label class="form-label input-group-text" for="end-time" i18n>End time</label>
-                </span>
                 <ngb-timepicker formControlName="endOfDay" [minuteStep]="minuteStep()" [meridian]="true"></ngb-timepicker>
               </span>
             </li>
@@ -129,9 +115,7 @@
             </li>
             <li class="list-group-item">
               <span class="input-group">
-                <span class="input-group-text">
                   <label class="form-label input-group-text" for="granularity" i18n>Granularity</label>
-                </span>
                 <eg-combobox (onChange)="changeGranularity($event)" [startId]="granularity ? granularity : 30">
                   <eg-combobox-entry [entryId]="15" entryLabel="15 minutes"
                     i18n-entryLabel></eg-combobox-entry>
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 3e3678c0a2..a947066355 100644
--- 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,9 +18,6 @@
           <ng-template ngbNavContent>
             <div class="m-2">
               <div class="input-group m-2">
-                <div class="input-group-text">
-                  <label class="form-label input-group-text" for="patron-barcode-value" i18n>Patron barcode</label>
-                </div>
                 <input type="text" id="patron-barcode-value" class="form-control" formControlName="patronBarcode">
                 <div class="input-group-button">
                   <button *ngIf="patronBarcode.value" class="btn btn-warning" (click)="removeFilters()" i18n><span class="material-icons">delete</span> Remove filter</button>
@@ -36,9 +33,7 @@
           <ng-template ngbNavContent>
             <div class="m-2">
               <div class="input-group m-2">
-                <div class="input-group-text">
                   <label class="form-label input-group-text" for="resource-barcode-value" i18n>Resource barcode</label>
-                </div>
                 <input type="text" id="resource-barcode-value" class="form-control" formControlName="resourceBarcode">
                 <div class="input-group-button">
                   <button *ngIf="resourceBarcode.value" class="btn btn-warning" (click)="removeFilters()" i18n><span class="material-icons">delete</span> Remove filter</button>
@@ -54,9 +49,7 @@
           <ng-template ngbNavContent>
             <div class="m-2">
               <div class="input-group m-2">
-                <div class="input-group-text">
                   <label class="form-label 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>
                 <div class="input-group-button">
                   <button class="btn btn-warning" (click)="removeFilters()" i18n><span class="material-icons">delete</span> Remove filter</button>
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 eebf04e79b..0330c9ebb6 100644
--- 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,10 +5,8 @@
 <form [formGroup]="findPatron" class="row">
   <div class="col-md-4">
     <div class="input-group flex-nowrap">
-      <div class="input-group-text">
         <label class="form-label input-group-text" for="patron-barcode" i18n>Patron barcode</label>
         <input type="text" id="patron-barcode" class="form-control" formControlName="patronBarcode">
-      </div>
     </div>
   </div>
 </form>
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 bca9f9c060..0471210e42 100644
--- 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,9 +5,7 @@
 <form [formGroup]="pullListCriteria" class="row">
   <div class="col-md-4">
     <div class="input-group">
-      <div class="input-group-text">
         <label for="ou" class="form-label input-group-text" i18n>Library:</label>
-      </div>
       <eg-org-select domId="ou" [applyDefault]="true"
         (onChange)="handleOrgChange($event)"
         [disableOrgs]="disableOrgs()" [hideOrgs]="disableOrgs()">
@@ -16,9 +14,7 @@
   </div>
   <div class="col-md-4">
     <div class="input-group">
-      <div class="input-group-text">
         <label for="days-hence" class="form-label input-group-text" i18n>Number of days to fetch:</label>
-      </div>
       <input type="number" min="1" class="form-control" formControlName="daysHence">
     </div>
   </div>
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 0cba8b9974..c7ce6e72be 100644
--- 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,10 +11,8 @@
         <div class="row">
           <div class="col-md-4">
             <div class="input-group flex-nowrap">
-              <div class="input-group-text">
                 <label class="form-label 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>
             </div>
           </div>
         </div>
@@ -31,10 +29,8 @@
       <a i18n ngbNavLink role="tab">By resource</a>
       <ng-template ngbNavContent>
         <div class="input-group flex-nowrap">
-          <div class="input-group-text">
             <label class="form-label 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>
         </div>
         <div *ngIf="patronId">
           <h2 class="text-center" i18n>Ready for return</h2>
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 fcb3aada1a..73aad31484 100644
--- 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,9 +8,7 @@
 <div class="row form-inline mb-3">
   <div class="col-lg-3">
     <div class="input-group">
-      <div class="input-group-text">
-        <span class="input-group-text" id="search-term" i18n>Search Term</span>
-      </div>
+      <span class="input-group-text" id="search-term" i18n>Search Term</span>
       <input type="text" class="form-control" placeholder="Search Term" 
         i18n-placeholder aria-describedby="search-term" 
         (change)="search(null, true)"
@@ -19,9 +17,7 @@
   </div>
   <div class="col-lg-5">
     <div class="input-group">
-      <div class="input-group-text">
-        <span class="input-group-text" id="auth-axis" i18n>Authority Type</span>
-      </div>
+      <span class="input-group-text" id="auth-axis" i18n>Authority Type</span>
       <eg-combobox #axisCbox [(ngModel)]="authorityAxis" 
         [entries]="browse.authorityAxes" (onChange)="search(null, true)">
       </eg-combobox>
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 f1f549207c..5387badf28 100644
--- 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,9 +7,7 @@
   <div class="row">
     <div class="col-lg-6 form-inline">
       <div class="input-group">
-        <div class="input-group-text">
-          <span class="input-group-text" i18n>Authorty Record Id</span>
-        </div>
+        <span class="input-group-text" i18n>Authorty Record Id</span>
         <input type="text" class="form-control" 
           id='auth-id-input'
           i18n-placeholder placeholder="Authorty Record Id" 
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 da1ec71c83..1e39b493df 100644
--- 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,12 +2,10 @@
 <div class="row form-validated mt-5">
   <div class="col-lg-6 form-inline">
     <div class="input-group">
-      <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>
         </span>
-      </div>
       <input id="bib-ident-value" type="text" required 
         (keyup.enter)="search()" [(ngModel)]="identValue"
         class="form-control" aria-describedby="bib-ident-label"/>
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 8f686195aa..f808d6a190 100644
--- 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,9 +6,7 @@
 <div class="row">
   <div class="col-lg-12 form-inline">
     <div class="input-group">
-      <div class="input-group-text">
-        <span class="input-group-text" id='barcode-label' i18n>Barcode</span>
-      </div>
+      <span class="input-group-text" id='barcode-label' i18n>Barcode</span>
       <input type="text" class="form-control" id="item-barcode-input" 
         (keydown)="noSuchItem=false; true;"
         (keyup.enter)="getItemByBarcode()" [(ngModel)]="itemBarcode" 
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 8c3cd4d255..a446b2f1e7 100644
--- 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,9 +2,7 @@
 <div class="d-flex mb-3">
   <div>
     <div class="input-group">
-      <div class="input-group-text">
-        <span class="input-group-text">Owner</span>
-      </div>
+      <span class="input-group-text">Owner</span>
       <eg-org-select
         [initialOrg]="contextOrg"
         (onChange)="orgOnChange($event)">
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 2b6e3f0f75..3e5c710ec0 100644
--- 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">
-        <span class="input-group-text" i18n>Show Sessions Since: </span>
+      <span class="input-group-text" i18n>Show Sessions Since: </span>
       <eg-date-select 
         [initialIso]="sinceDate"
         (onChangeAsIso)="dateFilterChange($event)">
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 15f7e3f731..a367287c03 100644
--- 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
@@ -144,9 +144,7 @@
             </div>
             <div class="flex-1">
               <div class="input-group">
-                <div class="input-group-text">
-                  <label for="userEmail" class="form-label input-group-text" i18n>Email Address</label>
-                </div>
+                <label for="userEmail" class="form-label input-group-text" i18n>Email Address</label>
                 <input type="text" class="form-control" name="userEmail"
                   id="userEmail"
                   [disabled]="true" value="{{user ? user.email() : ''}}"/>
@@ -164,9 +162,7 @@
             </div>
             <div class="flex-1">
               <div class="input-group">
-                <div class="input-group-text">
-                  <label for="phoneValue"  class="form-label input-group-text" i18n>Phone Number</label>
-                </div>
+                <label for="phoneValue"  class="form-label input-group-text" i18n>Phone Number</label>
                 <input type="text" class="form-control" [disabled]="!notifyPhone"
                   name="phoneValue" id="phoneValue" [(ngModel)]="phoneValue"/>
               </div>
@@ -182,9 +178,7 @@
             </div>
             <div class="flex-1">
               <div class="input-group">
-                <div class="input-group-text">
-                  <label for="smsValue"  class="form-label input-group-text" i18n>SMS Number</label>
-                </div>
+                <label for="smsValue"  class="form-label input-group-text" i18n>SMS Number</label>
                 <input type="text" class="form-control" [disabled]="!notifySms"
                   id="smsValue" name="smsValue" [(ngModel)]="smsValue"
                   [required]="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 4916ff32fd..1f87ce9beb 100644
--- 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,9 +4,7 @@
 <div class="row mt-3">
   <div class="col-lg-4">
     <div class="input-group">
-      <div class="input-group-text">
-        <div class="input-group-text" i18n>Holdings Maintenance</div>
-      </div>
+      <div class="input-group-text" i18n>Holdings Maintenance</div>
       <eg-org-select [initialOrg]="contextOrg"
         persistKey="catalog.holdings"
         (onChange)="contextOrgChanged($event)"
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 2232fa1e5b..25a52319f2 100644
--- 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,9 +85,7 @@
   <div class="col-lg-12 d-flex">
     <div class="form-inline">
       <div class="input-group">
-        <div class="input-group-text">
-          <span class="input-group-text" i18n>Barcode</span>
-        </div>
+        <span class="input-group-text" i18n>Barcode</span>
         <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()" />
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 73718209f4..5b10187bab 100644
--- 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,9 +5,7 @@
 <div class="row">
   <div class="col-lg-4">
     <div class="input-group">
-      <div class="input-group-text">
-        <span class="input-group-text" i18n>Patron Barcode:</span>
-      </div>
+      <span class="input-group-text" i18n>Patron Barcode:</span>
       <input type='text' id='barcode-search-input' class="form-control" 
         placeholder="Barcode" i18n-placeholder [(ngModel)]='barcode'
         (keydown.enter)="findUser()"/>
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 7193910ab6..d4019a9fca 100644
--- 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,9 +350,7 @@
     </div>
     <div class="form-inline ms-2">
       <div class="input-group">
-        <div class="input-group-text">
-          <span class="input-group-text" i18n># Receipts</span>
-        </div>
+        <span class="input-group-text" i18n># Receipts</span>
         <input type="number" class="form-control num-receipts" [(ngModel)]="numReceipts"/>
       </div>
     </div>
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 b1d325e90c..c1100bcd28 100644
--- 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,9 +14,7 @@
   <div class="col-lg-12 d-flex">
     <div class="form-inline">
       <div class="input-group">
-        <div class="input-group-text">
-          <span class="input-group-text" i18n>Barcode</span>
-        </div>
+        <span class="input-group-text" i18n>Barcode</span>
         <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()" />
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 475a8c3741..88e29fa011 100644
--- 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,9 +44,7 @@
     <div class="row" *ngIf="!hidePickupLibFilter">
       <div class="col-lg-5">
         <div class="input-group">
-          <div class="input-group-text">
-            <div class="input-group-text" i18n>Pickup Library</div>
-          </div>
+          <div class="input-group-text" i18n>Pickup Library</div>
           <eg-org-select [persistKey]="persistKey" [fallbackOrg]="pickupLib"
             (componentLoaded)="plCompLoaded = true" (onChange)="pickupLibChanged($event)">
           </eg-org-select>
@@ -57,9 +55,7 @@
     <div class="row" *ngIf="pullListOrg">
       <div class="col-lg-4 mb-2">
         <div class="input-group">
-          <div class="input-group-text">
-            <div class="input-group-text" i18n>View Pull List For:</div>
-          </div>
+          <div class="input-group-text" i18n>View Pull List For:</div>
           <eg-org-select [initialOrgId]="pullListOrg"
             (onChange)="pullListOrgChanged($event)">
           </eg-org-select>
-- 
2.11.0