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

2 files changed, 23 insertions, 23 deletions

diff --git a/src/views/Operations/ServerPowerOperations/BootSettings.vue b/src/views/Operations/ServerPowerOperations/BootSettings.vue
index ab3c22b9..b5cbb4e0 100644
--- a/src/views/Operations/ServerPowerOperations/BootSettings.vue
+++ b/src/views/Operations/ServerPowerOperations/BootSettings.vue
@@ -1,8 +1,5 @@
 <template>
-  <div class="form-background p-3">
-    <label class="semi-bold-16px">{{
-      $t('pageServerPowerOperations.serverBootSettings')
-    }}</label>
+  <page-section class="m-0">
     <b-form novalidate @submit.prevent="handleSubmit">
       <b-form-group label-for="boot-option" class="mb-3 regular-12px">
         <label class="semi-bold-12px">{{
@@ -49,16 +46,18 @@
         {{ $t('global.action.save') }}
       </b-button>
     </b-form>
-  </div>
+  </page-section>
 </template>
 
 <script>
 import { mapState } from 'vuex';
 import BVToastMixin from '@/components/Mixins/BVToastMixin';
 import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+import PageSection from '@/components/Global/PageSection';
 
 export default {
   name: 'BootSettings',
+  components: { PageSection },
   mixins: [BVToastMixin, LoadingBarMixin],
   data() {
     return {
diff --git a/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue b/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue
index a394a77f..823caa95 100644
--- a/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue
+++ b/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue
@@ -1,15 +1,15 @@
 <template>
   <b-container fluid="xxl pt-0 m-0">
     <page-title />
-    <b-row class="m-2">
+    <page-section
+      :section-title="$t('pageServerPowerOperations.serverStatus')"
+      class="m-4"
+    >
       <b-col md="8" xl="6">
-        <page-section class="m-2 pt-2 pb-2">
+        <page-section class="pt-2 mb-0">
           <b-row>
             <b-col>
               <dl>
-                <dt class="semi-bold-16px">
-                  {{ $t('pageServerPowerOperations.serverStatus') }}
-                </dt>
                 <dd
                   v-if="serverStatus === 'on'"
                   style="margin-top: 10px"
@@ -60,13 +60,13 @@
           </b-row>
         </page-section>
       </b-col>
-    </b-row>
-    <b-row class="m-2">
+    </page-section>
+    <page-section
+      :section-title="$t('SystemDescription.title.Control')"
+      class="ml-4 mb-0"
+    >
       <b-col sm="8" md="6" xl="7">
-        <page-section class="m-2">
-          <b-row class="ml-0 mb-3">
-            <span class="semi-bold-16px">{{ 'Управление' }}</span>
-          </b-row>
+        <page-section>
           <alert :show="oneTimeBootEnabled" variant="warning">
             {{ $t('pageServerPowerOperations.oneTimeBootWarning') }}
           </alert>
@@ -177,14 +177,15 @@
           </template>
         </page-section>
       </b-col>
-    </b-row>
-    <b-row>
-      <b-col v-if="hasBootSourceOptions" class="m-2" sm="8" md="6" xl="4">
-        <page-section class="m-2">
-          <boot-settings />
-        </page-section>
+    </page-section>
+    <page-section
+      :section-title="$t('pageServerPowerOperations.serverBootSettings')"
+      class="m-4"
+    >
+      <b-col v-if="hasBootSourceOptions" sm="8" md="6" xl="4">
+        <boot-settings />
       </b-col>
-    </b-row>
+    </page-section>
   </b-container>
 </template>