July 2025 - Evergreen-commits - Evergreen Mailing Lists Server

[GIT] Evergreen ILS branch rel_3_15 updated. 88ff235740ad37ddf8fd96af6d8860bdcfdca3c8
by Git User 13 Jul '25

13 Jul '25

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 88ff235740ad37ddf8fd96af6d8860bdcfdca3c8 (commit) from 6d1da591187c4c5bb99dd5527af5701ed05cb717 (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 88ff235740ad37ddf8fd96af6d8860bdcfdca3c8 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Jul 11 23:05:11 2025 +0000 LP2116753 Form dialog column layout corrections Corrects a form layout issue in the dialogs for adding translations, creating a reservation, and changing operators. Form labels that were intended to appear side by side with their inputs were instead on separate rows. Git diff makes the changes look like more than they are: * Add .col-form-label to the <label> * Remove .col-lg-7 from the <input> or <select> * Wrap the <input> or <select> in a <div> with .col-lg-8 Release-note: Fixes side-by-side form layout in three staff dialogs Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> 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 d5b3921ed2..c9ac5b7180 100644 --- a/Open-ILS/src/eg2/src/app/share/translate/translate.component.html +++ b/Open-ILS/src/eg2/src/app/share/translate/translate.component.html @@ -8,45 +8,55 @@ </div> <div class="modal-body form-common form-validated" *ngIf="idlObj"> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-form-label col-lg-4 text-end fw-bold" i18n>Field Name</label> - <input - type="text" - [disabled]="true" - class="form-control col-lg-7" - value="{{idlClassDef.field_map[field].label}}"> + <div class="col-lg-8"> + <input + type="text" + [disabled]="true" + class="form-control" + value="{{idlClassDef.field_map[field].label}}"> + </div> </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-form-label col-lg-4 text-end fw-bold" i18n>Current Value</label> - <input - type="text" - [disabled]="true" - class="form-control col-lg-7" - value="{{idlObj[field]()}}"> + <div class="col-lg-8"> + <input + type="text" + [disabled]="true" + class="form-control" + value="{{idlObj[field]()}}"> + </div> + </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-form-label col-lg-4 text-end fw-bold" i18n>Select Locale</label> - <select class="form-control col-lg-7" - (change)="localeChanged($event)" - [(ngModel)]="selectedLocale"> - <option value="{{locale.code()}}" *ngFor="let locale of locales"> - {{locale.name()}} - </option> - </select> + <div class="col-lg-8"> + <select class="form-control" + (change)="localeChanged($event)" + [(ngModel)]="selectedLocale"> + <option value="{{locale.code()}}" *ngFor="let locale of locales"> + {{locale.name()}} + </option> + </select> + </div> + </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" i18n>Translation</label> - <input - id='translation-input' - type="text" - class="form-control col-lg-7" - required - i18n-placeholder - (keyup.enter)="translate()" - placeholder="Translation..." - [(ngModel)]="translatedValue"/> + <label class="form-label col-form-label col-form-label col-lg-4 text-end fw-bold" i18n>Translation</label> + <div class="col-lg-8"> + <input + id='translation-input' + type="text" + class="form-control" + required + i18n-placeholder + (keyup.enter)="translate()" + placeholder="Translation..." + [(ngModel)]="translatedValue"/> + </div> </div> </div> <div class="modal-footer"> diff --git a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html index 5376a5e43d..438a952796 100644 --- a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html +++ b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html @@ -9,7 +9,7 @@ </div> <form class="modal-body form-common" [formGroup]="create"> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-lg-4 text-end fw-bold" i18n for="create-patron-barcode">Patron barcode</label> <div class="col-lg-7"> <input type="text" id="create-patron-barcode" @@ -27,34 +27,40 @@ </span> </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-lg-4 text-end fw-bold" i18n for="create-end-time">Start time</label> - <eg-datetime-select - formControlName="startTime" - [timezone]="timezone"> - </eg-datetime-select> + <div class="col-lg-8"> + <eg-datetime-select + formControlName="startTime" + [timezone]="timezone"> + </eg-datetime-select> + </div> </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-lg-4 text-end fw-bold" i18n for="create-end-time">End time</label> - <eg-datetime-select - formControlName="endTime" - [timezone]="timezone"> - </eg-datetime-select> + <div class="col-lg-8"> + <eg-datetime-select + formControlName="endTime" + [timezone]="timezone"> + </eg-datetime-select> + </div> <div role="alert" class="alert alert-danger offset-lg-4" *ngIf="create.errors?.datesOutOfOrder"> <span class="material-icons" aria-hidden="true">error</span> <span i18n>Start time must be before end time</span> </div> </div> <div class="form-group row"> - <label for="create-pickup-library" class="form-label col-lg-4 text-right font-weight-bold" i18n> + <label for="create-pickup-library" class="form-label col-form-label col-lg-4 text-end fw-bold" i18n> Reservation location </label> - <eg-org-select domId="create-pickup-library" [applyDefault]="true" - [disableOrgs]="disableOrgs()" [hideOrgs]="disableOrgs()" - (onChange)="handlePickupLibChange($event)"> - </eg-org-select> - <eg-help-popover helpText="The library where the resource is picked up or used" i18n-helpText></eg-help-popover> + <div class="col-lg-8"> + <eg-org-select domId="create-pickup-library" [applyDefault]="true" + [disableOrgs]="disableOrgs()" [hideOrgs]="disableOrgs()" + (onChange)="handlePickupLibChange($event)"> + </eg-org-select> + <eg-help-popover helpText="The library where the resource is picked up or used" i18n-helpText></eg-help-popover> + </div> </div> <div *ngIf="pickupLibraryUsesDifferentTz" role="alert" @@ -63,29 +69,36 @@ <span i18n>Reservation location is in the {{timezone}} timezone</span> </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-lg-4 text-end fw-bold" i18n for="create-resource">Resource</label> - <input *ngIf="targetResource && targetResourceBarcode" id="create-resource" value="{{targetResourceBarcode}}" disabled> - <eg-combobox - formControlName="resourceList" - *ngIf="!(targetResource && targetResourceBarcode)" - startId="any"> - <eg-combobox-entry entryId="any" entryLabel="Any resource" - i18n-entryLabel></eg-combobox-entry> - <eg-combobox-entry *ngFor="let r of resources" entryId="{{r.id()}}" entryLabel="{{r.barcode()}}"> - </eg-combobox-entry> - </eg-combobox> + <div class="col-lg-8"> + <input *ngIf="targetResource && targetResourceBarcode" id="create-resource" value="{{targetResourceBarcode}}" disabled> + <eg-combobox + formControlName="resourceList" + *ngIf="!(targetResource && targetResourceBarcode)" + startId="any"> + <eg-combobox-entry entryId="any" entryLabel="Any resource" + i18n-entryLabel></eg-combobox-entry> + <eg-combobox-entry *ngFor="let r of resources" entryId="{{r.id()}}" entryLabel="{{r.barcode()}}"> + </eg-combobox-entry> + </eg-combobox> + </div> </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-lg-4 text-end fw-bold" i18n for="create-email-notify">Notify by email?</label> - <input type="checkbox" formControlName="emailNotify"> + <div class="col-lg-8"> + <input type="checkbox" formControlName="emailNotify"> + </div> + </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-lg-4 text-end fw-bold" i18n for="create-note">Note</label> - <input type="text" id="create-note" - class="form-control col-lg-7" formControlName="note"> + <div class="col-lg-8"> + <input type="text" id="create-note" + class="form-control" formControlName="note"> + </div> </div> </form> <div class="modal-footer"> diff --git a/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.html b/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.html index 5ada1ed842..203c11a9ce 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.html @@ -15,53 +15,60 @@ <form class="form-validated"> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" for="username" i18n>Username</label> - <input - type="text" - class="form-control col-lg-7" - id="username" - name="username" - required - (keyup.enter)="login()" - autocomplete="username" - spellcheck="false" - i18n-placeholder - placeholder="Username" - [(ngModel)]="username"/> + <label class="form-label col-form-label col-lg-4 text-end fw-bold" for="username" i18n>Username</label> + <div class="col-lg-8"> + <input + type="text" + class="form-control" + id="username" + name="username" + required + (keyup.enter)="login()" + autocomplete="username" + spellcheck="false" + i18n-placeholder + placeholder="Username" + [(ngModel)]="username"/> + </div> </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-lg-4 text-end fw-bold" for="password" i18n>Password</label> - <input - type="password" - class="form-control col-lg-7" - id="password" - name="password" - required - (keyup.enter)="login()" - autocomplete="current-password" - spellcheck="false" - i18n-placeholder - placeholder="Password" - [(ngModel)]="password"/> + <div class="col-lg-8"> + <input + type="password" + class="form-control" + id="password" + name="password" + required + (keyup.enter)="login()" + autocomplete="current-password" + spellcheck="false" + i18n-placeholder + placeholder="Password" + [(ngModel)]="password"/> + </div> + </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-lg-4 text-end fw-bold" for="loginType" i18n>Login Type</label> - <select - class="form-control col-lg-7" - id="loginType" - name="loginType" - placeholder="Login Type" - i18n-placeholder - required - [(ngModel)]="loginType"> - <option value="temp" selected i18n>Temporary</option> - <option value="staff" i18n>Staff</option> - <option value="persist" i18n>Persistent</option> - </select> + <div class="col-lg-8"> + <select + class="form-control" + id="loginType" + name="loginType" + placeholder="Login Type" + i18n-placeholder + required + [(ngModel)]="loginType"> + <option value="temp" selected i18n>Temporary</option> + <option value="staff" i18n>Staff</option> + <option value="persist" i18n>Persistent</option> + </select> + </div> </div> </form> </div> ----------------------------------------------------------------------- Summary of changes: .../app/share/translate/translate.component.html | 70 ++++++++++-------- .../create-reservation-dialog.component.html | 79 +++++++++++--------- .../staff/share/op-change/op-change.component.html | 85 ++++++++++++---------- 3 files changed, 132 insertions(+), 102 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 302e6ff0c9d4fb8172257a67b515bac48fc3fde8
by Git User 13 Jul '25

13 Jul '25

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, main has been updated via 302e6ff0c9d4fb8172257a67b515bac48fc3fde8 (commit) from 19f506ea9e336a787cb4957dd5153c6e2970d2cf (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 302e6ff0c9d4fb8172257a67b515bac48fc3fde8 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Jul 11 23:05:11 2025 +0000 LP2116753 Form dialog column layout corrections Corrects a form layout issue in the dialogs for adding translations, creating a reservation, and changing operators. Form labels that were intended to appear side by side with their inputs were instead on separate rows. Git diff makes the changes look like more than they are: * Add .col-form-label to the <label> * Remove .col-lg-7 from the <input> or <select> * Wrap the <input> or <select> in a <div> with .col-lg-8 Release-note: Fixes side-by-side form layout in three staff dialogs Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> 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 d5b3921ed2..c9ac5b7180 100644 --- a/Open-ILS/src/eg2/src/app/share/translate/translate.component.html +++ b/Open-ILS/src/eg2/src/app/share/translate/translate.component.html @@ -8,45 +8,55 @@ </div> <div class="modal-body form-common form-validated" *ngIf="idlObj"> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-form-label col-lg-4 text-end fw-bold" i18n>Field Name</label> - <input - type="text" - [disabled]="true" - class="form-control col-lg-7" - value="{{idlClassDef.field_map[field].label}}"> + <div class="col-lg-8"> + <input + type="text" + [disabled]="true" + class="form-control" + value="{{idlClassDef.field_map[field].label}}"> + </div> </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-form-label col-lg-4 text-end fw-bold" i18n>Current Value</label> - <input - type="text" - [disabled]="true" - class="form-control col-lg-7" - value="{{idlObj[field]()}}"> + <div class="col-lg-8"> + <input + type="text" + [disabled]="true" + class="form-control" + value="{{idlObj[field]()}}"> + </div> + </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-form-label col-lg-4 text-end fw-bold" i18n>Select Locale</label> - <select class="form-control col-lg-7" - (change)="localeChanged($event)" - [(ngModel)]="selectedLocale"> - <option value="{{locale.code()}}" *ngFor="let locale of locales"> - {{locale.name()}} - </option> - </select> + <div class="col-lg-8"> + <select class="form-control" + (change)="localeChanged($event)" + [(ngModel)]="selectedLocale"> + <option value="{{locale.code()}}" *ngFor="let locale of locales"> + {{locale.name()}} + </option> + </select> + </div> + </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" i18n>Translation</label> - <input - id='translation-input' - type="text" - class="form-control col-lg-7" - required - i18n-placeholder - (keyup.enter)="translate()" - placeholder="Translation..." - [(ngModel)]="translatedValue"/> + <label class="form-label col-form-label col-form-label col-lg-4 text-end fw-bold" i18n>Translation</label> + <div class="col-lg-8"> + <input + id='translation-input' + type="text" + class="form-control" + required + i18n-placeholder + (keyup.enter)="translate()" + placeholder="Translation..." + [(ngModel)]="translatedValue"/> + </div> </div> </div> <div class="modal-footer"> diff --git a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html index 5376a5e43d..438a952796 100644 --- a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html +++ b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html @@ -9,7 +9,7 @@ </div> <form class="modal-body form-common" [formGroup]="create"> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-lg-4 text-end fw-bold" i18n for="create-patron-barcode">Patron barcode</label> <div class="col-lg-7"> <input type="text" id="create-patron-barcode" @@ -27,34 +27,40 @@ </span> </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-lg-4 text-end fw-bold" i18n for="create-end-time">Start time</label> - <eg-datetime-select - formControlName="startTime" - [timezone]="timezone"> - </eg-datetime-select> + <div class="col-lg-8"> + <eg-datetime-select + formControlName="startTime" + [timezone]="timezone"> + </eg-datetime-select> + </div> </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-lg-4 text-end fw-bold" i18n for="create-end-time">End time</label> - <eg-datetime-select - formControlName="endTime" - [timezone]="timezone"> - </eg-datetime-select> + <div class="col-lg-8"> + <eg-datetime-select + formControlName="endTime" + [timezone]="timezone"> + </eg-datetime-select> + </div> <div role="alert" class="alert alert-danger offset-lg-4" *ngIf="create.errors?.datesOutOfOrder"> <span class="material-icons" aria-hidden="true">error</span> <span i18n>Start time must be before end time</span> </div> </div> <div class="form-group row"> - <label for="create-pickup-library" class="form-label col-lg-4 text-right font-weight-bold" i18n> + <label for="create-pickup-library" class="form-label col-form-label col-lg-4 text-end fw-bold" i18n> Reservation location </label> - <eg-org-select domId="create-pickup-library" [applyDefault]="true" - [disableOrgs]="disableOrgs()" [hideOrgs]="disableOrgs()" - (onChange)="handlePickupLibChange($event)"> - </eg-org-select> - <eg-help-popover helpText="The library where the resource is picked up or used" i18n-helpText></eg-help-popover> + <div class="col-lg-8"> + <eg-org-select domId="create-pickup-library" [applyDefault]="true" + [disableOrgs]="disableOrgs()" [hideOrgs]="disableOrgs()" + (onChange)="handlePickupLibChange($event)"> + </eg-org-select> + <eg-help-popover helpText="The library where the resource is picked up or used" i18n-helpText></eg-help-popover> + </div> </div> <div *ngIf="pickupLibraryUsesDifferentTz" role="alert" @@ -63,29 +69,36 @@ <span i18n>Reservation location is in the {{timezone}} timezone</span> </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-lg-4 text-end fw-bold" i18n for="create-resource">Resource</label> - <input *ngIf="targetResource && targetResourceBarcode" id="create-resource" value="{{targetResourceBarcode}}" disabled> - <eg-combobox - formControlName="resourceList" - *ngIf="!(targetResource && targetResourceBarcode)" - startId="any"> - <eg-combobox-entry entryId="any" entryLabel="Any resource" - i18n-entryLabel></eg-combobox-entry> - <eg-combobox-entry *ngFor="let r of resources" entryId="{{r.id()}}" entryLabel="{{r.barcode()}}"> - </eg-combobox-entry> - </eg-combobox> + <div class="col-lg-8"> + <input *ngIf="targetResource && targetResourceBarcode" id="create-resource" value="{{targetResourceBarcode}}" disabled> + <eg-combobox + formControlName="resourceList" + *ngIf="!(targetResource && targetResourceBarcode)" + startId="any"> + <eg-combobox-entry entryId="any" entryLabel="Any resource" + i18n-entryLabel></eg-combobox-entry> + <eg-combobox-entry *ngFor="let r of resources" entryId="{{r.id()}}" entryLabel="{{r.barcode()}}"> + </eg-combobox-entry> + </eg-combobox> + </div> </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-lg-4 text-end fw-bold" i18n for="create-email-notify">Notify by email?</label> - <input type="checkbox" formControlName="emailNotify"> + <div class="col-lg-8"> + <input type="checkbox" formControlName="emailNotify"> + </div> + </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-lg-4 text-end fw-bold" i18n for="create-note">Note</label> - <input type="text" id="create-note" - class="form-control col-lg-7" formControlName="note"> + <div class="col-lg-8"> + <input type="text" id="create-note" + class="form-control" formControlName="note"> + </div> </div> </form> <div class="modal-footer"> diff --git a/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.html b/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.html index 5ada1ed842..203c11a9ce 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.html @@ -15,53 +15,60 @@ <form class="form-validated"> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" for="username" i18n>Username</label> - <input - type="text" - class="form-control col-lg-7" - id="username" - name="username" - required - (keyup.enter)="login()" - autocomplete="username" - spellcheck="false" - i18n-placeholder - placeholder="Username" - [(ngModel)]="username"/> + <label class="form-label col-form-label col-lg-4 text-end fw-bold" for="username" i18n>Username</label> + <div class="col-lg-8"> + <input + type="text" + class="form-control" + id="username" + name="username" + required + (keyup.enter)="login()" + autocomplete="username" + spellcheck="false" + i18n-placeholder + placeholder="Username" + [(ngModel)]="username"/> + </div> </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-lg-4 text-end fw-bold" for="password" i18n>Password</label> - <input - type="password" - class="form-control col-lg-7" - id="password" - name="password" - required - (keyup.enter)="login()" - autocomplete="current-password" - spellcheck="false" - i18n-placeholder - placeholder="Password" - [(ngModel)]="password"/> + <div class="col-lg-8"> + <input + type="password" + class="form-control" + id="password" + name="password" + required + (keyup.enter)="login()" + autocomplete="current-password" + spellcheck="false" + i18n-placeholder + placeholder="Password" + [(ngModel)]="password"/> + </div> + </div> <div class="form-group row"> - <label class="form-label col-lg-4 text-end fw-bold" + <label class="form-label col-form-label col-lg-4 text-end fw-bold" for="loginType" i18n>Login Type</label> - <select - class="form-control col-lg-7" - id="loginType" - name="loginType" - placeholder="Login Type" - i18n-placeholder - required - [(ngModel)]="loginType"> - <option value="temp" selected i18n>Temporary</option> - <option value="staff" i18n>Staff</option> - <option value="persist" i18n>Persistent</option> - </select> + <div class="col-lg-8"> + <select + class="form-control" + id="loginType" + name="loginType" + placeholder="Login Type" + i18n-placeholder + required + [(ngModel)]="loginType"> + <option value="temp" selected i18n>Temporary</option> + <option value="staff" i18n>Staff</option> + <option value="persist" i18n>Persistent</option> + </select> + </div> </div> </form> </div> ----------------------------------------------------------------------- Summary of changes: .../app/share/translate/translate.component.html | 70 ++++++++++-------- .../create-reservation-dialog.component.html | 79 +++++++++++--------- .../staff/share/op-change/op-change.component.html | 85 ++++++++++++---------- 3 files changed, 132 insertions(+), 102 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 19f506ea9e336a787cb4957dd5153c6e2970d2cf
by Git User 11 Jul '25

11 Jul '25

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, main has been updated via 19f506ea9e336a787cb4957dd5153c6e2970d2cf (commit) from 2fffeee8067fc3e2652defb0365a87a386f671a6 (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 19f506ea9e336a787cb4957dd5153c6e2970d2cf Author: Jane Sandberg <sandbergja(a)gmail.com> Date: Fri Jul 11 15:18:26 2025 -0700 LP2111948: follow-up: ng lint fixes Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts index 4d58bc0f66..a3f577e91f 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts @@ -440,7 +440,7 @@ export class MarcEditContext { } // Focus the requested subfield by its position. - focusSubfield(field: MarcField, position: number, target?: MARC_EDITABLE_FIELD_TYPE | "group" | "move") { + focusSubfield(field: MarcField, position: number, target?: MARC_EDITABLE_FIELD_TYPE | 'group' | 'move') { // console.debug("focusSubfield()", field, position, group); const focus: FieldFocusRequest = {fieldId: field.fieldId, target: 'sfv'}; diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index 94b12eeb91..3e2dd46440 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -214,9 +214,9 @@ export class MarcRichEditorComponent implements OnInit { onKeyDown(evt: KeyboardEvent, field: MarcField, subfield?: MarcSubfield) { switch (evt.key) { case 'ArrowLeft': - case 'ArrowRight': + case 'ArrowRight': { // console.debug("ArrowRight: ", evt, field, subfield); - // eslint-disable-next-line no-case-declarations + const el = evt.target as HTMLElement; // do nothing if we are in a text input if (el.nodeName && (el.nodeName.toLowerCase() === 'input' || el.nodeName.toLowerCase() === 'textarea')) { @@ -225,10 +225,10 @@ export class MarcRichEditorComponent implements OnInit { // otherwise, move focus from the group to the subfield code if it's empty, or the value if not evt.preventDefault(); evt.stopPropagation(); - const target = subfield[0] == ' ' ? 'sfc' : 'sfv'; + const target = subfield[0] === ' ' ? 'sfc' : 'sfv'; this.context.focusSubfield(field, subfield[2], target); break; - + } // all remaining shortcuts duplicated from editable-content.component.ts // minus combobox shortcuts case 'y': ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts | 2 +- .../eg2/src/app/staff/share/marc-edit/rich-editor.component.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 2fffeee8067fc3e2652defb0365a87a386f671a6
by Git User 11 Jul '25

11 Jul '25

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, main has been updated via 2fffeee8067fc3e2652defb0365a87a386f671a6 (commit) from bbf7a9c55a5e3999785a9f7fdaebad5cc1b3895d (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 2fffeee8067fc3e2652defb0365a87a386f671a6 Author: Jane Sandberg <js7389(a)princeton.edu> Date: Fri Jul 4 08:49:43 2025 -0700 LP2115993: Migrate to bundler moduleResolution moduleResolution: node is no longer recommended as of Typescript 5 See https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-0.h… To test: * Build the angular client in both dev and production mode * Run tests * Run lint * Export strings for translation * Confirm that all of the above works as expected Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/src/eg2/tsconfig.json b/Open-ILS/src/eg2/tsconfig.json index e2352a89ad..c081583f78 100644 --- a/Open-ILS/src/eg2/tsconfig.json +++ b/Open-ILS/src/eg2/tsconfig.json @@ -5,7 +5,7 @@ "sourceMap": true, "declaration": false, "module": "esnext", - "moduleResolution": "node", + "moduleResolution": "bundler", "experimentalDecorators": true, "useDefineForClassFields": false, "target": "es2022", ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. bbf7a9c55a5e3999785a9f7fdaebad5cc1b3895d
by Git User 11 Jul '25

11 Jul '25

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, main has been updated via bbf7a9c55a5e3999785a9f7fdaebad5cc1b3895d (commit) from 620b4ec28636e6bc615901eb3db975586983a00d (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 bbf7a9c55a5e3999785a9f7fdaebad5cc1b3895d Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Mon Jun 30 16:08:15 2025 +0000 LP2115662 holds table: individual row actions Adds individual suspend, activate, and cancel buttons for items in the OPAC holds table. Also adds an ID attribute to the title so it can be used with aria-describedby to associate each button with the item it affects. Release-note: Adds individual suspend, activate, and cancel buttons to OPAC holds table rows Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Garry Collum <gcollum(a)gmail.com> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 index b2bc7257b4..ee480112e5 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 @@ -174,7 +174,7 @@ END; %] <a href="[% mkurl(ctx.opac_root _ '/record/' _ - hold.hold.bre_id, {}, 1) %]"><span[%- deemphasize_class -%]> + hold.hold.bre_id, {}, 1) %]" id="hold-record-[% row_rec_id %]"><span[%- deemphasize_class -%]> [%- title.substr(0,hold.ATTRS.nonfiling_characters) | html %]</span> [%- title.substr(hold.ATTRS.nonfiling_characters) | html %]</a> </td> @@ -231,11 +231,39 @@ [%- END; END; %] </td> <td role="cell" mobile-title="" class="fullRow"> - <a class="btn btn-confirm btn-sm" href="[% mkurl(ctx.opac_root _ '/myopac/holds/edit', {hid => ahr.id}) %]" - [% html_text_attr('title', l('Edit hold for item [_1]', attrs.title)) %]> + <a class="btn btn-confirm btn-sm nowrap m-1" href="[% mkurl(ctx.opac_root _ '/myopac/holds/edit', {hid => ahr.id}) %]" + aria-describedby="hold-record-[% row_rec_id %]" + [% html_text_attr('title', l('Edit hold for item [_1]', row_title)) %]> <i class="fas fa-edit" aria-hidden="true"></i> [% l('Edit') %] </a> + [% # Don't show the suspend button if it is suspended or fulfilled %] + [% IF hold.hold.status != '7' && hold.hold.status != '9' %] + <a class="btn btn-action btn-sm nowrap m-1" href="[% mkurl('', {action => 'suspend', 'hold_id' => ahr.id }) %]" + aria-describedby="hold-record-[% row_rec_id %]" + [% html_text_attr('title', l('Suspend hold for item [_1]', row_title)) %]> + <i class="fas fa-hand-paper" aria-hidden="true"></i> + [% l('Suspend') %] + </a> + [% END %] + [% # Show the activate button ONLY if it is suspended %] + [% IF hold.hold.status == '7' %] + <a class="btn btn-opac btn-sm nowrap m-1" href="[% mkurl('', {action => 'activate', 'hold_id' => ahr.id }) %]" + aria-describedby="hold-record-[% row_rec_id %]" + [% html_text_attr('title', l('Activate hold for item [_1]', row_title)) %]> + <i class="fas fa-play" aria-hidden="true"></i> + [% l('Activate') %] + </a> + [% END %] + [% # Don't show the cancel button if it is canceled %] + [% IF hold.hold.status != '6' %] + <a class="btn btn-danger btn-sm nowrap m-1" href="[% mkurl('', {action => 'cancel', 'hold_id' => ahr.id }) %]" + aria-describedby="hold-record-[% row_rec_id %]" + [% html_text_attr('title', l('Cancel hold for item [_1]', row_title)) %]> + <i class="fas fa-circle-xmark" aria-hidden="true"></i> + [% l('Cancel') %] + </a> + [% END %] </td> </tr> [% END %] ----------------------------------------------------------------------- Summary of changes: .../src/templates-bootstrap/opac/myopac/holds.tt2 | 34 ++++++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 4a701eec7f888ffc1b314f515b24ca25ad6623c8
by Git User 11 Jul '25

11 Jul '25

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_14 has been updated via 4a701eec7f888ffc1b314f515b24ca25ad6623c8 (commit) from bc3f48a2347c8e9ee92faedf192ea5427e901bb6 (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 4a701eec7f888ffc1b314f515b24ca25ad6623c8 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Jun 6 21:02:56 2025 +0000 LP2111948 Focus on code first when adding subfield When adding a new subfield in the MARC rich editor, focus should move to the empty subfield code input first. Focus should also move to the code when pressing the right or left arrow key in a focused subfield group where the code is empty. Release-note: Focuses on subfield code input rather than value when the code is empty (as when adding a new subfield). Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Elizabeth Davis <elizabeth.davis(a)sparkpa.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts index 1df38c3658..4d58bc0f66 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts @@ -249,7 +249,7 @@ export class MarcEditContext { if (action.subfield) { const prevPos = action.subfield[2] - 1; action.field.deleteExactSubfields(action.subfield); - this.focusSubfield(action.field, prevPos, true); + this.focusSubfield(action.field, prevPos, 'group'); } else { this.record.deleteFields(action.field); @@ -265,7 +265,7 @@ export class MarcEditContext { if (action.subfield) { this.insertSubfield(action.field, action.subfield, true); - this.focusSubfield(action.field, action.subfield[2]); + this.focusSubfield(action.field, action.subfield[2], 'sfv'); } else { @@ -429,7 +429,7 @@ export class MarcEditContext { field.subfields.splice(position, 0, subfield); if (!skipTracking) { - this.focusSubfield(field, position); + this.focusSubfield(field, position, 'sfc'); this.trackStructuralUndo(field, true, subfield); } } @@ -440,15 +440,12 @@ export class MarcEditContext { } // Focus the requested subfield by its position. - focusSubfield(field: MarcField, position: number, group?: boolean) { + focusSubfield(field: MarcField, position: number, target?: MARC_EDITABLE_FIELD_TYPE | "group" | "move") { // console.debug("focusSubfield()", field, position, group); const focus: FieldFocusRequest = {fieldId: field.fieldId, target: 'sfv'}; - if (group) { - focus.target = 'group'; - } else if (position < 0) { - // Focus the code instead of the value - focus.target = 'sfc'; + if (target) { + focus.target = target; } focus.sfOffset = position; @@ -463,7 +460,7 @@ export class MarcEditContext { field.deleteExactSubfields(subfield); - this.focusSubfield(field, sfpos, true); + this.focusSubfield(field, sfpos, 'group'); } focusTag(field: MarcField) { diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index 211f08a535..3be9e5b3aa 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -218,10 +218,11 @@ export class MarcRichEditorComponent implements OnInit { if (el.nodeName && (el.nodeName.toLowerCase() === 'input' || el.nodeName.toLowerCase() === 'textarea')) { return; } - // otherwise, move focus from the group to its first input (the subfield code) + // otherwise, move focus from the group to the subfield code if it's empty, or the value if not evt.preventDefault(); evt.stopPropagation(); - this.context.focusSubfield(field, subfield[2], false); + const target = subfield[0] == ' ' ? 'sfc' : 'sfv'; + this.context.focusSubfield(field, subfield[2], target); break; // all remaining shortcuts duplicated from editable-content.component.ts ----------------------------------------------------------------------- Summary of changes: .../eg2/src/app/staff/share/marc-edit/editor-context.ts | 17 +++++++---------- .../app/staff/share/marc-edit/rich-editor.component.ts | 5 +++-- 2 files changed, 10 insertions(+), 12 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 6d1da591187c4c5bb99dd5527af5701ed05cb717
by Git User 11 Jul '25

11 Jul '25

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 6d1da591187c4c5bb99dd5527af5701ed05cb717 (commit) from fbd8884461dbc944b7a14c04e9aadff74f9c6e63 (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 6d1da591187c4c5bb99dd5527af5701ed05cb717 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Jun 6 21:02:56 2025 +0000 LP2111948 Focus on code first when adding subfield When adding a new subfield in the MARC rich editor, focus should move to the empty subfield code input first. Focus should also move to the code when pressing the right or left arrow key in a focused subfield group where the code is empty. Release-note: Focuses on subfield code input rather than value when the code is empty (as when adding a new subfield). Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Elizabeth Davis <elizabeth.davis(a)sparkpa.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts index 1df38c3658..4d58bc0f66 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts @@ -249,7 +249,7 @@ export class MarcEditContext { if (action.subfield) { const prevPos = action.subfield[2] - 1; action.field.deleteExactSubfields(action.subfield); - this.focusSubfield(action.field, prevPos, true); + this.focusSubfield(action.field, prevPos, 'group'); } else { this.record.deleteFields(action.field); @@ -265,7 +265,7 @@ export class MarcEditContext { if (action.subfield) { this.insertSubfield(action.field, action.subfield, true); - this.focusSubfield(action.field, action.subfield[2]); + this.focusSubfield(action.field, action.subfield[2], 'sfv'); } else { @@ -429,7 +429,7 @@ export class MarcEditContext { field.subfields.splice(position, 0, subfield); if (!skipTracking) { - this.focusSubfield(field, position); + this.focusSubfield(field, position, 'sfc'); this.trackStructuralUndo(field, true, subfield); } } @@ -440,15 +440,12 @@ export class MarcEditContext { } // Focus the requested subfield by its position. - focusSubfield(field: MarcField, position: number, group?: boolean) { + focusSubfield(field: MarcField, position: number, target?: MARC_EDITABLE_FIELD_TYPE | "group" | "move") { // console.debug("focusSubfield()", field, position, group); const focus: FieldFocusRequest = {fieldId: field.fieldId, target: 'sfv'}; - if (group) { - focus.target = 'group'; - } else if (position < 0) { - // Focus the code instead of the value - focus.target = 'sfc'; + if (target) { + focus.target = target; } focus.sfOffset = position; @@ -463,7 +460,7 @@ export class MarcEditContext { field.deleteExactSubfields(subfield); - this.focusSubfield(field, sfpos, true); + this.focusSubfield(field, sfpos, 'group'); } focusTag(field: MarcField) { diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index 36b6efbc2c..96cd0e668b 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -221,10 +221,11 @@ export class MarcRichEditorComponent implements OnInit { if (el.nodeName && (el.nodeName.toLowerCase() === 'input' || el.nodeName.toLowerCase() === 'textarea')) { return; } - // otherwise, move focus from the group to its first input (the subfield code) + // otherwise, move focus from the group to the subfield code if it's empty, or the value if not evt.preventDefault(); evt.stopPropagation(); - this.context.focusSubfield(field, subfield[2], false); + const target = subfield[0] == ' ' ? 'sfc' : 'sfv'; + this.context.focusSubfield(field, subfield[2], target); break; // all remaining shortcuts duplicated from editable-content.component.ts ----------------------------------------------------------------------- Summary of changes: .../eg2/src/app/staff/share/marc-edit/editor-context.ts | 17 +++++++---------- .../app/staff/share/marc-edit/rich-editor.component.ts | 5 +++-- 2 files changed, 10 insertions(+), 12 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 620b4ec28636e6bc615901eb3db975586983a00d
by Git User 11 Jul '25

11 Jul '25

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, main has been updated via 620b4ec28636e6bc615901eb3db975586983a00d (commit) from 2fb16362eccea81a1b4a3c4d3caeba866be161b7 (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 620b4ec28636e6bc615901eb3db975586983a00d Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Jun 6 21:02:56 2025 +0000 LP2111948 Focus on code first when adding subfield When adding a new subfield in the MARC rich editor, focus should move to the empty subfield code input first. Focus should also move to the code when pressing the right or left arrow key in a focused subfield group where the code is empty. Release-note: Focuses on subfield code input rather than value when the code is empty (as when adding a new subfield). Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Elizabeth Davis <elizabeth.davis(a)sparkpa.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts index 1df38c3658..4d58bc0f66 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts @@ -249,7 +249,7 @@ export class MarcEditContext { if (action.subfield) { const prevPos = action.subfield[2] - 1; action.field.deleteExactSubfields(action.subfield); - this.focusSubfield(action.field, prevPos, true); + this.focusSubfield(action.field, prevPos, 'group'); } else { this.record.deleteFields(action.field); @@ -265,7 +265,7 @@ export class MarcEditContext { if (action.subfield) { this.insertSubfield(action.field, action.subfield, true); - this.focusSubfield(action.field, action.subfield[2]); + this.focusSubfield(action.field, action.subfield[2], 'sfv'); } else { @@ -429,7 +429,7 @@ export class MarcEditContext { field.subfields.splice(position, 0, subfield); if (!skipTracking) { - this.focusSubfield(field, position); + this.focusSubfield(field, position, 'sfc'); this.trackStructuralUndo(field, true, subfield); } } @@ -440,15 +440,12 @@ export class MarcEditContext { } // Focus the requested subfield by its position. - focusSubfield(field: MarcField, position: number, group?: boolean) { + focusSubfield(field: MarcField, position: number, target?: MARC_EDITABLE_FIELD_TYPE | "group" | "move") { // console.debug("focusSubfield()", field, position, group); const focus: FieldFocusRequest = {fieldId: field.fieldId, target: 'sfv'}; - if (group) { - focus.target = 'group'; - } else if (position < 0) { - // Focus the code instead of the value - focus.target = 'sfc'; + if (target) { + focus.target = target; } focus.sfOffset = position; @@ -463,7 +460,7 @@ export class MarcEditContext { field.deleteExactSubfields(subfield); - this.focusSubfield(field, sfpos, true); + this.focusSubfield(field, sfpos, 'group'); } focusTag(field: MarcField) { diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index cc32d9d071..94b12eeb91 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -222,10 +222,11 @@ export class MarcRichEditorComponent implements OnInit { if (el.nodeName && (el.nodeName.toLowerCase() === 'input' || el.nodeName.toLowerCase() === 'textarea')) { return; } - // otherwise, move focus from the group to its first input (the subfield code) + // otherwise, move focus from the group to the subfield code if it's empty, or the value if not evt.preventDefault(); evt.stopPropagation(); - this.context.focusSubfield(field, subfield[2], false); + const target = subfield[0] == ' ' ? 'sfc' : 'sfv'; + this.context.focusSubfield(field, subfield[2], target); break; // all remaining shortcuts duplicated from editable-content.component.ts ----------------------------------------------------------------------- Summary of changes: .../eg2/src/app/staff/share/marc-edit/editor-context.ts | 17 +++++++---------- .../app/staff/share/marc-edit/rich-editor.component.ts | 5 +++-- 2 files changed, 10 insertions(+), 12 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. bc3f48a2347c8e9ee92faedf192ea5427e901bb6
by Git User 11 Jul '25

11 Jul '25

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_14 has been updated via bc3f48a2347c8e9ee92faedf192ea5427e901bb6 (commit) from 46c38a402cbba948c59c1b1f0b11012dcfca111e (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 bc3f48a2347c8e9ee92faedf192ea5427e901bb6 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri May 30 16:58:02 2025 +0000 LP1785697 Fix OPAC advanced filters applied count Adds 'sort','skip_check', and 'check_limit' to the list of filters that are ignored when calculating the count of filters applied in the OPAC advanced search results. Refactors the filter show/hide area to eliminate hard-coded square brackets containing a link with a click action that confused accessibility testers. Replaces this with a simple heading if only one filter is applied, or a details/summary area for more than one. Release-note: Corrects OPAC advanced filters applied count; refactors filter show/hide link as details/summary Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Susan Morrison <smorrison(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 index 2f6716f99b..1a253c5c72 100755 --- a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 @@ -603,7 +603,7 @@ a { } #search-wrapper h1, -#search-wrapper h2 { +#search-wrapper h2:not(h2.h3) { text-align: center; } @@ -980,6 +980,10 @@ for now until a better color is picked - if needed. margin-top: 0; } +.adv_filters_applied { + display: inline-flex; +} + .checkbox_col { width: 1%; [% IF rtl == 't' -%] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 index d28701eaf5..d1bf9479bb 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 @@ -3,7 +3,7 @@ # We need to ignore some filters in our count -fignore = ['lasso','location_groups','site','core_limit','limit','badge_orgs','badges','estimation_strategy','depth']; +fignore = ['lasso','location_groups','site','core_limit','limit','badge_orgs','badges','estimation_strategy','depth','sort','skip_check','check_limit']; fcount = 0; FOR f IN ctx.query_struct.filters; IF fignore.grep('^' _ f.name _ '$').size; @@ -165,23 +165,23 @@ END; </form> [% END %] [% IF fcount > 0 %] - <div class="refine_search result_block_visible"> - <span id="filter_hits">[ <a href="#" onclick="getAdvLimits();return false;">[% l('[quant,_1,filter,filters] applied', fcount) %]</a> ]</span> - </div> - [% END %] - [% IF ctx.query_struct.filters.size > 0 %] - [% stuff = INCLUDE 'opac/parts/result/adv_filter.tt2' %] - [% IF stuff %] - <h3 class="sr-only">[% l('Search Results filters') %]</h3> - <div class="d-flex justify-content-center"> - <div id="adv_filter_results_block" class="adv_filter_results_hide"> - <div class="adv_filter_results_block_label">[% l('Filtered by:') %]</div> + <div class="refine_search"> + [% IF fcount == 1 %] + <h2 class="h3">[% l('[_1] filter applied', fcount) %]</h2> <div class="d-inline-flex p-2"> - [% stuff %] + [% INCLUDE 'opac/parts/result/adv_filter.tt2' %] </div> - </div> - </div> + [% ELSE %] + <details id="filter_hits"> + <summary><h3>[% l('[_1] filters applied', fcount) %]</h3></summary> + <div class="adv_filter_results_block_label">[% l('Filtered by:') %]</div> + <div class="adv_filters_applied"> + [% INCLUDE 'opac/parts/result/adv_filter.tt2' %] + </div> + </div> + </details> [% END %] + </div> [% END %] [% IF ctx.search_summary.suggestions.one_class_multi_term %] <div class="result_block_visible refine_search" id="did_you_mean"> @@ -193,22 +193,6 @@ END; [% END %]</ul> </div> [% END %] - - <script> - function getAdvLimits() { - var AdvLimitsClass = document.getElementById('adv_filter_results_block').classList; - if (AdvLimitsClass.contains("adv_filter_results_hide")) { - AdvLimitsClass.remove("adv_filter_results_hide"); - } else { - AdvLimitsClass.add("adv_filter_results_hide"); - } - if (AdvLimitsClass.contains("adv_filter_results_show")) { - AdvLimitsClass.remove("adv_filter_results_show"); - } else { - AdvLimitsClass.add("adv_filter_results_show"); - } - } - </script>  </div> -</div> \ No newline at end of file +</div> ----------------------------------------------------------------------- Summary of changes: .../src/templates-bootstrap/opac/css/style.css.tt2 | 6 ++- .../templates-bootstrap/opac/parts/searchbar.tt2 | 48 ++++++++-------------- 2 files changed, 21 insertions(+), 33 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. fbd8884461dbc944b7a14c04e9aadff74f9c6e63
by Git User 11 Jul '25

11 Jul '25

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 fbd8884461dbc944b7a14c04e9aadff74f9c6e63 (commit) from a7afa416d19a5c84d66a11dd9cce6f2f630f8347 (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 fbd8884461dbc944b7a14c04e9aadff74f9c6e63 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri May 30 16:58:02 2025 +0000 LP1785697 Fix OPAC advanced filters applied count Adds 'sort','skip_check', and 'check_limit' to the list of filters that are ignored when calculating the count of filters applied in the OPAC advanced search results. Refactors the filter show/hide area to eliminate hard-coded square brackets containing a link with a click action that confused accessibility testers. Replaces this with a simple heading if only one filter is applied, or a details/summary area for more than one. Release-note: Corrects OPAC advanced filters applied count; refactors filter show/hide link as details/summary Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Susan Morrison <smorrison(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 index 2f6716f99b..1a253c5c72 100755 --- a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 @@ -603,7 +603,7 @@ a { } #search-wrapper h1, -#search-wrapper h2 { +#search-wrapper h2:not(h2.h3) { text-align: center; } @@ -980,6 +980,10 @@ for now until a better color is picked - if needed. margin-top: 0; } +.adv_filters_applied { + display: inline-flex; +} + .checkbox_col { width: 1%; [% IF rtl == 't' -%] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 index d28701eaf5..d1bf9479bb 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 @@ -3,7 +3,7 @@ # We need to ignore some filters in our count -fignore = ['lasso','location_groups','site','core_limit','limit','badge_orgs','badges','estimation_strategy','depth']; +fignore = ['lasso','location_groups','site','core_limit','limit','badge_orgs','badges','estimation_strategy','depth','sort','skip_check','check_limit']; fcount = 0; FOR f IN ctx.query_struct.filters; IF fignore.grep('^' _ f.name _ '$').size; @@ -165,23 +165,23 @@ END; </form> [% END %] [% IF fcount > 0 %] - <div class="refine_search result_block_visible"> - <span id="filter_hits">[ <a href="#" onclick="getAdvLimits();return false;">[% l('[quant,_1,filter,filters] applied', fcount) %]</a> ]</span> - </div> - [% END %] - [% IF ctx.query_struct.filters.size > 0 %] - [% stuff = INCLUDE 'opac/parts/result/adv_filter.tt2' %] - [% IF stuff %] - <h3 class="sr-only">[% l('Search Results filters') %]</h3> - <div class="d-flex justify-content-center"> - <div id="adv_filter_results_block" class="adv_filter_results_hide"> - <div class="adv_filter_results_block_label">[% l('Filtered by:') %]</div> + <div class="refine_search"> + [% IF fcount == 1 %] + <h2 class="h3">[% l('[_1] filter applied', fcount) %]</h2> <div class="d-inline-flex p-2"> - [% stuff %] + [% INCLUDE 'opac/parts/result/adv_filter.tt2' %] </div> - </div> - </div> + [% ELSE %] + <details id="filter_hits"> + <summary><h3>[% l('[_1] filters applied', fcount) %]</h3></summary> + <div class="adv_filter_results_block_label">[% l('Filtered by:') %]</div> + <div class="adv_filters_applied"> + [% INCLUDE 'opac/parts/result/adv_filter.tt2' %] + </div> + </div> + </details> [% END %] + </div> [% END %] [% IF ctx.search_summary.suggestions.one_class_multi_term %] <div class="result_block_visible refine_search" id="did_you_mean"> @@ -193,22 +193,6 @@ END; [% END %]</ul> </div> [% END %] - - <script> - function getAdvLimits() { - var AdvLimitsClass = document.getElementById('adv_filter_results_block').classList; - if (AdvLimitsClass.contains("adv_filter_results_hide")) { - AdvLimitsClass.remove("adv_filter_results_hide"); - } else { - AdvLimitsClass.add("adv_filter_results_hide"); - } - if (AdvLimitsClass.contains("adv_filter_results_show")) { - AdvLimitsClass.remove("adv_filter_results_show"); - } else { - AdvLimitsClass.add("adv_filter_results_show"); - } - } - </script>  </div> -</div> \ No newline at end of file +</div> ----------------------------------------------------------------------- Summary of changes: .../src/templates-bootstrap/opac/css/style.css.tt2 | 6 ++- .../templates-bootstrap/opac/parts/searchbar.tt2 | 48 ++++++++-------------- 2 files changed, 21 insertions(+), 33 deletions(-) hooks/post-receive -- Evergreen ILS

1 0