From 77e012680853d023678e76fa784c061d852b531c Mon Sep 17 00:00:00 2001 From: Matt Baer Date: Sun, 5 Jan 2020 11:00:58 -0500 Subject: [PATCH] Move and restyle OAuth login links - Move them above local login form - Restyle as side-by-side buttons Ref T712 --- pages/login.tmpl | 59 ++++++++++++++++++++++----- static/img/sign_in_with_slack.png | Bin 0 -> 2604 bytes static/img/sign_in_with_slack@2x.png | Bin 0 -> 5120 bytes 3 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 static/img/sign_in_with_slack.png create mode 100644 static/img/sign_in_with_slack@2x.png diff --git a/pages/login.tmpl b/pages/login.tmpl index 6c1b3ed..345b171 100644 --- a/pages/login.tmpl +++ b/pages/login.tmpl @@ -1,7 +1,38 @@ {{define "head"}}Log in — {{.SiteName}} - + {{end}} {{define "content"}}
@@ -11,6 +42,22 @@ {{range .Flashes}}
  • {{.}}
    • {{end}} {{end}} + {{ if or .OauthSlack .OauthWriteAs }} +
    + {{ if .OauthSlack }} + Sign in with Slack + {{ end }} + {{ if .OauthWriteAs }} + Sign in with Write.as + {{ end }} +
    + +
    +

    or

    +
    +
    + {{ end }} +


    @@ -19,16 +66,6 @@
    {{if and (not .SingleUser) .OpenRegistration}}

    {{if .Message}}{{.Message}}{{else}}No account yet? Sign up to start a blog.{{end}}

    {{end}} - {{ if .OauthSlack }} -

    - Sign-in with Slack. -

    - {{ end }} - {{ if .OauthWriteAs }} -

    - Sign-in with Write.As. -

    - {{ end }}