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@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@equinoxoli.org> Signed-off-by: Jane Sandberg <sandbergja@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