Influxdata
/
chronograf
mirror of https://github.com/influxdata/chronograf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '1.4.0.x' of github.com:influxdata/chronograf into 1.4.0.x

pull/2605/head^2
Hunter Trujillo 2017-12-18 16:11:10 -07:00
parent 66b45093fc ff5b2af5b9
commit dfa4feddd6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/src/auth/Login.js
View File

@ -22,7 +22,7 @@ const Login = ({authData: {auth}}) => {
auth.links.map(({name, login, label}) => auth.links.map(({name, login, label}) =>
<a key={name} className="btn btn-primary" href={login}> <a key={name} className="btn btn-primary" href={login}>
<span className={`icon ${name}`} /> <span className={`icon ${name}`} />
Login with {label} Log in with {label}
</a> </a>
)} )}
</SplashPage> </SplashPage>

2
ui/src/auth/PurgatoryAuthItem.js
View File

@ -23,7 +23,7 @@ const PurgatoryAuthItem = ({roleAndOrg, onClickLogin, superAdmin}) =>
className="btn btn-sm btn-primary" className="btn btn-sm btn-primary"
onClick={onClickLogin(roleAndOrg.organization)} onClick={onClickLogin(roleAndOrg.organization)}
> >
Login Log in
</button> </button>
: <span className="auth--list-blocked"> : <span className="auth--list-blocked">
Contact your Admin<br />for access Contact your Admin<br />for access