From c6141d8aba461e2ff7851087c5801fa2cd156265 Mon Sep 17 00:00:00 2001 From: Jannik Schönartz Date: Sun, 5 May 2019 20:58:34 +0000 Subject: [ipxe builder] Merge efi and bios ipxe builder to one tab & add parameters ui [server] Remove all req, res from the shell.js library Add ipxe config for the build parameters & parameter list Add api getter/setter methods for the ipxe config [webapp] Add ui for repository, branch and build targets Output: All of the scroll to bottom is now clickable --- webapp/src/components/IpxeBuilderModule.vue | 18 +- webapp/src/components/IpxeBuilderModuleConfig.vue | 224 +++++++++++++++++++--- 2 files changed, 203 insertions(+), 39 deletions(-) (limited to 'webapp') diff --git a/webapp/src/components/IpxeBuilderModule.vue b/webapp/src/components/IpxeBuilderModule.vue index f72e6ef..e2c38ff 100644 --- a/webapp/src/components/IpxeBuilderModule.vue +++ b/webapp/src/components/IpxeBuilderModule.vue @@ -1,12 +1,10 @@ { "en": { - "efi": "EFI", - "bios": "BIOS" + "ipxe": "iPXE" }, "de": { - "efi": "EFI", - "bios": "BIOS" + "ipxe": "iPXE" } } @@ -16,20 +14,14 @@ - - memory{{ $t('efi') }} - memory{{ $t('bios') }} + + memory{{ $t('ipxe') }} - - - - - + - diff --git a/webapp/src/components/IpxeBuilderModuleConfig.vue b/webapp/src/components/IpxeBuilderModuleConfig.vue index 638de2d..230e82a 100644 --- a/webapp/src/components/IpxeBuilderModuleConfig.vue +++ b/webapp/src/components/IpxeBuilderModuleConfig.vue @@ -3,8 +3,10 @@ "en": { "alreadyBuiling": "The iPXE building process not finished", "bios": "BIOS", + "branchName": "Branch Name", "buildingIpxe": "Building iPXE ...", "buildIpxe": "Build iPXE", + "buildTargetsLabel": "Build Targets", "cancelIpxe": "Cancel iPXE", "certificateSaved": "Certificate saved successfully", "cleaningIpxe": "Cleaning iPXE ...", @@ -15,8 +17,11 @@ "general": "general.h", "generalSaved": "general.h saved successfully", "ipxe": "iPXE", - "scripts": "Scripts", + "output": "Output", + "parameters": "Parameters", + "repoUrl": "Repository URL", "script": "Embedded script (EMBED=)", + "scripts": "Scripts", "scriptSaved": "Embedded script saved successfully", "scrollDown": "Go to the bottom", "trust": "Embedded certificate (TRUST=)" @@ -24,8 +29,10 @@ "de": { "alreadyBuiling": "Der iPXE build-Prozess ist noch nicht abgeschlossen", "bios": "BIOS", + "branchName": "Branch Name", "buildingIpxe": "iPXE wird gebaut ...", "buildIpxe": "iPXE bauen", + "buildTargetsLabel": "Build Targets", "cancelIpxe": "iPXE stoppen", "certificateSaved": "Zertifikat wurde erfolgreich gespeichert", "console": "console.h", @@ -35,9 +42,12 @@ "efi": "EFI", "general": "general.h", "generalSaved": "general.h wurde erfolgreich gespeichert", - "scripts": "Skripte", "ipxe": "iPXE", + "output": "Output", + "parameters": "Parameter", + "repoUrl": "Repository URL", "script": "Eingebettetes Skript (EMBED=)", + "scripts": "Skripte", "scriptSaved": "Eingebettetes Skript wurde erfolgreich gespeichert", "scrollDown": "Gehe nach unten", "trust": "Eingebettetes Zertifikat (TRUST=)" @@ -47,8 +57,116 @@