From da0633e4c0ec37fdd0517e7d990260d551d9f494 Mon Sep 17 00:00:00 2001 From: Sofia Papacharalampous Date: Wed, 3 Apr 2024 12:46:21 +0300 Subject: [PATCH] ui fixes on dmp and description overview --- .../post-login/post-login.component.html | 58 +++--- .../description-overview.component.html | 128 ++++++------ .../dmp/overview/dmp-overview.component.html | 187 ++++++++++-------- .../dmp/overview/dmp-overview.component.scss | 6 +- 4 files changed, 208 insertions(+), 171 deletions(-) diff --git a/dmp-frontend/src/app/ui/auth/login/post-login/post-login.component.html b/dmp-frontend/src/app/ui/auth/login/post-login/post-login.component.html index 799bfa81a..445c9870c 100644 --- a/dmp-frontend/src/app/ui/auth/login/post-login/post-login.component.html +++ b/dmp-frontend/src/app/ui/auth/login/post-login/post-login.component.html @@ -1,29 +1,31 @@ -
- - -

{{'TENANT-CHOOSE-DIALOG.TITLE' | translate}}

-
- -
-
- - {{'TENANT-CHOOSE-DIALOG.FIELDS.TENANT-CODE' | translate}} - - - {{tenant.code}} - - - {{formGroup.get('tenantCode').getError('backendError')?.message}} - {{'COMMONS.VALIDATION.REQUIRED' | translate}} - -
-
-
-
-
+
+
+ + +

{{'TENANT-CHOOSE-DIALOG.TITLE' | translate}}

+
+ + +
+ + {{'TENANT-CHOOSE-DIALOG.FIELDS.TENANT-CODE' | translate}} + + + {{tenant.code}} + + + {{formGroup.get('tenantCode').getError('backendError')?.message}} + {{'COMMONS.VALIDATION.REQUIRED' | translate}} +
-
- - - -
\ No newline at end of file +
+
+
+
+
+
+ + + +
+
diff --git a/dmp-frontend/src/app/ui/description/overview/description-overview.component.html b/dmp-frontend/src/app/ui/description/overview/description-overview.component.html index ccffd6d76..6e18777f5 100644 --- a/dmp-frontend/src/app/ui/description/overview/description-overview.component.html +++ b/dmp-frontend/src/app/ui/description/overview/description-overview.component.html @@ -115,70 +115,76 @@
-
- -
- -

{{ 'DESCRIPTION-OVERVIEW.ACTIONS.FINALIZE' | translate }}

-
-
-
-
-
- -
- -

{{ 'DESCRIPTION-OVERVIEW.ACTIONS.REVERSE' | translate }}

-
-
- -
- -

{{ 'DESCRIPTION-OVERVIEW.ACTIONS.EXPORT' | translate }}

-
-
- - - -
-
-
-
-

{{ 'DESCRIPTION-OVERVIEW.DESCRIPTION-AUTHORS' | translate }}

-
-
-
-
- -
-

{{ dmpUser.user?.name }}

-

({{ 'DESCRIPTION-OVERVIEW.YOU' | translate }})

-

{{ enumUtils.toDmpUserRoleString(dmpUser.role) }}

-
-
-
-
- -
+
+
+
+ +
+ +

{{ 'DESCRIPTION-OVERVIEW.ACTIONS.FINALIZE' | translate }}

+
+
+
+
+
+ +
+ +

{{ 'DESCRIPTION-OVERVIEW.ACTIONS.REVERSE' | translate }}

+
+
+ +
+ +

{{ 'DESCRIPTION-OVERVIEW.ACTIONS.EXPORT' | translate }}

+
+
+ + +
-
- + +
+
+
+
+

{{ 'DESCRIPTION-OVERVIEW.DESCRIPTION-AUTHORS' | translate }}

+
+
+
+
+ +
+

{{ dmpUser.user?.name }}

+

({{ 'DESCRIPTION-OVERVIEW.YOU' | translate }})

+

{{ enumUtils.toDmpUserRoleString(dmpUser.role) }}

+
+
+
+ +
+
+
+
+ +
+
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html index 2181194dc..453c44908 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html @@ -43,7 +43,7 @@
-
+
{{'DMP-OVERVIEW.DESCRIPTIONS' | translate}}
-
+
-
- {{'DMP-OVERVIEW.DOI-PROVIDED' | translate}}: +
+
{{'DMP-OVERVIEW.DOI-PROVIDED' | translate}}:
@@ -138,89 +138,118 @@
-
-
- {{selectedModel.doi}} -
- - +
+
+ +
+
+
+ {{selectedModel.doi}} +
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ +
+ +

{{ 'DMP-OVERVIEW.ACTIONS.FINALIZE' | translate }}

+
+
+
+
+
+ + +
+ +

{{ 'DMP-OVERVIEW.ACTIONS.REVERSE' | translate }}

+
+
+ +
+ +

{{ 'DMP-OVERVIEW.ACTIONS.EXPORT' | translate }}

+
+
+ +
+ +

{{ 'DMP-OVERVIEW.ACTIONS.NEW-VERSION' | translate }}

+
+
+ + + +
-
-
-
- -

{{ 'DMP-OVERVIEW.ACTIONS.FINALIZE' | translate }}

-
-
-
-
-
- -
- -

{{ 'DMP-OVERVIEW.ACTIONS.REVERSE' | translate }}

-
-
- -

- {{ 'DMP-OVERVIEW.ACTIONS.EXPORT' | translate }}

-
-
- -

{{ 'DMP-OVERVIEW.ACTIONS.NEW-VERSION' | translate }} -

-
- - - -
-
-
-

{{ 'DMP-OVERVIEW.DMP-AUTHORS' | translate }}

-
-
-
-
- -
-

{{ dmpUser.user?.name }} - - ({{ 'DMP-OVERVIEW.YOU' | translate }}) -

-

{{ enumUtils.toDmpUserRoleString(dmpUser.role) }}

+
+
+
+
+
+

{{ 'DMP-OVERVIEW.DMP-AUTHORS' | translate }}

+
+
+
+
+ +
+

{{ dmpUser.user?.name }} + + ({{ 'DMP-OVERVIEW.YOU' | translate }}) +

+

{{ enumUtils.toDmpUserRoleString(dmpUser.role) }}

+
+
+
+ +
+
+
+ +
+
-
-
- -
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss index 06a8a13f3..9616cfabb 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss @@ -11,7 +11,7 @@ opacity: 0.4; } -.mat-mini-fab { +.mat-mdc-mini-fab { width: 2.5em; height: 2.5em; background-color: var(--primary-color); @@ -216,7 +216,7 @@ } .doi-panel { - height: 3.5em; + // height: 3.5em; background: #fafafa; border: 1px solid #d1d1d1; border-radius: 4px; @@ -233,7 +233,7 @@ box-shadow: 0px 1px 5px #00000026; border-radius: 4px; overflow: hidden; - min-width: 18.5em; + //min-width: 18.5em; } .frame-txt {