summaryrefslogtreecommitdiff
path: root/src/views/Settings
diff options
context:
space:
mode:
Diffstat (limited to 'src/views/Settings')
-rw-r--r--src/views/Settings/DateTime/DateTime.vue58
-rw-r--r--src/views/Settings/Network/ModalDns.vue4
-rw-r--r--src/views/Settings/Network/Network.vue9
-rw-r--r--src/views/Settings/Network/TableDns.vue21
-rw-r--r--src/views/Settings/Network/TableIpv4.vue33
5 files changed, 81 insertions, 44 deletions
diff --git a/src/views/Settings/DateTime/DateTime.vue b/src/views/Settings/DateTime/DateTime.vue
index 7ab3ec0e..63570c39 100644
--- a/src/views/Settings/DateTime/DateTime.vue
+++ b/src/views/Settings/DateTime/DateTime.vue
@@ -1,67 +1,61 @@
<template>
- <b-container fluid="xxl" class="pt-0 m-0">
+ <b-container id="date-time" fluid="xxl" class="pt-0 m-0">
<page-title />
- <b-row class="m-4">
- <b-col md="8" xl="12">
- <alert variant="info">
- <span class="regular-12px">
+ <b-row class="bootstrap-table__section">
+ <b-col md="8" xl="6">
+ <alert variant="info" class="mb-4">
+ <span>
{{ $t('pageDateTime.alert.message') }}
- <b-link class="semi-bold-12px" to="/profile-settings">
+ <b-link to="/profile-settings">
{{ $t('pageDateTime.alert.link') }}</b-link
>
</span>
</alert>
</b-col>
</b-row>
- <page-section class="m-4">
+ <page-section class="bootstrap-table__section">
<b-row>
- <b-col sm="6" lg="5" xl="4" xxl="3">
+ <b-col lg="3">
<dl>
- <dt class="semi-bold-12px">{{ $t('pageDateTime.form.date') }}</dt>
- <dd v-if="bmcTime" class="regular-12px">
- {{ bmcTime | formatDate }}
- </dd>
+ <dt>{{ $t('pageDateTime.form.date') }}</dt>
+ <dd v-if="bmcTime">{{ bmcTime | formatDate }}</dd>
<dd v-else>--</dd>
</dl>
</b-col>
- <b-col sm="6" lg="5" xl="4" xxl="3">
+ <b-col lg="3">
<dl>
- <dt class="semi-bold-12px">
- {{ $t('pageDateTime.form.time.label') }}
- </dt>
- <dd v-if="bmcTime" class="regular-12px">
- {{ bmcTime | formatTime }}
- </dd>
+ <dt>{{ $t('pageDateTime.form.time.label') }}</dt>
+ <dd v-if="bmcTime">{{ bmcTime | formatTime }}</dd>
<dd v-else>--</dd>
</dl>
</b-col>
</b-row>
</page-section>
- <page-section class="m-4">
- <label class="semi-bold-16px">{{
- $t('pageDateTime.configureSettings')
- }}</label>
+ <page-section
+ class="bootstrap-table__section"
+ :section-title="$t('pageDateTime.configureSettings')"
+ >
<b-form novalidate @submit.prevent="submitForm">
<b-form-group
label="Configure date and time"
:disabled="loading"
label-sr-only
- class="system-control__radio regular-12px"
>
<b-form-radio
v-model="form.configurationSelected"
value="manual"
data-test-id="dateTime-radio-configureManual"
>
- {{ $t('SystemDescription.UseServerDatettime') }}
+ {{ $t('pageDateTime.form.manual') }}
</b-form-radio>
<b-row class="mt-3 ml-3">
- <b-col sm="7" lg="5" xl="5" xxl="3">
+ <b-col sm="6" lg="4" xl="3">
<b-form-group
:label="$t('pageDateTime.form.date')"
label-for="input-manual-date"
+ label-class="regular-14px"
>
- <span class="regular-12px">YYYY-MM-DD</span>
+ <b-form-text id="date-format-help">YYYY-MM-DD</b-form-text>
<b-input-group>
<b-form-input
id="input-manual-date"
@@ -105,12 +99,13 @@
</b-input-group>
</b-form-group>
</b-col>
- <b-col sm="7" lg="5" xl="5" xxl="3">
+ <b-col sm="6" lg="4" xl="3">
<b-form-group
:label="$t('pageDateTime.form.time.timezone', { timezone })"
label-for="input-manual-time"
+ label-class="regular-14px"
>
- <span class="regular-12px">HH:MM</span>
+ <b-form-text id="time-format-help">HH:MM</b-form-text>
<b-input-group>
<b-form-input
id="input-manual-time"
@@ -134,7 +129,6 @@
</b-row>
<b-form-radio
v-model="form.configurationSelected"
- class="system-control__radio regular-12px"
value="ntp"
data-test-id="dateTime-radio-configureNTP"
>
@@ -145,6 +139,7 @@
<b-form-group
:label="$t('pageDateTime.form.ntpServers.server1')"
label-for="input-ntp-1"
+ label-class="regular-14px"
>
<b-input-group>
<b-form-input
@@ -167,6 +162,7 @@
<b-form-group
:label="$t('pageDateTime.form.ntpServers.server2')"
label-for="input-ntp-2"
+ label-class="regular-14px"
>
<b-input-group>
<b-form-input
@@ -182,6 +178,7 @@
<b-form-group
:label="$t('pageDateTime.form.ntpServers.server3')"
label-for="input-ntp-3"
+ label-class="regular-14px"
>
<b-input-group>
<b-form-input
@@ -195,7 +192,6 @@
</b-col>
</b-row>
<b-button
- size="md"
variant="primary"
type="submit"
data-test-id="dateTime-button-saveSettings"
diff --git a/src/views/Settings/Network/ModalDns.vue b/src/views/Settings/Network/ModalDns.vue
index 7f127173..a1dc9cec 100644
--- a/src/views/Settings/Network/ModalDns.vue
+++ b/src/views/Settings/Network/ModalDns.vue
@@ -5,9 +5,9 @@
:title="$t('pageNetwork.table.addDnsAddress')"
@hidden="resetForm"
>
- <b-form id="form-dns" @submit.prevent="handleSubmit">
+ <b-form id="form-dns" style="width: 100%" @submit.prevent="handleSubmit">
<b-row>
- <b-col sm="6">
+ <b-col>
<b-form-group
:label="$t('pageNetwork.modal.staticDns')"
label-for="staticDns"
diff --git a/src/views/Settings/Network/Network.vue b/src/views/Settings/Network/Network.vue
index 2abbcd7a..2d8fd61d 100644
--- a/src/views/Settings/Network/Network.vue
+++ b/src/views/Settings/Network/Network.vue
@@ -1,10 +1,9 @@
<template>
- <b-container fluid="xl">
+ <b-container fluid="m-0 p-0" class="page-network">
<page-title :description="$t('pageNetwork.pageDescription')" />
- <!-- Global settings for all interfaces -->
- <network-global-settings />
- <!-- Interface tabs -->
- <page-section v-show="ethernetData">
+
+ <page-section v-show="ethernetData" class="m-4">
+ <network-global-settings class="m-4" />
<b-row>
<b-col>
<b-card no-body>
diff --git a/src/views/Settings/Network/TableDns.vue b/src/views/Settings/Network/TableDns.vue
index 569109f1..1ad8f436 100644
--- a/src/views/Settings/Network/TableDns.vue
+++ b/src/views/Settings/Network/TableDns.vue
@@ -3,7 +3,7 @@
<b-row>
<b-col lg="6">
<div class="text-right">
- <b-button variant="primary" @click="initDnsModal()">
+ <b-button variant="primary" class="mb-2" @click="initDnsModal()">
<icon-add />
{{ $t('pageNetwork.table.addDnsAddress') }}
</b-button>
@@ -14,7 +14,7 @@
:fields="dnsTableFields"
:items="form.dnsStaticTableItems"
:empty-text="$t('global.table.emptyMessage')"
- class="mb-0"
+ class="bootstrap-rounded-table mb-0"
show-empty
>
<template #cell(actions)="{ item, index }">
@@ -82,8 +82,19 @@ export default {
{
key: 'address',
label: this.$t('pageNetwork.table.ipAddress'),
+ thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
+ class: 'bootstrap-rounded-table__column-first',
+ tdClass: 'regular-12px bootstrap-rounded-table__td',
+ },
+ {
+ key: 'actions',
+ thStyle: { width: '30%' },
+ label: this.$t('pageNetwork.table.actions'),
+ thClass:
+ 'text-right semi-bold-12px__caps bootstrap-rounded-table__head_bg',
+ class: 'bootstrap-rounded-table__column-last',
+ tdClass: 'text-right bootstrap-rounded-table__td',
},
- { key: 'actions', label: '', tdClass: 'text-right' },
],
};
},
@@ -115,6 +126,10 @@ export default {
address: server,
actions: [
{
+ value: 'edit',
+ title: this.$t('global.action.edit'),
+ },
+ {
value: 'delete',
title: this.$t('pageNetwork.table.deleteDns'),
},
diff --git a/src/views/Settings/Network/TableIpv4.vue b/src/views/Settings/Network/TableIpv4.vue
index 75870031..7481dc7b 100644
--- a/src/views/Settings/Network/TableIpv4.vue
+++ b/src/views/Settings/Network/TableIpv4.vue
@@ -7,7 +7,7 @@
</h3>
</b-col>
<b-col class="text-right">
- <b-button variant="primary" @click="initAddIpv4Address()">
+ <b-button variant="primary" class="mb-2" @click="initAddIpv4Address()">
<icon-add />
{{ $t('pageNetwork.table.addIpv4Address') }}
</b-button>
@@ -19,7 +19,7 @@
:fields="ipv4TableFields"
:items="form.ipv4TableItems"
:empty-text="$t('global.table.emptyMessage')"
- class="mb-0"
+ class="bootstrap-rounded-table mb-0"
show-empty
>
<template #cell(actions)="{ item, index }">
@@ -86,20 +86,43 @@ export default {
{
key: 'Address',
label: this.$t('pageNetwork.table.ipAddress'),
+ thStyle: { width: '20%' },
+ thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
+ class: 'bootstrap-rounded-table__column-first',
+ tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'Gateway',
label: this.$t('pageNetwork.table.gateway'),
+ thStyle: { width: '20%' },
+ thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
+ class: 'bootstrap-rounded-table__column-center',
+ tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'SubnetMask',
label: this.$t('pageNetwork.table.subnet'),
+ thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
+ class: 'bootstrap-rounded-table__column-center',
+ tdClass: 'regular-12px bootstrap-rounded-table__td',
},
{
key: 'AddressOrigin',
label: this.$t('pageNetwork.table.addressOrigin'),
+ thStyle: { width: '20%' },
+ thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg',
+ class: 'bootstrap-rounded-table__column-center',
+ tdClass: 'regular-12px bootstrap-rounded-table__td',
+ },
+ {
+ key: 'actions',
+ label: this.$t('pageNetwork.table.actions'),
+ thStyle: { width: '10%' },
+ thClass:
+ 'text-right semi-bold-12px__caps bootstrap-rounded-table__head_bg',
+ class: 'bootstrap-rounded-table__column-last',
+ tdClass: 'text-right bootstrap-rounded-table__td',
},
- { key: 'actions', label: '', tdClass: 'text-right' },
],
};
},
@@ -134,6 +157,10 @@ export default {
AddressOrigin: ipv4.AddressOrigin,
actions: [
{
+ value: 'edit',
+ title: this.$t('pageNetwork.table.edit'),
+ },
+ {
value: 'delete',
title: this.$t('pageNetwork.table.deleteIpv4'),
},
generated by cgit v1.2.3 (git 2.39.0) at 2024-07-05 04:59:14 +0300