diff options
| author | Andrey V.Kosteltsev <AKosteltsev@IBS.RU> | 2022-07-05 01:00:31 +0300 |
|---|---|---|
| committer | Andrey V.Kosteltsev <AKosteltsev@IBS.RU> | 2022-07-05 01:00:31 +0300 |
| commit | cc58736600ef087e534e9145f60814d620625a48 (patch) | |
| tree | 216119f1d578896bcffa6ce8709f2919f6eaed4b | |
| parent | 2c1aa192177770d84e07caccd269d8313f7fbe49 (diff) | |
| download | openbmc-cc58736600ef087e534e9145f60814d620625a48.tar.xz | |
WEBUI: Use _ibs ENV instead patches
29 files changed, 27 insertions, 2222 deletions
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0001-IBS-html-head-title.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0001-IBS-html-head-title.patch new file mode 100644 index 0000000000..2a7ad2ff53 --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0001-IBS-html-head-title.patch @@ -0,0 +1,25 @@ +From 0ab1a183e33a04e8ea1f6a5dc6702387bfc48eff Mon Sep 17 00:00:00 2001 +From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> +Date: Tue, 5 Jul 2022 00:28:39 +0300 +Subject: [PATCH] IBS: html head title + +--- + public/index.html | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/public/index.html b/public/index.html +index c355ece4..980fa394 100644 +--- a/public/index.html ++++ b/public/index.html +@@ -6,7 +6,7 @@ + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width,initial-scale=1.0"> + <link rel="icon" href="<%= BASE_URL %>favicon.ico"> +- <title>OpenBMC Web UI</title> ++ <title>BMC Web UI</title> + </head> + <body> + <noscript> +-- +2.35.1 + diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0001-Set-login-brand.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0001-Set-login-brand.patch deleted file mode 100644 index b1616ed833..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0001-Set-login-brand.patch +++ /dev/null @@ -1,85 +0,0 @@ -From c3455f6270c9434c61bddfda7e64a1ac1d50bfdc Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Tue, 28 Jun 2022 07:07:41 +0300 -Subject: [PATCH] Set login brand - ---- - src/layouts/LoginLayout.vue | 26 ++++++++++++++++++++------ - 1 file changed, 20 insertions(+), 6 deletions(-) - -diff --git a/src/layouts/LoginLayout.vue b/src/layouts/LoginLayout.vue -index cdff2040..20d123be 100644 ---- a/src/layouts/LoginLayout.vue -+++ b/src/layouts/LoginLayout.vue -@@ -2,10 +2,17 @@ - <main> - <div class="login-container"> - <div class="login-main"> -+ <div class="login-main__logo-vector"> -+ <img -+ height="100%" -+ src="@/assets/images/login-main-vector.svg" -+ alt="SILA" -+ /> -+ </div> - <div> - <div class="login-brand mb-5"> - <img -- width="90px" -+ width="60%" - src="@/assets/images/login-company-logo.svg" - :alt="altLogo" - /> -@@ -22,8 +29,8 @@ - </div> - <div class="login-aside__logo-bmc"> - <img -- height="60px" -- src="@/assets/images/built-on-openbmc-logo.svg" -+ height="32px" -+ src="@/assets/images/login-aside-vector.svg" - alt="Built on OpenBMC" - /> - </div> -@@ -50,7 +57,6 @@ export default { - display: flex; - flex-direction: column; - gap: $spacer * 2; -- max-width: 1400px; - min-width: 320px; - min-height: 100vh; - justify-content: space-around; -@@ -76,8 +82,16 @@ export default { - } - } - -+.login-main__logo-vector { -+ position: absolute; -+ top: 0; -+ left: 0; -+ height: $spacer * 3; -+} -+ - .login-form { - @include media-breakpoint-up('md') { -+ width: 360px; - max-width: 360px; - } - } -@@ -88,11 +102,11 @@ export default { - justify-content: flex-end; - gap: $spacer * 1.5; - margin-right: $spacer * 3; -- margin-bottom: $spacer; -+ margin-bottom: $spacer * 3; - - @include media-breakpoint-up('md') { - min-height: 100vh; -- padding-bottom: $spacer; -+ padding-bottom: $spacer * 3; - flex: 1 1 25%; - margin-bottom: 0; - } --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0002-Login-languages-list.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0002-Login-languages-list.patch deleted file mode 100644 index c10d20d31e..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0002-Login-languages-list.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 38bafe7371b2bd0fa14cbc5be7d7ca658ecaf2af Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Fri, 10 Jun 2022 07:53:17 +0300 -Subject: [PATCH 2/2] Login languages list - ---- - src/views/Login/Login.vue | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue -index 8d96573..bd79d09 100644 ---- a/src/views/Login/Login.vue -+++ b/src/views/Login/Login.vue -@@ -86,10 +86,6 @@ export default { - value: 'en-US', - text: 'English', - }, -- { -- value: 'es', -- text: 'Español', -- }, - { - value: 'ru-RU', - text: 'Русский', --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0003-GlobalStore-Trim-assetTag-and-serialNumber.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0003-GlobalStore-Trim-assetTag-and-serialNumber.patch deleted file mode 100644 index 59ff3c8976..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0003-GlobalStore-Trim-assetTag-and-serialNumber.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f52609d851d02a55f2791d7faf822672bcaf445d Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Sat, 11 Jun 2022 11:19:26 +0300 -Subject: [PATCH] GlobalStore: Trim assetTag and serialNumber - ---- - src/store/modules/GlobalStore.js | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/src/store/modules/GlobalStore.js b/src/store/modules/GlobalStore.js -index 95d7a083..49283b03 100644 ---- a/src/store/modules/GlobalStore.js -+++ b/src/store/modules/GlobalStore.js -@@ -95,8 +95,19 @@ const GlobalStore = { - Status: { State } = {}, - }, - } = {}) => { -- commit('setAssetTag', AssetTag); -- commit('setSerialNumber', SerialNumber); -+ /* -+ Trim AssetTag and SerialNumber -+ */ -+ var s, tag, srn; -+ -+ s = AssetTag; -+ tag = s.replace(/\./g, ' ').trim(); -+ -+ s = SerialNumber; -+ srn = s.replace(/\./g, ' ').trim(); -+ -+ commit('setAssetTag', tag); -+ commit('setSerialNumber', srn); - commit('setModelType', Model); - if (State === 'Quiesced' || State === 'InTest') { - // OpenBMC's host state interface is mapped to 2 Redfish --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0004-main-padding-right-when-media-gt-992px.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0004-main-padding-right-when-media-gt-992px.patch deleted file mode 100644 index b25c01d24c..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0004-main-padding-right-when-media-gt-992px.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a33293455d1a5a7fbb74c14419a4c58a1bbf808a Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Sun, 12 Jun 2022 06:05:38 +0300 -Subject: [PATCH 1/2] main: padding-right when media gt 992px - ---- - src/components/Global/PageContainer.vue | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/components/Global/PageContainer.vue b/src/components/Global/PageContainer.vue -index ab4adb63..f598be7b 100644 ---- a/src/components/Global/PageContainer.vue -+++ b/src/components/Global/PageContainer.vue -@@ -32,6 +32,7 @@ main { - - @include media-breakpoint-up($responsive-layout-bp) { - padding-left: $spacer * 2; -+ padding-right: $spacer * 2; - } - } - </style> --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0005-ButtonBackToTop-alignment.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0005-ButtonBackToTop-alignment.patch deleted file mode 100644 index 1cd3147ce8..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0005-ButtonBackToTop-alignment.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 47310669da5de88f9beef863aa944240f84a4ecf Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Wed, 22 Jun 2022 11:46:27 +0300 -Subject: [PATCH] ButtonBackToTop alignment - ---- - src/components/Global/ButtonBackToTop.vue | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/components/Global/ButtonBackToTop.vue b/src/components/Global/ButtonBackToTop.vue -index 9160c7b7..26c3688b 100644 ---- a/src/components/Global/ButtonBackToTop.vue -+++ b/src/components/Global/ButtonBackToTop.vue -@@ -47,8 +47,8 @@ export default { - <style lang="scss" scoped> - .btn-top { - position: fixed; -- bottom: 24px; -- right: 24px; -+ bottom: $spacer; -+ right: $spacer * 2; - - box-shadow: $box-shadow; - visibility: hidden; -@@ -56,9 +56,9 @@ export default { - transition: $transition-base; - z-index: $zindex-fixed; - -- @media (min-width: 1600px) { -- left: 1485px; -- right: auto; -+ @include media-breakpoint-up($responsive-layout-bp) { -+ left: auto; -+ right: $spacer * 3; - } - } - .show-btn { --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0006-AppLayout-app-content-overflow.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0006-AppLayout-app-content-overflow.patch deleted file mode 100644 index f79b9ffd74..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0006-AppLayout-app-content-overflow.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ccfd9a235b40b0eee364a72458c0e9a82c8e51ce Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Wed, 22 Jun 2022 14:16:57 +0300 -Subject: [PATCH] AppLayout app-content overflow - ---- - src/layouts/AppLayout.vue | 1 + - 1 file changed, 1 insertions(+), 0 deletion(-) - -diff --git a/src/layouts/AppLayout.vue b/src/layouts/AppLayout.vue -index 0b78e5b1..43980111 100644 ---- a/src/layouts/AppLayout.vue -+++ b/src/layouts/AppLayout.vue -@@ -87,5 +87,6 @@ export default { - .app-content { - grid-area: content; - background-color: $white; -+ overflow-x: auto; - } - </style> --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0007-bootstrap-grid-for-large-media.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0007-bootstrap-grid-for-large-media.patch deleted file mode 100644 index 05fdeee349..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0007-bootstrap-grid-for-large-media.patch +++ /dev/null @@ -1,43 +0,0 @@ -From cddad628770eab2acabee70eb7e868dde36ac9dc Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Fri, 24 Jun 2022 15:22:27 +0300 -Subject: [PATCH] bootstrap: grid for large media - ---- - .../styles/bmc/custom/_bootstrap-grid.scss | 22 ++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -diff --git a/src/assets/styles/bmc/custom/_bootstrap-grid.scss b/src/assets/styles/bmc/custom/_bootstrap-grid.scss -index 7ad7c81b..87332f4b 100644 ---- a/src/assets/styles/bmc/custom/_bootstrap-grid.scss -+++ b/src/assets/styles/bmc/custom/_bootstrap-grid.scss -@@ -5,4 +5,24 @@ - // so the content doesn't center align - // https://bootstrap-vue.org/docs/components/layout#fluid-width-container - margin-left: 0; --} -\ No newline at end of file -+} -+ -+@media (min-width: 1200px) { -+ .container-xl { -+ max-width: unset !important; -+ } -+ .col-md-9, -+ .col-xl-9, -+ .col-xl-10, -+ .col-xl-11 { -+ flex: 0 0 100%; -+ max-width: unset !important; -+ } -+} -+ -+@media (min-width: 768px) { -+ .col-md-9 { -+ flex: 0 0 100%; -+ max-width: unset !important; -+ } -+} --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0008-SOL-96x44-geometry.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0008-SOL-96x44-geometry.patch deleted file mode 100644 index d9515462b7..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0008-SOL-96x44-geometry.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c070e9a2c8a91ec526dc4c80ebf25617192b0902 Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Thu, 23 Jun 2022 03:25:24 +0300 -Subject: [PATCH] SOL: 96x44 geometry - ---- - src/views/Operations/SerialOverLan/SerialOverLanConsole.vue | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/views/Operations/SerialOverLan/SerialOverLanConsole.vue b/src/views/Operations/SerialOverLan/SerialOverLanConsole.vue -index 694083fd..cb462a59 100644 ---- a/src/views/Operations/SerialOverLan/SerialOverLanConsole.vue -+++ b/src/views/Operations/SerialOverLan/SerialOverLanConsole.vue -@@ -98,6 +98,8 @@ export default { - // Refer https://github.com/xtermjs/xterm.js/ for xterm implementation and addons. - - this.term = new Terminal({ -+ cols: 96, -+ rows: 44, - fontSize: 15, - fontFamily: - 'SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace', --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0009-AppHeader-color-nav-trigger-width-wrap.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0009-AppHeader-color-nav-trigger-width-wrap.patch deleted file mode 100644 index aaaf034e49..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0009-AppHeader-color-nav-trigger-width-wrap.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0cb71e2f23c1f153d553396a506c028ce6e7da31 Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Fri, 24 Jun 2022 13:17:05 +0300 -Subject: [PATCH] AppHeader: color, nav-trigger width, wrap - ---- - src/components/AppHeader/AppHeader.vue | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/components/AppHeader/AppHeader.vue b/src/components/AppHeader/AppHeader.vue -index 84e4588f..64fec2f2 100644 ---- a/src/components/AppHeader/AppHeader.vue -+++ b/src/components/AppHeader/AppHeader.vue -@@ -284,7 +284,7 @@ export default { - - .helper-menu { - @include media-breakpoint-down(sm) { -- background-color: gray('800'); -+ background-color: $navbar-color; - width: 100%; - justify-content: flex-end; - -@@ -332,7 +332,7 @@ export default { - - .nav-trigger { - fill: theme-color('light'); -- width: $header-height; -+ width: $header-height * 1.5; - height: $header-height; - transition: none; - display: inline-flex; -@@ -366,6 +366,7 @@ export default { - } - - .navbar-expand { -+ flex-flow: row wrap; - @include media-breakpoint-down(sm) { - flex-flow: wrap; - } --- -2.35.1 - 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 deleted file mode 100644 index c87134e805..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0010-virtual-media-layout-and-styles.patch +++ /dev/null @@ -1,230 +0,0 @@ -From 876007dfcbaa2862058dc3e04a0ecc600ef7720d Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Thu, 30 Jun 2022 06:27:35 +0300 -Subject: [PATCH] virtual-media: layout and styles - ---- - src/assets/styles/bmc/custom/_index.scss | 3 +- - .../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..bc05a82a 100644 ---- a/src/assets/styles/bmc/custom/_index.scss -+++ b/src/assets/styles/bmc/custom/_index.scss -@@ -15,4 +15,5 @@ - @import "./section-divider"; - @import "./sol"; - @import "./tables"; --@import "./toasts"; -\ No newline at end of file -+@import "./toasts"; -+@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..040e57b1 ---- /dev/null -+++ b/src/assets/styles/bmc/custom/ibs/_virtual-media.scss -@@ -0,0 +1,47 @@ -+ -+// -+// Media -+// -+.media-start { -+ margin-top: $spacer * 2; -+} -+ -+.media-buttons-group >.media-start label { -+ width: 100%; -+} -+ -+.media-buttons-group >.media-start .btn { -+ width: 50%; -+} -+ -+.media-buttons-group >.media-stop > .btn { -+ width: 50%; -+} -+ -+ -+// -+// Media Legacy -+// -+.media-legacy label { -+ margin-top: $spacer * 2; -+} -+ -+.media-legacy-buttons-group { -+ margin: 0px; -+} -+ -+.media-legacy-buttons-group .btn { -+ width: 100%; -+} -+ -+.media-legacy-buttons-group > .media-legacy-configure { -+ display: block; -+ width: 50%; -+ margin-bottom: $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..fc8369d4 100644 ---- a/src/views/Operations/VirtualMedia/VirtualMedia.vue -+++ b/src/views/Operations/VirtualMedia/VirtualMedia.vue -@@ -8,35 +8,41 @@ - > - <b-row> - <b-col v-for="(dev, $index) in proxyDevices" :key="$index" md="6"> -- <b-form-group :label="dev.id" label-class="bold"> -- <form-file -- v-if="!dev.isActive" -- :id="concatId(dev.id)" -- v-model="dev.file" -- > -- <template #invalid> -- <b-form-invalid-feedback role="alert"> -- {{ $t('global.form.required') }} -- </b-form-invalid-feedback> -- </template> -- </form-file> -- </b-form-group> -- <b-button -- v-if="!dev.isActive" -- variant="primary" -- :disabled="!dev.file" -- @click="startVM(dev)" -- > -- {{ $t('pageVirtualMedia.start') }} -- </b-button> -- <b-button -- v-if="dev.isActive" -- variant="primary" -- :disabled="!dev.file" -- @click="stopVM(dev)" -- > -- {{ $t('pageVirtualMedia.stop') }} -- </b-button> -+ <div class="media-buttons-group"> -+ <div class="media-start"> -+ <b-form-group :label="dev.id" label-class="bold"> -+ <form-file -+ v-if="!dev.isActive" -+ :id="concatId(dev.id)" -+ v-model="dev.file" -+ > -+ <template #invalid> -+ <b-form-invalid-feedback role="alert"> -+ {{ $t('global.form.required') }} -+ </b-form-invalid-feedback> -+ </template> -+ </form-file> -+ </b-form-group> -+ </div> -+ <div class="media-stop"> -+ <b-button -+ v-if="!dev.isActive" -+ variant="primary" -+ :disabled="!dev.file" -+ @click="startVM(dev)" -+ > -+ {{ $t('pageVirtualMedia.start') }} -+ </b-button> -+ <b-button -+ v-if="dev.isActive" -+ variant="primary" -+ :disabled="!dev.file" -+ @click="stopVM(dev)" -+ > -+ {{ $t('pageVirtualMedia.stop') }} -+ </b-button> -+ </div> -+ </div> - </b-col> - </b-row> - </page-section> -@@ -53,37 +59,45 @@ - :key="$index" - md="6" - > -- <b-form-group -- :label="device.id" -- :label-for="device.id" -- label-class="bold" -- > -- <b-button -- variant="primary" -- :disabled="device.isActive" -- @click="configureConnection(device)" -+ <div class="media-legacy"> -+ <b-form-group -+ :label="device.id" -+ :label-for="device.id" -+ label-class="bold" - > -- {{ $t('pageVirtualMedia.configureConnection') }} -- </b-button> -+ <div class="media-legacy-buttons-group"> -+ <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" -- 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> -- </b-form-group> -+ <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> - </b-col> - </b-row> - </page-section> --- -2.35.1 - 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 deleted file mode 100644 index 3288603c9a..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0011-firmware-buttons-layout.patch +++ /dev/null @@ -1,66 +0,0 @@ -From d1d073607c677569a4056921078c7aaa3ceac229 Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Tue, 28 Jun 2022 08:03:44 +0300 -Subject: [PATCH] firmware: buttons layout - ---- - src/assets/styles/bmc/custom/_index.scss | 1 + - src/assets/styles/bmc/custom/ibs/_firmware.scss | 13 +++++++++++++ - src/views/Operations/Firmware/Firmware.vue | 12 +++++++----- - 3 files changed, 21 insertions(+), 5 deletions(-) - create mode 100644 src/assets/styles/bmc/custom/ibs/_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..de65dc10 ---- /dev/null -+++ b/src/assets/styles/bmc/custom/ibs/_firmware.scss -@@ -0,0 +1,13 @@ -+ -+// -+// Firmware Update: -+// -+.firmware-update .btn, -+.firmware-update label { -+ width: 100%; -+} -+.firmware-update .form-background { -+ padding: $spacer * 2 !important; -+ border-radius: $border-radius; -+ background-color: $surface-secondary !important; -+} -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 -+++ b/src/views/Operations/Firmware/Firmware.vue -@@ -23,11 +23,13 @@ - > - <b-row> - <b-col sm="8" md="6" xl="4"> -- <!-- Update form --> -- <form-update -- :is-server-off="isServerOff" -- :is-page-disabled="isPageDisabled" -- /> -+ <div class="firmware-update"> -+ <!-- Update form --> -+ <form-update -+ :is-server-off="isServerOff" -+ :is-page-disabled="isPageDisabled" -+ /> -+ </div> - </b-col> - </b-row> - </page-section> --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0012-inventory-service-indicators.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0012-inventory-service-indicators.patch deleted file mode 100644 index 5315cb348a..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0012-inventory-service-indicators.patch +++ /dev/null @@ -1,54 +0,0 @@ -From db9f3b648d1ca6d385776a0bc58a2e75ee94f41e Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Tue, 28 Jun 2022 10:40:25 +0300 -Subject: [PATCH] inventory: service indicators - ---- - src/assets/styles/bmc/custom/_index.scss | 1 + - src/assets/styles/bmc/custom/ibs/_inventory.scss | 9 +++++++++ - src/views/HardwareStatus/Inventory/Inventory.vue | 4 +++- - 3 files changed, 13 insertions(+), 1 deletion(-) - create mode 100644 src/assets/styles/bmc/custom/ibs/_inventory.scss - -diff --git a/src/assets/styles/bmc/custom/_index.scss b/src/assets/styles/bmc/custom/_index.scss -index 5fb98f6e..85a93356 100644 ---- a/src/assets/styles/bmc/custom/_index.scss -+++ b/src/assets/styles/bmc/custom/_index.scss -@@ -18,3 +18,4 @@ - @import "./toasts"; - @import "./ibs/virtual-media"; - @import "./ibs/firmware"; -+@import "./ibs/inventory"; -diff --git a/src/assets/styles/bmc/custom/ibs/_inventory.scss b/src/assets/styles/bmc/custom/ibs/_inventory.scss -new file mode 100644 -index 00000000..6f065ad4 ---- /dev/null -+++ b/src/assets/styles/bmc/custom/ibs/_inventory.scss -@@ -0,0 +1,9 @@ -+ -+// -+// Service Indicators: -+// -+.service-indicators .form-background { -+ padding: $spacer * 2 !important; -+ border-radius: $border-radius; -+ background-color: $surface-secondary !important; -+} -diff --git a/src/views/HardwareStatus/Inventory/Inventory.vue b/src/views/HardwareStatus/Inventory/Inventory.vue -index fcdbf8d2..0cc542e7 100644 ---- a/src/views/HardwareStatus/Inventory/Inventory.vue -+++ b/src/views/HardwareStatus/Inventory/Inventory.vue -@@ -3,7 +3,9 @@ - <page-title /> - - <!-- Service indicators --> -- <service-indicator /> -+ <div class="service-indicators"> -+ <service-indicator /> -+ </div> - - <!-- Quicklinks section --> - <page-section :section-title="$t('pageInventory.quicklinkTitle')"> --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0013-power-operations-boot-settings.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0013-power-operations-boot-settings.patch deleted file mode 100644 index 04b0698c53..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0013-power-operations-boot-settings.patch +++ /dev/null @@ -1,62 +0,0 @@ -From e8efe44db456a2f271c2aa398241ed48ee2ba192 Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Tue, 28 Jun 2022 11:15:37 +0300 -Subject: [PATCH] power operations: boot settings - ---- - src/assets/styles/bmc/custom/_index.scss | 1 + - .../styles/bmc/custom/ibs/_power-operations.scss | 9 +++++++++ - .../ServerPowerOperations/ServerPowerOperations.vue | 12 +++++++----- - 3 files changed, 17 insertions(+), 5 deletions(-) - create mode 100644 src/assets/styles/bmc/custom/ibs/_power-operations.scss - -diff --git a/src/assets/styles/bmc/custom/_index.scss b/src/assets/styles/bmc/custom/_index.scss -index 85a93356..2be710cc 100644 ---- a/src/assets/styles/bmc/custom/_index.scss -+++ b/src/assets/styles/bmc/custom/_index.scss -@@ -19,3 +19,4 @@ - @import "./ibs/virtual-media"; - @import "./ibs/firmware"; - @import "./ibs/inventory"; -+@import "./ibs/power-operations"; -diff --git a/src/assets/styles/bmc/custom/ibs/_power-operations.scss b/src/assets/styles/bmc/custom/ibs/_power-operations.scss -new file mode 100644 -index 00000000..0921323e ---- /dev/null -+++ b/src/assets/styles/bmc/custom/ibs/_power-operations.scss -@@ -0,0 +1,9 @@ -+ -+// -+// Power Operations: -+// -+.boot-settings .form-background { -+ padding: $spacer * 2 $spacer * 2 $spacer !important; -+ border-radius: $border-radius; -+ background-color: $surface-secondary !important; -+} -diff --git a/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue b/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue -index 9e030837..e6b685f4 100644 ---- a/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue -+++ b/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue -@@ -50,11 +50,13 @@ - </b-row> - <b-row> - <b-col v-if="hasBootSourceOptions" sm="8" md="6" xl="4"> -- <page-section -- :section-title="$t('pageServerPowerOperations.serverBootSettings')" -- > -- <boot-settings /> -- </page-section> -+ <div class="boot-settings"> -+ <page-section -+ :section-title="$t('pageServerPowerOperations.serverBootSettings')" -+ > -+ <boot-settings /> -+ </page-section> -+ </div> - </b-col> - <b-col sm="8" md="6" xl="7"> - <page-section --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0014-security-ldap-settings.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0014-security-ldap-settings.patch deleted file mode 100644 index daf85c3539..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0014-security-ldap-settings.patch +++ /dev/null @@ -1,411 +0,0 @@ -From 3826216e8f7a6c11291dde78b437f7554819f7ff Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Tue, 28 Jun 2022 11:56:53 +0300 -Subject: [PATCH] security: ldap settings - ---- - src/assets/styles/bmc/custom/_index.scss | 1 + - .../styles/bmc/custom/ibs/_security.scss | 9 + - src/views/SecurityAndAccess/Ldap/Ldap.vue | 348 +++++++++--------- - 3 files changed, 185 insertions(+), 173 deletions(-) - create mode 100644 src/assets/styles/bmc/custom/ibs/_security.scss - -diff --git a/src/assets/styles/bmc/custom/_index.scss b/src/assets/styles/bmc/custom/_index.scss -index 2be710cc..16170b72 100644 ---- a/src/assets/styles/bmc/custom/_index.scss -+++ b/src/assets/styles/bmc/custom/_index.scss -@@ -20,3 +20,4 @@ - @import "./ibs/firmware"; - @import "./ibs/inventory"; - @import "./ibs/power-operations"; -+@import "./ibs/security"; -diff --git a/src/assets/styles/bmc/custom/ibs/_security.scss b/src/assets/styles/bmc/custom/ibs/_security.scss -new file mode 100644 -index 00000000..45473a53 ---- /dev/null -+++ b/src/assets/styles/bmc/custom/ibs/_security.scss -@@ -0,0 +1,9 @@ -+ -+// -+// Security and Access: -+// -+.ldap-settings .form-background { -+ padding: $spacer * 2 $spacer * 2 $spacer !important; -+ border-radius: $border-radius; -+ background-color: $surface-secondary !important; -+} -diff --git a/src/views/SecurityAndAccess/Ldap/Ldap.vue b/src/views/SecurityAndAccess/Ldap/Ldap.vue -index 1f2108de..b4eba281 100644 ---- a/src/views/SecurityAndAccess/Ldap/Ldap.vue -+++ b/src/views/SecurityAndAccess/Ldap/Ldap.vue -@@ -20,192 +20,194 @@ - </b-form-group> - </b-col> - </b-row> -- <div class="form-background p-3"> -- <b-form-group -- class="m-0" -- :label="$t('pageLdap.ariaLabel.ldapSettings')" -- label-class="sr-only" -- :disabled="!form.ldapAuthenticationEnabled || loading" -- > -- <b-row> -- <b-col md="3" lg="4" xl="3"> -- <b-form-group -- class="mb-4" -- :label="$t('pageLdap.form.secureLdapUsingSsl')" -- > -- <b-form-text id="enable-secure-help-block"> -- {{ $t('pageLdap.form.secureLdapHelper') }} -- </b-form-text> -- <b-form-checkbox -- id="enable-secure-ldap" -- v-model="form.secureLdapEnabled" -- aria-describedby="enable-secure-help-block" -- data-test-id="ldap-checkbox-secureLdapEnabled" -- :disabled=" -- !caCertificateExpiration || !ldapCertificateExpiration -- " -- @change="$v.form.secureLdapEnabled.$touch()" -+ <div class="ldap-settings"> -+ <div class="form-background p-3"> -+ <b-form-group -+ class="m-0" -+ :label="$t('pageLdap.ariaLabel.ldapSettings')" -+ label-class="sr-only" -+ :disabled="!form.ldapAuthenticationEnabled || loading" -+ > -+ <b-row> -+ <b-col md="3" lg="4" xl="3"> -+ <b-form-group -+ class="mb-4" -+ :label="$t('pageLdap.form.secureLdapUsingSsl')" - > -- {{ $t('global.action.enable') }} -- </b-form-checkbox> -- </b-form-group> -- <dl> -- <dt>{{ $t('pageLdap.form.caCertificateValidUntil') }}</dt> -- <dd v-if="caCertificateExpiration"> -- {{ caCertificateExpiration | formatDate }} -- </dd> -- <dd v-else>--</dd> -- <dt>{{ $t('pageLdap.form.ldapCertificateValidUntil') }}</dt> -- <dd v-if="ldapCertificateExpiration"> -- {{ ldapCertificateExpiration | formatDate }} -- </dd> -- <dd v-else>--</dd> -- </dl> -- <b-link -- class="d-inline-block mb-4 m-md-0" -- to="/security-and-access/certificates" -- > -- {{ $t('pageLdap.form.manageSslCertificates') }} -- </b-link> -- </b-col> -- <b-col md="9" lg="8" xl="9"> -- <b-row> -- <b-col> -- <b-form-group :label="$t('pageLdap.form.serviceType')"> -- <b-form-radio -- v-model="form.activeDirectoryEnabled" -- data-test-id="ldap-radio-activeDirectoryEnabled" -- :value="false" -- @change="onChangeServiceType" -- > -- OpenLDAP -- </b-form-radio> -- <b-form-radio -- v-model="form.activeDirectoryEnabled" -- data-test-id="ldap-radio-activeDirectoryEnabled" -- :value="true" -- @change="onChangeServiceType" -+ <b-form-text id="enable-secure-help-block"> -+ {{ $t('pageLdap.form.secureLdapHelper') }} -+ </b-form-text> -+ <b-form-checkbox -+ id="enable-secure-ldap" -+ v-model="form.secureLdapEnabled" -+ aria-describedby="enable-secure-help-block" -+ data-test-id="ldap-checkbox-secureLdapEnabled" -+ :disabled=" -+ !caCertificateExpiration || !ldapCertificateExpiration -+ " -+ @change="$v.form.secureLdapEnabled.$touch()" -+ > -+ {{ $t('global.action.enable') }} -+ </b-form-checkbox> -+ </b-form-group> -+ <dl> -+ <dt>{{ $t('pageLdap.form.caCertificateValidUntil') }}</dt> -+ <dd v-if="caCertificateExpiration"> -+ {{ caCertificateExpiration | formatDate }} -+ </dd> -+ <dd v-else>--</dd> -+ <dt>{{ $t('pageLdap.form.ldapCertificateValidUntil') }}</dt> -+ <dd v-if="ldapCertificateExpiration"> -+ {{ ldapCertificateExpiration | formatDate }} -+ </dd> -+ <dd v-else>--</dd> -+ </dl> -+ <b-link -+ class="d-inline-block mb-4 m-md-0" -+ to="/security-and-access/certificates" -+ > -+ {{ $t('pageLdap.form.manageSslCertificates') }} -+ </b-link> -+ </b-col> -+ <b-col md="9" lg="8" xl="9"> -+ <b-row> -+ <b-col> -+ <b-form-group :label="$t('pageLdap.form.serviceType')"> -+ <b-form-radio -+ v-model="form.activeDirectoryEnabled" -+ data-test-id="ldap-radio-activeDirectoryEnabled" -+ :value="false" -+ @change="onChangeServiceType" -+ > -+ OpenLDAP -+ </b-form-radio> -+ <b-form-radio -+ v-model="form.activeDirectoryEnabled" -+ data-test-id="ldap-radio-activeDirectoryEnabled" -+ :value="true" -+ @change="onChangeServiceType" -+ > -+ Active Directory -+ </b-form-radio> -+ </b-form-group> -+ </b-col> -+ </b-row> -+ <b-row> -+ <b-col sm="6" xl="4"> -+ <b-form-group label-for="server-uri"> -+ <template #label> -+ {{ $t('pageLdap.form.serverUri') }} -+ <info-tooltip -+ :title="$t('pageLdap.form.serverUriTooltip')" -+ /> -+ </template> -+ <b-input-group :prepend="ldapProtocol"> -+ <b-form-input -+ id="server-uri" -+ v-model="form.serverUri" -+ data-test-id="ldap-input-serverUri" -+ :state="getValidationState($v.form.serverUri)" -+ @change="$v.form.serverUri.$touch()" -+ /> -+ <b-form-invalid-feedback role="alert"> -+ {{ $t('global.form.fieldRequired') }} -+ </b-form-invalid-feedback> -+ </b-input-group> -+ </b-form-group> -+ </b-col> -+ <b-col sm="6" xl="4"> -+ <b-form-group -+ :label="$t('pageLdap.form.bindDn')" -+ label-for="bind-dn" - > -- Active Directory -- </b-form-radio> -- </b-form-group> -- </b-col> -- </b-row> -- <b-row> -- <b-col sm="6" xl="4"> -- <b-form-group label-for="server-uri"> -- <template #label> -- {{ $t('pageLdap.form.serverUri') }} -- <info-tooltip -- :title="$t('pageLdap.form.serverUriTooltip')" -- /> -- </template> -- <b-input-group :prepend="ldapProtocol"> - <b-form-input -- id="server-uri" -- v-model="form.serverUri" -- data-test-id="ldap-input-serverUri" -- :state="getValidationState($v.form.serverUri)" -- @change="$v.form.serverUri.$touch()" -+ id="bind-dn" -+ v-model="form.bindDn" -+ data-test-id="ldap-input-bindDn" -+ :state="getValidationState($v.form.bindDn)" -+ @change="$v.form.bindDn.$touch()" - /> - <b-form-invalid-feedback role="alert"> - {{ $t('global.form.fieldRequired') }} - </b-form-invalid-feedback> -- </b-input-group> -- </b-form-group> -- </b-col> -- <b-col sm="6" xl="4"> -- <b-form-group -- :label="$t('pageLdap.form.bindDn')" -- label-for="bind-dn" -- > -- <b-form-input -- id="bind-dn" -- v-model="form.bindDn" -- data-test-id="ldap-input-bindDn" -- :state="getValidationState($v.form.bindDn)" -- @change="$v.form.bindDn.$touch()" -- /> -- <b-form-invalid-feedback role="alert"> -- {{ $t('global.form.fieldRequired') }} -- </b-form-invalid-feedback> -- </b-form-group> -- </b-col> -- <b-col sm="6" xl="4"> -- <b-form-group -- :label="$t('pageLdap.form.bindPassword')" -- label-for="bind-password" -- > -- <input-password-toggle -- data-test-id="ldap-input-togglePassword" -+ </b-form-group> -+ </b-col> -+ <b-col sm="6" xl="4"> -+ <b-form-group -+ :label="$t('pageLdap.form.bindPassword')" -+ label-for="bind-password" -+ > -+ <input-password-toggle -+ data-test-id="ldap-input-togglePassword" -+ > -+ <b-form-input -+ id="bind-password" -+ v-model="form.bindPassword" -+ type="password" -+ :state="getValidationState($v.form.bindPassword)" -+ class="form-control-with-button" -+ @change="$v.form.bindPassword.$touch()" -+ /> -+ <b-form-invalid-feedback role="alert"> -+ {{ $t('global.form.fieldRequired') }} -+ </b-form-invalid-feedback> -+ </input-password-toggle> -+ </b-form-group> -+ </b-col> -+ <b-col sm="6" xl="4"> -+ <b-form-group -+ :label="$t('pageLdap.form.baseDn')" -+ label-for="base-dn" - > - <b-form-input -- id="bind-password" -- v-model="form.bindPassword" -- type="password" -- :state="getValidationState($v.form.bindPassword)" -- class="form-control-with-button" -- @change="$v.form.bindPassword.$touch()" -+ id="base-dn" -+ v-model="form.baseDn" -+ data-test-id="ldap-input-baseDn" -+ :state="getValidationState($v.form.baseDn)" -+ @change="$v.form.baseDn.$touch()" - /> - <b-form-invalid-feedback role="alert"> - {{ $t('global.form.fieldRequired') }} - </b-form-invalid-feedback> -- </input-password-toggle> -- </b-form-group> -- </b-col> -- <b-col sm="6" xl="4"> -- <b-form-group -- :label="$t('pageLdap.form.baseDn')" -- label-for="base-dn" -- > -- <b-form-input -- id="base-dn" -- v-model="form.baseDn" -- data-test-id="ldap-input-baseDn" -- :state="getValidationState($v.form.baseDn)" -- @change="$v.form.baseDn.$touch()" -- /> -- <b-form-invalid-feedback role="alert"> -- {{ $t('global.form.fieldRequired') }} -- </b-form-invalid-feedback> -- </b-form-group> -- </b-col> -- <b-col sm="6" xl="4"> -- <b-form-group label-for="user-id-attribute"> -- <template #label> -- {{ $t('pageLdap.form.userIdAttribute') }} - -- <span class="form-text d-inline"> -- {{ $t('global.form.optional') }} -- </span> -- </template> -- <b-form-input -- id="user-id-attribute" -- v-model="form.userIdAttribute" -- data-test-id="ldap-input-userIdAttribute" -- @change="$v.form.userIdAttribute.$touch()" -- /> -- </b-form-group> -- </b-col> -- <b-col sm="6" xl="4"> -- <b-form-group label-for="group-id-attribute"> -- <template #label> -- {{ $t('pageLdap.form.groupIdAttribute') }} - -- <span class="form-text d-inline"> -- {{ $t('global.form.optional') }} -- </span> -- </template> -- <b-form-input -- id="group-id-attribute" -- v-model="form.groupIdAttribute" -- data-test-id="ldap-input-groupIdAttribute" -- @change="$v.form.groupIdAttribute.$touch()" -- /> -- </b-form-group> -- </b-col> -- </b-row> -- </b-col> -- </b-row> -- </b-form-group> -+ </b-form-group> -+ </b-col> -+ <b-col sm="6" xl="4"> -+ <b-form-group label-for="user-id-attribute"> -+ <template #label> -+ {{ $t('pageLdap.form.userIdAttribute') }} - -+ <span class="form-text d-inline"> -+ {{ $t('global.form.optional') }} -+ </span> -+ </template> -+ <b-form-input -+ id="user-id-attribute" -+ v-model="form.userIdAttribute" -+ data-test-id="ldap-input-userIdAttribute" -+ @change="$v.form.userIdAttribute.$touch()" -+ /> -+ </b-form-group> -+ </b-col> -+ <b-col sm="6" xl="4"> -+ <b-form-group label-for="group-id-attribute"> -+ <template #label> -+ {{ $t('pageLdap.form.groupIdAttribute') }} - -+ <span class="form-text d-inline"> -+ {{ $t('global.form.optional') }} -+ </span> -+ </template> -+ <b-form-input -+ id="group-id-attribute" -+ v-model="form.groupIdAttribute" -+ data-test-id="ldap-input-groupIdAttribute" -+ @change="$v.form.groupIdAttribute.$touch()" -+ /> -+ </b-form-group> -+ </b-col> -+ </b-row> -+ </b-col> -+ </b-row> -+ </b-form-group> -+ </div> - </div> - <b-row class="mt-4 mb-5"> - <b-col> --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0015-Logs-search-alignment.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0015-Logs-search-alignment.patch deleted file mode 100644 index 185a21b78d..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0015-Logs-search-alignment.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 192689b1ea1604ce9a9f42640afd0fb41af7cb76 Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Tue, 28 Jun 2022 19:35:57 +0300 -Subject: [PATCH] Logs: search alignment - ---- - src/views/Logs/EventLogs/EventLogs.vue | 4 ++-- - src/views/Logs/PostCodeLogs/PostCodeLogs.vue | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/views/Logs/EventLogs/EventLogs.vue b/src/views/Logs/EventLogs/EventLogs.vue -index 5b8ca110..e7fc507b 100644 ---- a/src/views/Logs/EventLogs/EventLogs.vue -+++ b/src/views/Logs/EventLogs/EventLogs.vue -@@ -1,8 +1,8 @@ - <template> - <b-container fluid="xl"> - <page-title /> -- <b-row class="align-items-start"> -- <b-col sm="8" xl="6" class="d-sm-flex align-items-end mb-4"> -+ <b-row class="align-items-end"> -+ <b-col sm="8" xl="6" class="d-sm-flex align-items-end"> - <search - :placeholder="$t('pageEventLogs.table.searchLogs')" - data-test-id="eventLogs-input-searchLogs" -diff --git a/src/views/Logs/PostCodeLogs/PostCodeLogs.vue b/src/views/Logs/PostCodeLogs/PostCodeLogs.vue -index d116d2ed..ea3d54ab 100644 ---- a/src/views/Logs/PostCodeLogs/PostCodeLogs.vue -+++ b/src/views/Logs/PostCodeLogs/PostCodeLogs.vue -@@ -1,8 +1,8 @@ - <template> - <b-container fluid="xl"> - <page-title /> -- <b-row class="align-items-start"> -- <b-col sm="8" xl="6" class="d-sm-flex align-items-end mb-4"> -+ <b-row class="align-items-end"> -+ <b-col sm="8" xl="6" class="d-sm-flex align-items-end"> - <search - :placeholder="$t('pagePostCodeLogs.table.searchLogs')" - @change-search="onChangeSearchInput" --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0071-IBS-custom-styles-_alert.scss.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0071-IBS-custom-styles-_alert.scss.patch deleted file mode 100644 index 1f98959558..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0071-IBS-custom-styles-_alert.scss.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 2c38628afd6d5799f47fb3f13faaa1116b9e72e9 Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Mon, 27 Jun 2022 23:16:16 +0300 -Subject: [PATCH 1/7] IBS: custom styles _alert.scss - ---- - src/assets/styles/bmc/custom/_alert.scss | 110 +++++++++++------------ - 1 file changed, 55 insertions(+), 55 deletions(-) - -diff --git a/src/assets/styles/bmc/custom/_alert.scss b/src/assets/styles/bmc/custom/_alert.scss -index 0e78ba64..d85e9127 100644 ---- a/src/assets/styles/bmc/custom/_alert.scss -+++ b/src/assets/styles/bmc/custom/_alert.scss -@@ -1,70 +1,70 @@ - .alert { -- display: flex; -- padding: $spacer; -- border-width: 0 0 0 3px; -- color: gray("800"); -- margin-bottom: $spacer; -+ display: flex; -+ padding: $spacer; -+ border-width: 0 0 0 3px; -+ color: gray("800"); -+ margin-bottom: $spacer; - -- &.small { -- padding: $spacer / 2; -- font-size: 1rem; -- } -+ &.small { -+ padding: $spacer / 2; -+ font-size: 1rem; -+ } - -- .close { -- font-weight: 300; -- opacity: 1; -- } -+ .close { -+ font-weight: 300; -+ opacity: 1; -+ } - -- .alert-icon { -- display: inline-flex; -- align-items: flex-start; -- margin-right: $spacer; -- margin-bottom: $spacer; -+ .alert-icon { -+ display: inline-flex; -+ align-items: flex-start; -+ margin-right: $spacer; -+ margin-bottom: $spacer; - -- @include media-breakpoint-up(sm) { -- margin-bottom: 0; -- } -+ @include media-breakpoint-up(sm) { -+ margin-bottom: 0; - } -+ } - -- .alert-content { -- flex: 1 1 auto; -- } -+ .alert-content { -+ flex: 1 1 auto; -+ } - -- .alert-title { -- margin-bottom: $spacer / 2; -- } -+ .alert-title { -+ margin-bottom: $spacer / 2; -+ } - -- .alert-msg { -- p + p { -- margin-bottom: $spacer; -- } -- -- p:last-of-type { -- margin-bottom: 0; -- } -+ .alert-msg { -+ p + p { -+ margin-bottom: $spacer; - } - -- &.alert-info { -- border-left-color: theme-color("info"); -- background-color: theme-color-light("info"); -- fill: theme-color("info"); -+ p:last-of-type { -+ margin-bottom: 0; - } -+ } - -- &.alert-success { -- border-left-color: theme-color("success"); -- background-color: theme-color-light("success"); -- fill: theme-color("success"); -- } -+ &.alert-info { -+ border-left-color: theme-color("info"); -+ background-color: theme-color-light("info"); -+ fill: theme-color("info"); -+ } - -- &.alert-danger { -- border-left-color: theme-color("danger"); -- background-color: theme-color-light("danger"); -- fill: theme-color("danger"); -- } -+ &.alert-success { -+ border-left-color: theme-color("success"); -+ background-color: theme-color-light("success"); -+ fill: theme-color("success"); -+ } - -- &.alert-warning { -- border-left-color: theme-color("warning"); -- background-color: theme-color-light("warning"); -- fill: theme-color("warning"); -- } -- } -\ No newline at end of file -+ &.alert-danger { -+ border-left-color: theme-color("danger"); -+ background-color: theme-color-light("danger"); -+ fill: theme-color("danger"); -+ } -+ -+ &.alert-warning { -+ border-left-color: theme-color("warning"); -+ background-color: theme-color-light("warning"); -+ fill: theme-color("warning"); -+ } -+} --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0072-IBS-custom-styles-_base.scss.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0072-IBS-custom-styles-_base.scss.patch deleted file mode 100644 index 2498145552..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0072-IBS-custom-styles-_base.scss.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 6198794ce96561b30e95dc28c2d2fa43d8bd1fe8 Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Tue, 28 Jun 2022 19:52:22 +0300 -Subject: [PATCH] IBS: custom styles _base.scss - ---- - src/assets/styles/bmc/custom/_base.scss | 64 ++++++++++++++++--------- - 1 file changed, 42 insertions(+), 22 deletions(-) - -diff --git a/src/assets/styles/bmc/custom/_base.scss b/src/assets/styles/bmc/custom/_base.scss -index c11e046c..53be0328 100644 ---- a/src/assets/styles/bmc/custom/_base.scss -+++ b/src/assets/styles/bmc/custom/_base.scss -@@ -1,50 +1,70 @@ --dt, --legend, --label { -- color: gray("800"); -- font-size: 14px; -- font-weight: 400; -- line-height: 1.4285; --} - - h1, - .h1 { -- font-size: 2.625rem; -- font-weight: 300; -- line-height: 1.238; -+ font-size: 2.25rem !important; -+ font-weight: 500; -+ line-height: 1.2; - } - - h2, - .h2 { -- font-size: 2.25rem; -- font-weight: 300; -- line-height: 1.3333; -+ font-size: 1.5rem !important; -+ font-weight: 500; -+ line-height: 1.2; - } - - h3, - .h3 { -- font-size: 1.75rem; -+ font-size: 1.5rem !important; - font-weight: 400; -- line-height: 1.2857; -+ line-height: 1.2; - } - - h4, - .h4 { -- font-size: 1.25rem; -+ font-size: 1.25rem !important; - font-weight: 400; -- line-height: 1.3; -+ line-height: 1.2; - } - - h5, - .h5 { -- font-size: 1rem; -+ font-size: 1rem !important; - font-weight: 500; -- line-height: 1.375; -+ line-height: 1.2; - } - - h6, - .h6 { -- font-size: 0.875rem; -+ font-size: 0.825rem !important; - font-weight: 500; -- line-height: 1.2857; -+ line-height: 1.2; -+} -+ -+ -+.nav-link--current{ -+ background-color: $red-light-background !important; -+ color: $red !important; -+ &:hover, -+ &:focus { -+ background-color: $red-light-background !important; -+ color: $red !important; -+ } -+} -+ -+.btn-link:active, .nav-link:active { -+ background-color: $red-light-background !important; -+ color: $red !important; -+} -+ -+.app-header .navbar-text, .app-header .nav-link, .app-header .btn-link { -+ &:hover { -+ background-color: $red-40 !important; -+ } -+ &:active { -+ background-color: $red-active !important; -+ } -+ &:focus { -+ outline: 0; -+ } - } --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0073-IBS-custom-styles-_buttons.scss.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0073-IBS-custom-styles-_buttons.scss.patch deleted file mode 100644 index 0ff4344c10..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0073-IBS-custom-styles-_buttons.scss.patch +++ /dev/null @@ -1,187 +0,0 @@ -From 990924d19a56b5dace9ca596bb55fa407e698715 Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Tue, 28 Jun 2022 05:02:55 +0300 -Subject: [PATCH] IBS: custom styles _buttons.scss - ---- - src/assets/styles/bmc/custom/_buttons.scss | 132 +++++++++++++++++---- - 1 file changed, 112 insertions(+), 20 deletions(-) - -diff --git a/src/assets/styles/bmc/custom/_buttons.scss b/src/assets/styles/bmc/custom/_buttons.scss -index 2a7b8169..b3a69757 100644 ---- a/src/assets/styles/bmc/custom/_buttons.scss -+++ b/src/assets/styles/bmc/custom/_buttons.scss -@@ -10,7 +10,7 @@ - margin-right: $spacer / 4; - } - &:disabled { -- color: gray("600"); -+ color: $red; - fill: currentColor; - box-shadow: none !important; - &:not(.btn-link) { -@@ -21,27 +21,114 @@ - } - - .btn-primary { -- fill: currentColor; -- &:focus, -- &:not(:disabled):not(.disabled):active:focus { -- border-color: $white; -- box-shadow: inset 0 0 0 3px theme-color('primary'), inset 0 0 0 5px $white; -+ background-color: $red; -+ border-radius: $border-radius; -+ border: none; -+ box-shadow: 1px 2px 2px -1px #4f252566 inset; -+ &:hover { -+ background-color: $red-hover; -+ } -+ &:not(:disabled):not(.disabled):active:focus, -+ &:focus-visible { -+ border: none; -+ box-shadow: none; -+ background-color: $red-click; -+ } -+ &:focus { -+ border: none; -+ box-shadow: 0px 0px 0px 4px $red-shadow; -+ background-color: $red; -+ } -+ &:active { -+ border: none; -+ box-shadow: none; -+ background-color: $red; - } - } - - .btn-secondary { -- fill: currentColor; -- &:focus, -- &:not(:disabled):not(.disabled):active:focus { -- border-color: $white; -- box-shadow: inset 0 0 0 3px theme-color('secondary'), inset 0 0 0 5px $white; -+ background-color: $dark; -+ color: $gray-2; -+ border-radius: $border-radius; -+ border: none; -+ box-shadow: 1px 2px 4px -1px rgb(79 37 37 / 10%) inset; -+ font-style: normal; -+ font-weight: 600; -+ font-size: 16px; -+ line-height: 20px; -+ &:hover { -+ background-color: $dark-hover; -+ color: $gray-2; -+ } -+ &:focus { -+ border: none; -+ box-shadow: 0px 0px 0px 4px $red-shadow; -+ color: $gray-2; -+ background-color: $dark; -+ } -+ &:not(:disabled):not(.disabled):active:focus, -+ &:focus-visible { -+ border: none; -+ box-shadow: none; -+ color: $gray-2; -+ background-color: $dark; -+ } -+} -+ -+.btn-unstiled { -+ border: none; -+ &:focus { -+ box-shadow: none; -+ } -+ &:active { -+ box-shadow: none; -+ } -+} -+ -+.btn-popover { -+ border: none; -+ color: $red; -+ height: 28px; -+ border-radius: $border-radius; -+ font-weight: 500; -+ font-size: 12px; -+ transition: ease-in 0.2s; -+ &:hover { -+ color: $white; -+ transition: ease-in 0.2s; -+ } -+ &:focus { -+ box-shadow: none; -+ } -+ &:active { -+ box-shadow: none; -+ } -+ &.selected-unit-button { -+ transition: ease-in 0.2s; -+ color: $white; -+ } -+ &.selected-choice-button { -+ transition: ease-in 0.2s; -+ color: $white; -+ } -+} -+ -+.btn-toogle-popover { -+ justify-content: flex-start; -+ width: 25px; -+ height: 16px; -+ padding: 0; -+ &:focus { -+ box-shadow: none; -+ } -+ &:active { -+ box-shadow: none; - } - } - - // Global style for all button link - .btn-link { -- font-weight: $headings-font-weight; -- fill: theme-color("primary"); -+ color: $text-primary; - text-decoration: none !important; - &:hover { - background-color: gray("200"); -@@ -50,14 +137,19 @@ - &:active { - background-color: gray("300"); - } -- &:focus { -- box-shadow: inset 0 0 0 2px theme-color("primary"); -- color: theme-color("primary"); -- outline: none; -- } - &:disabled { - box-shadow: $btn-focus-box-shadow; - } -+ &.collapsed { -+ .icon-expand { -+ transform: rotate(180deg); -+ transition: 0.3s linear; -+ } -+ .icon-expand-right { -+ transform: rotate(180deg); -+ transition: 0.3s linear; -+ } -+ } - } - - // Icon only buttons -@@ -77,6 +169,6 @@ - // Contain input buttons within input - .btn-datepicker .dropdown-toggle, - .input-action-btn { -- padding: 7px; -+ padding: 6px; - margin: 1px; --} -\ No newline at end of file -+} --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0074-IBS-custom-styles-_card.scss.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0074-IBS-custom-styles-_card.scss.patch deleted file mode 100644 index fa1a8b5358..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0074-IBS-custom-styles-_card.scss.patch +++ /dev/null @@ -1,56 +0,0 @@ -From fa0ee9e6d5d99ac25418513b1ab0e01e2024d7fa Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Thu, 30 Jun 2022 03:47:39 +0300 -Subject: [PATCH] IBS: custom styles _card.scss - ---- - src/assets/styles/bmc/custom/_card.scss | 34 ++++++++++++++++++++++++- - 1 file changed, 33 insertions(+), 1 deletion(-) - -diff --git a/src/assets/styles/bmc/custom/_card.scss b/src/assets/styles/bmc/custom/_card.scss -index 5f2a5962..d7ac04d2 100644 ---- a/src/assets/styles/bmc/custom/_card.scss -+++ b/src/assets/styles/bmc/custom/_card.scss -@@ -1,5 +1,37 @@ - .card { -+ border-radius: $border-radius; - .bg-success { - background-color: theme-color-light('success')!important; - } --} -\ No newline at end of file -+} -+ -+.card-header { -+ .card-header-tabs { -+ border: none !important; -+ -+ .nav-link { -+ border: none !important; -+ color: $text-secondary; -+ font-weight: 500 !important; -+ background: none !important; -+ &:hover { -+ color: $red-hover -+ } -+ } -+ -+ .nav-link.active { -+ color: $red-active !important; -+ text-decoration: underline; -+ } -+ } -+} -+ -+.card-body dd .status-icon { -+ line-height: 1.1; -+} -+ -+.card-buttons > a { -+ font-weight: 500; -+ font-size: .825rem; -+ vertical-align: baseline; -+} --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0075-IBS-custom-styles-_dropdown.scss.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0075-IBS-custom-styles-_dropdown.scss.patch deleted file mode 100644 index b50139d13e..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0075-IBS-custom-styles-_dropdown.scss.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 3b53c5e3193c43aa9cbf5628ef25678e1d102c82 Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Tue, 28 Jun 2022 06:15:28 +0300 -Subject: [PATCH] IBS: custom styles _dropdown.scss - ---- - src/assets/styles/bmc/custom/_dropdown.scss | 26 +++++++++++++++++---- - 1 file changed, 22 insertions(+), 4 deletions(-) - -diff --git a/src/assets/styles/bmc/custom/_dropdown.scss b/src/assets/styles/bmc/custom/_dropdown.scss -index 969c4c68..02e4e855 100644 ---- a/src/assets/styles/bmc/custom/_dropdown.scss -+++ b/src/assets/styles/bmc/custom/_dropdown.scss -@@ -1,18 +1,36 @@ - // Make calendar visible over the table - .dropdown-menu { - z-index: $zindex-dropdown + 1; -- padding: 0; -+ padding: $spacer / 2; -+ border-radius: $border-radius; - } -+ - .dropdown-item { -- padding-left: $spacer/4; -- margin-top: -1 * $spacer/4; -+ padding: $spacer / 4 $spacer / 2; -+ margin: $spacer / 4; -+ width: auto; -+ border-radius: $border-radius; -+ &:hover { -+ background-color: $red-hover; -+ color: $white; -+ } -+ &:active { -+ background-color: $red-active; -+ } -+ &:focus { -+ outline: none; -+ background-color: $red-click; -+ box-shadow: inset 0 0 0 2px theme-color("primary"); -+ } - } -+ - .b-dropdown-form { - padding: $spacer/2; - .form-group { - margin-bottom: $spacer/2; - } - } -+ - // Table filter dropdown clear button style - .table-filter { - .dropdown-item { -@@ -28,4 +46,4 @@ - box-shadow: inset 0 0 0 2px theme-color("primary"); - } - } --} -\ No newline at end of file -+} --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0076-IBS-custom-styles-_forms.scss.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0076-IBS-custom-styles-_forms.scss.patch deleted file mode 100644 index 293ad54330..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0076-IBS-custom-styles-_forms.scss.patch +++ /dev/null @@ -1,189 +0,0 @@ -From f96c5c0e25f921cc8738817dd04ecfc1badbcbc6 Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Tue, 28 Jun 2022 06:41:02 +0300 -Subject: [PATCH] IBS: custom styles _forms.scss - ---- - src/assets/styles/bmc/custom/_forms.scss | 120 +++++++++++++++++++---- - 1 file changed, 99 insertions(+), 21 deletions(-) - -diff --git a/src/assets/styles/bmc/custom/_forms.scss b/src/assets/styles/bmc/custom/_forms.scss -index 428a40c2..914bf379 100644 ---- a/src/assets/styles/bmc/custom/_forms.scss -+++ b/src/assets/styles/bmc/custom/_forms.scss -@@ -21,20 +21,12 @@ - .custom-select, - .form-control, - .input-group-text { -- border-color: gray("500") !important; -- background-color: gray("100"); -+ border-radius: $border-radius; -+ background-color: $white; - } - - .custom-select, - .form-control { -- &:active { -- border: 1px solid $primary!important; -- } -- &:focus { -- color: theme-color("dark"); -- background-color: gray("100"); -- box-shadow: inset 0 0 0 3px gray("100"), inset 0 0 0 5px $primary !important; -- } - &:disabled { - background-color: gray("400"); - color: gray("600"); -@@ -48,26 +40,52 @@ - } - } - --.custom-select, --.custom-control-label, -+.form-control::-webkit-outer-spin-button, -+.form-control::-webkit-inner-spin-button { -+ -webkit-appearance: none; -+ margin: 0; -+} -+.form-control[type='number'] { -+ -moz-appearance: textfield; -+} -+ - .form-control { -- color: theme-color("dark") !important; -- font-size: 1rem; -+ color: $text-secondary; -+ border-radius: $border-radius; -+ border: none; -+ background-color: $gray-5; -+ font-size: 0.875rem; -+ &:focus { -+ color: $text-secondary; -+ } -+ &:hover { -+ background-color: $gray-5-hover; -+ } - } - - // Inverted form colors - .form-background { -- background-color: gray("100"); -+ background-color: none; -+ padding: 0 !important; - .custom-select, - .form-control { -- background-color: $white; -+ color: #0c1c29e6; -+ border-radius: $border-radius; -+ border: none; -+ background-color: $gray-5; -+ &:hover { -+ background-color: $gray-5-hover; -+ } - &:focus { -- background-color: $white; -+ border: 1px solid gray("400"); - } - &:disabled { - background-color: gray("400"); - color: gray("600"); - } -+ &.is-valid { -+ border: 1px solid gray("400"); -+ } - } - } - -@@ -76,12 +94,22 @@ - line-height: $form-line-height; - } - -+.custom-checkbox ::before { -+ box-shadow: none !important; -+ border: 2px solid $on-surface-secondary; -+ background-color: #fff; -+ border-radius: 3px; -+} -+ - .custom-checkbox .custom-control-input:checked ~ .custom-control-label::after, - .custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::before, - .custom-control-input:checked ~ .custom-control-label::before { -- background-color: $black; -- border-color: $black; -+ background-color: $red; -+ border-color: $red; - cursor: pointer; -+ &:focus { -+ box-shadow: none !important; -+ } - } - - .custom-control { -@@ -94,8 +122,35 @@ - } - } - --.custom-control-input:focus ~ .custom-control-label::before{ -- box-shadow: 0 0 0 2px theme-color("primary"); -+.custom-switch { -+ width: 28px; -+ height: 16px; -+} -+ -+.custom-switch -+.custom-control-input:focus ~ .custom-control-label::before { -+ box-shadow: none; -+} -+ -+.custom-switch -+.custom-control-input ~ .custom-control-label::after { -+ border: 1px solid $gray-20; -+ background: $white; -+} -+ -+.custom-control-input:focus:not(:checked) ~ .custom-control-label::before { -+ border-color: $gray-20; -+} -+ -+.custom-control-input:not(:disabled):active ~ .custom-control-label::before { -+ background-color: rgba(4, 10, 15, 0.3); -+ border-color: $gray-20; -+} -+ -+.custom-switch -+.custom-control-input ~ .custom-control-label::before { -+ border: 1px solid $gray-20; -+ background: rgba(4, 10, 15, 0.3); - } - - .custom-control-label::after { -@@ -130,3 +185,26 @@ - background-position: right 3rem bottom 50%; - } - } -+// For invisible label of fields -+.invisible { -+ height: 0; -+ margin-bottom: 0; -+} -+// Global style progress bar -+.progress { -+ height: 8px; -+ background-color: $gray-10; -+} -+ -+.progress-bar { -+ background-color: $red; -+ border-radius: 4px; -+} -+ -+.progress_bar_percent { -+ color: $red; -+} -+ -+.system-control__radio label { -+ padding-top: 4px; -+} --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0077-IBS-custom-styles-_tables.scss.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0077-IBS-custom-styles-_tables.scss.patch deleted file mode 100644 index df48717308..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0077-IBS-custom-styles-_tables.scss.patch +++ /dev/null @@ -1,155 +0,0 @@ -From bc759fbb12e038cf7b3d92b56cc91d5e97ed1a2a Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Thu, 30 Jun 2022 02:53:43 +0300 -Subject: [PATCH] IBS: custom styles _tables.scss - ---- - src/assets/styles/bmc/custom/_tables.scss | 59 +++++++++++++++-------- - 1 file changed, 38 insertions(+), 21 deletions(-) - -diff --git a/src/assets/styles/bmc/custom/_tables.scss b/src/assets/styles/bmc/custom/_tables.scss -index e8b5a832..d73bfdde 100644 ---- a/src/assets/styles/bmc/custom/_tables.scss -+++ b/src/assets/styles/bmc/custom/_tables.scss -@@ -3,16 +3,18 @@ - z-index: $zindex-dropdown; - - td { -- border-top: 1px solid gray("300"); -- border-bottom: 1px solid gray("300"); -+ border-top: 1px solid $gray-10; -+ border-right: 1px solid $gray-10; -+ border-bottom-width: 0px; - &:first-of-type { -- border-left: 1px solid gray("300"); -+ border-right: 1px solid $gray-10; - } - &:last-of-type { -- border-right: 1px solid gray("300"); -+ border-left: 1px solid $gray-10; -+ border-right-width: 0px; - } - vertical-align: middle; -- -+ font-size: 0.875rem; - // Table action buttons - .btn-link { - width: 40px; -@@ -26,19 +28,30 @@ - - // thead-light added for specificity - .thead-light th { -+ background-color: $surface-secondary; - vertical-align: middle; -- border-top: 1px solid gray("300"); -- border-bottom: 1px solid gray("300"); -+ border-top-width: 0px; -+ border-bottom: 1px solid $gray-10; -+ border-right: 1px solid $gray-10; - &:first-of-type { -- border-left: 1px solid gray("300"); -+ border-right: 1px solid $gray-10; - } - &:last-of-type { -- border-right: 1px solid gray("300"); -+ border-left: 1px solid $gray-10; -+ border-right-width: 0px; - } -- color: theme-color("dark"); -+ text-transform: uppercase; -+ color: $text-primary; - &:focus { - outline: none; - } -+ & > div { -+ font-size: 0.875rem !important; -+ } -+ } -+ -+ .custom-switch { -+ width: 100%; - } - - .status-icon svg { -@@ -56,21 +69,24 @@ - } - - .b-table-details { -- background-color: theme-color("light"); -+ border-top: 1px solid rgba(26,62,91,.3); -+ background-color: inherit; - td { -- padding-left: calc(50px + (#{$table-cell-padding} * 2)); -- padding-right: calc(50px + (#{$table-cell-padding} * 2)); -+ padding-left: $table-cell-padding; -+ padding-right: $table-cell-padding; - } - dl { - margin: 0; - } - dt { -+ font-size: 0.75rem !important; - float: left; - clear: left; - margin-right: $spacer / 2; - } - dd { -- line-height: 1.2 -+ font-size: 0.75rem !important; -+ line-height: 1.5 - } - } - -@@ -78,12 +94,13 @@ - width: 50px; - .btn { - padding: 0; -- width: 50px; -+ width: 40px; - } - svg { - fill: theme-color("dark"); - } - } -+ - .b-table-sort-icon-left { - background-position: left calc(1.5rem / 2) center !important; - padding-left: calc(1.2rem + 0.65em) !important; -@@ -104,12 +121,12 @@ - // Table stacked style for small screen only - @include media-breakpoint-down(xs) { - .b-table-stacked-sm { -- border: 1px solid gray("300"); -+ border: 1px solid $gray-10; - - tr { - - &:not(:first-child) > td[aria-colindex='1'] { -- border-top: 1px solid gray("300"); -+ border-top: 1px solid $gray-10; - padding-top: 0.625rem; - } - -@@ -157,15 +174,15 @@ - .table.b-table.b-table-stacked-sm > tbody > tr > [data-label] { - &::before { - text-align: left; -- padding-left: $spacer /2; -+ padding-left: $spacer / 2; - } - - > div { - padding-left: 1rem; - } - } -+} - -- .table.b-table.b-table-stacked-sm > tbody > tr > :first-child { -- border-top-width: 1px; -- } -+.table-responsive, .table-responsive-md { -+ margin-top: 0.5rem; - } --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0099-AppLayout-refresh-UI-on-time.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0099-AppLayout-refresh-UI-on-time.patch deleted file mode 100644 index 8ae2342734..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0099-AppLayout-refresh-UI-on-time.patch +++ /dev/null @@ -1,25 +0,0 @@ -From dde98ca4147da6e3df0dee55a3161573993f00cb Mon Sep 17 00:00:00 2001 -From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Tue, 14 Jun 2022 08:09:34 +0300 -Subject: [PATCH] AppLayout: refresh UI on time - ---- - src/layouts/AppLayout.vue | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/layouts/AppLayout.vue b/src/layouts/AppLayout.vue -index 0b78e5b1..c0bfff26 100644 ---- a/src/layouts/AppLayout.vue -+++ b/src/layouts/AppLayout.vue -@@ -3,7 +3,7 @@ - <app-header - ref="focusTarget" - class="app-header" -- :router-key="routerKey" -+ :key="routerKey" - @refresh="refresh" - /> - <app-navigation class="app-navigation" /> --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/login-aside-vector.svg b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/login-aside-vector.svg deleted file mode 100644 index 8d1c173141..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/login-aside-vector.svg +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - width="40" height="32" viewBox="0 0 40 32" - fill="none"> - <path d="M40 0L40 32L0 32L1.59859e-06 13.7143L13.3333 13.7143L13.3333 -2.33127e-06L40 0Z" fill="#E11717"/> -</svg> diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/login-company-logo.svg b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/login-company-logo.svg deleted file mode 100644 index 57d11ff43c..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/login-company-logo.svg +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - width="220px" height="50px" viewBox="0 0 89 13" - version="1.1"> - <style type="text/css"> - .st0{fill:#e11717;} - </style> - <g id="surface1"> - <path class="st0" style=" stroke:none;fill-rule:nonzero;fill-opacity:1;" d="M 5.648438 3.261719 C 5.351562 3.253906 5.0625 3.363281 4.847656 3.566406 C 4.628906 3.773438 4.503906 4.054688 4.496094 4.351562 L 4.496094 8.160156 C 4.511719 8.773438 5.019531 9.261719 5.636719 9.246094 L 19.867188 9.246094 L 19.867188 12.960938 L 3.414062 12.960938 C 1.578125 13 0.0625 11.542969 0.0195312 9.710938 C -0.0273438 9.664062 0.0195312 3.28125 0.0195312 3.28125 C 0.0625 1.449219 1.578125 -0.0078125 3.414062 0.03125 L 19.867188 0.03125 L 19.867188 3.261719 Z M 5.648438 3.261719 "/> - <path class="st0" style=" stroke:none;fill-rule:nonzero;fill-opacity:1;" d="M 38.398438 0.0390625 L 28.191406 9.738281 L 28.191406 3.199219 L 30.476562 3.195312 L 30.476562 0.0390625 L 23.609375 0.0390625 L 23.609375 12.96875 L 29.929688 12.96875 L 39.78125 3.296875 L 39.78125 12.96875 L 44.269531 12.96875 L 44.269531 0.0390625 Z M 38.398438 0.0390625 "/> - <path class="st0" style=" stroke:none;fill-rule:nonzero;fill-opacity:1;" d="M 59.210938 0.0390625 L 50.109375 0.0390625 L 50.109375 3.226562 L 51.542969 3.226562 L 46.457031 12.96875 L 50.761719 12.96875 L 55.828125 3.269531 L 57.519531 3.269531 L 62.582031 12.96875 L 67.132812 12.96875 L 60.347656 0.0390625 Z M 59.210938 0.0390625 "/> - <path class="st0" style=" stroke:none;fill-rule:nonzero;fill-opacity:1;" d="M 82.214844 0.0390625 L 72.0625 0.0390625 L 72.0625 3.226562 L 73.410156 3.226562 L 68.34375 12.96875 L 72.648438 12.96875 L 73.46875 11.347656 L 83.597656 11.347656 L 84.441406 12.96875 L 88.996094 12.96875 Z M 75.160156 8.117188 L 77.6875 3.261719 L 79.378906 3.261719 L 81.910156 8.109375 Z M 75.160156 8.117188 "/> - </g> -</svg> diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/login-main-vector.svg b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/login-main-vector.svg deleted file mode 100644 index 69d2dd75b7..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/login-main-vector.svg +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - width="80" height="64" viewBox="0 0 80 64" - fill="none"> - <path d="M0 64L0 0L80 0V36.5714H53.3333V64L0 64Z" fill="#E11717"/> -</svg> diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/logo-header.svg b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/logo-header.svg deleted file mode 100644 index 60eed5870d..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/logo-header.svg +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<svg - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - width="90px" height="32px" viewBox="0 0 89 13" - version="1.1"> - <style type="text/css"> - .st0{fill:#e11717;} - </style> - <g id="surface1"> - <path class="st0" style=" stroke:none;fill-rule:nonzero;fill-opacity:1;" d="M 5.648438 3.261719 C 5.351562 3.253906 5.0625 3.363281 4.847656 3.566406 C 4.628906 3.773438 4.503906 4.054688 4.496094 4.351562 L 4.496094 8.160156 C 4.511719 8.773438 5.019531 9.261719 5.636719 9.246094 L 19.867188 9.246094 L 19.867188 12.960938 L 3.414062 12.960938 C 1.578125 13 0.0625 11.542969 0.0195312 9.710938 C -0.0273438 9.664062 0.0195312 3.28125 0.0195312 3.28125 C 0.0625 1.449219 1.578125 -0.0078125 3.414062 0.03125 L 19.867188 0.03125 L 19.867188 3.261719 Z M 5.648438 3.261719 "/> - <path class="st0" style=" stroke:none;fill-rule:nonzero;fill-opacity:1;" d="M 38.398438 0.0390625 L 28.191406 9.738281 L 28.191406 3.199219 L 30.476562 3.195312 L 30.476562 0.0390625 L 23.609375 0.0390625 L 23.609375 12.96875 L 29.929688 12.96875 L 39.78125 3.296875 L 39.78125 12.96875 L 44.269531 12.96875 L 44.269531 0.0390625 Z M 38.398438 0.0390625 "/> - <path class="st0" style=" stroke:none;fill-rule:nonzero;fill-opacity:1;" d="M 59.210938 0.0390625 L 50.109375 0.0390625 L 50.109375 3.226562 L 51.542969 3.226562 L 46.457031 12.96875 L 50.761719 12.96875 L 55.828125 3.269531 L 57.519531 3.269531 L 62.582031 12.96875 L 67.132812 12.96875 L 60.347656 0.0390625 Z M 59.210938 0.0390625 "/> - <path class="st0" style=" stroke:none;fill-rule:nonzero;fill-opacity:1;" d="M 82.214844 0.0390625 L 72.0625 0.0390625 L 72.0625 3.226562 L 73.410156 3.226562 L 68.34375 12.96875 L 72.648438 12.96875 L 73.46875 11.347656 L 83.597656 11.347656 L 84.441406 12.96875 L 88.996094 12.96875 Z M 75.160156 8.117188 L 77.6875 3.261719 L 79.378906 3.261719 L 81.910156 8.109375 Z M 75.160156 8.117188 "/> - </g> -</svg> diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend index 34ea081d99..689782dc79 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend @@ -9,48 +9,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" EXTRA_OENPM = "-- --mode ibs" SRC_URI = "git://git@git.sila.ru/srv/pub/scm/git/openbmc/webui-vue.git;branch=sila;protocol=ssh" -SRCREV = "ec06fd210a1f1e8beab136b7b40154df540e73a8" +SRCREV = "8047ae3d83ba0718fb7a42907036157e5c680b85" SRC_URI += "\ file://favicon.ico \ - file://login-main-vector.svg \ - file://login-aside-vector.svg \ - file://login-company-logo.svg \ - file://logo-header.svg \ - file://0001-Set-login-brand.patch \ - file://0002-Login-languages-list.patch \ - file://0003-GlobalStore-Trim-assetTag-and-serialNumber.patch \ - file://0004-main-padding-right-when-media-gt-992px.patch \ - file://0005-ButtonBackToTop-alignment.patch \ - file://0006-AppLayout-app-content-overflow.patch \ - file://0007-bootstrap-grid-for-large-media.patch \ - file://0008-SOL-96x44-geometry.patch \ - file://0009-AppHeader-color-nav-trigger-width-wrap.patch \ - file://0010-virtual-media-layout-and-styles.patch \ - file://0011-firmware-buttons-layout.patch \ - file://0012-inventory-service-indicators.patch \ - file://0013-power-operations-boot-settings.patch \ - file://0014-security-ldap-settings.patch \ - file://0015-Logs-search-alignment.patch \ - file://0071-IBS-custom-styles-_alert.scss.patch \ - file://0072-IBS-custom-styles-_base.scss.patch \ - file://0073-IBS-custom-styles-_buttons.scss.patch \ - file://0074-IBS-custom-styles-_card.scss.patch \ - file://0075-IBS-custom-styles-_dropdown.scss.patch \ - file://0076-IBS-custom-styles-_forms.scss.patch \ - file://0077-IBS-custom-styles-_tables.scss.patch \ - file://0099-AppLayout-refresh-UI-on-time.patch \ + file://0001-IBS-html-head-title.patch \ " do_update_logo () { cp ${WORKDIR}/favicon.ico \ ${S}/public/. - - cp ${WORKDIR}/login-main-vector.svg \ - ${WORKDIR}/login-aside-vector.svg \ - ${WORKDIR}/login-company-logo.svg \ - ${WORKDIR}/logo-header.svg \ - ${S}/src/assets/images/. } addtask update_logo after do_unpack before do_configure |
