From ae0ea7ffbbe21a16866249177441bc6e2a80751c Mon Sep 17 00:00:00 2001 From: MWicenec Date: Thu, 12 Dec 2024 11:57:55 +0800 Subject: [PATCH 1/4] added the name of the active graph configuration to the graphnamewrapper at the top of the page --- src/Eagle.ts | 8 ++++++++ src/FileInfo.ts | 4 ++-- static/base.css | 4 ++++ templates/navbar.html | 3 ++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/Eagle.ts b/src/Eagle.ts index 2ed8bdcba..780a3d117 100644 --- a/src/Eagle.ts +++ b/src/Eagle.ts @@ -385,6 +385,14 @@ export class Eagle { return fileInfo.getText(); }, this); + activeConfigText : ko.PureComputed = ko.pureComputed(() => { + if (this.logicalGraph().getActiveGraphConfig() === null){ + return ""; + } + + return "Config: " +this.logicalGraph().getActiveGraphConfig().getName() + }, this); + toggleWindows = () : void => { const setOpen = !Setting.findValue(Setting.LEFT_WINDOW_VISIBLE) || !Setting.findValue(Setting.RIGHT_WINDOW_VISIBLE) || !Setting.findValue(Setting.BOTTOM_WINDOW_VISIBLE) diff --git a/src/FileInfo.ts b/src/FileInfo.ts index 2ac98bf2c..5cca53eb6 100644 --- a/src/FileInfo.ts +++ b/src/FileInfo.ts @@ -371,9 +371,9 @@ export class FileInfo { getText = () : string => { if (this.repositoryName !== ""){ if (this.path === ""){ - return this.repositoryService + ": " + this.repositoryName + " (" + this.repositoryBranch + "): " + this.name; + return "" + this.repositoryService + ": " + this.repositoryName + " (" + this.repositoryBranch + "): " + this.name; } else { - return this.repositoryService + ": " + this.repositoryName + " (" + this.repositoryBranch + "): " + this.path + "/" + this.name; + return "" + this.repositoryService + ": " + this.repositoryName + " (" + this.repositoryBranch + "): " + this.path + "/" + this.name; } } else { return this.name; diff --git a/static/base.css b/static/base.css index b28d2e532..1163e457d 100644 --- a/static/base.css +++ b/static/base.css @@ -2057,6 +2057,10 @@ ul.nav.navbar-nav .dropdown-item:hover{ transform: translateY(-50%); } +#activeConfig{ + margin-left:5px; +} + .navbar-light .navbar-nav .nav-link { color: rgba(255, 255, 255, 0.55); } diff --git a/templates/navbar.html b/templates/navbar.html index 59830ce93..871911e79 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -226,6 +226,7 @@
- + + draw
From 199c57ee22810c9c0fa359d4958d00bf15c457a3 Mon Sep 17 00:00:00 2001 From: MWicenec Date: Thu, 12 Dec 2024 14:41:44 +0800 Subject: [PATCH 2/4] config information in graph inspector --- static/tables.css | 1 + templates/inspector.html | 29 +++++++++++++++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/static/tables.css b/static/tables.css index 9b2ea9614..5a8280d10 100644 --- a/static/tables.css +++ b/static/tables.css @@ -178,6 +178,7 @@ td:first-child input { #graphConfigurationsTableWrapper thead{ top: 0px; + border-top: 1px white solid; } .eagleTableWrapper th{ diff --git a/templates/inspector.html b/templates/inspector.html index 1985138f3..cfaec42c9 100644 --- a/templates/inspector.html +++ b/templates/inspector.html @@ -271,17 +271,18 @@

Graph Info

- link - sticky_note_2 - menu_book -
-
- folder_open + folder_open account_tree + link + sticky_note_2 + menu_book +
+
+ dns
@@ -310,6 +311,22 @@
Modified Author:
+
+
+
Active Config:
+
+
+ +
+
+
+
+
Config Length:
+
+
+ +
+
From c906bfbc0c510118aad28358bc1972b7898709f8 Mon Sep 17 00:00:00 2001 From: M-Wicenec Date: Fri, 13 Dec 2024 11:53:10 +0800 Subject: [PATCH 3/4] few requested fixes --- src/Eagle.ts | 4 ++-- src/FileInfo.ts | 12 ++++++++++++ templates/navbar.html | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/Eagle.ts b/src/Eagle.ts index 780a3d117..5ce8f3b05 100644 --- a/src/Eagle.ts +++ b/src/Eagle.ts @@ -382,10 +382,10 @@ export class Eagle { return ""; } - return fileInfo.getText(); + return fileInfo.getHtml(); }, this); - activeConfigText : ko.PureComputed = ko.pureComputed(() => { + activeConfigHtml : ko.PureComputed = ko.pureComputed(() => { if (this.logicalGraph().getActiveGraphConfig() === null){ return ""; } diff --git a/src/FileInfo.ts b/src/FileInfo.ts index 5cca53eb6..f34182659 100644 --- a/src/FileInfo.ts +++ b/src/FileInfo.ts @@ -369,6 +369,18 @@ export class FileInfo { } getText = () : string => { + if (this.repositoryName !== ""){ + if (this.path === ""){ + return this.repositoryService + ": " + this.repositoryName + " (" + this.repositoryBranch + "): " + this.name; + } else { + return this.repositoryService + ": " + this.repositoryName + " (" + this.repositoryBranch + "): " + this.path + "/" + this.name; + } + } else { + return this.name; + } + } + + getHtml = () : string => { if (this.repositoryName !== ""){ if (this.path === ""){ return "" + this.repositoryService + ": " + this.repositoryName + " (" + this.repositoryBranch + "): " + this.name; diff --git a/templates/navbar.html b/templates/navbar.html index 871911e79..abcf5b49f 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -227,6 +227,6 @@
- + draw
From 91f2e69ed1e1f5a6e557b04fbb5198ba4af33d30 Mon Sep 17 00:00:00 2001 From: M-Wicenec Date: Fri, 13 Dec 2024 11:54:53 +0800 Subject: [PATCH 4/4] changed config length to config fields --- templates/inspector.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/inspector.html b/templates/inspector.html index cfaec42c9..452c82c9d 100644 --- a/templates/inspector.html +++ b/templates/inspector.html @@ -321,7 +321,7 @@
Active Config:
-
Config Length:
+
Config Fields: