From 34a3de99dbd281130a542216ec1607d28197fe1c Mon Sep 17 00:00:00 2001
From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu>
Date: Wed, 14 Jun 2023 06:30:55 +0200
Subject: [PATCH] Small ui fixes
---
smp-angular/src/app/login/login.component.html | 4 ++--
smp-angular/src/styles.css | 7 +++++++
.../eu/europa/ec/edelivery/smp/config/SMPWebAppConfig.java | 5 ++---
.../edelivery/smp/ui/external/ApplicationController.java | 2 +-
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/smp-angular/src/app/login/login.component.html b/smp-angular/src/app/login/login.component.html
index 5e74eaad3..36416885f 100644
--- a/smp-angular/src/app/login/login.component.html
+++ b/smp-angular/src/app/login/login.component.html
@@ -1,7 +1,7 @@
<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%'">
<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;">
<a mat-raised-button color="primary" href="{{lookups.cachedApplicationInfo.ssoAuthenticationURI}}"
[style]="'width=150px'">
@@ -11,7 +11,7 @@
</mat-card-content>
</mat-card>
<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;">
<form name="loginForm" #loginForm="ngForm" (ngSubmit)="login()">
<mat-form-field style="width: 100%">
diff --git a/smp-angular/src/styles.css b/smp-angular/src/styles.css
index 612b3b389..2b2cd3c2a 100644
--- a/smp-angular/src/styles.css
+++ b/smp-angular/src/styles.css
@@ -220,9 +220,16 @@ a:hover {
.panel {
margin-bottom: 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);
}
+
.empty-data-panel {
margin-bottom: 10px;
padding: 10px;
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPWebAppConfig.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPWebAppConfig.java
index d4f7519f3..b6f8d9a69 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPWebAppConfig.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPWebAppConfig.java
@@ -17,14 +17,12 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
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.LoggerFactory;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
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.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.servlet.config.annotation.*;
@@ -86,6 +84,7 @@ import static org.springframework.core.Ordered.HIGHEST_PRECEDENCE;
"eu.europa.ec.smp.spi"},
excludeFilters = {
@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = SMPWebAppConfig.class)})
+@PropertySource(value = "classpath:/application.properties", ignoreResourceNotFound = true)
public class SMPWebAppConfig implements WebMvcConfigurer {
private static final Logger LOG = LoggerFactory.getLogger(SMPWebAppConfig.class);
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/ApplicationController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/ApplicationController.java
index fc4a10cc9..7d5203f3c 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/ApplicationController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/ApplicationController.java
@@ -73,7 +73,7 @@ public class ApplicationController {
" Version [" +
artifactVersion +
"] Build-Time [" +
- buildTime + "|" + TimeZone.getDefault().getDisplayName() +
+ buildTime +
"]";
}
--
GitLab