ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-05-02 08:42:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.2' into master-3.0

Browse Source 
# Conflicts:
#	package.json
#	src/app/layouts/default-layout/default-layout.component.html
#	src/app/layouts/default-layout/default-layout.component.ts
#	yarn.lock
This commit is contained in:
grossmj 2024-07-22 19:16:37 +02:00
commit 9cb21c7dd1
No known key found for this signature in database
GPG Key ID: 0A2D76AC45EA25CD
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/requirements.txt
View File

@ -1,6 +1,6 @@
setuptools==65.5.1 setuptools==71.1.0
cx_Freeze==5.1.1 cx_Freeze==5.1.1
requests==2.31.0 requests==2.32.3
packaging==20.9 packaging==20.9
appdirs==1.4.4 appdirs==1.4.4
psutil==5.8.0 psutil==5.8.0

2
src/app/app.component.html
View File

@ -1,4 +1,4 @@
<div [ngClass]="{ dark: darkThemeEnabled, light: !darkThemeEnabled }"> <div [ngClass]="{ dark: darkThemeEnabled, light: !darkThemeEnabled }">
<router-outlet></router-outlet> <router-outlet></router-outlet>
<app-adbutler></app-adbutler> <!-- <app-adbutler></app-adbutler> -->
</div> </div>

6
src/app/cartography/widgets/interface-status.ts
View File

@ -90,7 +90,7 @@ export class InterfaceStatusWidget implements Widget {
.merge(status_started_enter) .merge(status_started_enter)
.attr('class', 'status_started') .attr('class', 'status_started')
.attr('width', (ls: LinkStatus) => { .attr('width', (ls: LinkStatus) => {
return ls.port.length * 8 + 10; return ls.port.length * 10 + 5;
}) })
.attr('height', 20) .attr('height', 20)
.attr('x', (ls: LinkStatus) => ls.x - 30) .attr('x', (ls: LinkStatus) => ls.x - 30)
@ -122,7 +122,7 @@ export class InterfaceStatusWidget implements Widget {
.merge(status_stopped_enter) .merge(status_stopped_enter)
.attr('class', 'status_stopped') .attr('class', 'status_stopped')
.attr('width', (ls: LinkStatus) => { .attr('width', (ls: LinkStatus) => {
return ls.port.length * 8 + 10; return ls.port.length * 10 + 5;
}) })
.attr('height', 20) .attr('height', 20)
.attr('x', (ls: LinkStatus) => ls.x - 30) .attr('x', (ls: LinkStatus) => ls.x - 30)
@ -154,7 +154,7 @@ export class InterfaceStatusWidget implements Widget {
.merge(status_suspended_enter) .merge(status_suspended_enter)
.attr('class', 'status_suspended') .attr('class', 'status_suspended')
.attr('width', (ls: LinkStatus) => { .attr('width', (ls: LinkStatus) => {
return ls.port.length * 8 + 10; return ls.port.length * 10 + 5;
}) })
.attr('height', 20) .attr('height', 20)
.attr('x', (ls: LinkStatus) => ls.x - 30) .attr('x', (ls: LinkStatus) => ls.x - 30)

2
src/app/layouts/default-layout/default-layout.component.html
View File

@ -90,4 +90,4 @@
<app-progress></app-progress> <app-progress></app-progress>
<footer class="footer mat-app-background">GNS3 Web UI &copy; 2022 - v{{ uiVersion }}</footer> <footer class="footer mat-app-background">GNS3 Web-UI &copy;2018-{{ currentYear }} v{{ uiVersion }}</footer>

1
src/app/layouts/default-layout/default-layout.component.ts
View File

@ -25,6 +25,7 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
public uiVersion = version; public uiVersion = version;
public isLoginPage = false; public isLoginPage = false;
public routeSubscription; public routeSubscription;
public currentYear = new Date().getFullYear();
controllerStatusSubscription: Subscription; controllerStatusSubscription: Subscription;
shouldStopControllersOnClosing = true; shouldStopControllersOnClosing = true;

4
src/index.html
View File

@ -38,7 +38,7 @@
<body class="mat-app-background" oncontextmenu="return false;"> <body class="mat-app-background" oncontextmenu="return false;">
<app-root></app-root> <app-root></app-root>
<!-- Global site tag (gtag.js) - Google Analytics --> <!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-5D6FZL9923"></script> <script async src="https://www.googletagmanager.com/gtag/js?id=G-0BT7QQV1W1"></script>
<script> <script>
window.dataLayer = window.dataLayer || []; window.dataLayer = window.dataLayer || [];
function gtag() { function gtag() {
@ -46,7 +46,7 @@
} }
gtag('js', new Date()); gtag('js', new Date());
gtag('config', 'G-5D6FZL9923'); gtag('config', 'G-0BT7QQV1W1');
</script> </script>
</body> </body>
</html> </html>