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@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@georgialibraries.org> Signed-off-by: John Amundson <jamundson@cwmars.org> Signed-off-by: Stephanie Leary <stephanie.leary@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