From 2e8faeaf0da58e0613a2fb80e8f21108bb76b5b2 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Mon, 28 Nov 2016 22:12:50 -0500 Subject: [PATCH] AzureAD auth updates. Add auth backend to settings, add microsoft icon to fontcustom, add azuread support to login modal. --- awx/settings/defaults.py | 1 + .../fontcustom/.fontcustom-manifest.json | 54 ++++++--- .../assets/fontcustom/fontcustom-preview.html | 70 ++++-------- .../client/assets/fontcustom/fontcustom.css | 28 ++--- ...ustom_3dfbafd778b214fc5df2a64fe14fbfb3.eot | Bin 0 -> 3120 bytes ...ustom_3dfbafd778b214fc5df2a64fe14fbfb3.svg | 76 ++++++++++++ ...ustom_3dfbafd778b214fc5df2a64fe14fbfb3.ttf | Bin 0 -> 2936 bytes ...stom_3dfbafd778b214fc5df2a64fe14fbfb3.woff | Bin 0 -> 2064 bytes ...ustom_d77a9996ed04d45b02f5c06874cd36db.eot | Bin 3982 -> 0 bytes ...ustom_d77a9996ed04d45b02f5c06874cd36db.svg | 108 ------------------ ...ustom_d77a9996ed04d45b02f5c06874cd36db.ttf | Bin 3796 -> 0 bytes ...stom_d77a9996ed04d45b02f5c06874cd36db.woff | Bin 2376 -> 0 bytes .../assets/fontcustom/new_icons/microsoft.svg | 14 +++ .../thirdPartySignOn.service.js | 15 ++- 14 files changed, 174 insertions(+), 192 deletions(-) create mode 100644 awx/ui/client/assets/fontcustom/fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.eot create mode 100644 awx/ui/client/assets/fontcustom/fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.svg create mode 100644 awx/ui/client/assets/fontcustom/fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.ttf create mode 100644 awx/ui/client/assets/fontcustom/fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.woff delete mode 100644 awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot delete mode 100644 awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg delete mode 100644 awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.ttf delete mode 100644 awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.woff create mode 100644 awx/ui/client/assets/fontcustom/new_icons/microsoft.svg diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 040bbb2ee0..ef33a512cb 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -260,6 +260,7 @@ AUTHENTICATION_BACKENDS = ( 'social.backends.github.GithubOAuth2', 'social.backends.github.GithubOrganizationOAuth2', 'social.backends.github.GithubTeamOAuth2', + 'social.backends.azuread.AzureADOAuth2', 'awx.sso.backends.SAMLAuth', 'django.contrib.auth.backends.ModelBackend', ) diff --git a/awx/ui/client/assets/fontcustom/.fontcustom-manifest.json b/awx/ui/client/assets/fontcustom/.fontcustom-manifest.json index 06fddffd64..c50d13abe3 100644 --- a/awx/ui/client/assets/fontcustom/.fontcustom-manifest.json +++ b/awx/ui/client/assets/fontcustom/.fontcustom-manifest.json @@ -1,18 +1,38 @@ { "checksum": { - "previous": "e4442d278bfc4c1a673bdd29512213a18cfaf74decd9bb21ecd698b4860e7453", - "current": "e4442d278bfc4c1a673bdd29512213a18cfaf74decd9bb21ecd698b4860e7453" + "previous": "3dfbafd778b214fc5df2a64fe14fbfb30ba40e33282eedf0d98b5a613786db88", + "current": "3dfbafd778b214fc5df2a64fe14fbfb30ba40e33282eedf0d98b5a613786db88" }, "fonts": [ - "..//fontcustom_e4442d278bfc4c1a673bdd29512213a1.ttf", - "..//fontcustom_e4442d278bfc4c1a673bdd29512213a1.svg", - "..//fontcustom_e4442d278bfc4c1a673bdd29512213a1.woff", - "..//fontcustom_e4442d278bfc4c1a673bdd29512213a1.eot" + "./fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.ttf", + "./fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.svg", + "./fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.woff", + "./fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.eot" ], "glyphs": { - "fontcustom_fbf6cfce71d2c35351b84596defbfd01": { - "codepoint": 61696, - "source": "./fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg" + "activity-stream": { + "codepoint": 61697, + "source": "new_icons/activity-stream.svg" + }, + "google": { + "codepoint": 61698, + "source": "new_icons/google.svg" + }, + "launch": { + "codepoint": 61699, + "source": "new_icons/launch.svg" + }, + "microsoft": { + "codepoint": 61700, + "source": "new_icons/microsoft.svg" + }, + "saml-02": { + "codepoint": 61701, + "source": "new_icons/saml-02.svg" + }, + "user": { + "codepoint": 61702, + "source": "new_icons/user.svg" } }, "options": { @@ -25,16 +45,16 @@ "font_design_size": 16, "font_em": 512, "font_name": "fontcustom", - "force": true, + "force": false, "input": { - "templates": ".", - "vectors": "." + "templates": "new_icons/", + "vectors": "new_icons/" }, "no_hash": false, "output": { - "css": "../", - "fonts": "../", - "preview": "../" + "css": ".", + "fonts": ".", + "preview": "." }, "preprocessor_path": null, "quiet": false, @@ -44,7 +64,7 @@ ] }, "templates": [ - "../fontcustom.css", - "../fontcustom-preview.html" + "./fontcustom.css", + "./fontcustom-preview.html" ] } \ No newline at end of file diff --git a/awx/ui/client/assets/fontcustom/fontcustom-preview.html b/awx/ui/client/assets/fontcustom/fontcustom-preview.html index becd88eca8..bda47533ba 100644 --- a/awx/ui/client/assets/fontcustom/fontcustom-preview.html +++ b/awx/ui/client/assets/fontcustom/fontcustom-preview.html @@ -141,11 +141,11 @@ @font-face { font-family: "fontcustom"; - src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot"); - src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot?#iefix") format("embedded-opentype"), - url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.woff") format("woff"), - url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.ttf") format("truetype"), - url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg#fontcustom") format("svg"); + src: url("./fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.eot"); + src: url("./fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.eot?#iefix") format("embedded-opentype"), + url("./fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.woff") format("woff"), + url("./fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.ttf") format("truetype"), + url("./fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.svg#fontcustom") format("svg"); font-weight: normal; font-style: normal; } @@ -153,7 +153,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: "fontcustom"; - src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg#fontcustom") format("svg"); + src: url("./fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.svg#fontcustom") format("svg"); } } @@ -163,9 +163,7 @@ .icon-activity-stream:before, .icon-google:before, .icon-launch:before, -.icon-launch-circle:before, -.icon-launch-new:before, -.icon-launch2:before, +.icon-microsoft:before, .icon-saml-02:before, .icon-user:before { display: inline-block; @@ -182,14 +180,12 @@ font-smoothing: antialiased; } - .icon-activity-stream:before { content: "\f102"; } -.icon-google:before { content: "\f100"; } + .icon-activity-stream:before { content: "\f101"; } +.icon-google:before { content: "\f102"; } .icon-launch:before { content: "\f103"; } -.icon-launch-circle:before { content: "\f105"; } -.icon-launch-new:before { content: "\f107"; } -.icon-launch2:before { content: "\f106"; } -.icon-saml-02:before { content: "\f101"; } -.icon-user:before { content: "\f104"; } +.icon-microsoft:before { content: "\f104"; } +.icon-saml-02:before { content: "\f105"; } +.icon-user:before { content: "\f106"; } @@ -205,7 +201,7 @@
-

fontcustom contains 8 glyphs:

+

fontcustom contains 6 glyphs:

Toggle Preview Characters
@@ -219,7 +215,7 @@
- +
@@ -232,7 +228,7 @@
- +
@@ -251,40 +247,14 @@
- PpPpPpPpPpPpPpPpPpPp + PpPpPpPpPpPpPpPpPpPp
12141618212436486072
- - -
-
- -
-
- PpPpPpPpPpPpPpPpPpPp -
-
- 12141618212436486072 -
-
- - -
-
- -
-
- PpPpPpPpPpPpPpPpPpPp -
-
- 12141618212436486072 -
-
- - + +
@@ -297,7 +267,7 @@
- +
@@ -310,7 +280,7 @@
- +
diff --git a/awx/ui/client/assets/fontcustom/fontcustom.css b/awx/ui/client/assets/fontcustom/fontcustom.css index 39ab124bda..6dfb140f36 100644 --- a/awx/ui/client/assets/fontcustom/fontcustom.css +++ b/awx/ui/client/assets/fontcustom/fontcustom.css @@ -4,11 +4,11 @@ @font-face { font-family: "fontcustom"; - src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot"); - src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot?#iefix") format("embedded-opentype"), - url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.woff") format("woff"), - url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.ttf") format("truetype"), - url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg#fontcustom") format("svg"); + src: url("./fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.eot"); + src: url("./fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.eot?#iefix") format("embedded-opentype"), + url("./fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.woff") format("woff"), + url("./fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.ttf") format("truetype"), + url("./fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.svg#fontcustom") format("svg"); font-weight: normal; font-style: normal; } @@ -16,7 +16,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: "fontcustom"; - src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg#fontcustom") format("svg"); + src: url("./fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.svg#fontcustom") format("svg"); } } @@ -26,9 +26,7 @@ .icon-activity-stream:before, .icon-google:before, .icon-launch:before, -.icon-launch-circle:before, -.icon-launch-new:before, -.icon-launch2:before, +.icon-microsoft:before, .icon-saml-02:before, .icon-user:before { display: inline-block; @@ -45,11 +43,9 @@ font-smoothing: antialiased; } -.icon-activity-stream:before { content: "\f102"; } -.icon-google:before { content: "\f100"; } +.icon-activity-stream:before { content: "\f101"; } +.icon-google:before { content: "\f102"; } .icon-launch:before { content: "\f103"; } -.icon-launch-circle:before { content: "\f105"; } -.icon-launch-new:before { content: "\f107"; } -.icon-launch2:before { content: "\f106"; } -.icon-saml-02:before { content: "\f101"; } -.icon-user:before { content: "\f104"; } +.icon-microsoft:before { content: "\f104"; } +.icon-saml-02:before { content: "\f105"; } +.icon-user:before { content: "\f106"; } diff --git a/awx/ui/client/assets/fontcustom/fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.eot b/awx/ui/client/assets/fontcustom/fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.eot new file mode 100644 index 0000000000000000000000000000000000000000..7d890d22c2221262827b2616f751ee7554065213 GIT binary patch literal 3120 zcmds3TWlOx8UFvd?(EFocV;iK*W=xIwz-3y5*rL-kOEa_puAp5y4|)|E3!c796+Bfcd$0mI(SNc9kvK$%Hb|zk z4*PA^Wa-1&#S1NygkADRAA+oc$vB$5w8 zuFOrXt?cf?5}A*I4$NJ;+PZV=8^4Bpj7YWSXQyV2KYZm3Wbfc@%!47n&%cDNBZi7LS0m%L3#w-q?Rw@%xa_ANI9u6>lIxbQ^Ql#k8`uw zES5l|8bfslyfT*>P2E8N8cpDk2(L<5=SYN8Z{FV7?L9d<>Skq2c4JO9+mng~O37d; zXj#dUsah}d4+5c(8!Q?*?X6tlNaauu@K`F9aN^yTQ3}TSkg&74HI}v=Gp$%sZ&VLx zdMcjIeN)c`@&_Y1JAKSdmuvk;a(Yfr7Ut5184Pv>x^+{*2qg=FT%Z8&WYTtD!#~R} z=nPHauNnVwVL8G%4s(Pxq^DGDR)!iSU9&aejGiyRouNT^*MRGlMzvYglT|obEjEu! zP6|`AQLm+HDTntWpeJq3PS!G$jp)?@4TpnGJ}DDEHNwH2h3OU>2yBDKUI^J z@~}N=^$d;oK~L5AA+R~11dM{hAtf9Sb=euyiAyP`2iu@X`VJecOy>FwhGltYl2v^$ zYiF%!K#_HsRq4;^UKqc>MofxOLVO4IYD6EZ+jYDG_Tu#ues?3av9Yo9mkmE}e+RYk zteE!ikf^z%`<7%;Gk%~EOoSB#ZV18%!hh_fRzQAAHm+7$h@7(2i$9nk4Bm@@!a#Gs#c{H#DrU z7S6yswBzG4mGHmW`M@X?nN>SeSaSi-Gi7%I8 z!2Z*CJ2<1MdBevgG)3?ExJ+kQ^>Kxg{AC|k$>ryLTm%0tI)SEX7I(AlwNox#psVD9 zI}iQ>+Nln{4r&@amo9_b_ONlkF%xi==CIzSn%8i-__EGJt4%93LIZgAnm7SFx@FjI zL3;`7+Vlyc6RWdR?b#Xk!d3Ug{OZCQ=JnO-dH3={d)^&iUTTjoug=Z7wQ|LMV7}d6 z85tO8f!h+?@>;9BG~0%iy^Zec7KPsQ`dWJ#o#K6M^863!=vq@LydSfm-zfA!g#e(^-}z5n{>hyH literal 0 HcmV?d00001 diff --git a/awx/ui/client/assets/fontcustom/fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.svg b/awx/ui/client/assets/fontcustom/fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.svg new file mode 100644 index 0000000000..20e687b626 --- /dev/null +++ b/awx/ui/client/assets/fontcustom/fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.svg @@ -0,0 +1,76 @@ + + + + + +Created by FontForge 20120731 at Mon Nov 28 21:58:48 2016 + By Chris Church +Created by Chris Church with FontForge 2.0 (http://fontforge.sf.net) + + + + + + + + + + + + + + diff --git a/awx/ui/client/assets/fontcustom/fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.ttf b/awx/ui/client/assets/fontcustom/fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.ttf new file mode 100644 index 0000000000000000000000000000000000000000..b5bb62ffce4e087d0a02264b0b7fbd356da9c384 GIT binary patch literal 2936 zcmds3TWlOx8UFvd?(EFocV;iK*W=xIHze_TFWz0_*r}zYHm%YSXcO8BVI13QZxml- zuSxSjun?eCOv8=I4R-efrUn%DE@MFiymeL;m9Y z%G~;$f7u<#zej&~{!49_B7B-iK8$%~X>N19+l3}FAA{^$x_q^H=hioWgZU{U)mmPh zTQL6gm9v<88@;{^Kz@&Z1zmB-hnH8{Pbnjmfc$gFnagYQbLy`0Q|vzi*;$!;YMnkq z-^ctIWOsFLW%0AeYgL#!LnOVhzP8!^#WQc2ME-wZzDXiB^s%qb{B|}p@d23<0HWI$ zf3SR)cK0OWS0Vdof4aAaU+wNuaUZ}aG~N5CJ;YC!NbSL5A@{H;D)tbCf5-2OSw6!} zATu8QfKv1|cuN}c%g;vi@Z?d;w-^54q z|0mO{aXRX?@36%$@#|7v`Ub+4dgt&xK9B6`RJ_SFGO?>G^iJibroKI~D@$PMrYvAp zz`MG}A5QEdo$pktk!qw+jpQOvUuib^eCNjzMm38pdsUgGX`-QOkaO95p;~!>6HenK zPx3x1#%jW;RvJUOd~LK|aqPIB%Z9j+KgJ+(Ue`j{su%Kwyv~0Zh(Gh>=C?mI%~o31kH=z{c6Kg>BAOM{%_3`8})>f2(n(%g_{~$UO&l=d?R0gkf_(H4zMB@>J8mN0_qL$m=RGGu+NbQUhmxQ zbO%pQOt@*;lHG`tP7fp^zCzqz@LN{AV5-*3{6k+L;QI4MMtd`pJ6<|E06vmP#GGiq zWfc5TJ}UI=>`onx2RzGvCrPzU<*p#!gO}$zo;rct+3Y@!V3=34swV!98V$NDAno(U9&Y2jGoOQ zoZ2X&t0VMMz1+y_@iKxe=Nl&_CxM|+uT~P3gu@3J(Brmd$E%_yD)rHPR*S=;5pwNW zm5pPESyCifQf1dka@0|b!3on0sw}I4psgC5%uZ`6E9%fpEo04QK38=VnOTzL&Wmaw zHR|)p60_2O$b2Q6OlA}OGc{f+j@h%;Ky7*m>r{;&1k66gXXF$PD8Xo;&rX?6R7yAl zFoPl)I%cpkn;9|~n&r+ctNLi#PFrE0BI`1%(qEH<_gz1{iSws&s-gtYyv81CL7QFABmYLZ3Gc!@?bkyZ$}AxI+xui0@ehw~}e zxLWnvsAo-$jSg9URkbW97K>(5{i$@{_~4-59|>o3mZfQj5LkMsIR3z=JbyZWPo*M0 zpYHQV{C-slOj?@Wcc`3>#X`Yw*w7818H?+Bc*Ys4h?b}Mu)QnD3MA3@VyCW)m zz}dpXlZ*>rsZX+qp~wwzb)3EMyPpw&EiQ_t+i~XvXQXFu-MDe<2ESCgwtH>Z${2n- znhI!=q{}#G!#b9V2ST`^L4~zoDrzgiL4E}rZrpnJ#F;0qU3=o86L!C>q@uxaOk*wT z(>QMjBB=8~IGtzIMkJ)L6AngGtPQ|@JVE-&M<0ySblu~b{Pbs!$A^zP9xqb?@6G)W zj6#0?uE(ns<~@(sfd55&xfBEXpGM#3nd0<@$4g|p*Vlp<5hC`d5_nC zze%TPgBEc&+ZY$frHgbG<0)DO-l9#9--0v`%%v+p+dXcY)@T*Hpc}M={VrAT-7kS2 z!HPE8I*ro^TGLxA=>FOwbT_ej75m!s38GUQi*xP81^41r_tf%6YZK$v#{9B-rPW?` zr`J~7(`y?`i*BV@a*r&x+w0>aBTb-9ffhHL#nr_&v>X_kr!5$0!`uo$tefB3Y_EZT zq!(uk(?VEWXl;Rt5dK>z;|S;Dw7LjQ1UyE=R7M*HUjnT|-F@DUyLauo<8EbaxLh8t zl*(B6aeD9b_5!@!Kp?H2gDwmR6C%f=xkMKhH#S>qt8S@OE|y9qApcXR_xFOosub$z zKOa9J@kb=1xMfyYWsP-xYqd39E|oo6@o3efqaLk!6tM{{_@ffmSO~9AzW9cq_x^YO E8*jX|jQ{`u literal 0 HcmV?d00001 diff --git a/awx/ui/client/assets/fontcustom/fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.woff b/awx/ui/client/assets/fontcustom/fontcustom_3dfbafd778b214fc5df2a64fe14fbfb3.woff new file mode 100644 index 0000000000000000000000000000000000000000..1ec0dcb5c6ef0243196d22cd865ab3a11fc72a81 GIT binary patch literal 2064 zcmZuyc{r47AAa7MF*EjYY%?fBnj;A_V=ay;OqOWK2waivzNo zZ|T_0`Tq?%-Q5`g%qMtF4TeSxV!YzuAwvoPP$|qEVXzq9zPq`h><9o5sQ+n@STNUsp@Uq2?gfTM!`Y!3n5)CsiZTSMA>mxuhj53v$|fWlQT3th zShy~f2y;ysMBoa}hp|Kb0YJm~ARpLY;ihjwjR=p5hV#|K9!nVf|71OvjveB%cq|s+ zWRaGn7uHPu2seuHv@ys2H5t^p7$_nq_Y%*gLHe>_`?ypF0N?$V%VLnWRS}5=4s^7; zND45T5$)gC#yCA3mOp?S{Tiwpn%+0@Xxos?2bpvr&7+Qq&&?aXQ!mx-r|_# zpUVqmvsfG!m!AyLAv6kWALYz87gfyXWiN=tNSXNGFa!-+aBiWlkr4s};AG6d!R)@vnC$k7>IvN)NeZ=2RR6)xU`_PvNgd)7sPmSwh z`Kg_Wyfv{{%st7kiYKyo+~g>HaWYB~smDt9B$q;%r|-_7)AzQ>C(PG*_g4B|Jz3&>Z(4WWDvu=F)8s6& zdx#1jW99|Kk;dL$TY4}YZZ)4Hv%^s*t7cdwl$oE|A5nbuVK1ij@=BA%E03b9y}`k* z>vq9j&DMn%otZ)4vyVY#!CtJ~YDa!r8cXO_@^~dh~eq*N~|-o5avr^7X4j`h&9-){#d z>{Mx(??1kc`La3Y^0sJ#^)silo(_3sw#zGuQ)^aj&abtWu+WoyHC&p6>{wB`WsRVK zqB`={gpha1K7c|$w%turxQ9vV*rL-`z+5%Py1M(5rS`Ld*p3$a)6&h#YniSVkAL_u zo)ygPvgTKW`9gY!GATjZPKzXYEoRSSvQoMa^akkJK7ayn}dsgU2 zX)^Ip%0%>(nXJ41VCR4xrG%T`c%!NQ>cL)3F;~NvPStI!yh15zoGyBQ(n(%J4egVN z&briDotmhz#H2mx|A;Tbx2|7*>dtep7tPeU%9n{d>Cyc}14+Xpwg;p-MP7AQr8Vhd zE9roy!H=zjdf`bEVPEQ1&RMyy4&VHwuTrqlfqj<>=b_GA5kml zvr5bQ+){S^y=g7~kn+{a_HtZb*VvHm&6$Mw4V2K6nmVG>O^{HnB5*__+ILQf1e#|P z7*TlIDeug-I`VNKxqRDhb=kLGntWpU)2C1Gb|jiudX76Q+l3c7+JHP8m z2rI*z5>Yd~-1t0g{~w>rI*<9aM@2@yeQ|9xZ%W8D@sS&GHRs(5;+CE7JBIdDKV~DS z2(s8U=94a#XQ%YU!2fu5j+ILn4R>nv%|Y#br?oKyXBY!s?WeU{>F+AGotPMCke&^^ z=~0-v^=W?;>aj=`mqBZ`fF=gLX!h9oht$!I;<93ih;$5gwv#&ItuixtH&WWF!z*mk z_80FD6^0-5j~~_Fx@)Pbv(YVD4*$xyHCP2d_8?L^V*vK-i{5qI2=`Lho;&e6GUqFG zUto7p*MAMP8bm@T!s62TSS+=3%@4HG9MH4T*3bCm@F*VAe9UbVfoJ(u0eYYOv|mJ%_8mT{-y zi*>VSa6py4%w8>RQt8AEu-^R%Etx}j*W nDkHxI-VVV%7P0va7K;Z`sn@d}r_JniSfsLyfzurN3jqHDa!FYs literal 0 HcmV?d00001 diff --git a/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot b/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot deleted file mode 100644 index 739e0b64f593b72c4ec3cbfb2e3a7338f56292ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3982 zcmds4eP|rV6@PDLzi)5vYj^L%(%tILx=SqSd>_)CYfHA9*s^2n#Ka%914WS)eYvuv z%93M;U|QOel0tF8l_|6on*PzIro^I!LWr?T|L8x4#JChn3N57&3ZV%hU{WLX&ECqA z8@YD>?abZ2d2eQC=DqiOv-7?i0k~rUATSVxfz15|NiLyi9X#w4fM`oD#;L{>xb*{(br% z7&$lZK@9f*@F%EW8XrD8yRt$vf%O*g+W6FkvHT~$o}&K!#J)8#I{cFS$t&+tAH5Ha z2@>#+@OLzqP5kDGGxO)At>6$Z*3VDPj0_teXjkd|ZsId%hR@H!5%@XvZzJBD9zHXA z>(n>C4-mRbHs3xwb9VmjyI&om^?RxR6<;^fZ`a9FSBE0~pF*hRo!h5>w1xUX(3O>y z>kRNFv0C6fnx1|)SFS^u0qG;e!b`P2I4`dxGVq)}VyUFmPNcd;GBzo~6juF2v zpr1k-zPTPD)Q9&$LCoQ?y)ThJypL79v2p{-w6~|k82YakkGQuX=Cg0o^Y^U{1l?jU zEYL-uQ2g71_xBJdW@-ZogwGVB0<^T6(3B`?yz;k*kOl>nwZ*YD_i9&*(#Qbp56b_) zI3MS*C8$?X!CBVEUga5nLlV)!e1H4^kC8D{C|^U^+P|bq@L}zmBER3i#2Gc=8W&<& zh?i6a@AWT{Nk6RBWA#|69xKGY{qoot9$WrJ4C^!}p=ad=q4NgK=s_23hr=Ybm3*!xe>dT{U>j&17=Pm{zill3|*5DI}Y3exylPoo^SUTgIA2HMJr-cHkyWz%#MiFh{Mp3byw@8~d$STtWSO-0$1aWa|C z^7dW(1AUhNkxs`nP1TH;VaQT=z*N+>P1Q^y5wW6C(ohQ}Y*mf!bGOyRrdRiT6Y@YO zUuWIILcUn4*LER!VJ8k?t0|uKByFzQSs+bFkt{m4TF6JRRO~_`oZK3rmsO#wihs)4 z-+AH0>&`Kgr}ErV^d5_)n>7`wEX(BeDU<)!d}*+$$CiA3lxL^<=og_LJ zev8X^ov?Tij>5|%Yt&o;#-?rY2xig32r9JgQn6WSHcA9NiY*!^PHwl?7Yzn7RwG~H*Y=>&y#jad;Hrt)Mjd~>K3`tDy>O{sF z=Q78fn?z))?dGy^iE%_s=J%o^qa=6k>&ux#?I&ukL~_p9Yhsq%tx$+3Wuv1%6tZOG zayXh~n#7Q|W5XZtrfgTr+ngaY*EdKDFVBVt@p9oyZ3S$5_2<;%A(<4-FWmoE00S>15r>9E3> z%1L|O>`L3=2szY}P_fc+N3uHb9eUyN?T>aGJbCfr$!B&r?OaO7t!P3)C9Wx0biy$T z%5XGOMAA4Gkpm_xeWwnHOG+}{tRqd-v~ z2LeuWYsHo&`BDBKz|WQy{P+R)tLo#p-^oREraZp$CEGp`uIp2$v8_oxebD9d5B3`I-POStI;E~Kehsm?8fig@({d8 zwxm1d=T9Zyf{w5tef{zUGE8vPJj#Tv?`F4e!9~K-PArn<0dF=^577S6v@*BB}Y?K;pvv-j>6Z75^BTss@O0}=sJ1{db z?H!t&ADI}Pq9GfmTw^oS^CJsq=V$0-`;Xk~`O)!(sbNaO2K~%y-luc4!BKx(A_Md2 z(&lYAajU0F+wY-ltxC^TMPQJY9GsaOAN6YGinrZc+X6AwT2HmwBliCo8-8SJczks3 z?BvX}SE*FXl}g2Xj5+=L4f&StWt7WoR7?_ztb)@AgQG-WJOx$MP*)eGCkLyQN+roR|crb0KY7Utgj;=MP7bbU_uZ{CLy7XSbN diff --git a/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg b/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg deleted file mode 100644 index f1fe2ac03d..0000000000 --- a/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg +++ /dev/null @@ -1,108 +0,0 @@ - - - - - -Created by FontForge 20150401 at Thu Nov 12 14:46:50 2015 - By John Mitchell -Copyright (c) 2015, John Mitchell - - - - - - - - - - - - - - - - diff --git a/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.ttf b/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.ttf deleted file mode 100644 index 5d151b75b0ff606ea5b8f9617302a595e2f4864e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3796 zcmds4YiJzT6+Y+QdC%mn&;k zS#q2ZOiNo*(myGp$~M9nv5 zCdZ$XKYsCT>ZAEkpCJMN5Pwf=In>@db8hLPv;$mfi~VzR&53d2eeEjE@27V9-1x-> zI1ay{{+-nJ=f}@Y-g@?1KL9ZA0I*#P&GSol-v0U+?LSEUFM_a*p1o(Dy*d^i{sc@$ z0)X3Rf4qI2wpy+04DcqkHRyD==itrObto|)dxTi5wE2?T5(_Q@d511B6Wg+VP-;sg z{0qJ+dhrNOk>p@NKYVvW`$^t5geI&aX5 zKJ>vZI7U)O$rT3cRk_}%C%lBsRGX`XVnJ2tE~tC3QD_v3)JW8aY97f-yjX9jUczhC z8zmGyMH*hTQS}(Cyt}gU?pmv7|M0M%=8D3(t{Ob*rPJ9&R4Y10(XcG1Xv)@`_;W23 z^3`xCqGXhJGWq`U_N-CRqlrY^i*;Li(TL%8vE0h)zNG7!Nv^0&(p6oGsG6cCV#&;_ zYDUX#4QJfsh?y)^2l_LzWmvM4pHAwgVRUKTswvSGa`IY6%L@Pz+V1&a_lEUcm_YZ? zV545Ek{`(CLO!P|u0xIBb{!?3qfxF`tJa4G18e2@V6SD!vSoSkcr26ZPNlnc_4F7< zG?L3(mZEG)yXkaqY1iIEfjw*gOr@flrfNpiFk~q-Vkv6ZmP$Gv58IIlS*V$DM^z&S zy`5E|^t#SBAqQ0XdTTc3bA@89x)&)5dvF9hta#TFq+FvnPnM7&8FU>rp9^EL(1%1g zg*8l*Rbi`&f6hAJd;0V%?n#R$bKF++0h^^7JVb9RF6+9q_R14{- zo0(r?w#|CW5~f+mlD>1QId|MR_#+EZl^-|1f7di;)2iAZkDp!He_=EnRV-UIOQ_HQ z^N+Y}5Fwi+stdovHM~w(JOU@+d6Lzuo&aORv3VFXXk!=^QoC4alpFOTLCs{ddNHN(tHBn(M*EVRYzGEhc0ZACPRtDH(FRqA_w-3Jis zxO7k^ypm@K&E!9VOML_d-b>gZu1**d81F^`yDM^BQC-K|jTv_3_T|gBFXPY3msT$g zSQ*`LW2unBn99j|-Res@p)dv1mQb-%F;}vC@GY8f`SypqkDR%5>CEH1-EJ{tqwEJ2`+i|cJ%aQaRihI0UkXio|^W8%SpkZRTc z1q&QM-HZZ7eHaM1jU8o2mgEP;e*`~WQ}CnDgkM!3Cj4$TtTW}|gD;8LQ+*dXbpmE! zf&AGi?%w@!YN(x4N^v7kM3&U4-k0l@MnU9G<#QQEU=hG+&*>x*rC%rM@JhBXOTSt2 zrSFc(sP}C}M(M+3?t4kXY+6=(MkqljFPLJ59a+bue`r0eGS*n;E46l7F~-+k)3tOe zt!e`8yt~W%t5`dWMph)lrO&u?Bb#(t*EZ)z%1Fdm!p+_%sn*7rq@_}6H?^KUGW$~} z(a3N7o-dEWGvrG;Q+~cGwLRzx57O5!mnX*rrRG5{?0h$=6j4UjLXmOFbHvH<|DX$0i2RwoSF9kd!TwV!y4n_D^z)N7@K)}lo!KVXWA^A7O z2~*N({YTqT5j=teQ-Pe(zApznhbQ1C0WX1riGY{ErxSi>9fjmygU6sr+3^A_!YoWv zbeHHnv<)WU5u#NnLj{JQpZLQxZU*LwJ4z#$Xv7Rm!W`Z3Saacp#o6hZC4bw*BYw49 z8S3{BH)rPkqq9pBGm~>PWQu0bw`VQGd7@2G&8C|3OB2iImzu;sMT4lw*)rQ!&?kk2uY_Xa_5n^!E}oxl&imzZrBp7LN%BA^w9hvb zTRNA~f0_GT774|_3QivkjuL(G6jV_|U0t4^9j%nh0j&hI8qium2Ln13(0V`{?ah$> Usn7|lgSmIUeD^gW-Ta^KKdK`9RR910 diff --git a/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.woff b/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.woff deleted file mode 100644 index 4c79bee685837eb1b64ad90daef441ecd51cd202..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2376 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 diff --git a/awx/ui/client/assets/fontcustom/new_icons/microsoft.svg b/awx/ui/client/assets/fontcustom/new_icons/microsoft.svg new file mode 100644 index 0000000000..934eb2b4b9 --- /dev/null +++ b/awx/ui/client/assets/fontcustom/new_icons/microsoft.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/awx/ui/client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js b/awx/ui/client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js index ebc64fe9fc..7ab1980495 100644 --- a/awx/ui/client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js +++ b/awx/ui/client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js @@ -25,6 +25,17 @@ var options = [], error = ""; + function parseAzure(option) { + var newOption = {}; + + newOption.type = "azure"; + newOption.icon = "ThirdPartySignOn-icon--fontCustom icon-microsoft"; + newOption.link = option.login_url; + newOption.tooltip = i18n.sprintf(i18n._("Sign in with %s"), "Azure AD"); + + return newOption; + } + function parseGoogle(option) { var newOption = {}; @@ -78,7 +89,9 @@ // set up the particular tooltip, icon, etc. // needed by the login type - if (key.split("-")[0] === "google") { + if (key.split("-")[0] === "azuread") { + finalOption = parseAzure(option, key); + } else if (key.split("-")[0] === "google") { finalOption = parseGoogle(option, key); } else if (key.split("-")[0] === "github") { finalOption = parseGithub(option, key);