From 63fdfdcdd59bbb957d91bcbf44623a900d1416be Mon Sep 17 00:00:00 2001
From: Stephanie Leary <stephanie.leary@equinoxoli.org>
Date: Tue, 12 Dec 2023 17:49:24 +0000
Subject: [PATCH] LP2023803 Replace btn-warning with appropriate color

Replaces all instances of .btn-warning, which has poor color contrast,
with other button colors. Actions that reset forms or delete data use
.btn-destroy; other instances may use .btn-info or btn-normal depending
on their context.

Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org>
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../eg2/src/app/share/fm-editor/fm-editor.component.html    | 4 ++--
 .../src/app/staff/acq/lineitem/lineitem-list.component.html | 2 +-
 .../src/eg2/src/app/staff/acq/po/charges.component.html     | 4 ++--
 .../local/course-reserves/course-term-map.component.ts      | 2 +-
 .../server/coded-value-maps/composite-def.component.html    | 2 +-
 .../floating-group/edit-floating-group.component.html       | 2 +-
 .../eg2/src/app/staff/admin/server/org-addr.component.html  | 2 +-
 .../src/app/staff/admin/server/org-unit-type.component.html | 2 +-
 .../eg2/src/app/staff/admin/server/org-unit.component.html  | 2 +-
 .../app/staff/admin/server/perm-group-tree.component.html   | 2 +-
 .../admin/workstation/printers/printers.component.html      | 2 +-
 .../app/staff/booking/manage-reservations.component.html    | 6 +++---
 .../src/app/staff/cat/item/missing-pieces.component.html    | 4 +++-
 .../staff/cat/vandelay/match-set-expression.component.html  | 2 +-
 .../app/staff/cat/vandelay/match-set-quality.component.html | 2 +-
 .../eg2/src/app/staff/catalog/search-form.component.html    | 2 +-
 .../app/staff/circ/patron/secondary-groups.component.html   | 4 ++--
 .../app/staff/share/billing/billing-dialog.component.html   | 2 +-
 .../src/eg2/src/app/staff/share/holds/detail.component.html | 2 +-
 .../src/eg2/src/app/staff/share/holds/manage.component.html | 2 +-
 .../eg2/src/app/staff/share/marc-edit/editor.component.html | 2 +-
 21 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html
index 18140004cd..f4af6004d0 100644
--- a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html
+++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html
@@ -226,12 +226,12 @@
     <ng-container *ngIf="isDialog()">
       <button type="button" class="btn btn-success" *ngIf="mode === 'view'"
         (click)="closeEditor()" i18n>Close</button>
-      <button type="button" class="btn btn-warning ms-2" *ngIf="mode !== 'view'"
+      <button type="button" class="btn btn-normal ms-2" *ngIf="mode !== 'view'"
         (click)="cancel()" i18n>Cancel</button>
     </ng-container>
 
     <ng-container *ngIf="showDelete && mode !== 'view'">
-      <button type="button" class="btn btn-warning" (click)="remove()"
+      <button type="button" class="btn btn-destroy" (click)="remove()"
         [disabled]="record && record.isnew()" i18n>Delete</button>
     </ng-container>
 
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 45b2314e10..5f02f4d843 100644
--- 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
@@ -363,7 +363,7 @@
                 <div ngbDropdown>
                   <button class="btn btn-outline-dark btn-sm" ngbDropdownToggle type="button"
                     title="Order Identifier Type" i18n-title [disabled]="!canEditIdent(li)"
-                    [ngClass]="{'btn-warning': !selectedIdent(li)}">
+                    [ngClass]="{'text-danger': !selectedIdent(li)}">
                     <ng-container *ngIf="orderIdentTypes[li.id()]==='isbn'" i18n>ISBN</ng-container>
                     <ng-container *ngIf="orderIdentTypes[li.id()]==='issn'" i18n>ISSN</ng-container>
                     <ng-container *ngIf="orderIdentTypes[li.id()]==='upc'" i18n>UPC</ng-container>
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/po/charges.component.html b/Open-ILS/src/eg2/src/app/staff/acq/po/charges.component.html
index 14d4957425..6d39bce005 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/po/charges.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/po/charges.component.html
@@ -78,9 +78,9 @@
     <div class="flex-2 p-1">
       <button type="button" *ngIf="canModify" [disabled]="!(charge.isnew() || charge.ischanged())" class="btn btn-success btn-sm" 
         (click)="saveCharge(charge)" i18n>Save</button>
-      <button type="button" *ngIf="canModify" [disabled]="charge.isnew()" class="btn btn-outline-dark btn-sm ms-1" 
+      <button type="button" *ngIf="canModify" [disabled]="charge.isnew()" class="btn btn-normal btn-sm ms-1" 
         (click)="charge.ischanged(true)" i18n>Edit</button>
-      <button type="button" class="btn btn-warning btn-sm ms-1" 
+      <button type="button" class="btn btn-destroy btn-sm ms-1" 
         (click)="disencumberCharge(charge)" *ngIf="canDisencumber(charge)" i18n>Disencumber</button>
       <button type="button" class="btn btn-danger btn-sm ms-1" 
         (click)="removeCharge(charge)" *ngIf="canDelete(charge)" i18n>Remove</button>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-term-map.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-term-map.component.ts
index d5c4686324..e46c3c2fd7 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-term-map.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-term-map.component.ts
@@ -13,7 +13,7 @@ import {ActivatedRoute} from '@angular/router';
         </eg-staff-banner>
         <div class="row">
             <div class="col text-right">
-                <a class="btn btn-warning ml-3" routerLink="/staff/admin/local/asset/course_list" i18n>
+                <a class="btn btn-info ml-3" routerLink="/staff/admin/local/asset/course_list" i18n>
                     <i class="material-icons align-middle" aria-hidden="true">keyboard_return</i>
                     <span class="align-middle">Return to Course List</span>
                 </a>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/coded-value-maps/composite-def.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/coded-value-maps/composite-def.component.html
index 867dbb5296..06b62acf38 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/coded-value-maps/composite-def.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/coded-value-maps/composite-def.component.html
@@ -19,7 +19,7 @@
 <div class="row">
   <div class="col-lg-6">
     <div class="d-flex mb-4" *ngIf="tree">
-      <button type="button" class="btn btn-warning me-2" (click)="deleteNode()"
+      <button type="button" class="btn btn-destroy me-2" (click)="deleteNode()"
         [disabled]="!hasSelectedNode()" i18n>
         Remove Selected Node
       </button>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/floating-group/edit-floating-group.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/floating-group/edit-floating-group.component.html
index 096aa67331..55cc4944cf 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/floating-group/edit-floating-group.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/floating-group/edit-floating-group.component.html
@@ -4,7 +4,7 @@
 
 <div class="row">
     <div class="col text-end">
-        <a class="btn btn-warning ms-3" routerLink="/staff/admin/server/config/floating_group">
+        <a class="btn btn-info ms-3" routerLink="/staff/admin/server/config/floating_group">
             <span class="material-icons align-middle" aria-hidden="true">keyboard_return</span>
             <span class="align-middle" i18n>Return to Floating Groups List</span>
         </a>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/org-addr.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/org-addr.component.html
index f4c7003a4a..7fb3eab699 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/org-addr.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/org-addr.component.html
@@ -17,7 +17,7 @@
               (actionClick)="getCoordinates($event)">
             </eg-fm-record-editor-action>
             <eg-fm-record-editor-action i18n-label label="Delete" *ngIf="!addr(type).isnew()"
-              (actionClick)="deleteAddress($event)" buttonCss="btn-warning">
+              (actionClick)="deleteAddress($event)" buttonCss="btn-destroy">
             </eg-fm-record-editor-action>
           </eg-fm-record-editor>
 
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit-type.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit-type.component.html
index f647e14ac1..af01f301ee 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit-type.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit-type.component.html
@@ -41,7 +41,7 @@
         <div class="col-lg-9">
           <button type="button" class="btn btn-info me-2" (click)="edit()" i18n>Edit</button>
           <button type="button" class="btn btn-info me-2" (click)="addChild()" i18n>Add Child</button>
-          <button type="button" class="btn btn-warning me-2" (click)="remove()"
+          <button type="button" class="btn btn-destroy me-2" (click)="remove()"
             [disabled]="selected.callerData.aout.children().length > 0 || selected.callerData.orgCount > 0" i18n>Delete</button>
         </div>
       </div>
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 1cc27d862f..eb7f770b3f 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
@@ -121,7 +121,7 @@
                 </a>
               </div>
               <div class="me-2">
-                <button type="button" class="btn btn-warning" (click)="deleteHours()" i18n>
+                <button type="button" class="btn btn-destroy" (click)="deleteHours()" i18n>
                   Clear Hours of Operation
                 </button>
               </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.html
index 5af8e78b82..da0de99445 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.html
@@ -64,7 +64,7 @@
               <div class="col-lg-9">
                 <button type="button" class="btn btn-info me-2" (click)="edit()" i18n>Edit</button>
                 <button type="button" class="btn btn-info me-2" (click)="addChild()" i18n>Add Child</button>
-                <button type="button" class="btn btn-warning me-2" (click)="remove()" i18n>Delete</button>
+                <button type="button" class="btn btn-destroy me-2" (click)="remove()" i18n>Delete</button>
               </div>
             </div>
             <div class="row">
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/workstation/printers/printers.component.html b/Open-ILS/src/eg2/src/app/staff/admin/workstation/printers/printers.component.html
index b1ea9be464..12c538413c 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/workstation/printers/printers.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/workstation/printers/printers.component.html
@@ -70,7 +70,7 @@
         </div>
       </div>
       <div class="col-lg-4">
-        <button type="button" class="btn btn-warning" 
+        <button type="button" class="btn btn-destroy" 
           (click)="resetConfig(context)" i18n>Reset Form</button>
 
         <button type="button" class="btn btn-success ms-2" 
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 4c0c5ac11b..4d20f61318 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
@@ -20,7 +20,7 @@
               <div class="input-group m-2">
                 <input type="text" id="patron-barcode-value" class="form-control" formControlName="patronBarcode">
                 <div class="input-group-button">
-                  <button type="button" *ngIf="patronBarcode.value" class="btn btn-warning" (click)="removeFilters()" i18n><span class="material-icons" aria-hidden="true">delete</span> Remove filter</button>
+                  <button type="button" *ngIf="patronBarcode.value" class="btn btn-destroy" (click)="removeFilters()" i18n><span class="material-icons" aria-hidden="true">delete</span> Remove filter</button>
                 </div>
               </div>
             </div>
@@ -37,7 +37,7 @@
                   <label class="form-label input-group-text" for="resource-barcode-value" i18n>Resource barcode</label>
                 <input type="text" id="resource-barcode-value" class="form-control" formControlName="resourceBarcode">
                 <div class="input-group-button">
-                  <button type="button" *ngIf="resourceBarcode.value" class="btn btn-warning" (click)="removeFilters()">
+                  <button type="button" *ngIf="resourceBarcode.value" class="btn btn-destroy" (click)="removeFilters()">
                     <span class="material-icons" aria-hidden="true">delete</span> 
                     <span i18n>Remove filter</span>
                   </button>
@@ -57,7 +57,7 @@
                   <label class="form-label input-group-text" for="resource-type-value" i18n>Resource type</label>
                 <eg-combobox domId="resource-type-value" formControlName="resourceType" idlClass="brt" [asyncSupportsEmptyTermClick]="true"></eg-combobox>
                 <div class="input-group-button">
-                  <button type="button" class="btn btn-warning" (click)="removeFilters()">
+                  <button type="button" class="btn btn-destroy" (click)="removeFilters()">
                     <span class="material-icons" aria-hidden="true">delete</span> 
                     <span i18n>Remove filter</span>
                   </button>
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 301a13be16..5fafa11dd2 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
@@ -35,7 +35,9 @@
       <button type="button" class="btn btn-success" (click)="processItem()" i18n>
         Mark Item as Missing Pieces?
       </button>
-      <button type="button" class="btn btn-warning ms-2" (click)="reset()">
+      <button type="button" class="btn ms-2" (click)="reset()"
+        [ngClass]="{'btn-destroy': itemProcessed,
+                    'btn-normal': !itemProcessed }">
         <ng-container *ngIf="!itemProcessed" i18n>Cancel</ng-container>
         <ng-container *ngIf="itemProcessed" i18n>Reset Form</ng-container>
       </button>
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-expression.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-expression.component.html
index 9c4305fc83..e63a5556a3 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-expression.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-expression.component.html
@@ -57,7 +57,7 @@
   <div class="col-lg-5">
     <ng-container *ngIf="tree">
       <div class="d-flex">
-        <button type="button" class="btn btn-warning me-1" (click)="deleteNode()" 
+        <button type="button" class="btn btn-destroy me-1" (click)="deleteNode()" 
           [disabled]="!hasSelectedNode() || isRootNode()" i18n>
           Remove Selected Node
         </button>
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-quality.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-quality.component.html
index 8b53fcdc8e..c5458969db 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-quality.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/match-set-quality.component.html
@@ -16,7 +16,7 @@
       <div class="col">
         <button type="button" class="btn btn-success me-2" 
           (click)="addQuality()" i18n>Add</button>
-        <button type="button" class="btn btn-warning"
+        <button type="button" class="btn btn-normal"
           (click)="newPointType=null" i18n>Cancel</button>
       </div>
     </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html
index 53ef332342..c72e8f7905 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html
@@ -453,7 +453,7 @@
                 (click)="context.pager.offset=0;searchByForm()" i18n>
                 Search
               </button>
-              <button type="button" class="btn btn-warning me-1" type="button"
+              <button type="button" class="btn btn-destroy me-1" type="button"
                 [disabled]="searchIsActive()"
                 (click)="context.reset()" i18n>
                 Reset
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/secondary-groups.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/secondary-groups.component.html
index 5aad2510f4..6b4a2ac6ff 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/secondary-groups.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/secondary-groups.component.html
@@ -31,7 +31,7 @@
     <div class="row mt-2" *ngFor="let grp of pendingGroups">
       <div class="col-lg-6">{{grp.name()}}</div>
       <div class="col-lg-6">
-        <button type="button" class="btn btn-warning" 
+        <button type="button" class="btn btn-destroy" 
           (click)="removePending(grp)" i18n>Remove Pending</button>
       </div>
     </div>
@@ -48,7 +48,7 @@
   <div class="modal-footer">
     <button type="button" class="btn btn-success"
       (click)="applyChanges()" i18n>Apply Changes</button>
-    <button type="button" class="btn btn-warning"
+    <button type="button" class="btn btn-normal"
       (click)="close()" i18n>Cancel</button>
   </div>
 </ng-template>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/billing/billing-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/billing/billing-dialog.component.html
index ed1bcde1d0..0528f9a08d 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/billing/billing-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/billing/billing-dialog.component.html
@@ -79,7 +79,7 @@
   <div class="modal-footer">
     <button type="button" class="btn btn-success" [disabled]="!saveable()"
       (click)="submit()" i18n>Submit Bill</button>
-    <button type="button" class="btn btn-warning"
+    <button type="button" class="btn btn-normal"
       (click)="close()" i18n>Cancel</button>
   </div>
 </ng-template>
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 7dcc57a2ef..61ba0978ba 100644
--- 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
@@ -124,7 +124,7 @@
               <div class="well-row">
                 <div class="well-value">{{note.body()}}</div>
                 <div class="well-label-no-flex">
-                  <button type="button" class="btn btn-warning" 
+                  <button type="button" class="btn btn-destroy" 
                     (click)="deleteNote(note)" i18n>Delete</button>
                 </div>
               </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/manage.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/manage.component.html
index c4df7294d8..b0a239c2bc 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/manage.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/manage.component.html
@@ -260,7 +260,7 @@
 
   <div class="row d-flex justify-content-end">
     <div>
-      <button type="button" class="btn btn-warning" (click)="exit()" i18n>
+      <button type="button" class="btn btn-normal" (click)="exit()" i18n>
         Cancel
       </button>
       <button type="button" class="btn btn-success ms-2" (click)="save()" i18n>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor.component.html
index afa60aa6e9..03e4be1762 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor.component.html
@@ -66,7 +66,7 @@
 
   <ng-container *ngIf="record && record.id">
     <div>
-      <button type="button" *ngIf="!record.deleted && record.id !== -1" class="btn btn-warning"
+      <button type="button" *ngIf="!record.deleted && record.id !== -1" class="btn btn-destroy"
         [disabled]="inPlaceMode" (click)="deleteRecord()" i18n>Delete Record</button>
       <button type="button" *ngIf="record.deleted" class="btn btn-info" 
         [disabled]="inPlaceMode" (click)="undeleteRecord()" i18n>Undelete Record</button>
-- 
2.43.2