[GIT] Evergreen ILS branch rel_3_15 updated. c1e4c5446c39d76fc18f74cb6028fd7e0c893242

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_15 has been updated via c1e4c5446c39d76fc18f74cb6028fd7e0c893242 (commit) via 5f30c615576c63c21e183fc95751f5420ed6f930 (commit) from 9b677218b211f6b51b25d8fc2a1c5cbb34218572 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c1e4c5446c39d76fc18f74cb6028fd7e0c893242 Author: Stephanie Leary <stephanie.leary@equinoxoli.org> Date: Sat Apr 5 20:21:26 2025 +0000 LP2104272 Follow-up: style tweaks for Self-check Adds spacing and button styling to the self-check launch button. Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org> Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org> 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 6eddbab96a..d3e1dea765 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 @@ -12,7 +12,7 @@ </eg-confirm-dialog> <div class="row"> - <div class="col-lg-8 offset-1 mt-3"> + <div class="col-lg-8 offset-1 mt-3 position-relative" style="min-height: calc(100vh - 4rem)"> <div class="alert alert-warning" *ngIf="removeWorkstation" i18n> Workstation {{removeWorkstation}} is no longer valid. Removing registration. </div> @@ -96,9 +96,12 @@ </button> </div> </div> - <div> - <a href="/eg2/en-US/staff/selfcheck" i18n>Launch Self-Check</a> - </div> + </div> +</div> + +<div class="row mt-5 pt-5"> + <div class="col offset-1"> + <a class="btn btn-normal text-reset" href="/eg2/en-US/staff/selfcheck" i18n>Launch Self-Check</a> </div> </div> commit 5f30c615576c63c21e183fc95751f5420ed6f930 Author: Terran McCanna <tmccanna@georgialibraries.org> Date: Wed Mar 26 11:06:41 2025 -0400 LP2104272 Self-check tweaks for use with ChromeOS kiosks The Angular self-check doesn't work well with remotely managed ChromeOS devices in kiosk mode because it launches a different tab for registering a workstation and then there isn't a way on the page to get back to the self-check login after registering one because the address bar and tool bar are hidden while in kiosk mode. This change makes the "Manage Workstations" link open in the same tab, and adds a "Launch Self-Check" link to the workstation registration page. Release-note: Adjusts self-check links to accommodate use by remotely managed ChromeOS kiosks. Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org> Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org> Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org> 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 7b734e5213..6eddbab96a 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 @@ -96,6 +96,9 @@ </button> </div> </div> + <div> + <a href="/eg2/en-US/staff/selfcheck" i18n>Launch Self-Check</a> + </div> </div> </div> diff --git a/Open-ILS/src/eg2/src/app/staff/scko/banner.component.html b/Open-ILS/src/eg2/src/app/staff/scko/banner.component.html index b83e329e41..28a4a43de3 100644 --- a/Open-ILS/src/eg2/src/app/staff/scko/banner.component.html +++ b/Open-ILS/src/eg2/src/app/staff/scko/banner.component.html @@ -116,7 +116,7 @@ <button type="submit" class="btn btn-outline-dark" i18n>Sign In</button> </div> <div class="col-lg-3"> - <a target="_blank" href="/eg/staff/admin/workstation/workstations" i18n> + <a href="/eg/staff/admin/workstation/workstations" i18n> Manage Workstations </a> </div> @@ -124,7 +124,7 @@ <div *ngIf="staffLoginFailed" class="badge badge-warning p-2" i18n>Login Failed</div> <div *ngIf="missingRequiredWorkstation"> <span i18n>Workstations are required.</span> - <a target="_blank" href="/eg/staff/admin/workstation/workstations" i18n> + <a href="/eg/staff/admin/workstation/workstations" i18n> Please configure a workstation. </a> </div> 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 83cf23936b..5f71595440 100644 --- a/Open-ILS/src/templates/staff/admin/workstation/t_workstations.tt2 +++ b/Open-ILS/src/templates/staff/admin/workstation/t_workstations.tt2 @@ -71,6 +71,9 @@ [% l('Remove') %] </button> </div> + <div style="margin-top:50px;margin-left:15px;"> + <a href="/eg2/staff/selfcheck">[% l('Launch Self-Check') %]</a> + </div> </div> </div> ----------------------------------------------------------------------- Summary of changes: .../admin/workstation/workstations/workstations.component.html | 8 +++++++- Open-ILS/src/eg2/src/app/staff/scko/banner.component.html | 4 ++-- Open-ILS/src/templates/staff/admin/workstation/t_workstations.tt2 | 3 +++ 3 files changed, 12 insertions(+), 3 deletions(-) hooks/post-receive -- Evergreen ILS
participants (1)
-
Git User