From 47c141d17e2a1be206788a74f6ef9b2e494f9b8f Mon Sep 17 00:00:00 2001 From: Jannik Schönartz Date: Mon, 22 Apr 2019 23:24:22 +0000 Subject: [webapp/ipxeBuilder] Change expansion-panels to tabs --- webapp/src/components/IpxeBuilderModule.vue | 4 +- webapp/src/components/IpxeBuilderModuleConfig.vue | 118 +++++++++------------- 2 files changed, 50 insertions(+), 72 deletions(-) (limited to 'webapp') diff --git a/webapp/src/components/IpxeBuilderModule.vue b/webapp/src/components/IpxeBuilderModule.vue index 2cd6eaf..f72e6ef 100644 --- a/webapp/src/components/IpxeBuilderModule.vue +++ b/webapp/src/components/IpxeBuilderModule.vue @@ -23,10 +23,10 @@ - + - + diff --git a/webapp/src/components/IpxeBuilderModuleConfig.vue b/webapp/src/components/IpxeBuilderModuleConfig.vue index 6454d41..638de2d 100644 --- a/webapp/src/components/IpxeBuilderModuleConfig.vue +++ b/webapp/src/components/IpxeBuilderModuleConfig.vue @@ -15,6 +15,7 @@ "general": "general.h", "generalSaved": "general.h saved successfully", "ipxe": "iPXE", + "scripts": "Scripts", "script": "Embedded script (EMBED=)", "scriptSaved": "Embedded script saved successfully", "scrollDown": "Go to the bottom", @@ -34,6 +35,7 @@ "efi": "EFI", "general": "general.h", "generalSaved": "general.h wurde erfolgreich gespeichert", + "scripts": "Skripte", "ipxe": "iPXE", "script": "Eingebettetes Skript (EMBED=)", "scriptSaved": "Eingebettetes Skript wurde erfolgreich gespeichert", @@ -77,70 +79,61 @@ cancel{{ $t('cancelIpxe') }} gavel{{ $t('buildIpxe') }} - - - + {{ $t('scripts') }} + + + description{{ $t('script') }} + description{{ $t('trust') }} + description{{ $t('general') }} + description{{ $t('console') }} + + + +
{{ $t('script') }}
+
+ undo{{ $t('undo') }} + redo{{ $t('redo') }} + save{{ $t('save') }} +
- -
- undo{{ $t('undo') }} - redo{{ $t('redo') }} - save{{ $t('save') }} -
-
-
- - - - +
+
{{ $t('trust') }}
+
+ undo{{ $t('undo') }} + redo{{ $t('redo') }} + save{{ $t('save') }} +
- -
- undo{{ $t('undo') }} - redo{{ $t('redo') }} - save{{ $t('save') }} -
- - - - - - +
+
{{ $t('general') }}
+
+ undo{{ $t('undo') }} + redo{{ $t('redo') }} + save{{ $t('save') }} +
- -
- undo{{ $t('undo') }} - redo{{ $t('redo') }} - save{{ $t('save') }} -
- - - - - - +
+
{{ $t('console') }}
+
+ undo{{ $t('undo') }} + redo{{ $t('redo') }} + save{{ $t('save') }} +
- -
- undo{{ $t('undo') }} - redo{{ $t('redo') }} - save{{ $t('save') }} -
- - - +
+
@@ -160,10 +153,6 @@ export default { certificate: '', general: '', console: '', - scriptExpanded: null, - certificateExpanded: null, - generalExpanded: null, - consoleExpanded: null, log: [], disableButtons: false, autoscroll: true @@ -172,24 +161,6 @@ export default { computed: { ...mapGetters(['tabsDark', 'tabsColor', 'tabsSliderColor']) }, - watch: { - scriptExpanded: async function () { - await this.$nextTick() - if (this.scriptExpanded === 0) this.$refs.script.refresh() - }, - certificateExpanded: async function () { - await this.$nextTick() - if (this.certificateExpanded === 0) this.$refs.certificate.refresh() - }, - generalExpanded: async function () { - await this.$nextTick() - if (this.generalExpanded === 0) this.$refs.general.refresh() - }, - consoleExpanded: async function () { - await this.$nextTick() - if (this.consoleExpanded === 0) this.$refs.console.refresh() - } - }, methods: { save (apiPath) { axios.put('/api/ipxe/' + this.ipxeVersion + '/' + apiPath, { data: this[apiPath] }).then(result => { @@ -292,4 +263,11 @@ export default { height: 588px; overflow: auto; } + + .script-editor >>> .CodeMirror { + height: calc(90vh - 160px); + } + .subtabs { + z-index: 1; + } -- cgit v1.2.3-55-g7522