-
+
+
+
+
-
OpenBMC
-
-
-
-
-
-
+
+ {{ customizableGuiName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -26,7 +37,8 @@ export default {
name: 'LoginLayout',
data() {
return {
- altLogo: `${process.env.VUE_APP_COMPANY_NAME} logo`,
+ altLogo: process.env.VUE_APP_COMPANY_NAME || 'OpenBMC',
+ customizableGuiName: process.env.VUE_APP_GUI_NAME || '',
};
},
};
@@ -34,25 +46,67 @@ export default {
diff --git a/src/views/ChangePassword/ChangePassword.vue b/src/views/ChangePassword/ChangePassword.vue
index e43193034b..2440ace1c2 100644
--- a/src/views/ChangePassword/ChangePassword.vue
+++ b/src/views/ChangePassword/ChangePassword.vue
@@ -1,71 +1,73 @@
-
+
{{ $t('pageChangePassword.changePasswordError') }}
{{ $t('pageChangePassword.changePasswordAlertMessage') }}
-
- - {{ $t('pageChangePassword.username') }}
- - {{ username }}
-
-
-
-
-
-
-
-
- {{ $t('global.form.fieldRequired') }}
-
-
-
-
-
-
-
-
-
-
- {{ $t('global.form.fieldRequired') }}
-
-
- {{ $t('global.form.passwordsDoNotMatch') }}
-
-
-
-
-
-
- {{ $t('pageChangePassword.goBack') }}
-
-
- {{ $t('pageChangePassword.changePassword') }}
-
-
-
+
@@ -124,7 +126,9 @@ export default {
diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue
index fc679361fc..8d96573a4e 100644
--- a/src/views/Login/Login.vue
+++ b/src/views/Login/Login.vue
@@ -1,9 +1,5 @@
-
+
{{ $t('pageLogin.alert.message') }}
@@ -37,16 +33,19 @@
-
-
+
+
+
+
{{ $t('global.form.fieldRequired') }}
@@ -54,8 +53,7 @@
-
-
diff --git a/tests/unit/__snapshots__/AppHeader.spec.js.snap b/tests/unit/__snapshots__/AppHeader.spec.js.snap
index b9e3bf7169..1ad2b3d614 100644
--- a/tests/unit/__snapshots__/AppHeader.spec.js.snap
+++ b/tests/unit/__snapshots__/AppHeader.spec.js.snap
@@ -54,7 +54,7 @@ exports[`AppHeader.vue should render correctly 1`] = `
to="/"
>