TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 11:07:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(login): show profile (#485)

Browse Source 
* profile data

* fix scripts

* fix image paths

* feat: show profile (with image) when possible

* fix profile image width
This commit is contained in:
Livio Amstutz
2020-07-20 10:00:29 +02:00
committed by GitHub
parent 4f3ccbfad0
commit 933193855a
42 changed files with 321 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/auth/repository/eventsourcing/eventstore/auth_request.go
View File

@@ -138,7 +138,7 @@ func (repo *AuthRequestRepo) SelectUser(ctx context.Context, id, userID string)
if err != nil { if err != nil {
return err return err
} }
request.SetUserInfo(user.ID, user.PreferredLoginName, user.ResourceOwner) request.SetUserInfo(user.ID, user.PreferredLoginName, user.DisplayName, user.ResourceOwner)
return repo.AuthRequests.UpdateAuthRequest(ctx, request) return repo.AuthRequests.UpdateAuthRequest(ctx, request)
} }
@@ -182,7 +182,7 @@ func (repo *AuthRequestRepo) checkLoginName(request *model.AuthRequest, loginNam
if err != nil { if err != nil {
return err return err
} }
request.SetUserInfo(user.ID, loginName, user.ResourceOwner) request.SetUserInfo(user.ID, loginName, "", user.ResourceOwner)
return nil return nil
} }

4
internal/auth_request/model/auth_request.go
View File

@@ -25,6 +25,7 @@ type AuthRequest struct {
levelOfAssurance LevelOfAssurance levelOfAssurance LevelOfAssurance
UserID string UserID string
LoginName string LoginName string
DisplayName string
UserOrgID string UserOrgID string
PossibleSteps []NextStep PossibleSteps []NextStep
PasswordVerified bool PasswordVerified bool
@@ -96,8 +97,9 @@ func (a *AuthRequest) WithCurrentInfo(info *BrowserInfo) *AuthRequest {
return a return a
} }
func (a *AuthRequest) SetUserInfo(userID string, loginName string, userOrgID string) { func (a *AuthRequest) SetUserInfo(userID, loginName, displayName, userOrgID string) {
a.UserID = userID a.UserID = userID
a.LoginName = loginName a.LoginName = loginName
a.DisplayName = displayName
a.UserOrgID = userOrgID a.UserOrgID = userOrgID
} }

10
internal/ui/login/handler/change_password_handler.go
View File

@@ -24,7 +24,6 @@ func (l *Login) handleChangePassword(w http.ResponseWriter, r *http.Request) {
l.renderError(w, r, authReq, err) l.renderError(w, r, authReq, err)
return return
} }
err = l.authRepo.ChangePassword(setContext(r.Context(), authReq.UserOrgID), authReq.UserID, data.OldPassword, data.NewPassword) err = l.authRepo.ChangePassword(setContext(r.Context(), authReq.UserOrgID), authReq.UserID, data.OldPassword, data.NewPassword)
if err != nil { if err != nil {
l.renderChangePassword(w, r, authReq, err) l.renderChangePassword(w, r, authReq, err)
@@ -39,8 +38,8 @@ func (l *Login) renderChangePassword(w http.ResponseWriter, r *http.Request, aut
errMessage = l.getErrorMessage(r, err) errMessage = l.getErrorMessage(r, err)
} }
data := passwordData{ data := passwordData{
baseData: l.getBaseData(r, authReq, "Change Password", errType, errMessage), baseData: l.getBaseData(r, authReq, "Change Password", errType, errMessage),
LoginName: authReq.LoginName, profileData: l.getProfileData(authReq),
} }
policy, description, _ := l.getPasswordComplexityPolicy(r, authReq.UserOrgID) policy, description, _ := l.getPasswordComplexityPolicy(r, authReq.UserOrgID)
if policy != nil { if policy != nil {
@@ -64,9 +63,6 @@ func (l *Login) renderChangePassword(w http.ResponseWriter, r *http.Request, aut
func (l *Login) renderChangePasswordDone(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest) { func (l *Login) renderChangePasswordDone(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest) {
var errType, errMessage string var errType, errMessage string
data := userData{ data := l.getUserData(r, authReq, "Password Change Done", errType, errMessage)
baseData: l.getBaseData(r, authReq, "Password Change Done", errType, errMessage),
LoginName: authReq.LoginName,
}
l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplChangePasswordDone], data, nil) l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplChangePasswordDone], data, nil)
} }

17
internal/ui/login/handler/init_password_handler.go
View File

@@ -25,6 +25,7 @@ type initPasswordFormData struct {
type initPasswordData struct { type initPasswordData struct {
baseData baseData
profileData
Code string Code string
UserID string UserID string
PasswordPolicyDescription string PasswordPolicyDescription string
@@ -93,9 +94,10 @@ func (l *Login) renderInitPassword(w http.ResponseWriter, r *http.Request, authR
} }
data := initPasswordData{ data := initPasswordData{
baseData: l.getBaseData(r, authReq, "Init Password", errType, errMessage), baseData: l.getBaseData(r, authReq, "Init Password", errType, errMessage),
UserID: userID, profileData: l.getProfileData(authReq),
Code: code, UserID: userID,
Code: code,
} }
policy, description, _ := l.getPasswordComplexityPolicyByUserID(r, userID) policy, description, _ := l.getPasswordComplexityPolicyByUserID(r, userID)
if policy != nil { if policy != nil {
@@ -118,13 +120,6 @@ func (l *Login) renderInitPassword(w http.ResponseWriter, r *http.Request, authR
} }
func (l *Login) renderInitPasswordDone(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest) { func (l *Login) renderInitPasswordDone(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest) {
loginName := "" data := l.getUserData(r, authReq, "Password Init Done", "", "")
if authReq != nil {
loginName = authReq.LoginName
}
data := userData{
baseData: l.getBaseData(r, authReq, "Password Init Done", "", ""),
LoginName: loginName,
}
l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplInitPasswordDone], data, nil) l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplInitPasswordDone], data, nil)
} }

17
internal/ui/login/handler/init_user_handler.go
View File

@@ -28,6 +28,7 @@ type initUserFormData struct {
type initUserData struct { type initUserData struct {
baseData baseData
profileData
Code string Code string
UserID string UserID string
PasswordSet bool PasswordSet bool
@@ -73,10 +74,10 @@ func (l *Login) checkUserInitCode(w http.ResponseWriter, r *http.Request, authRe
} }
err = l.authRepo.VerifyInitCode(setContext(r.Context(), userOrgID), data.UserID, data.Code, data.Password) err = l.authRepo.VerifyInitCode(setContext(r.Context(), userOrgID), data.UserID, data.Code, data.Password)
if err != nil { if err != nil {
l.renderInitUser(w, r, nil, data.UserID, "", data.PasswordSet, err) l.renderInitUser(w, r, authReq, data.UserID, "", data.PasswordSet, err)
return return
} }
l.renderInitUserDone(w, r, nil) l.renderInitUserDone(w, r, authReq)
} }
func (l *Login) resendUserInit(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest, userID string, showPassword bool) { func (l *Login) resendUserInit(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest, userID string, showPassword bool) {
@@ -97,7 +98,8 @@ func (l *Login) renderInitUser(w http.ResponseWriter, r *http.Request, authReq *
userID = authReq.UserID userID = authReq.UserID
} }
data := initUserData{ data := initUserData{
baseData: l.getBaseData(r, nil, "Init User", errType, errMessage), baseData: l.getBaseData(r, authReq, "Init User", errType, errMessage),
profileData: l.getProfileData(authReq),
UserID: userID, UserID: userID,
Code: code, Code: code,
PasswordSet: passwordSet, PasswordSet: passwordSet,
@@ -123,13 +125,6 @@ func (l *Login) renderInitUser(w http.ResponseWriter, r *http.Request, authReq *
} }
func (l *Login) renderInitUserDone(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest) { func (l *Login) renderInitUserDone(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest) {
var loginName string data := l.getUserData(r, authReq, "User Init Done", "", "")
if authReq != nil {
loginName = authReq.LoginName
}
data := userData{
baseData: l.getBaseData(r, authReq, "User Init Done", "", ""),
LoginName: loginName,
}
l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplInitUserDone], data, nil) l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplInitUserDone], data, nil)
} }

9
internal/ui/login/handler/login_handler.go
View File

@@ -61,13 +61,6 @@ func (l *Login) renderLogin(w http.ResponseWriter, r *http.Request, authReq *mod
if err != nil { if err != nil {
errMessage = l.getErrorMessage(r, err) errMessage = l.getErrorMessage(r, err)
} }
loginName := "" data := l.getUserData(r, authReq, "Login", errType, errMessage)
if authReq != nil {
loginName = authReq.LoginName
}
data := userData{
baseData: l.getBaseData(r, authReq, "Login", errType, errMessage),
LoginName: loginName,
}
l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplLogin], data, nil) l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplLogin], data, nil)
} }

4
internal/ui/login/handler/logout_handler.go
View File

@@ -13,8 +13,6 @@ func (l *Login) handleLogoutDone(w http.ResponseWriter, r *http.Request) {
} }
func (l *Login) renderLogoutDone(w http.ResponseWriter, r *http.Request) { func (l *Login) renderLogoutDone(w http.ResponseWriter, r *http.Request) {
data := userData{ data := l.getUserData(r, nil, "Logout Done", "", "")
baseData: l.getBaseData(r, nil, "Logout Done", "", ""),
}
l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplLogoutDone], data, nil) l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplLogoutDone], data, nil)
} }

9
internal/ui/login/handler/mail_verify_handler.go
View File

@@ -22,6 +22,7 @@ type mailVerificationFormData struct {
type mailVerificationData struct { type mailVerificationData struct {
baseData baseData
profileData
UserID string UserID string
} }
@@ -77,15 +78,17 @@ func (l *Login) renderMailVerification(w http.ResponseWriter, r *http.Request, a
userID = authReq.UserID userID = authReq.UserID
} }
data := mailVerificationData{ data := mailVerificationData{
baseData: l.getBaseData(r, authReq, "Mail Verification", errType, errMessage), baseData: l.getBaseData(r, authReq, "Mail Verification", errType, errMessage),
UserID: userID, UserID: userID,
profileData: l.getProfileData(authReq),
} }
l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplMailVerification], data, nil) l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplMailVerification], data, nil)
} }
func (l *Login) renderMailVerified(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest) { func (l *Login) renderMailVerified(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest) {
data := mailVerificationData{ data := mailVerificationData{
baseData: l.getBaseData(r, authReq, "Mail Verified", "", ""), baseData: l.getBaseData(r, authReq, "Mail Verified", "", ""),
profileData: l.getProfileData(authReq),
} }
l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplMailVerified], data, nil) l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplMailVerified], data, nil)
} }

2
internal/ui/login/handler/mfa_init_done_handler.go
View File

@@ -16,6 +16,6 @@ type mfaInitDoneData struct {
func (l *Login) renderMfaInitDone(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest, data *mfaDoneData) { func (l *Login) renderMfaInitDone(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest, data *mfaDoneData) {
var errType, errMessage string var errType, errMessage string
data.baseData = l.getBaseData(r, authReq, "Mfa Init Done", errType, errMessage) data.baseData = l.getBaseData(r, authReq, "Mfa Init Done", errType, errMessage)
data.LoginName = authReq.LoginName data.profileData = l.getProfileData(authReq)
l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplMfaInitDone], data, nil) l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplMfaInitDone], data, nil)
} }

2
internal/ui/login/handler/mfa_init_verify_handler.go
View File

@@ -68,7 +68,7 @@ func (l *Login) renderMfaInitVerify(w http.ResponseWriter, r *http.Request, auth
errMessage = l.getErrorMessage(r, err) errMessage = l.getErrorMessage(r, err)
} }
data.baseData = l.getBaseData(r, authReq, "Mfa Init Verify", errType, errMessage) data.baseData = l.getBaseData(r, authReq, "Mfa Init Verify", errType, errMessage)
data.LoginName = authReq.LoginName data.profileData = l.getProfileData(authReq)
if data.MfaType == model.MfaTypeOTP { if data.MfaType == model.MfaTypeOTP {
code, err := generateQrCode(data.otpData.Url) code, err := generateQrCode(data.otpData.Url)
if err == nil { if err == nil {

26
internal/ui/login/handler/mfa_prompt_handler.go
View File

@@ -18,37 +18,37 @@ type mfaPromptData struct {
func (l *Login) handleMfaPrompt(w http.ResponseWriter, r *http.Request) { func (l *Login) handleMfaPrompt(w http.ResponseWriter, r *http.Request) {
data := new(mfaPromptData) data := new(mfaPromptData)
authSession, err := l.getAuthRequestAndParseData(r, data) authReq, err := l.getAuthRequestAndParseData(r, data)
if err != nil { if err != nil {
l.renderError(w, r, authSession, err) l.renderError(w, r, authReq, err)
return return
} }
if !data.Skip { if !data.Skip {
mfaVerifyData := new(mfaVerifyData) mfaVerifyData := new(mfaVerifyData)
mfaVerifyData.MfaType = data.MfaProvider mfaVerifyData.MfaType = data.MfaProvider
l.handleMfaCreation(w, r, authSession, mfaVerifyData) l.handleMfaCreation(w, r, authReq, mfaVerifyData)
return return
} }
err = l.authRepo.SkipMfaInit(setContext(r.Context(), authSession.UserOrgID), authSession.UserID) err = l.authRepo.SkipMfaInit(setContext(r.Context(), authReq.UserOrgID), authReq.UserID)
if err != nil { if err != nil {
l.renderError(w, r, authSession, err) l.renderError(w, r, authReq, err)
return return
} }
l.handleLogin(w, r) l.handleLogin(w, r)
} }
func (l *Login) renderMfaPrompt(w http.ResponseWriter, r *http.Request, authSession *model.AuthRequest, mfaPromptData *model.MfaPromptStep, err error) { func (l *Login) renderMfaPrompt(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest, mfaPromptData *model.MfaPromptStep, err error) {
var errType, errMessage string var errType, errMessage string
if err != nil { if err != nil {
errMessage = l.getErrorMessage(r, err) errMessage = l.getErrorMessage(r, err)
} }
data := mfaData{ data := mfaData{
baseData: l.getBaseData(r, authSession, "Mfa Prompt", errType, errMessage), baseData: l.getBaseData(r, authReq, "Mfa Prompt", errType, errMessage),
LoginName: authSession.LoginName, profileData: l.getProfileData(authReq),
} }
if mfaPromptData == nil { if mfaPromptData == nil {
l.renderError(w, r, authSession, caos_errs.ThrowPreconditionFailed(nil, "APP-XU0tj", "Errors.User.Mfa.NoProviders")) l.renderError(w, r, authReq, caos_errs.ThrowPreconditionFailed(nil, "APP-XU0tj", "Errors.User.Mfa.NoProviders"))
return return
} }
@@ -59,19 +59,19 @@ func (l *Login) renderMfaPrompt(w http.ResponseWriter, r *http.Request, authSess
data := &mfaVerifyData{ data := &mfaVerifyData{
MfaType: mfaPromptData.MfaProviders[0], MfaType: mfaPromptData.MfaProviders[0],
} }
l.handleMfaCreation(w, r, authSession, data) l.handleMfaCreation(w, r, authReq, data)
return return
} }
l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplMfaPrompt], data, nil) l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplMfaPrompt], data, nil)
} }
func (l *Login) handleMfaCreation(w http.ResponseWriter, r *http.Request, authSession *model.AuthRequest, data *mfaVerifyData) { func (l *Login) handleMfaCreation(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest, data *mfaVerifyData) {
switch data.MfaType { switch data.MfaType {
case model.MfaTypeOTP: case model.MfaTypeOTP:
l.handleOtpCreation(w, r, authSession, data) l.handleOtpCreation(w, r, authReq, data)
return return
} }
l.renderError(w, r, authSession, caos_errs.ThrowPreconditionFailed(nil, "APP-Or3HO", "Errors.User.Mfa.NoProviders")) l.renderError(w, r, authReq, caos_errs.ThrowPreconditionFailed(nil, "APP-Or3HO", "Errors.User.Mfa.NoProviders"))
} }
func (l *Login) handleOtpCreation(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest, data *mfaVerifyData) { func (l *Login) handleOtpCreation(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest, data *mfaVerifyData) {

5
internal/ui/login/handler/mfa_verify_handler.go
View File

@@ -37,10 +37,7 @@ func (l *Login) renderMfaVerify(w http.ResponseWriter, r *http.Request, authReq
if err != nil { if err != nil {
errMessage = l.getErrorMessage(r, err) errMessage = l.getErrorMessage(r, err)
} }
data := userData{ data := l.getUserData(r, authReq, "Mfa Verify", errType, errMessage)
baseData: l.getBaseData(r, authReq, "Mfa Verify", errType, errMessage),
LoginName: authReq.LoginName,
}
if verificationStep != nil { if verificationStep != nil {
data.MfaProviders = verificationStep.MfaProviders data.MfaProviders = verificationStep.MfaProviders
data.SelectedMfaProvider = verificationStep.MfaProviders[0] data.SelectedMfaProvider = verificationStep.MfaProviders[0]

5
internal/ui/login/handler/password_handler.go
View File

@@ -19,10 +19,7 @@ func (l *Login) renderPassword(w http.ResponseWriter, r *http.Request, authReq *
if err != nil { if err != nil {
errMessage = l.getErrorMessage(r, err) errMessage = l.getErrorMessage(r, err)
} }
data := userData{ data := l.getUserData(r, authReq, "Password", errType, errMessage)
baseData: l.getBaseData(r, authReq, "Password", errType, errMessage),
LoginName: authReq.LoginName,
}
l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplPassword], data, nil) l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplPassword], data, nil)
} }

5
internal/ui/login/handler/password_reset_handler.go
View File

@@ -25,9 +25,6 @@ func (l *Login) renderPasswordResetDone(w http.ResponseWriter, r *http.Request,
if err != nil { if err != nil {
errMessage = l.getErrorMessage(r, err) errMessage = l.getErrorMessage(r, err)
} }
data := userData{ data := l.getUserData(r, authReq, "Password Reset Done", errType, errMessage)
baseData: l.getBaseData(r, authReq, "Password Reset Done", errType, errMessage),
LoginName: authReq.LoginName,
}
l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplPasswordResetDone], data, nil) l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplPasswordResetDone], data, nil)
} }

41
internal/ui/login/handler/renderer.go
View File

@@ -3,11 +3,12 @@ package handler
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/gorilla/csrf"
"html/template" "html/template"
"net/http" "net/http"
"path" "path"
"github.com/gorilla/csrf"
"github.com/caos/zitadel/internal/api/http/middleware" "github.com/caos/zitadel/internal/api/http/middleware"
"github.com/caos/zitadel/internal/auth_request/model" "github.com/caos/zitadel/internal/auth_request/model"
caos_errs "github.com/caos/zitadel/internal/errors" caos_errs "github.com/caos/zitadel/internal/errors"
@@ -185,6 +186,13 @@ func (l *Login) renderInternalError(w http.ResponseWriter, r *http.Request, auth
l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplError], data, nil) l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplError], data, nil)
} }
func (l *Login) getUserData(r *http.Request, authReq *model.AuthRequest, title string, errType, errMessage string) userData {
return userData{
baseData: l.getBaseData(r, authReq, title, errType, errMessage),
profileData: l.getProfileData(authReq),
}
}
func (l *Login) getBaseData(r *http.Request, authReq *model.AuthRequest, title string, errType, errMessage string) baseData { func (l *Login) getBaseData(r *http.Request, authReq *model.AuthRequest, title string, errType, errMessage string) baseData {
return baseData{ return baseData{
errorData: errorData{ errorData: errorData{
@@ -201,6 +209,18 @@ func (l *Login) getBaseData(r *http.Request, authReq *model.AuthRequest, title s
} }
} }
func (l *Login) getProfileData(authReq *model.AuthRequest) profileData {
var loginName, displayName string
if authReq != nil {
loginName = authReq.LoginName
displayName = authReq.DisplayName
}
return profileData{
LoginName: loginName,
DisplayName: displayName,
}
}
func (l *Login) getErrorMessage(r *http.Request, err error) (errMsg string) { func (l *Login) getErrorMessage(r *http.Request, err error) (errMsg string) {
caosErr := new(caos_errs.CaosError) caosErr := new(caos_errs.CaosError)
if errors.As(err, &caosErr) { if errors.As(err, &caosErr) {
@@ -257,15 +277,20 @@ type errorData struct {
type userData struct { type userData struct {
baseData baseData
LoginName string profileData
PasswordChecked string PasswordChecked string
MfaProviders []model.MfaType MfaProviders []model.MfaType
SelectedMfaProvider model.MfaType SelectedMfaProvider model.MfaType
} }
type profileData struct {
LoginName string
DisplayName string
}
type passwordData struct { type passwordData struct {
baseData baseData
LoginName string profileData
PasswordPolicyDescription string PasswordPolicyDescription string
MinLength uint64 MinLength uint64
HasUppercase string HasUppercase string
@@ -281,22 +306,22 @@ type userSelectionData struct {
type mfaData struct { type mfaData struct {
baseData baseData
LoginName string profileData
MfaProviders []model.MfaType MfaProviders []model.MfaType
MfaRequired bool MfaRequired bool
} }
type mfaVerifyData struct { type mfaVerifyData struct {
baseData baseData
LoginName string profileData
MfaType model.MfaType MfaType model.MfaType
otpData otpData
} }
type mfaDoneData struct { type mfaDoneData struct {
baseData baseData
LoginName string profileData
MfaType model.MfaType MfaType model.MfaType
} }
type otpData struct { type otpData struct {

2
internal/ui/login/static/resources/scripts/change_password_check.js
View File

@@ -10,5 +10,5 @@ function CheckChangePwPolicy() {
return pwNew == pwNewConfirmation; return pwNew == pwNewConfirmation;
} }
let button = document.getElementById("change-password--button"); let button = document.getElementById("change-password-button");
disableSubmit(CheckChangePwPolicy, button); disableSubmit(CheckChangePwPolicy, button);

1
internal/ui/login/static/resources/scripts/form_submit.js
View File

@@ -1,5 +1,4 @@
function disableSubmit(checks, button) { function disableSubmit(checks, button) {
console.log("GUGUS");
let form = document.getElementsByTagName('form')[0]; let form = document.getElementsByTagName('form')[0];
let inputs = form.getElementsByTagName('input'); let inputs = form.getElementsByTagName('input');
for (i = 0; i < inputs.length; i++) { for (i = 0; i < inputs.length; i++) {

65
internal/ui/login/static/resources/themes/caos/css/dark.css
View File

@@ -101,6 +101,7 @@ h1 {
p { p {
font-weight: 300; font-weight: 300;
text-align: center;
} }
header { header {
@@ -173,6 +174,42 @@ input:not([type=radio]), select {
padding-left: 15px; padding-left: 15px;
} }
form button.user-selection .profile-image, .login-profile .profile-image {
height: 100px;
background-position: center;
background-repeat: no-repeat;
background-image: url("../../../images/icon-user-dark.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection .profile-image, .login-profile .profile-image {
background-image: url("../../../images/icon-user-dark@2x.png");
background-size: 100px 100px;
}
}
form button.user-selection:hover .profile-image, .login-profile:hover .profile-image {
background-image: url("../../../images/icon-user-dark-hover.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection:hover .profile-image, .login-profile:hover .profile-image {
background-image: url("../../../images/icon-user-dark-hover@2x.png");
background-size: 100px 100px;
}
}
.login-profile .names {
padding: 10px 0;
text-align: center;
}
.login-profile .names div:first-of-type {
font-size: 1.3rem;
}
.login-profile .names div:nth-of-type(2) {
font-weight: 300;
font-size: 0.9rem;
font-style: italic;
color: #898989;
}
form .field { form .field {
display: grid; display: grid;
padding: 10px 0; padding: 10px 0;
@@ -228,26 +265,6 @@ form button.clean * {
form .user-selection-list { form .user-selection-list {
margin-bottom: 80px; margin-bottom: 80px;
} }
form button.user-selection .profile-image {
width: 100px;
height: 100px;
background-image: url("/resources/images/icon-user-dark.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection .profile-image {
background-image: url("/resources/images/icon-user-dark@2x.png");
background-size: 100px 100px;
}
}
form button.user-selection:hover .profile-image {
background-image: url("/resources/images/icon-user-dark-hover.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection:hover .profile-image {
background-image: url("/resources/images/icon-user-dark-hover@2x.png");
background-size: 100px 100px;
}
}
form button.user-selection .sessionstate { form button.user-selection .sessionstate {
display: inline-block; display: inline-block;
height: 20px; height: 20px;
@@ -286,22 +303,22 @@ form button.other-user .other-user-image {
height: 75px; height: 75px;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-image: url("/resources/images/icon-newuser-dark.png"); background-image: url("../../../images/icon-newuser-dark.png");
} }
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.other-user .other-user-image { form button.other-user .other-user-image {
background-image: url("/resources/images/icon-newuser-dark@2x.png"); background-image: url("../../../images/icon-newuser-dark@2x.png");
background-size: 100px 75px; background-size: 100px 75px;
} }
} }
form button.other-user:hover .other-user-image { form button.other-user:hover .other-user-image {
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-image: url("/resources/images/icon-newuser-dark-hover.png"); background-image: url("../../../images/icon-newuser-dark-hover.png");
} }
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.other-user:hover .other-user-image { form button.other-user:hover .other-user-image {
background-image: url("/resources/images/icon-newuser-dark-hover@2x.png"); background-image: url("../../../images/icon-newuser-dark-hover@2x.png");
background-size: 100px 75px; background-size: 100px 75px;
} }
} }

2
internal/ui/login/static/resources/themes/caos/css/dark.css.map
View File

@@ -1 +1 @@
{"version":3,"sourceRoot":"","sources":["../../scss/fonts.scss","../../scss/main.scss","../../scss/caos/variables.scss","../../scss/variables.scss"],"names":[],"mappings":"AACA;EACI;EACA;;AAIJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAIJ;EACI;EACA;EACA;EACA;AAA6D;EAC7D;;AC5EJ;EACI;EACA,aCMW;EDLX;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA,kBCDc;EDEd,OCDQ;EDER;EACA;EACA;;;AAMJ;EACI,OCXQ;EDYR,aClBS;EDmBT;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;;;AAIR;EACI;EACA;EACA;EACA;;;AAGJ;EACI,OCxCW;EDyCX;EACA;;AAEA;EACI,OC5CY;;;ADgDpB;EACI,kBCpDc;EDqDd,OCnDW;EDoDX;EACA;EACA;EACA;EACA,QErEU;EFsEV;EACA;EACA;;AACA;EACI,kBC5DY;ED6DZ,OChEU;EDiEV;;AAGJ;EACI,kBCnEO;EDoEP,OCrEI;EDsEJ;;AACA;EACI,kBCtEQ;;AD0EhB;EACI,kBEnEW;EFoEX;;AAEA;EACI,kBEvEO;EFwEP;;;AAKZ;EACI,kBE7EmB;EF8EnB,OCzFQ;ED0FR,QEtGU;EFuGV;EACA;EACA;;;AAIA;EACI;EACA;;AAGJ;EACI;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAIR;EACI,OE9GK;EF+GL;EACA;EACA;;AAEA;EACI;EACA;;AAIR;EACI;;AAEA;EACI;;AAGJ;EACI;;AAIR;EACI;EACA;EACA,OCjJI;EDkJJ;EACA;EACA;EACA;;AAEA;EACI;EACA,kBE9IW;;AFiJf;EACI;;AAIR;EACI;;AAIA;EACI;EACA;EE3KV;;AACA;EFwKM;IEvKJ;IACA;;;AF6KQ;EEhLV;;AACA;EF+KU;IE9KR;IACA;;;AFkLI;EACI;EACA;EACA;EACA;EACA,cE7KO;EF8KP;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;;AAKR;EACI;;AAEA;EACI;;AAEA;EACI;;AAEJ;EACI,OEzMP;;AFgNL;EACI;;AAEJ;EACI;EACA;EACA;EACA;EEnOV;;AACA;EF8NM;IE7NJ;IACA;;;AFqOQ;EACI;EACA;EE1Od;;AACA;EFuOU;IEtOR;IACA;;;AF4OI;EACI;EACA;;AAIR;EACI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA,OEnPN;;AFwPE;EACI,OE1PL;;;AFgQX;EACI;EACA;;;AAGJ;EACI;;AAEA;EACI,MCxRI;;AD2RR;EACI,MC7RU;;;ADkSd;EACI;EACA;;;AAIR;EAEQ;EAEJ;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;AAAkB;EAClB;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;AACA;EACA;AAEA;EACA;AAEA;EACA","file":"dark.css"} {"version":3,"sourceRoot":"","sources":["../../scss/fonts.scss","../../scss/main.scss","../../scss/caos/variables.scss","../../scss/variables.scss"],"names":[],"mappings":"AACA;EACI;EACA;;AAIJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAIJ;EACI;EACA;EACA;EACA;AAA6D;EAC7D;;AC5EJ;EACI;EACA,aCMW;EDLX;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA,kBCDc;EDEd,OCDQ;EDER;EACA;EACA;;;AAMJ;EACI,OCXQ;EDYR,aClBS;EDmBT;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;;;AAIR;EACI;EACA;EACA;EACA;;;AAGJ;EACI,OCzCW;ED0CX;EACA;;AAEA;EACI,OC7CY;;;ADiDpB;EACI,kBCrDc;EDsDd,OCpDW;EDqDX;EACA;EACA;EACA;EACA,QEtEU;EFuEV;EACA;EACA;;AACA;EACI,kBC7DY;ED8DZ,OCjEU;EDkEV;;AAGJ;EACI,kBCpEO;EDqEP,OCtEI;EDuEJ;;AACA;EACI,kBCvEQ;;AD2EhB;EACI,kBEpEW;EFqEX;;AAEA;EACI,kBExEO;EFyEP;;;AAKZ;EACI,kBE9EmB;EF+EnB,OC1FQ;ED2FR,QEvGU;EFwGV;EACA;EACA;;;AAIA;EACI;EACA;EACA;EExGN;;AACA;EFoGE;IEnGA;IACA;;;AFyGA;EE5GF;;AACA;EF2GE;IE1GA;IACA;;;;AFiHA;EACI;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;EACA,OEpHC;;;AF0HT;EACI;EACA;;AAGJ;EACI;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAIR;EACI,OEhJK;EFiJL;EACA;EACA;;AAEA;EACI;EACA;;AAIR;EACI;;AAEA;EACI;;AAGJ;EACI;;AAIR;EACI;EACA;EACA,OCnLI;EDoLJ;EACA;EACA;EACA;;AAEA;EACI;EACA,kBEhLW;;AFmLf;EACI;;AAIR;EACI;;AAMA;EACI;EACA;EACA;EACA;EACA,cErMO;EFsMP;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;;AAKR;EACI;;AAEA;EACI;;AAEA;EACI;;AAEJ;EACI,OEjOP;;AFwOL;EACI;;AAEJ;EACI;EACA;EACA;EACA;EE3PV;;AACA;EFsPM;IErPJ;IACA;;;AF6PQ;EACI;EACA;EElQd;;AACA;EF+PU;IE9PR;IACA;;;AFoQI;EACI;EACA;;AAIR;EACI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA,OE3QN;;AFgRE;EACI,OElRL;;;AFwRX;EACI;EACA;;;AAGJ;EACI;;AAEA;EACI,MChTI;;ADmTR;EACI,MCrTU;;;AD0Td;EACI;EACA;;;AAIR;EAEQ;EAEJ;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;AAAkB;EAClB;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;AACA;EACA;AAEA;EACA;AAEA;EACA","file":"dark.css"}

65
internal/ui/login/static/resources/themes/caos/css/light.css
View File

@@ -101,6 +101,7 @@ h1 {
p { p {
font-weight: 300; font-weight: 300;
text-align: center;
} }
header { header {
@@ -173,6 +174,42 @@ input:not([type=radio]), select {
padding-left: 15px; padding-left: 15px;
} }
form button.user-selection .profile-image, .login-profile .profile-image {
height: 100px;
background-position: center;
background-repeat: no-repeat;
background-image: url("../../../images/icon-user-dark.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection .profile-image, .login-profile .profile-image {
background-image: url("../../../images/icon-user-dark@2x.png");
background-size: 100px 100px;
}
}
form button.user-selection:hover .profile-image, .login-profile:hover .profile-image {
background-image: url("../../../images/icon-user-dark-hover.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection:hover .profile-image, .login-profile:hover .profile-image {
background-image: url("../../../images/icon-user-dark-hover@2x.png");
background-size: 100px 100px;
}
}
.login-profile .names {
padding: 10px 0;
text-align: center;
}
.login-profile .names div:first-of-type {
font-size: 1.3rem;
}
.login-profile .names div:nth-of-type(2) {
font-weight: 300;
font-size: 0.9rem;
font-style: italic;
color: #898989;
}
form .field { form .field {
display: grid; display: grid;
padding: 10px 0; padding: 10px 0;
@@ -228,26 +265,6 @@ form button.clean * {
form .user-selection-list { form .user-selection-list {
margin-bottom: 80px; margin-bottom: 80px;
} }
form button.user-selection .profile-image {
width: 100px;
height: 100px;
background-image: url("/resources/images/icon-user-dark.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection .profile-image {
background-image: url("/resources/images/icon-user-dark@2x.png");
background-size: 100px 100px;
}
}
form button.user-selection:hover .profile-image {
background-image: url("/resources/images/icon-user-dark-hover.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection:hover .profile-image {
background-image: url("/resources/images/icon-user-dark-hover@2x.png");
background-size: 100px 100px;
}
}
form button.user-selection .sessionstate { form button.user-selection .sessionstate {
display: inline-block; display: inline-block;
height: 20px; height: 20px;
@@ -286,22 +303,22 @@ form button.other-user .other-user-image {
height: 75px; height: 75px;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-image: url("/resources/images/icon-newuser-dark.png"); background-image: url("../../../images/icon-newuser-dark.png");
} }
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.other-user .other-user-image { form button.other-user .other-user-image {
background-image: url("/resources/images/icon-newuser-dark@2x.png"); background-image: url("../../../images/icon-newuser-dark@2x.png");
background-size: 100px 75px; background-size: 100px 75px;
} }
} }
form button.other-user:hover .other-user-image { form button.other-user:hover .other-user-image {
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-image: url("/resources/images/icon-newuser-dark-hover.png"); background-image: url("../../../images/icon-newuser-dark-hover.png");
} }
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.other-user:hover .other-user-image { form button.other-user:hover .other-user-image {
background-image: url("/resources/images/icon-newuser-dark-hover@2x.png"); background-image: url("../../../images/icon-newuser-dark-hover@2x.png");
background-size: 100px 75px; background-size: 100px 75px;
} }
} }

2
internal/ui/login/static/resources/themes/caos/css/light.css.map
View File

@@ -1 +1 @@
{"version":3,"sourceRoot":"","sources":["../../scss/fonts.scss","../../scss/main.scss","../../scss/caos/variables.scss","../../scss/variables.scss","../../scss/light.scss"],"names":[],"mappings":"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","file":"light.css"} {"version":3,"sourceRoot":"","sources":["../../scss/fonts.scss","../../scss/main.scss","../../scss/caos/variables.scss","../../scss/variables.scss","../../scss/light.scss"],"names":[],"mappings":"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","file":"light.css"}

47
internal/ui/login/static/resources/themes/scss/main.scss
View File

@@ -34,6 +34,7 @@ h1 {
p { p {
font-weight: 300; font-weight: 300;
text-align: center;
} }
header { header {
@@ -111,6 +112,40 @@ input:not([type='radio']), select {
padding-left: 15px; padding-left: 15px;
} }
%profile-image {
.profile-image {
height: 100px;
width: 100px;
background-position: center;
background-repeat: no-repeat;
@include retina-background-image($profileImgDark, "png", false, 100px, 100px);
}
&:hover .profile-image {
@include retina-background-image($profileImgDark, "png", true, 100px, 100px);
}
}
.login-profile {
@extend %profile-image;
.names {
padding: 10px 0;
text-align: center;
div:first-of-type {
font-size: 1.3rem;
}
div:nth-of-type(2) {
font-weight: 300;
font-size: 0.9rem;
font-style: italic;
color: $labelColor;
}
}
}
form { form {
.field { .field {
display: grid; display: grid;
@@ -181,17 +216,7 @@ form {
} }
button.user-selection { button.user-selection {
.profile-image { @extend %profile-image;
width: 100px;
height: 100px;
@include retina-background-image($profileImgDark, "png", false, 100px, 100px);
}
&:hover {
.profile-image {
@include retina-background-image($profileImgDark, "png", true, 100px, 100px);
}
}
.sessionstate { .sessionstate {
display: inline-block; display: inline-block;

8
internal/ui/login/static/resources/themes/scss/variables.scss
View File

@@ -28,8 +28,8 @@ $labelColor: #898989;
$inputBorderColor: #505050; $inputBorderColor: #505050;
$inputBackgroundColor: #252525; $inputBackgroundColor: #252525;
$buttonBackgroundColorHover: $inputBackgroundColor; $buttonBackgroundColorHover: $inputBackgroundColor;
$profileImgDark: "/resources/images/icon-user-dark"; $profileImgDark: "../../../images/icon-user-dark";
$otherUserImgDark: "/resources/images/icon-newuser-dark"; $otherUserImgDark: "../../../images/icon-newuser-dark";
$nokColor: #F20D6B; $nokColor: #F20D6B;
$okColor: #0DF279; $okColor: #0DF279;
@@ -41,5 +41,5 @@ $primaryColorLight: $primaryColor;
$primaryColorHoverLight: lighten($primaryColorLight, 10%); $primaryColorHoverLight: lighten($primaryColorLight, 10%);
$inputBackgroundColorLight: #FFFFFF; $inputBackgroundColorLight: #FFFFFF;
$buttonBackgroundColorHoverLight: $inputBackgroundColor; $buttonBackgroundColorHoverLight: $inputBackgroundColor;
$profileImgLight: "/resources/images/icon-user-light"; $profileImgLight: "../../../images/icon-user-light";
$otherUserImgLight: "/resources/images/icon-newuser-light"; $otherUserImgLight: "../../../images/icon-newuser-light";

65
internal/ui/login/static/resources/themes/zitadel/css/dark.css
View File

@@ -102,6 +102,7 @@ h1 {
p { p {
font-weight: 300; font-weight: 300;
text-align: center;
} }
header { header {
@@ -174,6 +175,42 @@ input:not([type=radio]), select {
padding-left: 15px; padding-left: 15px;
} }
form button.user-selection .profile-image, .login-profile .profile-image {
height: 100px;
background-position: center;
background-repeat: no-repeat;
background-image: url("../../../images/icon-user-dark.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection .profile-image, .login-profile .profile-image {
background-image: url("../../../images/icon-user-dark@2x.png");
background-size: 100px 100px;
}
}
form button.user-selection:hover .profile-image, .login-profile:hover .profile-image {
background-image: url("../../../images/icon-user-dark-hover.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection:hover .profile-image, .login-profile:hover .profile-image {
background-image: url("../../../images/icon-user-dark-hover@2x.png");
background-size: 100px 100px;
}
}
.login-profile .names {
padding: 10px 0;
text-align: center;
}
.login-profile .names div:first-of-type {
font-size: 1.3rem;
}
.login-profile .names div:nth-of-type(2) {
font-weight: 300;
font-size: 0.9rem;
font-style: italic;
color: #898989;
}
form .field { form .field {
display: grid; display: grid;
padding: 10px 0; padding: 10px 0;
@@ -229,26 +266,6 @@ form button.clean * {
form .user-selection-list { form .user-selection-list {
margin-bottom: 80px; margin-bottom: 80px;
} }
form button.user-selection .profile-image {
width: 100px;
height: 100px;
background-image: url("/resources/images/icon-user-dark.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection .profile-image {
background-image: url("/resources/images/icon-user-dark@2x.png");
background-size: 100px 100px;
}
}
form button.user-selection:hover .profile-image {
background-image: url("/resources/images/icon-user-dark-hover.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection:hover .profile-image {
background-image: url("/resources/images/icon-user-dark-hover@2x.png");
background-size: 100px 100px;
}
}
form button.user-selection .sessionstate { form button.user-selection .sessionstate {
display: inline-block; display: inline-block;
height: 20px; height: 20px;
@@ -287,22 +304,22 @@ form button.other-user .other-user-image {
height: 75px; height: 75px;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-image: url("/resources/images/icon-newuser-dark.png"); background-image: url("../../../images/icon-newuser-dark.png");
} }
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.other-user .other-user-image { form button.other-user .other-user-image {
background-image: url("/resources/images/icon-newuser-dark@2x.png"); background-image: url("../../../images/icon-newuser-dark@2x.png");
background-size: 100px 75px; background-size: 100px 75px;
} }
} }
form button.other-user:hover .other-user-image { form button.other-user:hover .other-user-image {
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-image: url("/resources/images/icon-newuser-dark-hover.png"); background-image: url("../../../images/icon-newuser-dark-hover.png");
} }
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.other-user:hover .other-user-image { form button.other-user:hover .other-user-image {
background-image: url("/resources/images/icon-newuser-dark-hover@2x.png"); background-image: url("../../../images/icon-newuser-dark-hover@2x.png");
background-size: 100px 75px; background-size: 100px 75px;
} }
} }

2
internal/ui/login/static/resources/themes/zitadel/css/dark.css.map
View File

@@ -1 +1 @@
{"version":3,"sourceRoot":"","sources":["../../scss/fonts.scss","../../scss/main.scss","../../scss/variables.scss"],"names":[],"mappings":"AACA;EACI;EACA;;AAIJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAIJ;EACI;EACA;EACA;EACA;AAA6D;EAC7D;;AC5EJ;EACI;EACA,aCHW;EDIX;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA,kBCKc;EDJd,OCKQ;EDJR;EACA;EACA;EAEI;;;AAIR;EACI,OCLQ;EDMR,aC3BS;ED4BT;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;;;AAIR;EACI;EACA;EACA;EACA;;;AAGJ;EACI,OClCW;EDmCX;EACA;;AAEA;EACI,OCtCY;;;AD0CpB;EACI,kBC9Cc;ED+Cd,OC7CW;ED8CX;EACA;EACA;EACA;EACA,QCrEU;EDsEV;EACA;EACA;;AACA;EACI,kBCtDY;EDuDZ,OC1DU;ED2DV;;AAGJ;EACI,kBC7DO;ED8DP,OC/DI;EDgEJ;;AACA;EACI,kBChEQ;;ADoEhB;EACI,kBCnEW;EDoEX;;AAEA;EACI,kBCvEO;EDwEP;;;AAKZ;EACI,kBC7EmB;ED8EnB,OCnFQ;EDoFR,QCtGU;EDuGV;EACA;EACA;;;AAIA;EACI;EACA;;AAGJ;EACI;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAIR;EACI,OC9GK;ED+GL;EACA;EACA;;AAEA;EACI;EACA;;AAIR;EACI;;AAEA;EACI;;AAGJ;EACI;;AAIR;EACI;EACA;EACA,OC3II;ED4IJ;EACA;EACA;EACA;;AAEA;EACI;EACA,kBC9IW;;ADiJf;EACI;;AAIR;EACI;;AAIA;EACI;EACA;EC3KV;;AACA;EDwKM;ICvKJ;IACA;;;AD6KQ;EChLV;;AACA;ED+KU;IC9KR;IACA;;;ADkLI;EACI;EACA;EACA;EACA;EACA,cC7KO;ED8KP;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;;AAKR;EACI;;AAEA;EACI;;AAEA;EACI;;AAEJ;EACI,OCzMP;;ADgNL;EACI;;AAEJ;EACI;EACA;EACA;EACA;ECnOV;;AACA;ED8NM;IC7NJ;IACA;;;ADqOQ;EACI;EACA;EC1Od;;AACA;EDuOU;ICtOR;IACA;;;AD4OI;EACI;EACA;;AAIR;EACI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA,OCnPN;;ADwPE;EACI,OC1PL;;;ADgQX;EACI;EACA;;;AAGJ;EACI;;AAEA;EACI,MClRI;;ADqRR;EACI,MCvRU;;;AD4Rd;EACI;EACA;;;AAIR;EAII;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;AAAkB;EAClB;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;AACA;EACA;AAEA;EACA;AAEA;EACA","file":"dark.css"} {"version":3,"sourceRoot":"","sources":["../../scss/fonts.scss","../../scss/main.scss","../../scss/variables.scss"],"names":[],"mappings":"AACA;EACI;EACA;;AAIJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAIJ;EACI;EACA;EACA;EACA;AAA6D;EAC7D;;AC5EJ;EACI;EACA,aCHW;EDIX;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA,kBCKc;EDJd,OCKQ;EDJR;EACA;EACA;EAEI;;;AAIR;EACI,OCLQ;EDMR,aC3BS;ED4BT;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;;;AAIR;EACI;EACA;EACA;EACA;;;AAGJ;EACI,OCnCW;EDoCX;EACA;;AAEA;EACI,OCvCY;;;AD2CpB;EACI,kBC/Cc;EDgDd,OC9CW;ED+CX;EACA;EACA;EACA;EACA,QCtEU;EDuEV;EACA;EACA;;AACA;EACI,kBCvDY;EDwDZ,OC3DU;ED4DV;;AAGJ;EACI,kBC9DO;ED+DP,OChEI;EDiEJ;;AACA;EACI,kBCjEQ;;ADqEhB;EACI,kBCpEW;EDqEX;;AAEA;EACI,kBCxEO;EDyEP;;;AAKZ;EACI,kBC9EmB;ED+EnB,OCpFQ;EDqFR,QCvGU;EDwGV;EACA;EACA;;;AAIA;EACI;EACA;EACA;ECxGN;;AACA;EDoGE;ICnGA;IACA;;;ADyGA;EC5GF;;AACA;ED2GE;IC1GA;IACA;;;;ADiHA;EACI;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;EACA,OCpHC;;;AD0HT;EACI;EACA;;AAGJ;EACI;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAIR;EACI,OChJK;EDiJL;EACA;EACA;;AAEA;EACI;EACA;;AAIR;EACI;;AAEA;EACI;;AAGJ;EACI;;AAIR;EACI;EACA;EACA,OC7KI;ED8KJ;EACA;EACA;EACA;;AAEA;EACI;EACA,kBChLW;;ADmLf;EACI;;AAIR;EACI;;AAMA;EACI;EACA;EACA;EACA;EACA,cCrMO;EDsMP;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;;AAKR;EACI;;AAEA;EACI;;AAEA;EACI;;AAEJ;EACI,OCjOP;;ADwOL;EACI;;AAEJ;EACI;EACA;EACA;EACA;EC3PV;;AACA;EDsPM;ICrPJ;IACA;;;AD6PQ;EACI;EACA;EClQd;;AACA;ED+PU;IC9PR;IACA;;;ADoQI;EACI;EACA;;AAIR;EACI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA,OC3QN;;ADgRE;EACI,OClRL;;;ADwRX;EACI;EACA;;;AAGJ;EACI;;AAEA;EACI,MC1SI;;AD6SR;EACI,MC/SU;;;ADoTd;EACI;EACA;;;AAIR;EAII;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;AAAkB;EAClB;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;AACA;EACA;AAEA;EACA;AAEA;EACA","file":"dark.css"}

65
internal/ui/login/static/resources/themes/zitadel/css/light.css
View File

@@ -102,6 +102,7 @@ h1 {
p { p {
font-weight: 300; font-weight: 300;
text-align: center;
} }
header { header {
@@ -174,6 +175,42 @@ input:not([type=radio]), select {
padding-left: 15px; padding-left: 15px;
} }
form button.user-selection .profile-image, .login-profile .profile-image {
height: 100px;
background-position: center;
background-repeat: no-repeat;
background-image: url("../../../images/icon-user-dark.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection .profile-image, .login-profile .profile-image {
background-image: url("../../../images/icon-user-dark@2x.png");
background-size: 100px 100px;
}
}
form button.user-selection:hover .profile-image, .login-profile:hover .profile-image {
background-image: url("../../../images/icon-user-dark-hover.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection:hover .profile-image, .login-profile:hover .profile-image {
background-image: url("../../../images/icon-user-dark-hover@2x.png");
background-size: 100px 100px;
}
}
.login-profile .names {
padding: 10px 0;
text-align: center;
}
.login-profile .names div:first-of-type {
font-size: 1.3rem;
}
.login-profile .names div:nth-of-type(2) {
font-weight: 300;
font-size: 0.9rem;
font-style: italic;
color: #898989;
}
form .field { form .field {
display: grid; display: grid;
padding: 10px 0; padding: 10px 0;
@@ -229,26 +266,6 @@ form button.clean * {
form .user-selection-list { form .user-selection-list {
margin-bottom: 80px; margin-bottom: 80px;
} }
form button.user-selection .profile-image {
width: 100px;
height: 100px;
background-image: url("/resources/images/icon-user-dark.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection .profile-image {
background-image: url("/resources/images/icon-user-dark@2x.png");
background-size: 100px 100px;
}
}
form button.user-selection:hover .profile-image {
background-image: url("/resources/images/icon-user-dark-hover.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection:hover .profile-image {
background-image: url("/resources/images/icon-user-dark-hover@2x.png");
background-size: 100px 100px;
}
}
form button.user-selection .sessionstate { form button.user-selection .sessionstate {
display: inline-block; display: inline-block;
height: 20px; height: 20px;
@@ -287,22 +304,22 @@ form button.other-user .other-user-image {
height: 75px; height: 75px;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-image: url("/resources/images/icon-newuser-dark.png"); background-image: url("../../../images/icon-newuser-dark.png");
} }
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.other-user .other-user-image { form button.other-user .other-user-image {
background-image: url("/resources/images/icon-newuser-dark@2x.png"); background-image: url("../../../images/icon-newuser-dark@2x.png");
background-size: 100px 75px; background-size: 100px 75px;
} }
} }
form button.other-user:hover .other-user-image { form button.other-user:hover .other-user-image {
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-image: url("/resources/images/icon-newuser-dark-hover.png"); background-image: url("../../../images/icon-newuser-dark-hover.png");
} }
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.other-user:hover .other-user-image { form button.other-user:hover .other-user-image {
background-image: url("/resources/images/icon-newuser-dark-hover@2x.png"); background-image: url("../../../images/icon-newuser-dark-hover@2x.png");
background-size: 100px 75px; background-size: 100px 75px;
} }
} }

2
internal/ui/login/static/resources/themes/zitadel/css/light.css.map
View File

@@ -1 +1 @@
{"version":3,"sourceRoot":"","sources":["../../scss/fonts.scss","../../scss/main.scss","../../scss/variables.scss","../../scss/light.scss"],"names":[],"mappings":"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","file":"light.css"} {"version":3,"sourceRoot":"","sources":["../../scss/fonts.scss","../../scss/main.scss","../../scss/variables.scss","../../scss/light.scss"],"names":[],"mappings":"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","file":"light.css"}

3
internal/ui/login/static/templates/change_password.html
View File

@@ -1,6 +1,7 @@
{{template "main-top" .}} {{template "main-top" .}}
<h1>{{t "PasswordChange.Title"}}</h1> {{ template "user-profile" . }}
<p>{{t "PasswordChange.Description"}}</p> <p>{{t "PasswordChange.Description"}}</p>
<form action="{{ changePasswordUrl }}" method="POST"> <form action="{{ changePasswordUrl }}" method="POST">

2
internal/ui/login/static/templates/change_password_done.html
View File

@@ -1,7 +1,7 @@
{{template "main-top" .}} {{template "main-top" .}}
{{ template "user-profile" . }}
<h1>{{t "PasswordChangeDone.Title"}}</h1>
<p>{{t "PasswordChangeDone.Description"}}</p> <p>{{t "PasswordChangeDone.Description"}}</p>
<form action="{{ loginUrl }}" method="POST"> <form action="{{ loginUrl }}" method="POST">

2
internal/ui/login/static/templates/init_password.html
View File

@@ -1,7 +1,7 @@
{{template "main-top" .}} {{template "main-top" .}}
{{ template "user-profile" . }}
<h1>{{t "InitPassword.Title" }}</h1>
<p>{{t "InitPassword.Description" }}</p> <p>{{t "InitPassword.Description" }}</p>
<form action="{{ initPasswordUrl }}" method="POST"> <form action="{{ initPasswordUrl }}" method="POST">

3
internal/ui/login/static/templates/init_password_done.html
View File

@@ -1,8 +1,9 @@
{{template "main-top" .}} {{template "main-top" .}}
{{ template "user-profile" . }}
<h1>{{t "PasswordSetDone.Title"}}</h1>
<p>{{t "PasswordSetDone.Description"}}</p> <p>{{t "PasswordSetDone.Description"}}</p>
<form action="{{ loginUrl }}" method="POST"> <form action="{{ loginUrl }}" method="POST">
{{ .CSRF }} {{ .CSRF }}

2
internal/ui/login/static/templates/init_user.html
View File

@@ -1,7 +1,7 @@
{{template "main-top" .}} {{template "main-top" .}}
{{ template "user-profile" . }}
<h1>{{t "InitUser.Title" }}</h1>
<p>{{t "InitUser.Description" }}</p> <p>{{t "InitUser.Description" }}</p>
<form action="{{ initUserUrl }}" method="POST"> <form action="{{ initUserUrl }}" method="POST">

3
internal/ui/login/static/templates/init_user_done.html
View File

@@ -1,8 +1,9 @@
{{template "main-top" .}} {{template "main-top" .}}
{{ template "user-profile" . }}
<h1>{{t "InitUserDone.Title"}}</h1>
<p>{{t "InitUserDone.Description"}}</p> <p>{{t "InitUserDone.Description"}}</p>
<form action="{{ loginUrl }}" method="POST"> <form action="{{ loginUrl }}" method="POST">
{{ .CSRF }} {{ .CSRF }}

2
internal/ui/login/static/templates/mail_verification.html
View File

@@ -1,7 +1,7 @@
{{template "main-top" .}} {{template "main-top" .}}
{{ template "user-profile" . }}
<h1>{{t "EmailVerification.Title"}}</h1>
<p>{{t "EmailVerification.Description"}}</p> <p>{{t "EmailVerification.Description"}}</p>
<form action="{{ mailVerificationUrl }}" method="POST"> <form action="{{ mailVerificationUrl }}" method="POST">

2
internal/ui/login/static/templates/mail_verified.html
View File

@@ -1,7 +1,7 @@
{{template "main-top" .}} {{template "main-top" .}}
{{ template "user-profile" . }}
<h1>{{t "EmailVerificationDone.Title"}}</h1>
<p>{{t "EmailVerificationDone.Description"}}</p> <p>{{t "EmailVerificationDone.Description"}}</p>
<form action="{{ loginUrl }}" method="POST"> <form action="{{ loginUrl }}" method="POST">

2
internal/ui/login/static/templates/mfa_init_done.html
View File

@@ -1,7 +1,7 @@
{{template "main-top" .}} {{template "main-top" .}}
{{ template "user-profile" . }}
<h1>{{t "MfaInitDone.Title"}}</h1>
<p>{{t "MfaInitDone.Description"}}</p> <p>{{t "MfaInitDone.Description"}}</p>
<form action="{{ loginUrl }}" method="POST"> <form action="{{ loginUrl }}" method="POST">

2
internal/ui/login/static/templates/mfa_init_verify.html
View File

@@ -1,7 +1,7 @@
{{template "main-top" .}} {{template "main-top" .}}
{{ template "user-profile" . }}
<h1>{{t "MfaInitVerify.Title"}}</h1>
<p>{{t "MfaInitVerify.Description"}}</p> <p>{{t "MfaInitVerify.Description"}}</p>
<form action="{{ mfaInitVerifyUrl }}" method="POST"> <form action="{{ mfaInitVerifyUrl }}" method="POST">

3
internal/ui/login/static/templates/mfa_prompt.html
View File

@@ -1,7 +1,8 @@
{{template "main-top" .}} {{template "main-top" .}}
{{ template "user-profile" . }}
<h1>{{t "MfaPrompt.Title"}}</h1> <p>{{t "MfaPrompt.Description"}}</p>
<form action="{{ mfaPromptUrl }}" method="POST"> <form action="{{ mfaPromptUrl }}" method="POST">

2
internal/ui/login/static/templates/mfa_verify.html
View File

@@ -1,7 +1,7 @@
{{template "main-top" .}} {{template "main-top" .}}
{{ template "user-profile" . }}
<h1>{{t "MfaVerify.Title"}}</h1>
<p>{{t "MfaVerify.Description"}}</p> <p>{{t "MfaVerify.Description"}}</p>
<form action="{{ mfaVerifyUrl }}" method="POST"> <form action="{{ mfaVerifyUrl }}" method="POST">

3
internal/ui/login/static/templates/password.html
View File

@@ -1,7 +1,8 @@
{{template "main-top" .}} {{template "main-top" .}}
{{ template "user-profile" . }}
<h1>{{t "Password.Title"}}</h1> <p>{{t "Password.Description"}}</p>
<form action="{{ passwordUrl }}" method="POST"> <form action="{{ passwordUrl }}" method="POST">

3
internal/ui/login/static/templates/password_reset_done.html
View File

@@ -1,8 +1,9 @@
{{template "main-top" .}} {{template "main-top" .}}
{{ template "user-profile" . }}
<h1>{{t "PasswordResetDone.Title"}}</h1>
<p>{{t "PasswordResetDone.Description"}}</p> <p>{{t "PasswordResetDone.Description"}}</p>
<form action="{{ loginUrl }}" method="POST"> <form action="{{ loginUrl }}" method="POST">
{{ .CSRF }} {{ .CSRF }}

13
internal/ui/login/static/templates/user_profile.html Normal file
View File

@@ -0,0 +1,13 @@
{{define "user-profile"}}
{{if .LoginName}}
<div class="login-profile">
<div class="profile-image"></div>
<div class="names">
{{if .DisplayName}}
<div class="displayname">{{.DisplayName}}</div>
{{end}}
<div class="loginname">{{.LoginName}}</div>
</div>
</div>
{{end}}
{{end}}