From 491a1148ee503c4bd709493f00017da8fdf9fd1d Mon Sep 17 00:00:00 2001 From: Matt Baer Date: Tue, 24 Mar 2020 10:41:53 -0400 Subject: [PATCH] Restyle OAuth account management section - Break up linked / to-link sections - Add logos for all services - Lay out buttons horizontally - Tweak the copy Ref T713 --- static/img/mark/gitlab.png | Bin 0 -> 1005 bytes static/img/mark/slack.png | Bin 0 -> 2291 bytes static/img/mark/writeas.png | Bin 0 -> 2884 bytes templates/user/settings.tmpl | 66 ++++++++++++++++++++++++++++++------------- 4 files changed, 47 insertions(+), 19 deletions(-) create mode 100644 static/img/mark/gitlab.png create mode 100644 static/img/mark/slack.png create mode 100644 static/img/mark/writeas.png diff --git a/static/img/mark/gitlab.png b/static/img/mark/gitlab.png new file mode 100644 index 0000000000000000000000000000000000000000..214b0ad3d6d836234b25127184fe75338b981eeb GIT binary patch literal 1005 zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I8A$FCoG#D6z{nlo6XNg=swV)O_l$ z`884fLxjfbK#g}H8n65`-i4{Z1{&z60W=n9CXoB32&CZ8Vl@!zSNoHz_NPVKxH{aK*)r(ErKw%V^uwLf#z{uHSF=~eqPN$t-xwLcwdf9ll!l&JlgsrIKw z?avgoKXXBhccB_U1wT^N|8%Q?P^;RXiE4kk)PTDgZ-=u_VYZn8D%MjWiG^$=lt9p@UV{1IXbl z@Q5sCVBi)8VMc~ob0mO*>?NMQuIx{kCHORSzKKg-XJBB8_H=O!skrs_=3YPPK!LW0 znr@3YJvg+yOd^^D*t;||L=;q9CUQx=`|rnbBk}s~>VLfXV z_pfO0diF1mS!&HMe!o~3pD;U=4r}K+QFZjVEev7qh@A{fn!}$vX79Db0aD~;6 zL;uje?iK!7Kc4JLX?=V?&YSh&G1FA*1y|VnTFVvh#~w;&*)w&DL3QI{ZQH963r_Is zeyA&1X?5Tt*YwN#-mhd0WA?hob$MTw!$pRrVg}AT<}SwV1s{%a~%`ZvM7J{-#%_V(LO&R^}9d(J8MFI)Bhysln4EsFd4fo<2Wi?3_Y{bko-FW!HqzdPUeQ^r^Q+gF)Z xUYz$-R%8E)yHCD^tay1Y51s}fso}+5^BW4eZYQ(4_5)KMgQu&X%Q~loCIBTb!}$OJ literal 0 HcmV?d00001 diff --git a/static/img/mark/slack.png b/static/img/mark/slack.png new file mode 100644 index 0000000000000000000000000000000000000000..33b4abcd4c0361d7e44dbf0f822a5f878e2f36f8 GIT binary patch literal 2291 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 literal 0 HcmV?d00001 diff --git a/static/img/mark/writeas.png b/static/img/mark/writeas.png new file mode 100644 index 0000000000000000000000000000000000000000..777885b4ecbea9c4d81a88256b001dc93583beda GIT binary patch literal 2884 zcmb^z2UnBX@=Ia}9UDdrpe`L25f$l8$cr;Lg^2M z4X|BFjNVGCz^>OwqI+kM--XO}(H1s&Tvl7U5wdHXKh=E&vxDa|ipYcE-kgngG%{aD zrw|Mvc@kOkt)Y+3e$t9LU`rE4ijSic-7n5+G!p^6N+p2Wq+Hb6Qg<9Zv?VA`JbyvV zPfZPOHK1Y#{BUUBAT>eE^F(_Xxpsi`%GP|9g&M?)f3IoYp~Ua$`=A-I87JIPCm}ul z7EMtI9&!nj z*mH`u=LVUuNS1hhCi=*PH0rWlf3uDVUX?woOG0`3M3-O1h}5dXz!7NLlHiS1D)MF|6a!;)wZFy_! zv$g8&4r*G>_0_$$k0BOv?cd5|orO){1`GkvnXIT>GP*I8s(Ms1jo z=p5P9&K;Pi9S(rHNsO&j-^g`9Q_AUAXg*EJls;}!BXzMLIslt#(aVG{p zef6;@$js^mAHrp~=y?oUXWwLU+0%SyPNr|ENI_E)0b#(PC5SF)|P29V2zFS_QAp_?h zzp!J2p+YH64dTzc;AHKGgXPs0rQe4=3<`mo?ygNZAM1CJ5$qOIxtPs(i((!{J-h{R zdgDtBBKg<#4+i^NDA~%J4^}QH_b(sp>4fE$r^v6XYU_$L*R^LLDcG|%z$tA1*3z{o zxz>D|xC9he#odr+k$IllJt-OfBCV;44~t(2_X$kmNluIE5%Y6|Y(DqT<$R0R4j5fM zWyuCLZ|Xv*wa*DCqs>;MD>56{o!Ev zrR}WeS02_r9IM|H#hy_F7BLDqPt2J#MREW+);U9~%HZp&T5~0nF=25s-{a+vAilnm z?MGqImZPYRYA7X|&WUCTyf2$`q1ZahMD=&41^o!3n;QO@`3M4mmajd^ef@McAy~g# z&+60~5l%>^=o`BdzgJDemS&zBL+mny;hy*A=2D2%v1#;)A=2G?9c2)Cdywf7Kn#r$ zIZOQGk3U@Fw~Sf|1uunT?qugm@$Bn+x$;~6Wip^(sz}atL)AL0hV$c>L{c_H#fjQM zQ*Y%u?q3>{e%`ZbQ`us9d4jO|A63dsEvQ$2dHwXX>|jD1AF0_N^DOL2w6M$PViWT9*x~AWdaI4j$rg4E5J%f& zd=#wt*tKT~(b}eS?lU&@j&gclU=LMg_UmF}QiBGJkq6XYdcl&XB6^>WpWIg1E`X^pOMZx$8MQh<7mB{D*z%=|0^4q#(Ga0%yP;@X4x+5&rET zRgz;#vzmTYaA_LNF@>%VLnK%JeAR1dD2bwO`SF9l859NA3l*J8A&gT9h6dzyIXBa` z{ZHYn_SKy`7!SFp@n)WphYHh~Bcqe;!n&aTxIXvlQvb+Ub@GS_Bx^F5HD3VPRbT3B z$W~%h!7o{_XI9cR%$xN7%`X2y=R681Jj=Ep3=7+dK{WQ2PS3>F%tY>72b23&4h(_z z)dj!F8fC54&xAyZ@wb26?e%h`z>Qk_C~#-v)Z|(!761>>}_ErPPN_|Zx$h(0X6)7 zKitz9;xw)rYBsdXSA^}Kwk`LK>g@gd6**b~YACd;osbJKXBxBXiAPq<)YTjnRtIqiBdT-P3wb>Hw~UI8VOLYnz96}mk1OABux1tc$Wl~x*x zcX)%o9+p_K{=?fxT2;|nmw)_YI1~78t&b;<3Hfbgvk}4YiU8F< z;yO6ATbMF|LQ!j3dacOQMA+^Fo%S}O>F(X^1!*`YESJK*Yv3@fWR2n+qUrmR5t3%x zw{dbfTcfsBV8vxhUB(8ur}q21FEJLw%b}k~B54bpqnuZ|WlYAi0%N=aF3QmqJ1M4X zIA&o);l^)BpRQBCI@hZcrNl=m&zzg2gb=}EIi!&$bXsOyiOO}S@3VQSuC5)l=qC)$ zPhK>srd9SuM5YI#a^uHQs1p+qoG~-beKJ@?rjW{n?FlxAEYAJZ;OfiB&14OIAFejH vOBhR)^;fo;8Vl_(=WaTf{I8JgaR~3(VBe36y)DAqcL8&>l}YtAOzeLF$uw;F literal 0 HcmV?d00001 diff --git a/templates/user/settings.tmpl b/templates/user/settings.tmpl index a403feb..8ade8ad 100644 --- a/templates/user/settings.tmpl +++ b/templates/user/settings.tmpl @@ -4,7 +4,13 @@
{{if .Silenced}} @@ -62,41 +68,63 @@ h3 { font-weight: normal; }
-
+
{{ if .OauthSection }} -

OAuth Management

+
+ {{ if .OauthAccounts }} -

Existing OAuth accounts can be removed from your account.

+
+

Linked Accounts

+

These are your linked external accounts.

{{ range $oauth_account := .OauthAccounts }}
-
-
- -
-
+
+ {{ $oauth_account.Provider | title }} + +
{{ end }} - {{ end }} - {{ if or .OauthSlack .OauthWriteAs }} -

+

+ {{ end }} + {{ if or .OauthSlack .OauthWriteAs .OauthGitLab }} +
+

Link External Accounts

+

Connect additional accounts to enable logging in with those providers, instead of using your username and password.

+
+ {{ if .OauthWriteAs }} +
+ Write.as + + Link Write.as + +
+ {{ end }} {{ if .OauthSlack }} - Sign in with Slack - {{ end }} - {{ if .OauthWriteAs }} - Link your Write.as account. +
+ Slack + + Link Slack + +
{{ end }} {{ if .OauthGitLab }} - Link your {{.GitLabDisplayName}} account +
+ GitLab + + Link {{.GitLabDisplayName}} + +
{{ end }} -

- {{ end }} +
+
+ {{ end }} {{ end }}