diff options
| author | Vitalii Lysak <v.lysak@dunice.net> | 2022-07-14 13:10:56 +0300 |
|---|---|---|
| committer | Vitalii Lysak <v.lysak@dunice.net> | 2022-07-14 13:10:56 +0300 |
| commit | 1c0b3701d2514d3c23066a6ad7b2922a3de6a8d9 (patch) | |
| tree | 775dd507dc6f50a3c140ac67cf1d2fbfa8754c15 | |
| parent | 521a15c650a4c050a4366a8fbfa70f3db1c47fd4 (diff) | |
| parent | fb2187d0dd0561b1199835d9b7ca24634266a91c (diff) | |
| download | webui-vue-1c0b3701d2514d3c23066a6ad7b2922a3de6a8d9.tar.xz | |
Merge branch 'sila-ui' of git.sila.ru:pub/openbmc/webui-vue into sila-ui
| -rw-r--r-- | src/i18n.js | 6 | ||||
| -rw-r--r-- | src/views/_sila/ResourceManagement/Power.vue | 2 | ||||
| -rw-r--r-- | src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/i18n.js b/src/i18n.js index 33b602a6..919c363f 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -22,11 +22,9 @@ function loadLocaleMessages() { export default new VueI18n({ // Get default locale from local storage - // locale: window.localStorage.getItem('storedLanguage'), - locale: 'ru-RU', + locale: window.localStorage.getItem('storedLanguage'), // Locales that don't exist will fallback to English - // fallbackLocale: 'en-US', - fallbackLocale: 'ru-RU', + fallbackLocale: 'en-US', // Falling back to fallbackLocale generates two console warnings // Silent fallback suppresses console warnings when using fallback silentFallbackWarn: true, diff --git a/src/views/_sila/ResourceManagement/Power.vue b/src/views/_sila/ResourceManagement/Power.vue index fce15442..3c1e6412 100644 --- a/src/views/_sila/ResourceManagement/Power.vue +++ b/src/views/_sila/ResourceManagement/Power.vue @@ -34,7 +34,7 @@ </b-row> <b-row> - <b-col sm="8" md="6" xl="3"> + <b-col sm="8" md="6" xl="4"> <b-form-group id="input-group-1" :label="$t('pagePower.powerCapLabel')" diff --git a/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue b/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue index 8374b653..d05d9def 100644 --- a/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue +++ b/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue @@ -28,7 +28,7 @@ :disabled="!form.ldapAuthenticationEnabled || loading" > <b-row> - <b-col md="3" lg="4" xl="3"> + <b-col md="3" lg="4" xl="7"> <b-form-group class="mb-4" :label="$t('pageLdap.form.secureLdapUsingSsl')" @@ -207,7 +207,7 @@ </b-row> </b-form-group> </div> - <b-row class="mt-4 mb-5"> + <b-row class="mt-4 mb-7"> <b-col> <b-btn variant="primary" |