From 91392e6129a660e2ef1f452687e97dbdc59aa987 Mon Sep 17 00:00:00 2001
From: Stephanie Leary <stephanie.leary@equinoxoli.org>
Date: Mon, 13 Nov 2023 20:14:40 +0000
Subject: [PATCH] LP2002362 Follow-up: workstation registration labels

Updates the Angular workstation management form labels to be compatible
with recent changes to the org unit selector component.

Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
---
 .../workstations/workstations.component.html  | 20 +++++++++++--------
 .../admin/workstation/t_workstations.tt2      |  8 +++++---
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/workstations.component.html b/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/workstations.component.html
index 223bf91060..9650699f7d 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/workstations.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/workstations.component.html
@@ -22,11 +22,12 @@
 
     <div class="row">
       <div class="col">
-        <label for="workstationSelect" i18n>Register a New Workstation For This Browser</label>
+        <h2 class="form-label fs-6 text-dark" i18n>Register a New Workstation For This Browser</h2>
       </div>
     </div>
     <div class="row mt-2">
       <div class="col-lg-2">
+        <label class="form-label" for="workstationSelect" i18n="Workstation registration: owning library">Library</label>
         <eg-org-select 
           domId="workstationSelect"
           [applyDefault]="true"
@@ -37,14 +38,17 @@
           placeholder="Owner..." >
         </eg-org-select>
       </div>
+
       <div class="col-lg-6">
+        <label class="form-label" for="register-new-workstation-name" i18n>
+          Workstation Name
+        </label>
         <div class="input-group">
-          <input type='text'
+          <input type='text' 
+            id="register-new-workstation-name"
             class='form-control'
             i18n-title
             title="Workstation Name"
-            i18n-placeholder
-            placeholder="Workstation Name..."
             [(ngModel)]='newName'/>
           <div class="input-group-btn">
             <button class="btn btn-outline-dark" 
@@ -58,7 +62,7 @@
     </div>
     <div class="row mt-3 pt-3 border border-start-0 border-end-0 border-bottom-0 border-light">
       <div class="col">
-        <label for="registeredWS" i18n>Workstations Registered With This Browser</label>
+        <label class="form-label" for="registeredWS" i18n>Workstations Registered With This Browser</label>
       </div>
     </div>
     <div class="row">
@@ -77,15 +81,15 @@
     </div>
     <div class="row mt-2">
       <div class="col-lg-6">
-        <button i18n class="btn btn-success" 
+        <button i18n class="btn btn-success me-2" 
           (click)="useNow()" [disabled]="!selected">
           Use Now
         </button>
-        <button i18n class="btn btn-outline-dark" 
+        <button i18n class="btn btn-outline-dark me-2" 
           (click)="setDefault()" [disabled]="!selected">
           Mark As Default
         </button>
-        <button i18n class="btn btn-danger"
+        <button i18n class="btn btn-danger me-2"
           (click)="removeSelected()"
           [disabled]="!selected || !canDeleteSelected()">
           Remove
diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_workstations.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_workstations.tt2
index b69b909cb7..b8c36c3c81 100644
--- a/Open-ILS/src/templates/staff/admin/workstation/t_workstations.tt2
+++ b/Open-ILS/src/templates/staff/admin/workstation/t_workstations.tt2
@@ -11,13 +11,14 @@
   </div>
 
   <div class="row">
-    <div class="col-md-6" style="font-weight:bold;">
+    <div class="col-md-6 font-weight-bold">
       [% l('Register a New Workstation For This Browser') %]
     </div>
   </div>
   <div class="row">
     <div class="col-md-2">
-      <eg-org-selector 
+      <label class="form-label" for="register-new-workstation-org-unit">[% l('Library') %]</label>
+      <eg-org-selector domId="register-new-workstation-org-unit"
         selected="contextOrg"
         hidden-test="wsOrgHidden">
         disable-test="cant_have_users">
@@ -25,7 +26,8 @@
     </div>
     <div class="col-md-4">
       <div class="input-group">
-        <input type='text' class='form-control'  
+        <label class="form-label" for="register-new-workstation-name">[% l('Workstation Name') %]</label>
+        <input type='text' class='form-control' id="register-new-workstation-name"
           title="[% l('Workstation Name') %]"
           placeholder="[% l('Workstation Name') %]"
           ng-model='newWSName'/>
-- 
2.43.2