LP2000482 Bootstrap 5 / Recover .badge's

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

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 9873969..d21a808 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
@@ -317,28 +317,28 @@
             <div class="me-2">
               <ng-container [ngSwitch]="li.state()">   
                 <div i18n 
-                  class="p-1 text-dark border border-dark bg-light rounded-pill"
+                  class="p-1 text-dark border border-dark bg-light badge rounded-pill"
                   *ngSwitchCase="'new'">New</div>
                 <div i18n 
-                  class="p-1 text-dark border border-dark bg-light rounded-pill" 
+                  class="p-1 text-dark border border-dark bg-light badge rounded-pill" 
                   *ngSwitchCase="'selector-ready'">Selector-Ready</div>
                 <div i18n 
-                  class="p-1 text-dark border border-dark bg-light rounded-pill" 
+                  class="p-1 text-dark border border-dark bg-light badge rounded-pill" 
                   *ngSwitchCase="'order-ready'">Order-Ready</div>
                 <div i18n 
-                  class="p-1 text-dark border border-dark bg-light rounded-pill" 
+                  class="p-1 text-dark border border-dark bg-light badge rounded-pill" 
                   *ngSwitchCase="'approved'">Approved</div>
                 <div i18n 
-                  class="p-1 text-dark border border-dark bg-light rounded-pill" 
+                  class="p-1 text-dark border border-dark bg-light badge rounded-pill" 
                   *ngSwitchCase="'pending-order'">Pending-Order</div>
                 <div i18n 
-                  class="p-1 text-primary border border-primary bg-light rounded-pill" 
+                  class="p-1 text-primary border border-primary bg-light badge rounded-pill" 
                   *ngSwitchCase="'on-order'">On-Order</div>
                 <div i18n 
-                  class="p-1 text-success border border-success bg-light rounded-pill" 
+                  class="p-1 text-success border border-success bg-light badge rounded-pill" 
                   *ngSwitchCase="'received'">Received</div>
                 <div i18n 
-                  class="p-1 text-danger border border-danger bg-light rounded-pill" 
+                  class="p-1 text-danger border border-danger bg-light badge rounded-pill" 
                   *ngSwitchCase="'cancelled'">{{li.cancel_reason().label()}}</div>
               </ng-container>
             </div>

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 f12624e..b470c46 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
@@ -88,7 +88,7 @@
           <button class="btn btn-danger ms-2" (click)="deleteTemplate()" i18n>
             Delete Template
           </button>
-          <span *ngIf="invalidJson" class="rounded-pill bg-danger ms-2" i18n>
+          <span *ngIf="invalidJson" class="badge rounded-pill bg-danger ms-2" i18n>
             Invalid Sample JSON!
           </span>
         </div>
@@ -129,4 +129,4 @@
   </li>
 </ul>
 
-<div [ngbNavOutlet]="tabs" class="mt-2"></div>
\ No newline at end of file
+<div [ngbNavOutlet]="tabs" class="mt-2"></div>

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 541cf30..897c26b 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
@@ -116,7 +116,7 @@
 
 <div *ngIf="fineTally > 0">
   <span class="me-2" i18n>Fine Tally: </span>
-  <span class="rounded-pill bg-danger">{{fineTally | currency}}</span>
+  <span class="badge rounded-pill bg-danger">{{fineTally | currency}}</span>
 </div>
 
 <!-- doc_id below because checkin returns an MVR -->
@@ -310,72 +310,72 @@
         <div ngbDropdownMenu>
           <a ngbDropdownItem (click)="toggleMod('no_precat_alert')">
             <span *ngIf="modifiers.no_precat_alert" 
-              class="rounded-pill bg-success me-2">&#x2713;</span>
+              class="badge rounded-pill bg-success me-2">&#x2713;</span>
             <span *ngIf="!modifiers.no_precat_alert" 
-              class="rounded-pill bg-warning me-2">&#x2717;</span>
+              class="badge rounded-pill bg-warning me-2">&#x2717;</span>
             <span i18n>Ignore Pre-cataloged Items</span>
           </a>
           <a ngbDropdownItem (click)="toggleMod('noop')">
             <span *ngIf="modifiers.noop" 
-              class="rounded-pill bg-success me-2">&#x2713;</span>
+              class="badge rounded-pill bg-success me-2">&#x2713;</span>
             <span *ngIf="!modifiers.noop" 
-              class="rounded-pill bg-warning me-2">&#x2717;</span>
+              class="badge rounded-pill bg-warning me-2">&#x2717;</span>
             <span i18n>Suppress Holds and Transits</span>
           </a>
           <a ngbDropdownItem (click)="toggleMod('void_overdues')">
             <span *ngIf="modifiers.void_overdues" 
-              class="rounded-pill bg-success me-2">&#x2713;</span>
+              class="badge rounded-pill bg-success me-2">&#x2713;</span>
             <span *ngIf="!modifiers.void_overdues"
-              class="rounded-pill bg-warning me-2">&#x2717;</span>
+              class="badge rounded-pill bg-warning me-2">&#x2717;</span>
             <span i18n>Amnesty Mode</span>
           </a>
           <a ngbDropdownItem (click)="toggleMod('auto_print_holds_transits')">
             <span *ngIf="modifiers.auto_print_holds_transits" 
-              class="rounded-pill bg-success me-2">&#x2713;</span>
+              class="badge rounded-pill bg-success me-2">&#x2713;</span>
             <span *ngIf="!modifiers.auto_print_holds_transits"
-              class="rounded-pill bg-warning me-2">&#x2717;</span>
+              class="badge rounded-pill bg-warning me-2">&#x2717;</span>
             <span>Auto-Print Hold and Transit Slips</span>
           </a>
           <a ngbDropdownItem (click)="toggleMod('clear_expired')">
             <span *ngIf="modifiers.clear_expired" 
-              class="rounded-pill bg-success me-2">&#x2713;</span>
+              class="badge rounded-pill bg-success me-2">&#x2713;</span>
             <span *ngIf="!modifiers.clear_expired"
-              class="rounded-pill bg-warning me-2">&#x2717;</span>
+              class="badge rounded-pill bg-warning me-2">&#x2717;</span>
             <span i18n>Clear Holds Shelf</span>
           </a>
           <a ngbDropdownItem (click)="toggleMod('retarget_holds')">
             <span *ngIf="modifiers.retarget_holds" 
-              class="rounded-pill bg-success me-2">&#x2713;</span>
+              class="badge rounded-pill bg-success me-2">&#x2713;</span>
             <span *ngIf="!modifiers.retarget_holds"
-              class="rounded-pill bg-warning me-2">&#x2717;</span>
+              class="badge rounded-pill bg-warning me-2">&#x2717;</span>
             <span i18n>Retarget Local Holds</span>
           </a>
           <a ngbDropdownItem (click)="toggleMod('retarget_holds_all')">
             <span *ngIf="modifiers.retarget_holds_all" 
-              class="rounded-pill bg-success me-2">&#x2713;</span>
+              class="badge rounded-pill bg-success me-2">&#x2713;</span>
             <span *ngIf="!modifiers.retarget_holds_all"
-              class="rounded-pill bg-warning me-2">&#x2717;</span>
+              class="badge rounded-pill bg-warning me-2">&#x2717;</span>
             <span i18n>Retarget All Statuses</span>
           </a>
           <a ngbDropdownItem (click)="toggleMod('hold_as_transit')">
             <span *ngIf="modifiers.hold_as_transit" 
-              class="rounded-pill bg-success me-2">&#x2713;</span>
+              class="badge rounded-pill bg-success me-2">&#x2713;</span>
             <span *ngIf="!modifiers.hold_as_transit"
-              class="rounded-pill bg-warning me-2">&#x2717;</span>
+              class="badge rounded-pill bg-warning me-2">&#x2717;</span>
             <span i18n>Capture Local Holds As Transits</span>
           </a>
           <a ngbDropdownItem (click)="toggleMod('manual_float')">
             <span *ngIf="modifiers.manual_float"
-              class="rounded-pill bg-success me-2">&#x2713;</span>
+              class="badge rounded-pill bg-success me-2">&#x2713;</span>
             <span *ngIf="!modifiers.manual_float"
-              class="rounded-pill bg-warning me-2">&#x2717;</span>
+              class="badge rounded-pill bg-warning me-2">&#x2717;</span>
             <span i18n>Manual Floating Active</span>
           </a>
           <a ngbDropdownItem (click)="toggleMod('do_inventory_update')">
             <span *ngIf="modifiers.do_inventory_update"
-              class="rounded-pill bg-success me-2">&#x2713;</span>
+              class="badge rounded-pill bg-success me-2">&#x2713;</span>
             <span *ngIf="!modifiers.do_inventory_update"
-              class="rounded-pill bg-warning me-2">&#x2717;</span>
+              class="badge rounded-pill bg-warning me-2">&#x2717;</span>
             <span i18n>Update Inventory</span>
           </a>
         </div>

diff --git a/Open-ILS/src/eg2/src/app/staff/login.component.html b/Open-ILS/src/eg2/src/app/staff/login.component.html
index cdc4cc6..098a3c2 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/login.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/login.component.html
@@ -58,7 +58,7 @@
             <button type="submit" class="btn btn-outline-dark" i18n>Sign In</button>
           </div>
           <div class="col-4" *ngIf="loginFailed">
-            <div class="rounded-pill bg-warning p-2 ps-4" i18n>Login Failed</div>
+            <div class="badge rounded-pill bg-warning p-2" i18n>Login Failed</div>
           </div>
         </div>
       </form>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/detail.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/detail.component.html
index 9624cbc..0f8adf6 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/detail.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/detail.component.html
@@ -113,11 +113,11 @@
               <div class="flex-1"></div>
               <div>
                 <span *ngIf="note.slip() === 't'" 
-                  class="ms-2 rounded-pill bg-info p-1">Print on Slip</span>
+                  class="ms-2 badge rounded-pill bg-info p-1">Print on Slip</span>
                 <span *ngIf="note.pub() === 't'" 
-                  class="ms-2 rounded-pill bg-warning p-1">Patron Visible</span>
+                  class="ms-2 badge rounded-pill bg-warning p-1">Patron Visible</span>
                 <span *ngIf="note.staff() === 't'" 
-                  class="ms-2 rounded-pill bg-info p-1">Staff Create</span>
+                  class="ms-2 badge rounded-pill bg-info p-1">Staff Create</span>
               </div>
             </div>
             <div class="well-table">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html
index 6ee1b9d..377acf4 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html
@@ -80,11 +80,11 @@
         <div class="mt-2">
           <button type="button" class="btn btn-outline-info"
             [disabled]="undoCount() < 1" (click)="undo()">
-            Undo <span class="rounded-pill text-light bg-info p-1">{{undoCount()}}</span>
+            Undo <span class="badge rounded-pill text-light bg-info p-1">{{undoCount()}}</span>
           </button>
           <button type="button" class="btn btn-outline-info ms-2"
             [disabled]="redoCount() < 1" (click)="redo()">
-            Redo <span class="rounded-pill text-light bg-info p-1">{{redoCount()}}</span>
+            Redo <span class="badge rounded-pill text-light bg-info p-1">{{redoCount()}}</span>
           </button>
         </div>
         <div class="mt-2">