Commit 024e2d42 authored by Sascha Pfeiffer's avatar Sascha Pfeiffer

some beautification to the login form

Signed-off-by: 's avatarSascha Pfeiffer <sascha.pfeiffer@psono.com>
parent 48d43818
......@@ -7,10 +7,5 @@
"allow_custom_server": true,
"allow_registration": true,
"allow_lost_password": true,
"authentication_methods": ["SAML"],
"saml_provider": [{
"title": "Company Login",
"provider_id": 1,
"button_name": "SAML SSO Login"
}]
"authentication_methods": ["AUTHKEY", "LDAP"]
}
\ No newline at end of file
......@@ -15,6 +15,17 @@ h1, h2 {
.monospace {
font-family: 'Fira Code', monospace; }
p.horizontalline {
width: 100%;
text-align: center;
border-bottom: 1px solid #0f1118;
line-height: 0.1em;
margin: 10px 0 20px; }
p.horizontalline span {
background: #151f2b;
padding: 0 10px; }
#panel {
padding: 10px; }
......
......@@ -127,15 +127,6 @@
</div>
<form name="loginForm" ng-if="view === 'default'" autocomplete="off">
<div ng-if="authkey_enabled || ldap_enabled" ng-class="{'input-group': loginFormUsername == null || loginFormUsername.indexOf('@') == -1}">
<input type="text" class="form-control" id="loginUsername" placeholder="{{'USERNAME' | translate}}" ng-model="loginFormUsername" required aria-describedby="username-addon" autofocus>
<span class="input-group-addon" id="username-addon" ng-if="loginFormUsername == null || loginFormUsername.indexOf('@') == -1">@{{selected_server_domain}}</span>
</div>
<br ng-if="authkey_enabled || ldap_enabled">
<div ng-if="authkey_enabled || ldap_enabled" class="form-group">
<input type="password" class="form-control" id="loginPassword" placeholder="{{'PASSWORD' | translate}}" ng-model="loginFormPassword" required>
</div>
<br ng-if="authkey_enabled || ldap_enabled">
<div ng-if="saml_enabled" ng-repeat="provider in saml_provider">
<div class="form-group">
{{ provider.title }}
......@@ -145,6 +136,15 @@
<a ng-if="provider.registration_url" ng-href="{{ provider.registration_url }}">{{'REGISTER' | translate}}</a>
</div>
</div>
<p ng-if="saml_enabled && (authkey_enabled || ldap_enabled)" class="horizontalline"><span>{{'OR' | translate}}</span></p>
<div ng-if="authkey_enabled || ldap_enabled" ng-class="{'input-group': loginFormUsername == null || loginFormUsername.indexOf('@') == -1}">
<input type="text" class="form-control" id="loginUsername" placeholder="{{'USERNAME' | translate}}" ng-model="loginFormUsername" required aria-describedby="username-addon" autofocus>
<span class="input-group-addon" id="username-addon" ng-if="loginFormUsername == null || loginFormUsername.indexOf('@') == -1">@{{selected_server_domain}}</span>
</div>
<br ng-if="authkey_enabled || ldap_enabled">
<div ng-if="authkey_enabled || ldap_enabled" class="form-group">
<input type="password" class="form-control" id="loginPassword" placeholder="{{'PASSWORD' | translate}}" ng-model="loginFormPassword" required>
</div>
<div class="checkbox">
<label><input type="checkbox" ng-model="loginFormRemember"> {{'REMEMBER_USERNAME_AND_SERVER' | translate}}</label>
</div>
......
......@@ -206,15 +206,6 @@
<form name="loginForm" ng-if="view === 'default'" autocomplete="off">
<!-- default View -->
<div ng-if="authkey_enabled || ldap_enabled" ng-class="{'input-group': loginFormUsername == null || loginFormUsername.indexOf('@') == -1}">
<input type="text" class="form-control" id="loginUsername" placeholder="{{'USERNAME' | translate}}" ng-model="loginFormUsername" required aria-describedby="username-addon" autofocus>
<span class="input-group-addon" id="username-addon" ng-if="loginFormUsername == null || loginFormUsername.indexOf('@') == -1">@{{selected_server_domain}}</span>
</div>
<br ng-if="authkey_enabled || ldap_enabled">
<div ng-if="authkey_enabled || ldap_enabled" class="form-group">
<input type="password" class="form-control" id="loginPassword" placeholder="{{'PASSWORD' | translate}}" ng-model="loginFormPassword" required>
</div>
<br ng-if="authkey_enabled || ldap_enabled">
<div ng-if="saml_enabled" ng-repeat="provider in saml_provider">
<div class="form-group">
{{ provider.title }}
......@@ -224,6 +215,15 @@
<a ng-if="provider.registration_url" ng-href="{{ provider.registration_url }}">{{'REGISTER' | translate}}</a>
</div>
</div>
<p ng-if="saml_enabled && (authkey_enabled || ldap_enabled)" class="horizontalline"><span>{{'OR' | translate}}</span></p>
<div ng-if="authkey_enabled || ldap_enabled" ng-class="{'input-group': loginFormUsername == null || loginFormUsername.indexOf('@') == -1}">
<input type="text" class="form-control" id="loginUsername" placeholder="{{'USERNAME' | translate}}" ng-model="loginFormUsername" required aria-describedby="username-addon" autofocus>
<span class="input-group-addon" id="username-addon" ng-if="loginFormUsername == null || loginFormUsername.indexOf('@') == -1">@{{selected_server_domain}}</span>
</div>
<br ng-if="authkey_enabled || ldap_enabled">
<div ng-if="authkey_enabled || ldap_enabled" class="form-group">
<input type="password" class="form-control" id="loginPassword" placeholder="{{'PASSWORD' | translate}}" ng-model="loginFormPassword" required>
</div>
<div class="checkbox">
<label><input type="checkbox" ng-model="loginFormRemember"> {{'REMEMBER_USERNAME_AND_SERVER' | translate}}</label>
</div>
......
......@@ -77,15 +77,6 @@
<form name="loginForm" ng-if="view === 'default'" autocomplete="off">
<!-- default View -->
<div ng-if="authkey_enabled || ldap_enabled" ng-class="{'input-group': loginFormUsername == null || loginFormUsername.indexOf('@') == -1}">
<input type="text" class="form-control" id="loginUsername" placeholder="{{'USERNAME' | translate}}" ng-model="loginFormUsername" required aria-describedby="username-addon" autofocus>
<span class="input-group-addon" id="username-addon" ng-if="loginFormUsername == null || loginFormUsername.indexOf('@') == -1">@{{selected_server_domain}}</span>
</div>
<br ng-if="authkey_enabled || ldap_enabled">
<div ng-if="authkey_enabled || ldap_enabled" class="form-group">
<input type="password" class="form-control" id="loginPassword" placeholder="{{'PASSWORD' | translate}}" ng-model="loginFormPassword" required>
</div>
<br ng-if="authkey_enabled || ldap_enabled">
<div ng-if="saml_enabled" ng-repeat="provider in saml_provider">
<div class="form-group">
{{ provider.title }}
......@@ -95,6 +86,15 @@
<a ng-if="provider.registration_url" ng-href="{{ provider.registration_url }}">{{'REGISTER' | translate}}</a>
</div>
</div>
<p ng-if="saml_enabled && (authkey_enabled || ldap_enabled)" class="horizontalline"><span>{{'OR' | translate}}</span></p>
<div ng-if="authkey_enabled || ldap_enabled" ng-class="{'input-group': loginFormUsername == null || loginFormUsername.indexOf('@') == -1}">
<input type="text" class="form-control" id="loginUsername" placeholder="{{'USERNAME' | translate}}" ng-model="loginFormUsername" required aria-describedby="username-addon" autofocus>
<span class="input-group-addon" id="username-addon" ng-if="loginFormUsername == null || loginFormUsername.indexOf('@') == -1">@{{selected_server_domain}}</span>
</div>
<br ng-if="authkey_enabled || ldap_enabled">
<div ng-if="authkey_enabled || ldap_enabled" class="form-group">
<input type="password" class="form-control" id="loginPassword" placeholder="{{'PASSWORD' | translate}}" ng-model="loginFormPassword" required>
</div>
<div class="checkbox">
<label><input type="checkbox" ng-model="loginFormRemember"> {{'REMEMBER_USERNAME_AND_SERVER' | translate}}</label>
</div>
......
......@@ -21,6 +21,19 @@ h1, h2 {
font-family: 'Fira Code', monospace;
}
p.horizontalline {
width: 100%;
text-align: center;
border-bottom: 1px solid $dark-background;
line-height: 0.1em;
margin: 10px 0 20px;
}
p.horizontalline span {
background: $dark-color;
padding: 0 10px;
}
#panel {
padding: 10px;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment