LP2000482 Bootstrap 5: input group repairs

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

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 49d93ca..719e21a 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
@@ -67,9 +67,7 @@
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12'">
                   <div class="input-group">
                     <div class="input-group-text">
-                      <div class="input-group-text">
                         <label class="form-label" for="associate-item-temp-call-number" i18n>Call Number</label>
-                      </div>
                     </div>
                     <input type="text" [(ngModel)]="tempCallNumber" id="associate-item-temp-call-number"
                       [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'"
@@ -86,9 +84,7 @@
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12 mt-3'">
                   <div class="input-group">
                     <div class="input-group-text">
-                      <div class="input-group-text">
                         <label class="form-label" for="temp-circ-mod" i18n>Circulation Modifier</label>
-                      </div>
                     </div>
                     <eg-combobox i18n-placeholder placeholder="Circulation Modifier..." idlClass="ccm" idlField="name"
                       [displayTemplate]="idlClassLabel" [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'"
@@ -97,11 +93,9 @@
                       (onChange)="tempCircMod = $event.id; isModifyingCircMod = true">
                     </eg-combobox>
                     <div class="input-group-text">
-                      <div class="input-group-text">
                         <input type="checkbox" [(ngModel)]="isModifyingCircMod"
                           [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'"
                           aria-label="Checkbox for setting a temporary Circulation Modifier" />
-                      </div>
                     </div>
                   </div>
                 </div>
@@ -110,9 +104,7 @@
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12'">
                   <div class="input-group">
                     <div class="input-group-text">
-                      <div class="input-group-text">
                         <label class="form-label" for="temp-item-status" i18n>Item Status</label>
-                      </div>
                     </div>
                     <eg-combobox i18n-placeholder placeholder="Item Status..." idlClass="ccs" idlField="name"
                       [displayTemplate]="idlClassLabel" [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'"
@@ -121,31 +113,25 @@
                       (onChange)="tempStatus = $event.id; isModifyingStatus = true">
                     </eg-combobox>
                     <div class="input-group-text">
-                      <div class="input-group-text">
                         <input type="checkbox" [(ngModel)]="isModifyingStatus"
                           [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'"
                           aria-label="Checkbox for setting a temporary Item Status" />
-                      </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">
-                      <div class="input-group-text">
                         <label class="form-label" for="temp-location" i18n>Shelving Location</label>
-                      </div>
                     </div>
                     <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">
                     </eg-item-location-select>
                     <div class="input-group-text">
-                      <div class="input-group-text">
                         <input type="checkbox" [(ngModel)]="isModifyingLocation"
                           [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'"
                           aria-label="Checkbox for setting a temporary Shelving Location" />
-                      </div>
                     </div>
                   </div>
                 </div>
@@ -165,9 +151,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-text">
                     <label class="form-label input-group-text" for="brief-relationship" i18n>Relationship</label>
-                  </div>
                   <input type="text" [(ngModel)]="relationshipInput" id="brief-relationship"
                     [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'" placeholder-i18n
                     placeholder="e.g. Required" class="flex-grow-1" />
@@ -197,18 +181,14 @@
               <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-text">
                       <label for="bib-id" class="form-label input-group-text" i18n>Bibliographic Record ID</label>
-                    </div>
                     <input type="text" [(ngModel)]="bibId" id="bib-id"
                       [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'" class="flex-grow-1" />
                   </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 input-group-text" for="electronic-relationship" i18n>Relationship</label>
-                    </div>
                     <input type="text" [(ngModel)]="relationshipInput" id="electronic-relationship"
                       [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'" class="flex-grow-1" />
                   </div>

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 ac254f5..3e0f093 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
@@ -39,9 +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-text">
-              <label for="associate-user-role"  class="form-label input-group-text" i18n>Role</label>
-            </div>
+              <label for="associate-user-role input-group-text"  class="form-label input-group-text" i18n>Role</label>
             <eg-combobox idlClass="acmr" [(ngModel)]="userRoleInput"
             [asyncSupportsEmptyTermClick]="true"
             [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'">