From 0058453fd92748d20eb1562fcea5871cec4c4f5a Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 9 Jun 2023 06:59:18 -0400 Subject: [PATCH] Modify OAuth login ui and fix display name, iconurl related logic (#25030) (#25161) Backport #25030 by @HesterG Close #24808 Co-Authour @wxiaoguang @silverwind 1. Most svgs are found from https://worldvectorlogo.com/ , and some are from conversion of png to svg. (facebook and nextcloud). And also changed `templates/user/settings/security/accountlinks.tmpl`. 2. Fixed display name and iconurl related logic # After Screen Shot 2023-06-05 at 14 09 05 On mobile Screen Shot 2023-06-05 at 14 09 46 user/settings/security/accountlinks (The dropdown might be improved later) Screen Shot 2023-06-01 at 10 01 44 Co-authored-by: HesterG Co-authored-by: silverwind Co-authored-by: wxiaoguang --- options/locale/locale_en-US.ini | 3 +- public/img/auth/azuread.png | Bin 3099 -> 0 bytes public/img/auth/azuread.svg | 1 + public/img/auth/azureadv2.png | Bin 3099 -> 0 bytes public/img/auth/azureadv2.svg | 1 + public/img/auth/bitbucket.png | Bin 2161 -> 0 bytes public/img/auth/bitbucket.svg | 1 + public/img/auth/discord.png | Bin 1559 -> 0 bytes public/img/auth/discord.svg | 1 + public/img/auth/dropbox.png | Bin 1424 -> 0 bytes public/img/auth/dropbox.svg | 1 + public/img/auth/facebook.png | Bin 2088 -> 0 bytes public/img/auth/facebook.svg | 1 + public/img/auth/gitea.png | Bin 5576 -> 0 bytes public/img/auth/gitea.svg | 1 + public/img/auth/github.png | Bin 1151 -> 0 bytes public/img/auth/github.svg | 1 + public/img/auth/gitlab.png | Bin 3616 -> 0 bytes public/img/auth/gitlab.svg | 1 + public/img/auth/google.png | Bin 1622 -> 0 bytes public/img/auth/google.svg | 1 + public/img/auth/mastodon.png | Bin 5112 -> 0 bytes public/img/auth/mastodon.svg | 1 + public/img/auth/microsoftonline.png | Bin 792 -> 0 bytes public/img/auth/microsoftonline.svg | 1 + public/img/auth/nextcloud.png | Bin 2918 -> 0 bytes public/img/auth/nextcloud.svg | 1 + public/img/auth/openid_connect.svg | 1 - public/img/auth/twitter.png | Bin 2709 -> 0 bytes public/img/auth/twitter.svg | 1 + public/img/auth/yandex.png | Bin 826 -> 0 bytes public/img/auth/yandex.svg | 1 + services/auth/signin.go | 2 +- services/auth/source/oauth2/providers.go | 44 ++-- services/auth/source/oauth2/providers_base.go | 15 +- .../auth/source/oauth2/providers_custom.go | 2 +- .../auth/source/oauth2/providers_openid.go | 8 +- .../auth/source/oauth2/providers_simple.go | 6 +- templates/user/auth/signin_inner.tmpl | 28 +-- .../user/settings/security/accountlinks.tmpl | 2 +- web_src/css/base.css | 4 + web_src/css/form.css | 6 +- web_src/fomantic/_site/globals/site.variables | 1 + web_src/fomantic/build/semantic.css | 213 ------------------ 44 files changed, 80 insertions(+), 270 deletions(-) delete mode 100644 public/img/auth/azuread.png create mode 100644 public/img/auth/azuread.svg delete mode 100644 public/img/auth/azureadv2.png create mode 100644 public/img/auth/azureadv2.svg delete mode 100644 public/img/auth/bitbucket.png create mode 100644 public/img/auth/bitbucket.svg delete mode 100644 public/img/auth/discord.png create mode 100644 public/img/auth/discord.svg delete mode 100644 public/img/auth/dropbox.png create mode 100644 public/img/auth/dropbox.svg delete mode 100644 public/img/auth/facebook.png create mode 100644 public/img/auth/facebook.svg delete mode 100644 public/img/auth/gitea.png create mode 100644 public/img/auth/gitea.svg delete mode 100644 public/img/auth/github.png create mode 100644 public/img/auth/github.svg delete mode 100644 public/img/auth/gitlab.png create mode 100644 public/img/auth/gitlab.svg delete mode 100644 public/img/auth/google.png create mode 100644 public/img/auth/google.svg delete mode 100644 public/img/auth/mastodon.png create mode 100644 public/img/auth/mastodon.svg delete mode 100644 public/img/auth/microsoftonline.png create mode 100644 public/img/auth/microsoftonline.svg delete mode 100644 public/img/auth/nextcloud.png create mode 100644 public/img/auth/nextcloud.svg delete mode 100644 public/img/auth/openid_connect.svg delete mode 100644 public/img/auth/twitter.png create mode 100644 public/img/auth/twitter.svg delete mode 100644 public/img/auth/yandex.png create mode 100644 public/img/auth/yandex.svg diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 195252c47d..9528708623 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -4,7 +4,8 @@ explore = Explore help = Help logo = Logo sign_in = Sign In -sign_in_with = Sign In With +sign_in_with_provider = Sign in with %s +sign_in_or = or sign_out = Sign Out sign_up = Register link_account = Link Account diff --git a/public/img/auth/azuread.png b/public/img/auth/azuread.png deleted file mode 100644 index 1adbf15e28a0da8e8001a97790da0ad234e2b48a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3099 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 g