From e1f9aa4d84f76076711fa1a83004953902c6721a Mon Sep 17 00:00:00 2001
From: Anna Tsyganova <ATSyganova@IBS.RU>
Date: Wed, 13 Jul 2022 18:08:27 +0300
Subject: Fix folder SecurityAndAccess Issue: SILABMC-191

---
 src/i18n.js                                                  |  6 ++++--
 src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue              | 12 +++---------
 src/views/_sila/SecurityAndAccess/Policies/Policies.vue      | 10 +++++-----
 src/views/_sila/SecurityAndAccess/Sessions/Sessions.vue      |  6 +++---
 .../_sila/SecurityAndAccess/UserManagement/TableRoles.vue    |  2 +-
 .../SecurityAndAccess/UserManagement/UserManagement.vue      |  4 ++--
 6 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/i18n.js b/src/i18n.js
index 919c363f..33b602a6 100644
--- a/src/i18n.js
+++ b/src/i18n.js
@@ -22,9 +22,11 @@ function loadLocaleMessages() {
 
 export default new VueI18n({
   // Get default locale from local storage
-  locale: window.localStorage.getItem('storedLanguage'),
+  // locale: window.localStorage.getItem('storedLanguage'),
+  locale: 'ru-RU',
   // Locales that don't exist will fallback to English
-  fallbackLocale: 'en-US',
+  // fallbackLocale: 'en-US',
+  fallbackLocale: 'ru-RU',
   // Falling back to fallbackLocale generates two console warnings
   // Silent fallback suppresses console warnings when using fallback
   silentFallbackWarn: true,
diff --git a/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue b/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue
index c865ea3a..8374b653 100644
--- a/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue
+++ b/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue
@@ -1,10 +1,7 @@
 <template>
-  <b-container fluid="pt-0 m-0">
+  <b-container fluid="xl">
     <page-title :description="$t('pageLdap.pageDescription')" />
-    <page-section
-      :section-title="$t('pageLdap.settings')"
-      class="bootstrap-table__section"
-    >
+    <page-section :section-title="$t('pageLdap.settings')">
       <b-form novalidate @submit.prevent="handleSubmit">
         <b-row>
           <b-col>
@@ -226,10 +223,7 @@
     </page-section>
 
     <!-- Role groups -->
-    <page-section
-      :section-title="$t('pageLdap.roleGroups')"
-      class="bootstrap-table__section"
-    >
+    <page-section :section-title="$t('pageLdap.roleGroups')">
       <table-role-groups />
     </page-section>
   </b-container>
diff --git a/src/views/_sila/SecurityAndAccess/Policies/Policies.vue b/src/views/_sila/SecurityAndAccess/Policies/Policies.vue
index c594bde5..0de80de2 100644
--- a/src/views/_sila/SecurityAndAccess/Policies/Policies.vue
+++ b/src/views/_sila/SecurityAndAccess/Policies/Policies.vue
@@ -2,9 +2,9 @@
   <b-container fluid="xl">
     <page-title />
     <b-row>
-      <b-col md="8">
+      <b-col md="9">
         <b-row v-if="!modifySSHPolicyDisabled" class="setting-section">
-          <b-col class="d-flex align-items-center justify-content-between">
+          <b-col class="d-flex align-items-center justify-content">
             <dl class="mr-3 w-75">
               <dt>{{ $t('pagePolicies.ssh') }}</dt>
               <dd>
@@ -29,7 +29,7 @@
           </b-col>
         </b-row>
         <b-row class="setting-section">
-          <b-col class="d-flex align-items-center justify-content-between">
+          <b-col class="d-flex align-items-center justify-content">
             <dl class="mt-3 mr-3 w-75">
               <dt>{{ $t('pagePolicies.ipmi') }}</dt>
               <dd>
@@ -54,7 +54,7 @@
           </b-col>
         </b-row>
         <b-row class="setting-section">
-          <b-col class="d-flex align-items-center justify-content-between">
+          <b-col class="d-flex align-items-center justify-content">
             <dl class="mt-3 mr-3 w-75">
               <dt>{{ $t('pagePolicies.vtpm') }}</dt>
               <dd>
@@ -79,7 +79,7 @@
           </b-col>
         </b-row>
         <b-row class="setting-section">
-          <b-col class="d-flex align-items-center justify-content-between">
+          <b-col class="d-flex align-items-center justify-content">
             <dl class="mt-3 mr-3 w-75">
               <dt>{{ $t('pagePolicies.rtad') }}</dt>
               <dd>
diff --git a/src/views/_sila/SecurityAndAccess/Sessions/Sessions.vue b/src/views/_sila/SecurityAndAccess/Sessions/Sessions.vue
index d922c241..4f9d5e66 100644
--- a/src/views/_sila/SecurityAndAccess/Sessions/Sessions.vue
+++ b/src/views/_sila/SecurityAndAccess/Sessions/Sessions.vue
@@ -1,7 +1,7 @@
 <template>
-  <b-container fluid class="m-0 p-0">
+  <b-container fluid class="xl">
     <page-title />
-    <b-row class="align-items-center bootstrap-table__section">
+    <b-row class="align-items-center">
       <b-col sm="6" md="5" xl="4">
         <search
           :placeholder="$t('pageSessions.table.searchSessions')"
@@ -17,7 +17,7 @@
         ></table-cell-count>
       </b-col>
     </b-row>
-    <b-row class="bootstrap-table__section">
+    <b-row>
       <b-col>
         <table-toolbar
           ref="toolbar"
diff --git a/src/views/_sila/SecurityAndAccess/UserManagement/TableRoles.vue b/src/views/_sila/SecurityAndAccess/UserManagement/TableRoles.vue
index 61ef1ee8..b29fa20d 100644
--- a/src/views/_sila/SecurityAndAccess/UserManagement/TableRoles.vue
+++ b/src/views/_sila/SecurityAndAccess/UserManagement/TableRoles.vue
@@ -1,5 +1,5 @@
 <template>
-  <b-table stacked="sm" hover small :items="items" :fields="fields">
+  <b-table stacked="sm" hover :items="items" :fields="fields">
     <template #cell(administrator)="data">
       <template v-if="data.value">
         <checkmark20 />
diff --git a/src/views/_sila/SecurityAndAccess/UserManagement/UserManagement.vue b/src/views/_sila/SecurityAndAccess/UserManagement/UserManagement.vue
index 423ce4c1..ae8c5209 100644
--- a/src/views/_sila/SecurityAndAccess/UserManagement/UserManagement.vue
+++ b/src/views/_sila/SecurityAndAccess/UserManagement/UserManagement.vue
@@ -86,12 +86,12 @@
       </b-col>
     </b-row>
     <b-row>
-      <b-col xl="8">
+      <b-col xl="9">
         <b-button
           v-b-toggle.collapse-role-table
           data-test-id="userManagement-button-viewPrivilegeRoleDescriptions"
           variant="link"
-          class="mt-3"
+          class="mt-3 pl-0 pr-1"
         >
           <icon-chevron />
           {{ $t('pageUserManagement.viewPrivilegeRoleDescriptions') }}
-- 
cgit v1.2.3