summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey V.Kosteltsev <AKosteltsev@IBS.RU>2022-06-26 12:34:06 +0300
committerAndrey V.Kosteltsev <AKosteltsev@IBS.RU>2022-06-26 12:34:06 +0300
commit492a211859545e356e20d1872f2d135d4ca48da2 (patch)
treeb004b9096bf692b7c9ab30529bd0cfa764544e2b
parent874e0784b47dbd817d503603ab4064fb93ceb6d4 (diff)
downloadopenbmc-492a211859545e356e20d1872f2d135d4ca48da2.tar.xz
WEBUI: redesign patches for virtual-media and firmware pages
-rw-r--r--meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0010-virtual-media-layout-and-styles.patch101
-rw-r--r--meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0011-firmware-buttons-layout.patch38
2 files changed, 77 insertions, 62 deletions
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0010-virtual-media-layout-and-styles.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0010-virtual-media-layout-and-styles.patch
index 49c76fe928..6039c71dca 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0010-virtual-media-layout-and-styles.patch
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0010-virtual-media-layout-and-styles.patch
@@ -1,17 +1,17 @@
-From 0d00cabf1c7ddd8021ca71efb83545112aab055e Mon Sep 17 00:00:00 2001
+From ed8b6c17c671cc8bf3e7b0c1c70cbdbc2fca6647 Mon Sep 17 00:00:00 2001
From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU>
-Date: Sat, 25 Jun 2022 00:39:23 +0300
-Subject: [PATCH] virtual-media: layout and styles
+Date: Sun, 26 Jun 2022 12:10:08 +0300
+Subject: [PATCH 1/2] virtual-media: layout and styles
---
src/assets/styles/bmc/custom/_index.scss | 3 +-
- .../styles/bmc/custom/_virtual-media.scss | 36 +++++
- .../Operations/VirtualMedia/VirtualMedia.vue | 126 ++++++++++--------
- 3 files changed, 106 insertions(+), 59 deletions(-)
- create mode 100644 src/assets/styles/bmc/custom/_virtual-media.scss
+ .../styles/bmc/custom/ibs/_virtual-media.scss | 47 +++++++
+ .../Operations/VirtualMedia/VirtualMedia.vue | 130 ++++++++++--------
+ 3 files changed, 121 insertions(+), 59 deletions(-)
+ create mode 100644 src/assets/styles/bmc/custom/ibs/_virtual-media.scss
diff --git a/src/assets/styles/bmc/custom/_index.scss b/src/assets/styles/bmc/custom/_index.scss
-index 74594e35..eb466c4b 100644
+index 74594e35..bc05a82a 100644
--- a/src/assets/styles/bmc/custom/_index.scss
+++ b/src/assets/styles/bmc/custom/_index.scss
@@ -15,4 +15,5 @@
@@ -21,13 +21,13 @@ index 74594e35..eb466c4b 100644
-@import "./toasts";
\ No newline at end of file
+@import "./toasts";
-+@import "./virtual-media";
-diff --git a/src/assets/styles/bmc/custom/_virtual-media.scss b/src/assets/styles/bmc/custom/_virtual-media.scss
++@import "./ibs/virtual-media";
+diff --git a/src/assets/styles/bmc/custom/ibs/_virtual-media.scss b/src/assets/styles/bmc/custom/ibs/_virtual-media.scss
new file mode 100644
-index 00000000..b040fbaa
+index 00000000..865a3c39
--- /dev/null
-+++ b/src/assets/styles/bmc/custom/_virtual-media.scss
-@@ -0,0 +1,36 @@
++++ b/src/assets/styles/bmc/custom/ibs/_virtual-media.scss
+@@ -0,0 +1,47 @@
+
+//
+// Media
@@ -52,20 +52,31 @@ index 00000000..b040fbaa
+//
+// Media Legacy
+//
++.media-legacy label {
++ margin-top: $spacer * 2;
++}
++
+.media-legacy-buttons-group {
-+ display: inline-grid;
++ margin: 0px;
++}
++
++.media-legacy-buttons-group .btn {
++ width: 100%;
+}
+
-+.media-legacy-buttons-group > button {
++.media-legacy-buttons-group > .media-legacy-configure {
++ display: block;
++ width: 50%;
+ margin-bottom: $spacer * 2;
+}
+
-+.media-legacy > div {
-+ margin-top: $spacer * 2;
++.media-legacy-buttons-group > .media-legacy-start {
++ display: inline-block;
++ width: 50%;
+ margin-bottom: - $spacer * 2;
+}
diff --git a/src/views/Operations/VirtualMedia/VirtualMedia.vue b/src/views/Operations/VirtualMedia/VirtualMedia.vue
-index 8a3d5add..19f425d9 100644
+index 8a3d5add..fc8369d4 100644
--- a/src/views/Operations/VirtualMedia/VirtualMedia.vue
+++ b/src/views/Operations/VirtualMedia/VirtualMedia.vue
@@ -8,35 +8,41 @@
@@ -139,7 +150,7 @@ index 8a3d5add..19f425d9 100644
</b-col>
</b-row>
</page-section>
-@@ -53,37 +59,41 @@
+@@ -53,37 +59,45 @@
:key="$index"
md="6"
>
@@ -161,13 +172,15 @@ index 8a3d5add..19f425d9 100644
- {{ $t('pageVirtualMedia.configureConnection') }}
- </b-button>
+ <div class="media-legacy-buttons-group">
-+ <b-button
-+ variant="primary"
-+ :disabled="device.isActive"
-+ @click="configureConnection(device)"
-+ >
-+ {{ $t('pageVirtualMedia.configureConnection') }}
-+ </b-button>
++ <div class="media-legacy-configure">
++ <b-button
++ variant="primary"
++ :disabled="device.isActive"
++ @click="configureConnection(device)"
++ >
++ {{ $t('pageVirtualMedia.configureConnection') }}
++ </b-button>
++ </div>
- <b-button
- v-if="!device.isActive"
@@ -187,23 +200,25 @@ index 8a3d5add..19f425d9 100644
- {{ $t('pageVirtualMedia.stop') }}
- </b-button>
- </b-form-group>
-+ <b-button
-+ v-if="!device.isActive"
-+ variant="primary"
-+ class="float-right"
-+ :disabled="!device.serverUri"
-+ @click="startLegacy(device)"
-+ >
-+ {{ $t('pageVirtualMedia.start') }}
-+ </b-button>
-+ <b-button
-+ v-if="device.isActive"
-+ variant="primary"
-+ class="float-right"
-+ @click="stopLegacy(device)"
-+ >
-+ {{ $t('pageVirtualMedia.stop') }}
-+ </b-button>
++ <div class="media-legacy-start">
++ <b-button
++ v-if="!device.isActive"
++ variant="primary"
++ class="float-right"
++ :disabled="!device.serverUri"
++ @click="startLegacy(device)"
++ >
++ {{ $t('pageVirtualMedia.start') }}
++ </b-button>
++ <b-button
++ v-if="device.isActive"
++ variant="primary"
++ class="float-right"
++ @click="stopLegacy(device)"
++ >
++ {{ $t('pageVirtualMedia.stop') }}
++ </b-button>
++ </div>
+ </div>
+ </b-form-group>
+ </div>
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0011-firmware-buttons-layout.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0011-firmware-buttons-layout.patch
index 854ef42966..0c27a6eb82 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0011-firmware-buttons-layout.patch
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0011-firmware-buttons-layout.patch
@@ -1,20 +1,29 @@
-From 7cc49b087849cf885382e434f844b99ca4da96a8 Mon Sep 17 00:00:00 2001
+From 8c17b6afbd107c12802c79890789366d0deda5ec Mon Sep 17 00:00:00 2001
From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU>
-Date: Sat, 25 Jun 2022 02:17:06 +0300
-Subject: [PATCH] firmware: buttons layout
+Date: Sun, 26 Jun 2022 12:12:55 +0300
+Subject: [PATCH 2/2] firmware: buttons layout
---
- src/assets/styles/bmc/custom/_firmware.scss | 11 +++++++++++
- src/assets/styles/bmc/custom/_index.scss | 1 +
- src/views/Operations/Firmware/Firmware.vue | 12 +++++++-----
+ src/assets/styles/bmc/custom/_index.scss | 1 +
+ src/assets/styles/bmc/custom/ibs/_firmware.scss | 11 +++++++++++
+ src/views/Operations/Firmware/Firmware.vue | 12 +++++++-----
3 files changed, 19 insertions(+), 5 deletions(-)
- create mode 100644 src/assets/styles/bmc/custom/_firmware.scss
+ create mode 100644 src/assets/styles/bmc/custom/ibs/_firmware.scss
-diff --git a/src/assets/styles/bmc/custom/_firmware.scss b/src/assets/styles/bmc/custom/_firmware.scss
+diff --git a/src/assets/styles/bmc/custom/_index.scss b/src/assets/styles/bmc/custom/_index.scss
+index bc05a82a..5fb98f6e 100644
+--- a/src/assets/styles/bmc/custom/_index.scss
++++ b/src/assets/styles/bmc/custom/_index.scss
+@@ -17,3 +17,4 @@
+ @import "./tables";
+ @import "./toasts";
+ @import "./ibs/virtual-media";
++@import "./ibs/firmware";
+diff --git a/src/assets/styles/bmc/custom/ibs/_firmware.scss b/src/assets/styles/bmc/custom/ibs/_firmware.scss
new file mode 100644
-index 00000000..8a37efb9
+index 00000000..605a63e5
--- /dev/null
-+++ b/src/assets/styles/bmc/custom/_firmware.scss
++++ b/src/assets/styles/bmc/custom/ibs/_firmware.scss
@@ -0,0 +1,11 @@
+
+//
@@ -27,15 +36,6 @@ index 00000000..8a37efb9
+.firmware-update .form-background {
+ padding: $spacer * 2 !important;
+}
-diff --git a/src/assets/styles/bmc/custom/_index.scss b/src/assets/styles/bmc/custom/_index.scss
-index eb466c4b..87223c45 100644
---- a/src/assets/styles/bmc/custom/_index.scss
-+++ b/src/assets/styles/bmc/custom/_index.scss
-@@ -17,3 +17,4 @@
- @import "./tables";
- @import "./toasts";
- @import "./virtual-media";
-+@import "./firmware";
diff --git a/src/views/Operations/Firmware/Firmware.vue b/src/views/Operations/Firmware/Firmware.vue
index a2acb9b0..b4024323 100644
--- a/src/views/Operations/Firmware/Firmware.vue