fix Modals, Tables and Pages: event logs, inventoty, post logs, operttions, global styles

4 files changed, 54 insertions, 13 deletions

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'),
             },