April 2025 - Evergreen-commits

[GIT] Evergreen ILS branch main updated. f4e33bed880fecb30eec30d0418f1329850a8368
by Git User 01 Apr '25

01 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 f4e33bed880fecb30eec30d0418f1329850a8368 (commit) from 066cf8399c54178f6570a1b863909bd34746c021 (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 f4e33bed880fecb30eec30d0418f1329850a8368 Author: Terran McCanna <tmccanna(a)georgialibraries.org> Date: Tue Jan 28 16:00:55 2025 -0500 LP2067649 Staff Catalog Shelf Browse Layout Modify layout of Angular Staff Catalog Shelf Browse interface by moving cover image to the left of the associated text to be consistent with other interfaces and to reduce confusion caused by the cover being closer to the next item's text. Also moved "Next" button from the left side of the screen to the right side of the screen. Release-note: Improved layout of staff catalog shelf browse. Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> Signed-off-by: Andrea Buntz Neiman <abneiman(a)equinoxinitiative.org> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html index 02dd920287..49fe4268ce 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html +++ b/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html @@ -25,10 +25,11 @@  <div id="staff-catalog-browse-results-container" *ngIf="browseHasResults()"> - <div class="row mb-2 d-flex"> - <div class="flex-1"></div> - <div> + <div class="row mb-2"> + <div class="col-6"> <button type="button" class="btn btn-primary" (click)="prevPage()">Back</button> + </div> + <div class="col-6 text-end"> <button type="button" class="btn btn-primary ms-3" (click)="nextPage()">Next</button> </div> </div> @@ -37,9 +38,12 @@ <div class="row mb-3" *ngFor="let rowIdx of rowIndexList"> <ng-container *ngFor="let callNumber of resultSlice(rowIdx); let colIdx = index"> <ng-container *ngIf="callNumber._bibSummary"> - <div class="col-lg-4 pt-2 d-flex border" + <div class="row col-lg-4 col-sm-12 border m-0" [ngClass]="{'border-primary': isCenter(rowIdx, colIdx)}"> - <div class="flex-1"> + <div class="col-lg-4 col-md-12 col-sm-12 p-2 text-sm-center"> + <img alt="" src="/opac/extras/ac/jacket/small/r/{{callNumber._bibSummary.id}}"/> + </div> + <div class="col-lg-7 col-md-12 col-sm-12 p-2"> <h3 class="browse-call-number"> {{callNumber.prefix().label()}} {{callNumber.label()}} {{callNumber.suffix().label()}} @@ -64,19 +68,17 @@ </div> </ng-container> </div> - <div class="ms-2"> - <img alt="" src="/opac/extras/ac/jacket/small/r/{{callNumber._bibSummary.id}}"/> - </div> </div> </ng-container> </ng-container> </div> </ng-container> - <div class="row mb-2 d-flex"> - <div class="flex-1"></div> - <div> + <div class="row mb-2"> + <div class="col-6"> <button type="button" class="btn btn-primary" (click)="prevPage()">Back</button> + </div> + <div class="col-6 text-end"> <button type="button" class="btn btn-primary ms-3" (click)="nextPage()">Next</button> </div> </div> ----------------------------------------------------------------------- Summary of changes: .../staff/catalog/cnbrowse/results.component.html | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 7f90337e6e976a613996f5491e535e9f9ec3ab55
by Git User 01 Apr '25

01 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 7f90337e6e976a613996f5491e535e9f9ec3ab55 (commit) from 4f58ed3c861b64f1803dd1e3eaab5ccb3f986664 (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 7f90337e6e976a613996f5491e535e9f9ec3ab55 Author: Terran McCanna <tmccanna(a)georgialibraries.org> Date: Tue Jan 28 16:00:55 2025 -0500 LP2067649 Staff Catalog Shelf Browse Layout Modify layout of Angular Staff Catalog Shelf Browse interface by moving cover image to the left of the associated text to be consistent with other interfaces and to reduce confusion caused by the cover being closer to the next item's text. Also moved "Next" button from the left side of the screen to the right side of the screen. Release-note: Improved layout of staff catalog shelf browse. Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> Signed-off-by: Andrea Buntz Neiman <abneiman(a)equinoxinitiative.org> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html index 02dd920287..49fe4268ce 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html +++ b/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html @@ -25,10 +25,11 @@  <div id="staff-catalog-browse-results-container" *ngIf="browseHasResults()"> - <div class="row mb-2 d-flex"> - <div class="flex-1"></div> - <div> + <div class="row mb-2"> + <div class="col-6"> <button type="button" class="btn btn-primary" (click)="prevPage()">Back</button> + </div> + <div class="col-6 text-end"> <button type="button" class="btn btn-primary ms-3" (click)="nextPage()">Next</button> </div> </div> @@ -37,9 +38,12 @@ <div class="row mb-3" *ngFor="let rowIdx of rowIndexList"> <ng-container *ngFor="let callNumber of resultSlice(rowIdx); let colIdx = index"> <ng-container *ngIf="callNumber._bibSummary"> - <div class="col-lg-4 pt-2 d-flex border" + <div class="row col-lg-4 col-sm-12 border m-0" [ngClass]="{'border-primary': isCenter(rowIdx, colIdx)}"> - <div class="flex-1"> + <div class="col-lg-4 col-md-12 col-sm-12 p-2 text-sm-center"> + <img alt="" src="/opac/extras/ac/jacket/small/r/{{callNumber._bibSummary.id}}"/> + </div> + <div class="col-lg-7 col-md-12 col-sm-12 p-2"> <h3 class="browse-call-number"> {{callNumber.prefix().label()}} {{callNumber.label()}} {{callNumber.suffix().label()}} @@ -64,19 +68,17 @@ </div> </ng-container> </div> - <div class="ms-2"> - <img alt="" src="/opac/extras/ac/jacket/small/r/{{callNumber._bibSummary.id}}"/> - </div> </div> </ng-container> </ng-container> </div> </ng-container> - <div class="row mb-2 d-flex"> - <div class="flex-1"></div> - <div> + <div class="row mb-2"> + <div class="col-6"> <button type="button" class="btn btn-primary" (click)="prevPage()">Back</button> + </div> + <div class="col-6 text-end"> <button type="button" class="btn btn-primary ms-3" (click)="nextPage()">Next</button> </div> </div> ----------------------------------------------------------------------- Summary of changes: .../staff/catalog/cnbrowse/results.component.html | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_13 updated. f0456c35e1b9fd2a9b75067d3b2ce71e3df4c827
by Git User 01 Apr '25

01 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 f0456c35e1b9fd2a9b75067d3b2ce71e3df4c827 (commit) from c873bfc6f22ad3e1df70ac98c91ba0c407277444 (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 f0456c35e1b9fd2a9b75067d3b2ce71e3df4c827 Author: Terran McCanna <tmccanna(a)georgialibraries.org> Date: Tue Jan 28 16:00:55 2025 -0500 LP2067649 Staff Catalog Shelf Browse Layout Modify layout of Angular Staff Catalog Shelf Browse interface by moving cover image to the left of the associated text to be consistent with other interfaces and to reduce confusion caused by the cover being closer to the next item's text. Also moved "Next" button from the left side of the screen to the right side of the screen. Release-note: Improved layout of staff catalog shelf browse. Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> Signed-off-by: Andrea Buntz Neiman <abneiman(a)equinoxinitiative.org> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html index 02dd920287..49fe4268ce 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html +++ b/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html @@ -25,10 +25,11 @@  <div id="staff-catalog-browse-results-container" *ngIf="browseHasResults()"> - <div class="row mb-2 d-flex"> - <div class="flex-1"></div> - <div> + <div class="row mb-2"> + <div class="col-6"> <button type="button" class="btn btn-primary" (click)="prevPage()">Back</button> + </div> + <div class="col-6 text-end"> <button type="button" class="btn btn-primary ms-3" (click)="nextPage()">Next</button> </div> </div> @@ -37,9 +38,12 @@ <div class="row mb-3" *ngFor="let rowIdx of rowIndexList"> <ng-container *ngFor="let callNumber of resultSlice(rowIdx); let colIdx = index"> <ng-container *ngIf="callNumber._bibSummary"> - <div class="col-lg-4 pt-2 d-flex border" + <div class="row col-lg-4 col-sm-12 border m-0" [ngClass]="{'border-primary': isCenter(rowIdx, colIdx)}"> - <div class="flex-1"> + <div class="col-lg-4 col-md-12 col-sm-12 p-2 text-sm-center"> + <img alt="" src="/opac/extras/ac/jacket/small/r/{{callNumber._bibSummary.id}}"/> + </div> + <div class="col-lg-7 col-md-12 col-sm-12 p-2"> <h3 class="browse-call-number"> {{callNumber.prefix().label()}} {{callNumber.label()}} {{callNumber.suffix().label()}} @@ -64,19 +68,17 @@ </div> </ng-container> </div> - <div class="ms-2"> - <img alt="" src="/opac/extras/ac/jacket/small/r/{{callNumber._bibSummary.id}}"/> - </div> </div> </ng-container> </ng-container> </div> </ng-container> - <div class="row mb-2 d-flex"> - <div class="flex-1"></div> - <div> + <div class="row mb-2"> + <div class="col-6"> <button type="button" class="btn btn-primary" (click)="prevPage()">Back</button> + </div> + <div class="col-6 text-end"> <button type="button" class="btn btn-primary ms-3" (click)="nextPage()">Next</button> </div> </div> ----------------------------------------------------------------------- Summary of changes: .../staff/catalog/cnbrowse/results.component.html | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_13 updated. c873bfc6f22ad3e1df70ac98c91ba0c407277444
by Git User 01 Apr '25

01 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 c873bfc6f22ad3e1df70ac98c91ba0c407277444 (commit) from 8487d8340a69b8232bb427d3ccca37ec452c12e3 (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 c873bfc6f22ad3e1df70ac98c91ba0c407277444 Author: Steven Mayo <smayo(a)georgialibraries.org> Date: Thu Nov 21 09:14:29 2024 -0500 lp2084726: Reports Deactivate Unselected Folders Fixed missing background color on selected nodes in trees. Gives TreeComponent a static tracker of the last tree that's been clicked on. If you click on a tree, active nodes on other trees have a less contrasting border and background. Signed-off-by: Steven Mayo <smayo(a)georgialibraries.org> Signed-off-by: John Amundson <jamundson(a)cwmars.org> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/src/eg2/src/app/share/tree/tree.component.css b/Open-ILS/src/eg2/src/app/share/tree/tree.component.css index 9da05e5eef..aa3697d9dd 100644 --- a/Open-ILS/src/eg2/src/app/share/tree/tree.component.css +++ b/Open-ILS/src/eg2/src/app/share/tree/tree.component.css @@ -1,3 +1,7 @@ +:host { + --tree-border: var(--bs-gray-500); +} + .eg-tree { padding-left: 0; } @@ -46,7 +50,7 @@ /* elbow lines for folders */ .eg-tree-branch .eg-tree-node { - border-left: 2px solid var(--bs-gray-400); + border-left: 2px solid var(--tree-border); padding-left: 1rem; } @@ -55,7 +59,7 @@ } .eg-tree-branch .eg-tree-node-wrapper:before { - border-bottom: 2px solid var(--bs-gray-400); + border-bottom: 2px solid var(--tree-border); display: inline-block; height: 1rem; width: 1rem; @@ -64,7 +68,7 @@ } .eg-tree-branch .eg-tree-node:last-child > .eg-tree-node-wrapper:before { - border-left: 2px solid var(--bs-gray-400); + border-left: 2px solid var(--tree-border); } .eg-tree-branch .eg-tree-node > .eg-tree-node-wrapper { @@ -73,7 +77,12 @@ .eg-tree-branch .eg-tree-node.active > .eg-tree-node-wrapper { background-color: rgba(0,0,0,.03); - border: 1px solid var(--bs-gray-400); + border: 1px solid var(--tree-border); +} + +.eg-tree.blurred .eg-tree-node.active > .eg-tree-node-wrapper { + background-color: transparent; + border-color: var(--bs-gray-300); } .eg-tree-node-wrapper { diff --git a/Open-ILS/src/eg2/src/app/share/tree/tree.component.html b/Open-ILS/src/eg2/src/app/share/tree/tree.component.html index 0e355fb211..4be27d024d 100644 --- a/Open-ILS/src/eg2/src/app/share/tree/tree.component.html +++ b/Open-ILS/src/eg2/src/app/share/tree/tree.component.html @@ -26,7 +26,7 @@ </div> <div [attr.role]="showLabelFilter ? 'status' : null"> -<ul class="eg-tree" *ngIf="rootNode()"> +<ul class="eg-tree" [ngClass]="{blurred: !wasLastClicked()}" *ngIf="rootNode()"> <ng-container *ngTemplateOutlet="tree;context:{tree_node:rootNode(),disableStateFlag:disableRootSelector}"></ng-container> </ul> <ng-content select="[footer]"></ng-content> diff --git a/Open-ILS/src/eg2/src/app/share/tree/tree.component.ts b/Open-ILS/src/eg2/src/app/share/tree/tree.component.ts index 435eb7c3c3..3c10dbbb27 100644 --- a/Open-ILS/src/eg2/src/app/share/tree/tree.component.ts +++ b/Open-ILS/src/eg2/src/app/share/tree/tree.component.ts @@ -39,6 +39,8 @@ nodeClicked(node: TreeNode) { }) export class TreeComponent { + static lastClickedTree: TreeComponent; + _nodeList: any = []; _tree: Tree; _prev_stateFlagClick: TreeNode; @@ -106,6 +108,7 @@ export class TreeComponent { if (!this.disabled) { this.tree.selectNode(node); this.nodeClicked.emit(node); + TreeComponent.lastClickedTree = this; } } @@ -251,6 +254,10 @@ export class TreeComponent { } } + wasLastClicked(): boolean { + return TreeComponent.lastClickedTree === this; + } + } ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/share/tree/tree.component.css | 17 +++++++++++++---- Open-ILS/src/eg2/src/app/share/tree/tree.component.html | 2 +- Open-ILS/src/eg2/src/app/share/tree/tree.component.ts | 7 +++++++ 3 files changed, 21 insertions(+), 5 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 4f58ed3c861b64f1803dd1e3eaab5ccb3f986664
by Git User 31 Mar '25

31 Mar '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 4f58ed3c861b64f1803dd1e3eaab5ccb3f986664 (commit) from 7db4ac785cb66e79a88fa1cd13755cef7af7ace6 (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 4f58ed3c861b64f1803dd1e3eaab5ccb3f986664 Author: Steven Mayo <smayo(a)georgialibraries.org> Date: Thu Nov 21 09:14:29 2024 -0500 lp2084726: Reports Deactivate Unselected Folders Fixed missing background color on selected nodes in trees. Gives TreeComponent a static tracker of the last tree that's been clicked on. If you click on a tree, active nodes on other trees have a less contrasting border and background. Signed-off-by: Steven Mayo <smayo(a)georgialibraries.org> Signed-off-by: John Amundson <jamundson(a)cwmars.org> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/src/eg2/src/app/share/tree/tree.component.css b/Open-ILS/src/eg2/src/app/share/tree/tree.component.css index 0140cd2662..98946b4bd0 100644 --- a/Open-ILS/src/eg2/src/app/share/tree/tree.component.css +++ b/Open-ILS/src/eg2/src/app/share/tree/tree.component.css @@ -1,3 +1,7 @@ +:host { + --tree-border: light-dark(var(--bs-gray-500), var(--bs-gray-400)); +} + .eg-tree { padding-left: 0; } @@ -51,7 +55,7 @@ /* elbow lines for folders */ .eg-tree-branch .eg-tree-node { - border-left: 2px solid var(--bs-gray-400); + border-left: 2px solid var(--tree-border); padding-left: 1rem; } @@ -60,7 +64,7 @@ } .eg-tree-branch .eg-tree-node-wrapper:before { - border-bottom: 2px solid var(--bs-gray-400); + border-bottom: 2px solid var(--tree-border); display: inline-block; height: 1rem; width: 1rem; @@ -69,7 +73,7 @@ } .eg-tree-branch .eg-tree-node:last-child > .eg-tree-node-wrapper:before { - border-left: 2px solid var(--bs-gray-400); + border-left: 2px solid var(--tree-border); } .eg-tree-branch .eg-tree-node > .eg-tree-node-wrapper { @@ -77,8 +81,13 @@ } .eg-tree-branch .eg-tree-node.active > .eg-tree-node-wrapper { - background-color: light-dark(rgba(var(--box-shadow).03), rgba(255,255,255, .1)); - border: 1px solid var(--bs-gray-400); + background-color: light-dark(rgba(var(--box-shadow), .04), rgba(255,255,255, .1)); + border: 1px solid var(--tree-border); +} + +.eg-tree.blurred .eg-tree-node.active > .eg-tree-node-wrapper { + background-color: transparent; + border-color: light-dark(var(--bs-gray-300), var(--bs-gray-600)); } .eg-tree-node-wrapper { diff --git a/Open-ILS/src/eg2/src/app/share/tree/tree.component.html b/Open-ILS/src/eg2/src/app/share/tree/tree.component.html index 0e355fb211..4be27d024d 100644 --- a/Open-ILS/src/eg2/src/app/share/tree/tree.component.html +++ b/Open-ILS/src/eg2/src/app/share/tree/tree.component.html @@ -26,7 +26,7 @@ </div> <div [attr.role]="showLabelFilter ? 'status' : null"> -<ul class="eg-tree" *ngIf="rootNode()"> +<ul class="eg-tree" [ngClass]="{blurred: !wasLastClicked()}" *ngIf="rootNode()"> <ng-container *ngTemplateOutlet="tree;context:{tree_node:rootNode(),disableStateFlag:disableRootSelector}"></ng-container> </ul> <ng-content select="[footer]"></ng-content> diff --git a/Open-ILS/src/eg2/src/app/share/tree/tree.component.ts b/Open-ILS/src/eg2/src/app/share/tree/tree.component.ts index b9931172c8..510da8f22f 100644 --- a/Open-ILS/src/eg2/src/app/share/tree/tree.component.ts +++ b/Open-ILS/src/eg2/src/app/share/tree/tree.component.ts @@ -39,6 +39,8 @@ nodeClicked(node: TreeNode) { }) export class TreeComponent { + static lastClickedTree: TreeComponent; + _nodeList: any = []; _tree: Tree; _prev_stateFlagClick: TreeNode; @@ -106,6 +108,7 @@ export class TreeComponent { if (!this.disabled) { this.tree.selectNode(node); this.nodeClicked.emit(node); + TreeComponent.lastClickedTree = this; } } @@ -253,6 +256,10 @@ export class TreeComponent { } } + wasLastClicked(): boolean { + return TreeComponent.lastClickedTree === this; + } + } ----------------------------------------------------------------------- Summary of changes: .../src/eg2/src/app/share/tree/tree.component.css | 19 ++++++++++++++----- .../src/eg2/src/app/share/tree/tree.component.html | 2 +- Open-ILS/src/eg2/src/app/share/tree/tree.component.ts | 7 +++++++ 3 files changed, 22 insertions(+), 6 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 066cf8399c54178f6570a1b863909bd34746c021
by Git User 31 Mar '25

31 Mar '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 066cf8399c54178f6570a1b863909bd34746c021 (commit) from 8dbeb06ce59a6376fc239ddea0e8c44996e168ef (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 066cf8399c54178f6570a1b863909bd34746c021 Author: Steven Mayo <smayo(a)georgialibraries.org> Date: Thu Nov 21 09:14:29 2024 -0500 lp2084726: Reports Deactivate Unselected Folders Fixed missing background color on selected nodes in trees. Gives TreeComponent a static tracker of the last tree that's been clicked on. If you click on a tree, active nodes on other trees have a less contrasting border and background. Signed-off-by: Steven Mayo <smayo(a)georgialibraries.org> Signed-off-by: John Amundson <jamundson(a)cwmars.org> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> diff --git a/Open-ILS/src/eg2/src/app/share/tree/tree.component.css b/Open-ILS/src/eg2/src/app/share/tree/tree.component.css index 0140cd2662..98946b4bd0 100644 --- a/Open-ILS/src/eg2/src/app/share/tree/tree.component.css +++ b/Open-ILS/src/eg2/src/app/share/tree/tree.component.css @@ -1,3 +1,7 @@ +:host { + --tree-border: light-dark(var(--bs-gray-500), var(--bs-gray-400)); +} + .eg-tree { padding-left: 0; } @@ -51,7 +55,7 @@ /* elbow lines for folders */ .eg-tree-branch .eg-tree-node { - border-left: 2px solid var(--bs-gray-400); + border-left: 2px solid var(--tree-border); padding-left: 1rem; } @@ -60,7 +64,7 @@ } .eg-tree-branch .eg-tree-node-wrapper:before { - border-bottom: 2px solid var(--bs-gray-400); + border-bottom: 2px solid var(--tree-border); display: inline-block; height: 1rem; width: 1rem; @@ -69,7 +73,7 @@ } .eg-tree-branch .eg-tree-node:last-child > .eg-tree-node-wrapper:before { - border-left: 2px solid var(--bs-gray-400); + border-left: 2px solid var(--tree-border); } .eg-tree-branch .eg-tree-node > .eg-tree-node-wrapper { @@ -77,8 +81,13 @@ } .eg-tree-branch .eg-tree-node.active > .eg-tree-node-wrapper { - background-color: light-dark(rgba(var(--box-shadow).03), rgba(255,255,255, .1)); - border: 1px solid var(--bs-gray-400); + background-color: light-dark(rgba(var(--box-shadow), .04), rgba(255,255,255, .1)); + border: 1px solid var(--tree-border); +} + +.eg-tree.blurred .eg-tree-node.active > .eg-tree-node-wrapper { + background-color: transparent; + border-color: light-dark(var(--bs-gray-300), var(--bs-gray-600)); } .eg-tree-node-wrapper { diff --git a/Open-ILS/src/eg2/src/app/share/tree/tree.component.html b/Open-ILS/src/eg2/src/app/share/tree/tree.component.html index 0e355fb211..4be27d024d 100644 --- a/Open-ILS/src/eg2/src/app/share/tree/tree.component.html +++ b/Open-ILS/src/eg2/src/app/share/tree/tree.component.html @@ -26,7 +26,7 @@ </div> <div [attr.role]="showLabelFilter ? 'status' : null"> -<ul class="eg-tree" *ngIf="rootNode()"> +<ul class="eg-tree" [ngClass]="{blurred: !wasLastClicked()}" *ngIf="rootNode()"> <ng-container *ngTemplateOutlet="tree;context:{tree_node:rootNode(),disableStateFlag:disableRootSelector}"></ng-container> </ul> <ng-content select="[footer]"></ng-content> diff --git a/Open-ILS/src/eg2/src/app/share/tree/tree.component.ts b/Open-ILS/src/eg2/src/app/share/tree/tree.component.ts index b9931172c8..510da8f22f 100644 --- a/Open-ILS/src/eg2/src/app/share/tree/tree.component.ts +++ b/Open-ILS/src/eg2/src/app/share/tree/tree.component.ts @@ -39,6 +39,8 @@ nodeClicked(node: TreeNode) { }) export class TreeComponent { + static lastClickedTree: TreeComponent; + _nodeList: any = []; _tree: Tree; _prev_stateFlagClick: TreeNode; @@ -106,6 +108,7 @@ export class TreeComponent { if (!this.disabled) { this.tree.selectNode(node); this.nodeClicked.emit(node); + TreeComponent.lastClickedTree = this; } } @@ -253,6 +256,10 @@ export class TreeComponent { } } + wasLastClicked(): boolean { + return TreeComponent.lastClickedTree === this; + } + } ----------------------------------------------------------------------- Summary of changes: .../src/eg2/src/app/share/tree/tree.component.css | 19 ++++++++++++++----- .../src/eg2/src/app/share/tree/tree.component.html | 2 +- Open-ILS/src/eg2/src/app/share/tree/tree.component.ts | 7 +++++++ 3 files changed, 22 insertions(+), 6 deletions(-) hooks/post-receive -- Evergreen ILS

1 0