- Evergreen-commits - example.com

[GIT] Evergreen ILS branch main updated. 951eec731369ffa6225cef12c3fb4473c35874a9
by Git User 07 Apr '25

07 Apr '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 951eec731369ffa6225cef12c3fb4473c35874a9 (commit) from fe5463be4ce73b6cc3cd6031165fba2878addf5f (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 951eec731369ffa6225cef12c3fb4473c35874a9 Author: Tiffany Little <tlittle(a)georgialibraries.org> Date: Mon Jan 13 13:20:48 2025 -0500 LP2091178 Fix Acq providers codes in comboboxes Returns acq providers combobox display to use code rather than name. Release-note: Restores acquisitions provider codes in select boxes. Signed-off-by: Tiffany Little <tlittle(a)georgialibraries.org> Signed-off-by: Jason Stephenson <jason(a)sigio.com> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts index 0c338abcc4..6cb7278be5 100644 --- a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts +++ b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts @@ -313,7 +313,7 @@ implements ControlValueAccessor, OnInit, AfterViewInit, OnChanges { return fm.name() + ' (' + this.getOrgShortname(fm.owning_lib()) + ')'; break; case 'acqpro': - return fm.name() + ' (' + this.getOrgShortname(fm.owner()) + ')'; + return fm.code() + ' (' + this.getOrgShortname(fm.owner()) + ')'; break; default: const field = this.idlField; diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts index 9ccde4e069..9eb692ce32 100644 --- a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts @@ -480,7 +480,7 @@ export class FmRecordEditorComponent return fm.name() + ' (' + this.getOrgShortname(fm.owning_lib()) + ')'; break; case 'acqpro': - return fm.name() + ' (' + this.getOrgShortname(fm.owner()) + ')'; + return fm.code() + ' (' + this.getOrgShortname(fm.owner()) + ')'; break; default: // no equivalent of idlIncludeLibraryInLabel yet ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts | 2 +- Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_13 updated. 87d7b6c85a97ad5164e8839127ff0ad4860804b2
by Git User 07 Apr '25

07 Apr '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_13 has been updated via 87d7b6c85a97ad5164e8839127ff0ad4860804b2 (commit) from b1d1c2bacc38777a87c44c57ce2526acfe373b8e (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 87d7b6c85a97ad5164e8839127ff0ad4860804b2 Author: Tiffany Little <tlittle(a)georgialibraries.org> Date: Mon Jan 13 13:20:48 2025 -0500 LP2091178 Fix Acq providers codes in comboboxes Returns acq providers combobox display to use code rather than name. Release-note: Restores acquisitions provider codes in select boxes. Signed-off-by: Tiffany Little <tlittle(a)georgialibraries.org> Signed-off-by: Jason Stephenson <jason(a)sigio.com> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts index 88fa446631..011cb62d7b 100644 --- a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts +++ b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts @@ -302,7 +302,7 @@ implements ControlValueAccessor, OnInit, AfterViewInit, OnChanges { return fm.name() + ' (' + this.getOrgShortname(fm.owning_lib()) + ')'; break; case 'acqpro': - return fm.name() + ' (' + this.getOrgShortname(fm.owner()) + ')'; + return fm.code() + ' (' + this.getOrgShortname(fm.owner()) + ')'; break; default: const field = this.idlField; diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts index 9ccde4e069..9eb692ce32 100644 --- a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts @@ -480,7 +480,7 @@ export class FmRecordEditorComponent return fm.name() + ' (' + this.getOrgShortname(fm.owning_lib()) + ')'; break; case 'acqpro': - return fm.name() + ' (' + this.getOrgShortname(fm.owner()) + ')'; + return fm.code() + ' (' + this.getOrgShortname(fm.owner()) + ')'; break; default: // no equivalent of idlIncludeLibraryInLabel yet ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts | 2 +- Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 148c9782ba073c322b01bae9dd22f9429cd9f042
by Git User 07 Apr '25

07 Apr '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 148c9782ba073c322b01bae9dd22f9429cd9f042 (commit) from 3e4a07caa9218eb57384046a029ac72314cbf9ad (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 148c9782ba073c322b01bae9dd22f9429cd9f042 Author: Tiffany Little <tlittle(a)georgialibraries.org> Date: Mon Jan 13 13:20:48 2025 -0500 LP2091178 Fix Acq providers codes in comboboxes Returns acq providers combobox display to use code rather than name. Release-note: Restores acquisitions provider codes in select boxes. Signed-off-by: Tiffany Little <tlittle(a)georgialibraries.org> Signed-off-by: Jason Stephenson <jason(a)sigio.com> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts index 6820627015..77a27ab503 100644 --- a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts +++ b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts @@ -302,7 +302,7 @@ implements ControlValueAccessor, OnInit, AfterViewInit, OnChanges { return fm.name() + ' (' + this.getOrgShortname(fm.owning_lib()) + ')'; break; case 'acqpro': - return fm.name() + ' (' + this.getOrgShortname(fm.owner()) + ')'; + return fm.code() + ' (' + this.getOrgShortname(fm.owner()) + ')'; break; default: const field = this.idlField; diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts index 9ccde4e069..9eb692ce32 100644 --- a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts @@ -480,7 +480,7 @@ export class FmRecordEditorComponent return fm.name() + ' (' + this.getOrgShortname(fm.owning_lib()) + ')'; break; case 'acqpro': - return fm.name() + ' (' + this.getOrgShortname(fm.owner()) + ')'; + return fm.code() + ' (' + this.getOrgShortname(fm.owner()) + ')'; break; default: // no equivalent of idlIncludeLibraryInLabel yet ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts | 2 +- Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. fe5463be4ce73b6cc3cd6031165fba2878addf5f
by Git User 07 Apr '25

07 Apr '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 fe5463be4ce73b6cc3cd6031165fba2878addf5f (commit) from d1c36459a6e15fe0443dc5e55c638b140c80f5a4 (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 fe5463be4ce73b6cc3cd6031165fba2878addf5f Author: Dan Briem <dbriem(a)harrisonpl.org> Date: Sun Feb 23 21:46:36 2025 +0000 LP#2098903 Item Status Focus Is After Barcode When Not Found If a barcode is not found after an item status search, the focus remains in the input after the barcode. This allows for a model change so the input contents will be selected after item status searches. Signed-off-by: Dan Briem <dbriem(a)harrisonpl.org> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/app.js b/Open-ILS/web/js/ui/default/staff/cat/item/app.js index fc2d6a20d1..146bad26b2 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js +++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js @@ -421,6 +421,9 @@ function($scope , $q , $window , $location , $timeout , egCore , egNet , egGridD if (!args.barcode) return $q.when(); $scope.context.itemNotFound = false; + // reset so the input can be auto-selected after the search + $scope.context.selectBarcode = false; + //check to see if there are multiple barcodes in CSV format var barcodes = []; //split on commas and clean up barcodes ----------------------------------------------------------------------- Summary of changes: Open-ILS/web/js/ui/default/staff/cat/item/app.js | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 3e4a07caa9218eb57384046a029ac72314cbf9ad
by Git User 07 Apr '25

07 Apr '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 3e4a07caa9218eb57384046a029ac72314cbf9ad (commit) from 725f9fb153ad463ff379c188a7310e8a8f5860e6 (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 3e4a07caa9218eb57384046a029ac72314cbf9ad Author: Dan Briem <dbriem(a)harrisonpl.org> Date: Sun Feb 23 21:46:36 2025 +0000 LP#2098903 Item Status Focus Is After Barcode When Not Found If a barcode is not found after an item status search, the focus remains in the input after the barcode. This allows for a model change so the input contents will be selected after item status searches. Signed-off-by: Dan Briem <dbriem(a)harrisonpl.org> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/app.js b/Open-ILS/web/js/ui/default/staff/cat/item/app.js index fc2d6a20d1..146bad26b2 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js +++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js @@ -421,6 +421,9 @@ function($scope , $q , $window , $location , $timeout , egCore , egNet , egGridD if (!args.barcode) return $q.when(); $scope.context.itemNotFound = false; + // reset so the input can be auto-selected after the search + $scope.context.selectBarcode = false; + //check to see if there are multiple barcodes in CSV format var barcodes = []; //split on commas and clean up barcodes ----------------------------------------------------------------------- Summary of changes: Open-ILS/web/js/ui/default/staff/cat/item/app.js | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_13 updated. b1d1c2bacc38777a87c44c57ce2526acfe373b8e
by Git User 07 Apr '25

07 Apr '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_13 has been updated via b1d1c2bacc38777a87c44c57ce2526acfe373b8e (commit) from 86114db90d24613c073ed0c28d31da2020d3cc0b (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 b1d1c2bacc38777a87c44c57ce2526acfe373b8e Author: Dan Briem <dbriem(a)harrisonpl.org> Date: Sun Feb 23 21:46:36 2025 +0000 LP#2098903 Item Status Focus Is After Barcode When Not Found If a barcode is not found after an item status search, the focus remains in the input after the barcode. This allows for a model change so the input contents will be selected after item status searches. Signed-off-by: Dan Briem <dbriem(a)harrisonpl.org> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/app.js b/Open-ILS/web/js/ui/default/staff/cat/item/app.js index fc2d6a20d1..146bad26b2 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js +++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js @@ -421,6 +421,9 @@ function($scope , $q , $window , $location , $timeout , egCore , egNet , egGridD if (!args.barcode) return $q.when(); $scope.context.itemNotFound = false; + // reset so the input can be auto-selected after the search + $scope.context.selectBarcode = false; + //check to see if there are multiple barcodes in CSV format var barcodes = []; //split on commas and clean up barcodes ----------------------------------------------------------------------- Summary of changes: Open-ILS/web/js/ui/default/staff/cat/item/app.js | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 725f9fb153ad463ff379c188a7310e8a8f5860e6
by Git User 07 Apr '25

07 Apr '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 725f9fb153ad463ff379c188a7310e8a8f5860e6 (commit) from e64136b70be29c2926382a214c5493c602d16177 (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 725f9fb153ad463ff379c188a7310e8a8f5860e6 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Mon Apr 7 22:54:38 2025 +0000 LP2101886 Follow-up: lint Silence a lint warning about the new const declaration in the keydown switch case. Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> 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 e5fb58b15c..211f08a535 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 @@ -212,7 +212,8 @@ export class MarcRichEditorComponent implements OnInit { case 'ArrowLeft': case 'ArrowRight': // console.debug("ArrowRight: ", evt, field, subfield); - let el = evt.target as HTMLElement; + // 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')) { return; ----------------------------------------------------------------------- Summary of changes: .../src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. d1c36459a6e15fe0443dc5e55c638b140c80f5a4
by Git User 07 Apr '25

07 Apr '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 d1c36459a6e15fe0443dc5e55c638b140c80f5a4 (commit) from 9d15c6cfed1557cf637309b0c8b6c3c7b5aff6d7 (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 d1c36459a6e15fe0443dc5e55c638b140c80f5a4 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Mon Apr 7 22:54:38 2025 +0000 LP2101886 Follow-up: lint Silence a lint warning about the new const declaration in the keydown switch case. Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> 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..4f9973a30f 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 @@ -216,7 +216,8 @@ export class MarcRichEditorComponent implements OnInit { case 'ArrowLeft': case 'ArrowRight': // console.debug("ArrowRight: ", evt, field, subfield); - let el = evt.target as HTMLElement; + // 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')) { return; ----------------------------------------------------------------------- Summary of changes: .../src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 9d15c6cfed1557cf637309b0c8b6c3c7b5aff6d7
by Git User 07 Apr '25

07 Apr '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 9d15c6cfed1557cf637309b0c8b6c3c7b5aff6d7 (commit) via 7f2a24cde4dbb7bd0ae2e21f4595d936fa0088ac (commit) from 806866646fff176b1bec3487aa3668c2d8cadbba (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 9d15c6cfed1557cf637309b0c8b6c3c7b5aff6d7 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Mon Apr 7 22:47:05 2025 +0000 LP#2105906 Follow-up: CSS class cleanup Cleans up some extraneous CSS classes that created extra borders around form elements. Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html index 0714e10d04..842c72f00e 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html @@ -1,6 +1,6 @@ <div *ngIf="showLinkLimitSets"> - <div class="modal-header bg-info"><h4 class="modal-title" i18n>Linked Limit Sets</h4></div> + <div class="modal-header"><h2 class="modal-title" i18n>Linked Limit Sets</h2></div> <ng-container *ngIf="getObjectKeys().length > 0"> <ng-container *ngFor="let key of getObjectKeys(); let i = index"> <div *ngIf="!linkedSetList[i].isDeleted" class="col-lg-15 d-flex justify-content-center"> @@ -36,7 +36,7 @@ <div *ngIf="linkedSetList[i].created" class="col-lg-2 mt-3 mb-3 form-group form-check"> <button type="button" - class="btn btn-warning" + class="btn btn-destroy" ng-disabled="!linkedSet" (click)="removeLinkedSet(i)" i18n-title title="Remove" i18n>Remove @@ -46,13 +46,8 @@ </ng-container> </ng-container> <div class="form-group mt-3"> - <label for="limit-set-name" class="col-form-label" i18n>Circ Limit Set Name</label> - (<a target="_blank" href="/eg2/staff/admin/local/config/circ_limit_set" class="btn btn-link" i18n>Admin</a>) - <eg-help-popover - i18n-helpText - helpText="Use the Admin link or Local Admin -> Circulation Limit Sets to Create a Link Limit Set" - ></eg-help-popover> - <div class="input-group"> + <div class="hstack px-3 pt-2 gap-2"> + <label for="limit-set-name" class="col-form-label fw-bold" i18n>Circ Limit Set Name</label> <eg-combobox #combobox name="linkedLimitName" @@ -61,10 +56,9 @@ idlField="name" asyncSupportsEmptyTermClick="true" (onChange)="onChange($event)" - class="form-control" + class="flex-fill" > </eg-combobox> - <div class="input-group-append"> <button type="button" class="btn btn-info" @@ -72,10 +66,12 @@ i18n-title title="Add" i18n - > - Add + >Add </button> </div> - </div> + <p class="form-text w-100" i18n> + Use <a target="_blank" href="/eg2/staff/admin/local/config/circ_limit_set">Local Admin + → Circulation Limit Sets</a> to create a link limit set + </p> </div> </div> commit 7f2a24cde4dbb7bd0ae2e21f4595d936fa0088ac Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Mon Apr 7 22:47:01 2025 +0000 LP#2105906 Input Group Button Background Contrast When editing a circulation policy, the "Add" button for circ limit sets has insufficient contrast. This restricts gray backgrounds on input groups to the .btn class and .btn-outline classes to avoid contrast issues with other variants such as .btn-info. Signed-off-by: Dan Briem <dbriem(a)harrisonpl.org> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/src/eg2/src/styles.css b/Open-ILS/src/eg2/src/styles.css index 7f04caf7e1..c9b071b9c8 100644 --- a/Open-ILS/src/eg2/src/styles.css +++ b/Open-ILS/src/eg2/src/styles.css @@ -591,7 +591,8 @@ button.input-group-text.text-danger { color: var(--bs-btn-color); } -.input-group .btn { +.input-group .btn:not([class*="btn-"]), +.input-group .btn[class*="btn-outline-"] { background-color: var(--btn-gray-bg); } ----------------------------------------------------------------------- Summary of changes: .../linked-circ-limit-sets.component.html | 24 +++++++++------------- Open-ILS/src/eg2/src/styles.css | 3 ++- 2 files changed, 12 insertions(+), 15 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. e64136b70be29c2926382a214c5493c602d16177
by Git User 07 Apr '25

07 Apr '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 e64136b70be29c2926382a214c5493c602d16177 (commit) via 937ae9f8455119217006990900196281cd5e6362 (commit) from 9dc5d53ef20e0d352f58c10f5a2f388ab3d4051a (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 e64136b70be29c2926382a214c5493c602d16177 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Mon Apr 7 22:47:05 2025 +0000 LP#2105906 Follow-up: CSS class cleanup Cleans up some extraneous CSS classes that created extra borders around form elements. Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html index 0714e10d04..842c72f00e 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html @@ -1,6 +1,6 @@ <div *ngIf="showLinkLimitSets"> - <div class="modal-header bg-info"><h4 class="modal-title" i18n>Linked Limit Sets</h4></div> + <div class="modal-header"><h2 class="modal-title" i18n>Linked Limit Sets</h2></div> <ng-container *ngIf="getObjectKeys().length > 0"> <ng-container *ngFor="let key of getObjectKeys(); let i = index"> <div *ngIf="!linkedSetList[i].isDeleted" class="col-lg-15 d-flex justify-content-center"> @@ -36,7 +36,7 @@ <div *ngIf="linkedSetList[i].created" class="col-lg-2 mt-3 mb-3 form-group form-check"> <button type="button" - class="btn btn-warning" + class="btn btn-destroy" ng-disabled="!linkedSet" (click)="removeLinkedSet(i)" i18n-title title="Remove" i18n>Remove @@ -46,13 +46,8 @@ </ng-container> </ng-container> <div class="form-group mt-3"> - <label for="limit-set-name" class="col-form-label" i18n>Circ Limit Set Name</label> - (<a target="_blank" href="/eg2/staff/admin/local/config/circ_limit_set" class="btn btn-link" i18n>Admin</a>) - <eg-help-popover - i18n-helpText - helpText="Use the Admin link or Local Admin -> Circulation Limit Sets to Create a Link Limit Set" - ></eg-help-popover> - <div class="input-group"> + <div class="hstack px-3 pt-2 gap-2"> + <label for="limit-set-name" class="col-form-label fw-bold" i18n>Circ Limit Set Name</label> <eg-combobox #combobox name="linkedLimitName" @@ -61,10 +56,9 @@ idlField="name" asyncSupportsEmptyTermClick="true" (onChange)="onChange($event)" - class="form-control" + class="flex-fill" > </eg-combobox> - <div class="input-group-append"> <button type="button" class="btn btn-info" @@ -72,10 +66,12 @@ i18n-title title="Add" i18n - > - Add + >Add </button> </div> - </div> + <p class="form-text w-100" i18n> + Use <a target="_blank" href="/eg2/staff/admin/local/config/circ_limit_set">Local Admin + → Circulation Limit Sets</a> to create a link limit set + </p> </div> </div> commit 937ae9f8455119217006990900196281cd5e6362 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Mon Apr 7 22:47:01 2025 +0000 LP#2105906 Input Group Button Background Contrast When editing a circulation policy, the "Add" button for circ limit sets has insufficient contrast. This restricts gray backgrounds on input groups to the .btn class and .btn-outline classes to avoid contrast issues with other variants such as .btn-info. Signed-off-by: Dan Briem <dbriem(a)harrisonpl.org> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/src/eg2/src/styles.css b/Open-ILS/src/eg2/src/styles.css index dc875dfb43..c8a9735e87 100644 --- a/Open-ILS/src/eg2/src/styles.css +++ b/Open-ILS/src/eg2/src/styles.css @@ -484,7 +484,8 @@ button.input-group-text.text-danger { color: var(--bs-btn-color); } -.input-group .btn { +.input-group .btn:not([class*="btn-"]), +.input-group .btn[class*="btn-outline-"] { background-color: var(--btn-gray-bg); } ----------------------------------------------------------------------- Summary of changes: .../linked-circ-limit-sets.component.html | 24 +++++++++------------- Open-ILS/src/eg2/src/styles.css | 3 ++- 2 files changed, 12 insertions(+), 15 deletions(-) hooks/post-receive -- Evergreen ILS

1 0