forked from mystiq/dex
Merge pull request #1576 from flant/icons-proposal
Pick icons on login screen by connector type instead of ID
This commit is contained in:
commit
789272a0c1
4 changed files with 7 additions and 7 deletions
|
@ -259,16 +259,15 @@ func (s *Server) handleAuthorization(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
|
||||
connectorInfos := make([]connectorInfo, len(connectors))
|
||||
i := 0
|
||||
for _, conn := range connectors {
|
||||
connectorInfos[i] = connectorInfo{
|
||||
for index, conn := range connectors {
|
||||
connectorInfos[index] = connectorInfo{
|
||||
ID: conn.ID,
|
||||
Name: conn.Name,
|
||||
Type: conn.Type,
|
||||
// TODO(ericchiang): Make this pass on r.URL.RawQuery and let something latter
|
||||
// on create the auth request.
|
||||
URL: s.absPath("/auth", conn.ID) + "?req=" + authReq.ID,
|
||||
}
|
||||
i++
|
||||
}
|
||||
|
||||
if err := s.templates.login(r, w, connectorInfos, r.URL.Path); err != nil {
|
||||
|
|
|
@ -233,6 +233,7 @@ type connectorInfo struct {
|
|||
ID string
|
||||
Name string
|
||||
URL string
|
||||
Type string
|
||||
}
|
||||
|
||||
type byName []connectorInfo
|
||||
|
|
|
@ -68,12 +68,12 @@ body {
|
|||
background-size: contain;
|
||||
}
|
||||
|
||||
.dex-btn-icon--bitbucket {
|
||||
.dex-btn-icon--bitbucket-cloud {
|
||||
background-color: #205081;
|
||||
background-image: url(../static/img/bitbucket-icon.svg);
|
||||
}
|
||||
|
||||
.dex-btn-icon--ldap, .dex-btn-icon--tectonic-ldap {
|
||||
.dex-btn-icon--ldap {
|
||||
background-color: #84B6EF;
|
||||
background-image: url(../static/img/ldap-icon.svg);
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<div class="theme-form-row">
|
||||
<a href="{{ $c.URL }}" target="_self">
|
||||
<button class="dex-btn theme-btn-provider">
|
||||
<span class="dex-btn-icon dex-btn-icon--{{ $c.ID }}"></span>
|
||||
<span class="dex-btn-icon dex-btn-icon--{{ $c.Type }}"></span>
|
||||
<span class="dex-btn-text">Log in with {{ $c.Name }}</span>
|
||||
</button>
|
||||
</a>
|
||||
|
|
Loading…
Reference in a new issue