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

# Conflicts: # package.json # src/app/layouts/default-layout/default-layout.component.html # src/app/layouts/default-layout/default-layout.component.ts # yarn.lock
GNS3 · Jul 22, 2024 · 9cb21c7 · 9cb21c7
2 parents f3b3f35 + e5b3a10
commit 9cb21c7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/scripts/requirements.txt b/scripts/requirements.txt
@@ -1,6 +1,6 @@
-setuptools==65.5.1
+setuptools==71.1.0
 cx_Freeze==5.1.1
-requests==2.31.0
+requests==2.32.3
 packaging==20.9
 appdirs==1.4.4
 psutil==5.8.0
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -1,4 +1,4 @@
 <div [ngClass]="{ dark: darkThemeEnabled, light: !darkThemeEnabled }">
   <router-outlet></router-outlet>
-  <app-adbutler></app-adbutler>
+  <!-- <app-adbutler></app-adbutler> -->
 </div>
diff --git a/src/app/cartography/widgets/interface-status.ts b/src/app/cartography/widgets/interface-status.ts
@@ -90,7 +90,7 @@ export class InterfaceStatusWidget implements Widget {
           .merge(status_started_enter)
           .attr('class', 'status_started')
           .attr('width', (ls: LinkStatus) => {
-            return ls.port.length * 8 + 10;
+            return ls.port.length * 10 + 5;
           })
           .attr('height', 20)
           .attr('x', (ls: LinkStatus) => ls.x - 30)
@@ -122,7 +122,7 @@ export class InterfaceStatusWidget implements Widget {
           .merge(status_stopped_enter)
           .attr('class', 'status_stopped')
           .attr('width', (ls: LinkStatus) => {
-            return ls.port.length * 8 + 10;
+            return ls.port.length * 10 + 5;
           })
           .attr('height', 20)
           .attr('x', (ls: LinkStatus) => ls.x - 30)
@@ -154,7 +154,7 @@ export class InterfaceStatusWidget implements Widget {
           .merge(status_suspended_enter)
           .attr('class', 'status_suspended')
           .attr('width', (ls: LinkStatus) => {
-            return ls.port.length * 8 + 10;
+            return ls.port.length * 10 + 5;
           })
           .attr('height', 20)
           .attr('x', (ls: LinkStatus) => ls.x - 30)

diff --git a/src/app/layouts/default-layout/default-layout.component.html b/src/app/layouts/default-layout/default-layout.component.html
@@ -90,4 +90,4 @@
 
 <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>
diff --git a/src/app/layouts/default-layout/default-layout.component.ts b/src/app/layouts/default-layout/default-layout.component.ts
@@ -25,6 +25,7 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
   public uiVersion = version;
   public isLoginPage = false;
   public routeSubscription;
+  public currentYear = new Date().getFullYear();
 
   controllerStatusSubscription: Subscription;
   shouldStopControllersOnClosing = true;

diff --git a/src/index.html b/src/index.html
@@ -38,15 +38,15 @@
   <body class="mat-app-background" oncontextmenu="return false;">
     <app-root></app-root>
     <!-- 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>
       window.dataLayer = window.dataLayer || [];
       function gtag() {
         dataLayer.push(arguments);
       }
       gtag('js', new Date());
 
-      gtag('config', 'G-5D6FZL9923');
+      gtag('config', 'G-0BT7QQV1W1');
     </script>
   </body>
 </html>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -90,4 +90,4 @@

		<app-progress></app-progress>

		<footer class="footer mat-app-background">GNS3 Web UI © 2022 - v{{ uiVersion }}</footer>
		<footer class="footer mat-app-background">GNS3 Web-UI ©2018-{{ currentYear }} v{{ uiVersion }}</footer>