From c44760deb84fd18461df43bbda5a432ecb588d63 Mon Sep 17 00:00:00 2001 From: utchoang Date: Tue, 26 Oct 2021 15:59:56 +0700 Subject: [PATCH 1/7] add footer text option for login screen --- ui/public/config.json | 4 +++- ui/src/layouts/UserLayout.vue | 28 ++++++++++++++++++++++++++++ ui/src/style/dark-mode.less | 4 ++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/ui/public/config.json b/ui/public/config.json index 6c134087101b..59ae555eed8b 100644 --- a/ui/public/config.json +++ b/ui/public/config.json @@ -56,5 +56,7 @@ "plugins": [], "basicZoneEnabled": true, "multipleServer": false, - "docHelpMappings": {} + "docHelpMappings": {}, + "loginPolicy": "By logging, you are accepting the usage policy", + "loginHelp": "For login help see help" } diff --git a/ui/src/layouts/UserLayout.vue b/ui/src/layouts/UserLayout.vue index e25bab4c8cbb..59053062748a 100644 --- a/ui/src/layouts/UserLayout.vue +++ b/ui/src/layouts/UserLayout.vue @@ -31,6 +31,10 @@ +
+ + +
@@ -97,5 +101,29 @@ export default { margin-bottom: 1rem; } } + + &-footer { + display: flex; + flex-direction: column; + position: absolute; + bottom: 20px; + text-align: center; + width: 100%; + + @media (max-height: 600px) { + position: relative; + margin-top: 50px; + } + + label { + width: 368px; + font-weight: 500; + margin: 0 auto; + } + + .login-policy { + color: #f5222d; + } + } } diff --git a/ui/src/style/dark-mode.less b/ui/src/style/dark-mode.less index 10534f7a27a0..6e15abcd4afb 100644 --- a/ui/src/style/dark-mode.less +++ b/ui/src/style/dark-mode.less @@ -901,4 +901,8 @@ .ant-empty-normal { color: @dark-text-color-3; } + + .login-help { + color: @dark-text-color-3; + } } \ No newline at end of file From 8fdd8018edbebbb7ffb2f8be261883cc62657d9b Mon Sep 17 00:00:00 2001 From: utchoang Date: Wed, 27 Oct 2021 15:56:21 +0700 Subject: [PATCH 2/7] using single key for policy --- ui/public/config.json | 3 +-- ui/src/layouts/UserLayout.vue | 9 ++------- ui/src/style/dark-mode.less | 4 ---- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/ui/public/config.json b/ui/public/config.json index 59ae555eed8b..5c98a4af4062 100644 --- a/ui/public/config.json +++ b/ui/public/config.json @@ -57,6 +57,5 @@ "basicZoneEnabled": true, "multipleServer": false, "docHelpMappings": {}, - "loginPolicy": "By logging, you are accepting the usage policy", - "loginHelp": "For login help see help" + "loginPolicy": "By logging, you are accepting the usage policy
For login help see help" } diff --git a/ui/src/layouts/UserLayout.vue b/ui/src/layouts/UserLayout.vue index 59053062748a..2cb130342cc2 100644 --- a/ui/src/layouts/UserLayout.vue +++ b/ui/src/layouts/UserLayout.vue @@ -31,9 +31,8 @@ -
- - +
+
@@ -120,10 +119,6 @@ export default { font-weight: 500; margin: 0 auto; } - - .login-policy { - color: #f5222d; - } } } diff --git a/ui/src/style/dark-mode.less b/ui/src/style/dark-mode.less index 6e15abcd4afb..10534f7a27a0 100644 --- a/ui/src/style/dark-mode.less +++ b/ui/src/style/dark-mode.less @@ -901,8 +901,4 @@ .ant-empty-normal { color: @dark-text-color-3; } - - .login-help { - color: @dark-text-color-3; - } } \ No newline at end of file From f59a3c816366da21be85e350c346f3dc813bb435 Mon Sep 17 00:00:00 2001 From: utchoang Date: Wed, 27 Oct 2021 15:57:27 +0700 Subject: [PATCH 3/7] set empty for default policy text --- ui/public/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/public/config.json b/ui/public/config.json index 5c98a4af4062..29e9d0cdc11b 100644 --- a/ui/public/config.json +++ b/ui/public/config.json @@ -57,5 +57,5 @@ "basicZoneEnabled": true, "multipleServer": false, "docHelpMappings": {}, - "loginPolicy": "By logging, you are accepting the usage policy
For login help see help" + "loginPolicy": "" } From 46b8a994b7bd378071f3b262faec7e2a33ddf891 Mon Sep 17 00:00:00 2001 From: utchoang Date: Wed, 27 Oct 2021 16:14:43 +0700 Subject: [PATCH 4/7] rename footer text key --- ui/public/config.json | 2 +- ui/src/layouts/UserLayout.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/public/config.json b/ui/public/config.json index 29e9d0cdc11b..09e6b443227d 100644 --- a/ui/public/config.json +++ b/ui/public/config.json @@ -57,5 +57,5 @@ "basicZoneEnabled": true, "multipleServer": false, "docHelpMappings": {}, - "loginPolicy": "" + "footerText": "" } diff --git a/ui/src/layouts/UserLayout.vue b/ui/src/layouts/UserLayout.vue index 2cb130342cc2..84fccb7be5e5 100644 --- a/ui/src/layouts/UserLayout.vue +++ b/ui/src/layouts/UserLayout.vue @@ -31,8 +31,8 @@ -
- +
+
From 5b22d7839cf6d16318ed43ec26ff273e6aed6829 Mon Sep 17 00:00:00 2001 From: utchoang Date: Mon, 1 Nov 2021 08:08:34 +0700 Subject: [PATCH 5/7] rename the footer text property name --- ui/public/config.json | 2 +- ui/src/layouts/UserLayout.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/public/config.json b/ui/public/config.json index 09e6b443227d..8cb548c92936 100644 --- a/ui/public/config.json +++ b/ui/public/config.json @@ -57,5 +57,5 @@ "basicZoneEnabled": true, "multipleServer": false, "docHelpMappings": {}, - "footerText": "" + "loginFooter": "" } diff --git a/ui/src/layouts/UserLayout.vue b/ui/src/layouts/UserLayout.vue index 84fccb7be5e5..97faff1b4464 100644 --- a/ui/src/layouts/UserLayout.vue +++ b/ui/src/layouts/UserLayout.vue @@ -31,8 +31,8 @@ -
- +
+
From 1a5e885ac798a4f72df31cf655394ead86bf263e Mon Sep 17 00:00:00 2001 From: utchoang Date: Wed, 3 Nov 2021 09:09:52 +0700 Subject: [PATCH 6/7] change position avoid breaking with docHelp --- ui/public/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/public/config.json b/ui/public/config.json index 8cb548c92936..7298ccacc1ec 100644 --- a/ui/public/config.json +++ b/ui/public/config.json @@ -56,6 +56,6 @@ "plugins": [], "basicZoneEnabled": true, "multipleServer": false, - "docHelpMappings": {}, - "loginFooter": "" + "loginFooter": "", + "docHelpMappings": {} } From 2ba56015b2805d7be3f64bf9d3d6d9ed47a75f85 Mon Sep 17 00:00:00 2001 From: utchoang Date: Wed, 3 Nov 2021 17:11:35 +0700 Subject: [PATCH 7/7] change position of properties --- ui/public/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/public/config.json b/ui/public/config.json index 7298ccacc1ec..e99948045684 100644 --- a/ui/public/config.json +++ b/ui/public/config.json @@ -10,6 +10,7 @@ "docBase": "http://docs.cloudstack.apache.org/en/latest", "appTitle": "CloudStack", "footer": "Licensed under the Apache License, Version 2.0.", + "loginFooter": "", "logo": "assets/logo.svg", "banner": "assets/banner.svg", "error": { @@ -56,6 +57,5 @@ "plugins": [], "basicZoneEnabled": true, "multipleServer": false, - "loginFooter": "", "docHelpMappings": {} }