Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 34a3de99 authored by Joze RIHTARSIC's avatar Joze RIHTARSIC
Browse files

Small ui fixes

parent 17764b83
No related branches found
No related tags found
No related merge requests found
<div id="page" class="login-page" [style]="'justify-content:center; align-items:center; height:100%'"> <div id="page" class="login-page" [style]="'justify-content:center; align-items:center; height:100%'">
<div fxLayout="row" [style]="'justify-content:center; align-items:center; height:100%'"> <div fxLayout="row" [style]="'justify-content:center; align-items:center; height:100%'">
<mat-card *ngIf="isUserAuthSSOEnabled() == true" fxFlex="400px" [style]="'width:400px;height:300px;margin:10px'"> <mat-card *ngIf="isUserAuthSSOEnabled() == true" fxFlex="400px" [style]="'width:400px;height:300px;margin:10px'">
<mat-card-title>SSO Login: {{lookups.cachedApplicationInfo.ssoAuthenticationLabel}}</mat-card-title> <mat-card-title class="title-panel" >SSO Login: {{lookups.cachedApplicationInfo.ssoAuthenticationLabel}}</mat-card-title>
<mat-card-content style="align-items: center;justify-content: center;display: flex;height: 200px;"> <mat-card-content style="align-items: center;justify-content: center;display: flex;height: 200px;">
<a mat-raised-button color="primary" href="{{lookups.cachedApplicationInfo.ssoAuthenticationURI}}" <a mat-raised-button color="primary" href="{{lookups.cachedApplicationInfo.ssoAuthenticationURI}}"
[style]="'width=150px'"> [style]="'width=150px'">
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
<mat-card *ngIf="isUserAuthPasswdEnabled() == true" fxFlex="400px" [style]="'width:400px;height:300px;margin:10px;'"> <mat-card *ngIf="isUserAuthPasswdEnabled() == true" fxFlex="400px" [style]="'width:400px;height:300px;margin:10px;'">
<mat-card-title>SMP Login</mat-card-title> <mat-card-title class="title-panel">SMP Login</mat-card-title>
<mat-card-content style="align-items: center;justify-content: center;display: flex;flex-direction:column; height: 200px;"> <mat-card-content style="align-items: center;justify-content: center;display: flex;flex-direction:column; height: 200px;">
<form name="loginForm" #loginForm="ngForm" (ngSubmit)="login()"> <form name="loginForm" #loginForm="ngForm" (ngSubmit)="login()">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
......
...@@ -220,9 +220,16 @@ a:hover { ...@@ -220,9 +220,16 @@ a:hover {
.panel { .panel {
margin-bottom: 10px; margin-bottom: 10px;
padding: 10px; padding: 10px;
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 1px 2px 0 rgba(0, 0, 0, 0.24);
}
.title-panel {
margin-bottom: 5px;
padding: 5px;
text-align: center;
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 1px 2px 0 rgba(0, 0, 0, 0.24); box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 1px 2px 0 rgba(0, 0, 0, 0.24);
} }
.empty-data-panel { .empty-data-panel {
margin-bottom: 10px; margin-bottom: 10px;
padding: 10px; padding: 10px;
......
...@@ -17,14 +17,12 @@ import com.fasterxml.jackson.databind.DeserializationFeature; ...@@ -17,14 +17,12 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.json.JsonMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import eu.europa.ec.edelivery.smp.error.ServiceErrorControllerAdvice;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.FilterType;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.PropertySource;
import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.servlet.config.annotation.*; import org.springframework.web.servlet.config.annotation.*;
...@@ -86,6 +84,7 @@ import static org.springframework.core.Ordered.HIGHEST_PRECEDENCE; ...@@ -86,6 +84,7 @@ import static org.springframework.core.Ordered.HIGHEST_PRECEDENCE;
"eu.europa.ec.smp.spi"}, "eu.europa.ec.smp.spi"},
excludeFilters = { excludeFilters = {
@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = SMPWebAppConfig.class)}) @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = SMPWebAppConfig.class)})
@PropertySource(value = "classpath:/application.properties", ignoreResourceNotFound = true)
public class SMPWebAppConfig implements WebMvcConfigurer { public class SMPWebAppConfig implements WebMvcConfigurer {
private static final Logger LOG = LoggerFactory.getLogger(SMPWebAppConfig.class); private static final Logger LOG = LoggerFactory.getLogger(SMPWebAppConfig.class);
......
...@@ -73,7 +73,7 @@ public class ApplicationController { ...@@ -73,7 +73,7 @@ public class ApplicationController {
" Version [" + " Version [" +
artifactVersion + artifactVersion +
"] Build-Time [" + "] Build-Time [" +
buildTime + "|" + TimeZone.getDefault().getDisplayName() + buildTime +
"]"; "]";
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment