LP2000482 Bootstrap 5: Rename some utility classes

See previous commit.  I missed a sub-dir.

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/eg2/src/app/share/clipboard/clipboard-dialog.component.html b/Open-ILS/src/eg2/src/app/share/clipboard/clipboard-dialog.component.html
index 1ff5fa2..c4c4d03 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/clipboard/clipboard-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/share/clipboard/clipboard-dialog.component.html
@@ -8,7 +8,7 @@
   </div>
   <div class="modal-body common-form striped-odd">
     <div class="row" *ngFor="let value of values">
-      <div class="col-lg-4 font-weight-bold border-right">{{value.label}}</div>
+      <div class="col-lg-4 fw-bold border-right">{{value.label}}</div>
       <div class="col-lg-8">
         <a href="javascript:;" (click)="copyValue(value.value)">{{value.value}}</a>
       </div>

diff --git a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.html b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.html
index e498670..915b9e4 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.html
+++ b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.html
@@ -23,7 +23,7 @@
       class="form-control"
       [id]="domId"
       [ngClass]="{
-        'text-success font-italic font-weight-bold': selected && selected.freetext,
+        'text-success font-italic fw-bold': selected && selected.freetext,
         'form-control-sm': smallFormControl
       }"
       [placeholder]="placeholder"

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 0e5e8f2..9edc9f5 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
@@ -14,9 +14,9 @@
 <ng-template #actionsTemplate>
   <div class="pt-2">
     <button class="btn btn-sm btn-outline-dark" (click)="applyFilterCommon(col)" i18n>Apply filter</button>
-    <span class="pl-2"></span>
+    <span class="ps-2"></span>
     <button class="btn btn-sm btn-outline-dark" (click)="clearFilter(col)" i18n>Clear filter</button>
-    <span class="pl-2"></span>
+    <span class="ps-2"></span>
     <button class="btn btn-sm btn-outline-dark" (click)="closeDropdown()" i18n>Close</button>
   </div>
 </ng-template>

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-actions-editor.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-actions-editor.component.html
index 984ef04..26d7bc6 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-actions-editor.component.html
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-actions-editor.component.html
@@ -13,14 +13,14 @@
     </div>
     <div class="row pt-1" *ngFor="let action of gridContext.toolbarActions">
       <ng-container *ngIf="action.isGroup">
-        <div class="col-lg-12 font-weight-bold font-italic">{{action.label}}</div>
+        <div class="col-lg-12 fw-bold font-italic">{{action.label}}</div>
       </ng-container>
       <ng-container *ngIf="action.isSeparator">
         <div class="col-lg-12 dropdown-divider"></div>
       </ng-container>
       <ng-container *ngIf="!action.isGroup && !action.isSeparator">
         <div class="col-lg-9">
-          <div [ngClass]="{'pl-2': action.group}"
+          <div [ngClass]="{'ps-2': action.group}"
             (click)="showHideClicked(action)">{{action.label}}</div>
         </div>
         <div class="col-lg-3" (click)="showHideClicked(action)">

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-actions-menu.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-actions-menu.component.html
index 8bc8e32..eacb557 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-actions-menu.component.html
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar-actions-menu.component.html
@@ -14,7 +14,7 @@
     [disabled]="shouldDisable(action)"
     (click)="performAction(action)" tabindex="0">
     <ng-container *ngIf="action.isGroup">
-      <span class="font-weight-bold font-italic">{{action.label}}</span>
+      <span class="fw-bold font-italic">{{action.label}}</span>
     </ng-container>
     <ng-container *ngIf="action.isSeparator">
       <div class="dropdown-divider"></div>

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html
index 1c2407b..bdadb4a 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html
@@ -4,7 +4,7 @@
 <div class="eg-grid-toolbar mb-2">
 
   <div class="btn-toolbar">
-    <span class="font-weight-bold mr-2" *ngIf="gridContext.toolbarLabel">
+    <span class="fw-bold me-2" *ngIf="gridContext.toolbarLabel">
       {{gridContext.toolbarLabel}}
     </span>
 
@@ -12,13 +12,13 @@
     <div class="btn-grp" *ngIf="gridContext.toolbarButtons.length || gridContext.isFilterable">
       <!-- special case for remove filters button -->
       <button *ngIf="gridContext.isFilterable"
-        class="btn btn-outline-dark mr-1" (click)="gridContext.removeFilters()"
+        class="btn btn-outline-dark me-1" (click)="gridContext.removeFilters()"
         [disabled]="!gridContext.filtersSet() || gridContext.dataSource.requestingData" i18n>
         Remove Filters
       </button>
       <button *ngFor="let btn of gridContext.toolbarButtons"
         [disabled]="btn.disabled"
-        class="btn btn-outline-dark mr-1" (click)="performButtonAction(btn)">
+        class="btn btn-outline-dark me-1" (click)="performButtonAction(btn)">
         {{btn.label}}
       </button>
     </div>
@@ -42,10 +42,10 @@
 
   <ng-container *ngIf="!gridContext.disableSelect">
 
-  <div class="font-sm font-italic d-flex flex-column-reverse mr-2">
+  <div class="font-sm font-italic d-flex flex-column-reverse me-2">
     {{gridContext.getSelectedRows().length}} selected
   </div>
-  <div ngbDropdown class="mr-1" placement="bottom-right">
+  <div ngbDropdown class="me-1" placement="bottom-right">
     <button ngbDropdownToggle [disabled]="!gridContext.toolbarActions.length"
         class="btn btn-outline-dark no-dropdown-caret">
       <span title="Actions For Selected Rows" i18n-title
@@ -62,21 +62,21 @@
   <ng-container *ngIf="!gridContext.disablePaging">
 
   <button [disabled]="gridContext.pager.isFirstPage()" type="button"
-    class="btn btn-outline-dark mr-1" (click)="gridContext.pager.toFirst()">
+    class="btn btn-outline-dark me-1" (click)="gridContext.pager.toFirst()">
     <span title="First Page" i18n-title
         class="material-icons mat-icon-in-button">first_page</span>
   </button>
   <button [disabled]="gridContext.pager.isFirstPage()" type="button"
-    class="btn btn-outline-dark mr-1" (click)="gridContext.pager.decrement()">
+    class="btn btn-outline-dark me-1" (click)="gridContext.pager.decrement()">
     <span title="Previous Page" i18n-title
         class="material-icons mat-icon-in-button">keyboard_arrow_left</span>
   </button>
   <button [disabled]="gridContext.pager.isLastPage()" type="button"
-    class="btn btn-outline-dark mr-1" (click)="gridContext.pager.increment()">
+    class="btn btn-outline-dark me-1" (click)="gridContext.pager.increment()">
     <span title="Next Page" i18n-title
         class="material-icons mat-icon-in-button">keyboard_arrow_right</span>
   </button>
-  <div ngbDropdown class="mr-1" placement="bottom-right">
+  <div ngbDropdown class="me-1" placement="bottom-right">
     <button ngbDropdownToggle class="btn btn-outline-dark text-button">
       <span title="Select Row Count" i18n-title i18n>
         Rows {{gridContext.pager.limit}}
@@ -95,7 +95,7 @@
 
 
   <button type="button"
-    class="btn btn-outline-dark mr-1"
+    class="btn btn-outline-dark me-1"
     (click)="gridContext.overflowCells=!gridContext.overflowCells">
     <span *ngIf="!gridContext.overflowCells"
       title="Expand Cells Vertically" i18n-title

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid.component.html
index 7100187..2491df5 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/grid/grid.component.html
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid.component.html
@@ -26,10 +26,10 @@
         </div>
       </ng-container>
       <ng-container *ngIf="!dataSource.requestingData">
-        <div class="col-lg-12 text-center alert alert-danger font-italic font-weight-bold" *ngIf="dataSource.retrievalError">
+        <div class="col-lg-12 text-center alert alert-danger font-italic fw-bold" *ngIf="dataSource.retrievalError">
           <span i18n>Error Retrieving Results</span>
         </div>
-        <div class="col-lg-12 text-center alert font-italic font-weight-bold" *ngIf="!dataSource.retrievalError">
+        <div class="col-lg-12 text-center alert font-italic fw-bold" *ngIf="!dataSource.retrievalError">
           <span i18n>Nothing to Display</span>
         </div>
       </ng-container>

diff --git a/Open-ILS/src/eg2/src/app/share/translate/translate.component.html b/Open-ILS/src/eg2/src/app/share/translate/translate.component.html
index 61b9cb4..1302391 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/translate/translate.component.html
+++ b/Open-ILS/src/eg2/src/app/share/translate/translate.component.html
@@ -10,7 +10,7 @@
   </div>
   <div class="modal-body form-common form-validated" *ngIf="idlObj">
     <div class="form-group row">
-      <label class="col-lg-4 text-right font-weight-bold" 
+      <label class="col-lg-4 text-right fw-bold" 
         i18n>Field Name</label>
       <input 
         type="text" 
@@ -19,7 +19,7 @@
         value="{{idlClassDef.field_map[field].label}}">
     </div>
     <div class="form-group row">
-      <label class="col-lg-4 text-right font-weight-bold" 
+      <label class="col-lg-4 text-right fw-bold" 
         i18n>Current Value</label>
       <input 
         type="text" 
@@ -28,7 +28,7 @@
         value="{{idlObj[field]()}}">
     </div>
     <div class="form-group row">
-      <label class="col-lg-4 text-right font-weight-bold" 
+      <label class="col-lg-4 text-right fw-bold" 
         i18n>Select Locale</label>
       <select class="form-control col-lg-7" 
         (change)="localeChanged($event)"
@@ -39,7 +39,7 @@
       </select>
     </div>
     <div class="form-group row">
-      <label class="col-lg-4 text-right font-weight-bold" i18n>Translation</label>
+      <label class="col-lg-4 text-right fw-bold" i18n>Translation</label>
       <input 
         id='translation-input'
         type="text" 
@@ -55,7 +55,7 @@
     <button *ngIf="prevString" (click)="prevString()" 
       class="btn btn-info" i18n>Prev String</button>
     <button *ngIf="nextString" (click)="nextString()" 
-      class="btn btn-info mr-3" i18n>Next String</button>
+      class="btn btn-info me-3" i18n>Next String</button>
     <button (click)="translate()" class="btn btn-info" i18n>Apply</button>
     <button (click)="close()" class="btn btn-warning ml-2" i18n>Cancel</button>
   </div>