ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-04-09 03:24:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into github_issues

Browse Source
This commit is contained in:
piotrpekala7 2021-02-15 15:30:38 +01:00
commit d72cf3595f
9 changed files with 48 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -67,6 +67,8 @@
"core-js": "^3.8.2",
"d3-ng2-service": "^2.1.0",
"eev": "^0.1.5",
"file-saver": "^2.0.5",
"ini": "^1.3.8",
"material-design-icons": "^3.0.1",
"ng-circle-progress": "^1.6.0",
"ng2-file-upload": "^1.3.0",

9
src/app/cartography/widgets/node.ts
View File

@ -103,8 +103,12 @@ export class NodeWidget implements Widget {
if (n.height > 64) return 64;
return n.height;
})
.attr('x', (n: MapNode) => 0)
.attr('y', (n: MapNode) => 0)
.attr('x', (n: MapNode) => {
return 0
})
.attr('y', (n: MapNode) => {
return 0
})
.on('mouseover', function(this, n: MapNode) {
select(this).attr('class', 'over');
})
@ -113,6 +117,7 @@ export class NodeWidget implements Widget {
});
node_body_merge.attr('transform', (n: MapNode) => {
if (!n.width) return `translate(${n.x - 30},${n.y - 30})`
return `translate(${n.x},${n.y})`;
});

12
src/app/services/built-in-templates-configuration.service.ts
View File

@ -6,8 +6,8 @@ export class BuiltInTemplatesConfigurationService {
let categories = [["Default", "guest"],
["Routers", "router"],
["Switches", "switch"],
["End devices", "end_device"],
["Security devices", "security_device"]];
["End devices", "guest"],
["Security devices", "firewall"]];
return categories;
}
@ -20,8 +20,8 @@ export class BuiltInTemplatesConfigurationService {
let categories = [["Default", "guest"],
["Routers", "router"],
["Switches", "switch"],
["End devices", "end_device"],
["Security devices", "security_device"]];
["End devices", "guest"],
["Security devices", "firewall"]];
return categories;
}
@ -30,8 +30,8 @@ export class BuiltInTemplatesConfigurationService {
let categories = [["Default", "guest"],
["Routers", "router"],
["Switches", "switch"],
["End devices", "end_device"],
["Security devices", "security_device"]];
["End devices", "guest"],
["Security devices", "firewall"]];
return categories;
}

8
src/app/services/docker-configuration.service.ts
View File

@ -8,10 +8,10 @@ export class DockerConfigurationService {
getCategories() {
let categories = [["Default", "guest"],
["Routers", "routers"],
["Switches", "switches"],
["End devices", "end_devices"],
["Security devices", "security_devices"]];
["Routers", "router"],
["Switches", "switch"],
["End devices", "guest"],
["Security devices", "firewall"]];
return categories;
}

4
src/app/services/iou-configuration.service.ts
View File

@ -10,8 +10,8 @@ export class IouConfigurationService {
let categories = [["Default", "guest"],
["Routers", "router"],
["Switches", "switch"],
["End devices", "end_device"],
["Security devices", "security_device"]];
["End devices", "guest"],
["Security devices", "firewall"]];
return categories;
}

18
src/app/services/qemu-configuration.service.ts
View File

@ -64,17 +64,17 @@ export class QemuConfigurationService {
getBootPriorities() {
let bootPriorities = [["HDD", "c"],
["CD/DVD-ROM", "d"],
["Network", "n"],
["HDD or Network", "cn"],
["CD/DVD-ROM", "d"],
["Network", "n"],
["HDD or Network", "cn"],
["HDD or CD/DVD-ROM", "cd"]];
return bootPriorities;
}
getOnCloseOptions() {
let onCloseOptions = [["Power off the VM", "power_off"],
["Send the shutdown signal (ACPI)", "shutdown_signal"],
let onCloseOptions = [["Power off the VM", "power_off"],
["Send the shutdown signal (ACPI)", "shutdown_signal"],
["Save the VM state", "save_vm_state"]];
return onCloseOptions;
@ -82,10 +82,10 @@ export class QemuConfigurationService {
getCategories() {
let categories = [["Default", "guest"],
["Routers", "routers"],
["Switches", "switches"],
["End devices", "end_devices"],
["Security devices", "security_devices"]];
["Routers", "router"],
["Switches", "switch"],
["End devices", "guest"],
["Security devices", "firewall"]];
return categories;
}

14
src/app/services/virtual-box-configuration.service.ts
View File

@ -7,8 +7,8 @@ export class VirtualBoxConfigurationService{
}
getOnCloseoptions() {
let onCloseOptions = [["Power off the VM", "power_off"],
["Send the shutdown signal (ACPI)", "shutdown_signal"],
let onCloseOptions = [["Power off the VM", "power_off"],
["Send the shutdown signal (ACPI)", "shutdown_signal"],
["Save the VM state", "save_vm_state"]];
return onCloseOptions;
@ -16,10 +16,10 @@ export class VirtualBoxConfigurationService{
getCategories() {
let categories = [["Default", "guest"],
["Routers", "routers"],
["Switches", "switches"],
["End devices", "end_devices"],
["Security devices", "security_devices"]];
["Routers", "router"],
["Switches", "switch"],
["End devices", "guest"],
["Security devices", "firewall"]];
return categories;
}
@ -33,5 +33,5 @@ export class VirtualBoxConfigurationService{
"Paravirtualized Network (virtio-net)"];
return networkTypes;
}
}
}

14
src/app/services/vmware-configuration.service.ts
View File

@ -7,8 +7,8 @@ export class VmwareConfigurationService{
}
getOnCloseoptions() {
let onCloseOptions = [["Power off the VM", "power_off"],
["Send the shutdown signal (ACPI)", "shutdown_signal"],
let onCloseOptions = [["Power off the VM", "power_off"],
["Send the shutdown signal (ACPI)", "shutdown_signal"],
["Save the VM state", "save_vm_state"]];
return onCloseOptions;
@ -16,10 +16,10 @@ export class VmwareConfigurationService{
getCategories() {
let categories = [["Default", "guest"],
["Routers", "routers"],
["Switches", "switches"],
["End devices", "end_devices"],
["Security devices", "security_devices"]];
["Routers", "router"],
["Switches", "switch"],
["End devices", "guest"],
["Security devices", "firewall"]];
return categories;
}
@ -35,5 +35,5 @@ export class VmwareConfigurationService{
"vmxnet3"];
return networkTypes;
}
}
}

8
src/app/services/vpcs-configuration.service.ts
View File

@ -8,10 +8,10 @@ export class VpcsConfigurationService {
getCategories(){
let categories = [["Default", "guest"],
["Routers", "routers"],
["Switches", "switches"],
["End devices", "end_devices"],
["Security devices", "security_devices"]];
["Routers", "router"],
["Switches", "switch"],
["End devices", "guest"],
["Security devices", "firewall"]];
return categories;
}