diff options
author | Vitalii Lysak <v.lysak@dunice.net> | 2022-08-23 10:55:58 +0300 |
---|---|---|
committer | Vitalii Lysak <v.lysak@dunice.net> | 2022-08-23 10:55:58 +0300 |
commit | 3658baa90a04db600a721a313b12e2eefeb27b5a (patch) | |
tree | 5c073b08abcdf208fea06cc006b6e3b068265d8c | |
parent | 6f4939d1b17ad276c47a5cd1cd39182070cc9ea6 (diff) | |
parent | e03debf505115e7338aff758054abf59abbcceeb (diff) | |
download | webui-vue-3658baa90a04db600a721a313b12e2eefeb27b5a.tar.xz |
Merge branch 'sila' of git.sila.ru:pub/openbmc/webui-vue into sila
-rw-r--r-- | src/assets/styles/bmc/_sila/_forms.scss | 2 | ||||
-rw-r--r-- | src/assets/styles/bmc/_sila/_tables.scss | 8 | ||||
-rw-r--r-- | src/components/_sila/Global/FormFile.vue | 6 | ||||
-rw-r--r-- | src/locales/ru-RU.json | 2 | ||||
-rw-r--r-- | src/views/_sila/Overview/Inventory/InventoryTableFans.vue | 22 | ||||
-rw-r--r-- | src/views/_sila/Overview/Inventory/InventoryTablePowerSupplies.vue | 17 | ||||
-rw-r--r-- | src/views/_sila/Overview/Inventory/InventoryTableProcessors.vue | 10 | ||||
-rw-r--r-- | src/views/_sila/ResourceManagement/Power.vue | 6 |
8 files changed, 21 insertions, 52 deletions
diff --git a/src/assets/styles/bmc/_sila/_forms.scss b/src/assets/styles/bmc/_sila/_forms.scss index 4bffb27a..b206f46c 100644 --- a/src/assets/styles/bmc/_sila/_forms.scss +++ b/src/assets/styles/bmc/_sila/_forms.scss @@ -85,7 +85,7 @@ div:not(.search-global) > .form-group { margin-left: 10px; margin-bottom: $spacer / 4; span { - font-size: smaller; + display: block; } } } diff --git a/src/assets/styles/bmc/_sila/_tables.scss b/src/assets/styles/bmc/_sila/_tables.scss index 7cab44f3..ac35f605 100644 --- a/src/assets/styles/bmc/_sila/_tables.scss +++ b/src/assets/styles/bmc/_sila/_tables.scss @@ -135,6 +135,14 @@ background-color: $gray-5-hover; } } + .custom-radio, + .custom-checkbox { + margin-left: 10px; + .custom-control-label::before, + .custom-control-label::after { + margin-top: 0px; + } + } } .table-hover tbody tr:hover { diff --git a/src/components/_sila/Global/FormFile.vue b/src/components/_sila/Global/FormFile.vue index 686c9a09..874b4ebd 100644 --- a/src/components/_sila/Global/FormFile.vue +++ b/src/components/_sila/Global/FormFile.vue @@ -143,4 +143,10 @@ export default { background-color: $surface-secondary; border-radius: 0 0 16px 16px; } + +.custom-form-file-container { + label { + margin-left: 0px !important; + } +} </style> diff --git a/src/locales/ru-RU.json b/src/locales/ru-RU.json index 08152b73..148223f3 100644 --- a/src/locales/ru-RU.json +++ b/src/locales/ru-RU.json @@ -868,7 +868,7 @@ "max": "Максимальная", "maxDate": "Дата максимальной", "pwm": "% мощности", - "currentValue": "Current Speed, rpm" + "currentValue": "Текущая скорость, об/мин" }, "types": { "processors": "Процессоры", diff --git a/src/views/_sila/Overview/Inventory/InventoryTableFans.vue b/src/views/_sila/Overview/Inventory/InventoryTableFans.vue index 1012b8a9..c24066a7 100644 --- a/src/views/_sila/Overview/Inventory/InventoryTableFans.vue +++ b/src/views/_sila/Overview/Inventory/InventoryTableFans.vue @@ -15,16 +15,11 @@ </b-col> </b-row> <b-table - sort-icon-left - no-sort-reset hover responsive="md" - sort-by="health" show-empty :items="fans" :fields="fields" - :sort-desc="true" - :sort-compare="sortCompare" :filter="searchFilter" :empty-text="$t('global.table.emptyMessage')" :empty-filtered-text="$t('global.table.emptySearchMessage')" @@ -102,7 +97,6 @@ import TableCellCount from '@/components/_sila/Global/TableCellCount'; import StatusIcon from '@/components/_sila/Global/StatusIcon'; import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin'; -import TableSortMixin from '@/components/_sila/Mixins/TableSortMixin'; import Search from '@/components/_sila/Global/Search'; import SearchFilterMixin, { searchFilter, @@ -113,12 +107,7 @@ import TableRowExpandMixin, { export default { components: { IconChevron, PageSection, StatusIcon, Search, TableCellCount }, - mixins: [ - TableRowExpandMixin, - DataFormatterMixin, - TableSortMixin, - SearchFilterMixin, - ], + mixins: [TableRowExpandMixin, DataFormatterMixin, SearchFilterMixin], data() { return { isBusy: true, @@ -127,26 +116,22 @@ export default { key: 'expandRow', label: '', tdClass: 'table-row-expand', - sortable: false, }, { key: 'name', label: this.$t('pageInventory.table.id'), formatter: this.dataFormatter, - sortable: true, }, { key: 'health', label: this.$t('pageInventory.table.health'), formatter: this.dataFormatter, - sortable: true, tdClass: 'text-nowrap', }, { key: 'partNumber', label: this.$t('pageInventory.table.partNumber'), formatter: this.dataFormatter, - sortable: true, }, { key: 'serialNumber', @@ -177,11 +162,6 @@ export default { }); }, methods: { - sortCompare(a, b, key) { - if (key === 'health') { - return this.sortStatus(a, b, key); - } - }, onFiltered(filteredItems) { this.searchTotalFilteredRows = filteredItems.length; }, diff --git a/src/views/_sila/Overview/Inventory/InventoryTablePowerSupplies.vue b/src/views/_sila/Overview/Inventory/InventoryTablePowerSupplies.vue index a55b3e5e..217a4cc3 100644 --- a/src/views/_sila/Overview/Inventory/InventoryTablePowerSupplies.vue +++ b/src/views/_sila/Overview/Inventory/InventoryTablePowerSupplies.vue @@ -15,16 +15,11 @@ </b-col> </b-row> <b-table - sort-icon-left - no-sort-reset hover responsive="md" - sort-by="health" show-empty :items="powerSupplies" :fields="fields" - :sort-desc="true" - :sort-compare="sortCompare" :filter="searchFilter" :empty-text="$t('global.table.emptyMessage')" :empty-filtered-text="$t('global.table.emptySearchMessage')" @@ -120,7 +115,6 @@ import IconChevron from '@carbon/icons-vue/es/chevron--down/20'; import StatusIcon from '@/components/_sila/Global/StatusIcon'; import TableCellCount from '@/components/_sila/Global/TableCellCount'; import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin'; -import TableSortMixin from '@/components/_sila/Mixins/TableSortMixin'; import Search from '@/components/_sila/Global/Search'; import SearchFilterMixin, { searchFilter, @@ -131,12 +125,7 @@ import TableRowExpandMixin, { export default { components: { IconChevron, PageSection, StatusIcon, Search, TableCellCount }, - mixins: [ - TableRowExpandMixin, - DataFormatterMixin, - TableSortMixin, - SearchFilterMixin, - ], + mixins: [TableRowExpandMixin, DataFormatterMixin, SearchFilterMixin], data() { return { isBusy: true, @@ -145,26 +134,22 @@ export default { key: 'expandRow', label: '', tdClass: 'table-row-expand', - sortable: false, }, { key: 'id', label: this.$t('pageInventory.table.id'), formatter: this.dataFormatter, - sortable: true, }, { key: 'health', label: this.$t('pageInventory.table.health'), formatter: this.dataFormatter, - sortable: true, tdClass: 'text-nowrap', }, { key: 'locationNumber', label: this.$t('pageInventory.table.locationNumber'), formatter: this.dataFormatter, - sortable: true, }, { key: 'identifyLed', diff --git a/src/views/_sila/Overview/Inventory/InventoryTableProcessors.vue b/src/views/_sila/Overview/Inventory/InventoryTableProcessors.vue index ed9ca194..60121818 100644 --- a/src/views/_sila/Overview/Inventory/InventoryTableProcessors.vue +++ b/src/views/_sila/Overview/Inventory/InventoryTableProcessors.vue @@ -19,14 +19,11 @@ </b-col> </b-row> <b-table - sort-icon-left - no-sort-reset hover responsive="md" show-empty :items="processors" :fields="fields" - :sort-desc="true" :filter="searchFilter" :empty-text="$t('global.table.emptyMessage')" :empty-filtered-text="$t('global.table.emptySearchMessage')" @@ -156,7 +153,6 @@ import IconChevron from '@carbon/icons-vue/es/chevron--down/20'; import StatusIcon from '@/components/_sila/Global/StatusIcon'; import TableCellCount from '@/components/_sila/Global/TableCellCount'; import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin'; -import TableSortMixin from '@/components/_sila/Mixins/TableSortMixin'; import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin'; import Search from '@/components/_sila/Global/Search'; import SearchFilterMixin, { @@ -172,7 +168,6 @@ export default { BVToastMixin, TableRowExpandMixin, DataFormatterMixin, - TableSortMixin, SearchFilterMixin, ], data() { @@ -183,32 +178,27 @@ export default { key: 'expandRow', label: '', tdClass: 'table-row-expand', - sortable: false, }, { key: 'id', label: this.$t('pageInventory.table.id'), formatter: this.dataFormatter, - sortable: true, }, { key: 'health', label: this.$t('pageInventory.table.health'), formatter: this.dataFormatter, - sortable: true, tdClass: 'text-nowrap', }, { key: 'locationNumber', label: this.$t('pageInventory.table.locationNumber'), formatter: this.dataFormatter, - sortable: true, }, { key: 'identifyLed', label: this.$t('pageInventory.table.identifyLed'), formatter: this.dataFormatter, - sortable: false, }, ], searchFilter: searchFilter, diff --git a/src/views/_sila/ResourceManagement/Power.vue b/src/views/_sila/ResourceManagement/Power.vue index db1104e6..43256db2 100644 --- a/src/views/_sila/ResourceManagement/Power.vue +++ b/src/views/_sila/ResourceManagement/Power.vue @@ -44,8 +44,8 @@ <b-form-text id="power-help-text"> {{ $t('pagePower.powerCapLabelTextInfo', { - min: 1, - max: 10000, + min: 500, + max: 3000, }) }} </b-form-text> @@ -155,7 +155,7 @@ export default { }, validations: { powerCapValue: { - between: between(1, 10000), + between: between(500, 3000), required: requiredIf(function () { return this.isPowerCapFieldEnabled; }), |