From f8b7bfc96c702860f838242b1b3db00f0cb9fceb Mon Sep 17 00:00:00 2001 From: Sofia Papacharalampous Date: Fri, 29 Mar 2024 14:41:19 +0200 Subject: [PATCH 1/2] styling changes *changed sizing for editors and listings --- ...escription-template-listing.component.html | 60 +- ...escription-template-listing.component.scss | 6 +- ...iption-template-type-editor.component.html | 108 ++-- ...iption-template-type-editor.component.scss | 2 +- ...ption-template-type-listing.component.html | 67 +- ...ption-template-type-listing.component.scss | 6 +- .../dmp-blueprint-editor.component.html | 579 +++++++++--------- .../dmp-blueprint-listing.component.html | 59 +- .../dmp-blueprint-listing.component.scss | 6 +- .../entity-locks/lock-listing.component.html | 45 +- .../entity-locks/lock-listing.component.scss | 6 +- .../index-managment.component.html | 20 +- .../index-managment.component.scss | 2 +- .../editor/language-editor.component.html | 146 ++--- .../editor/language-editor.component.scss | 6 +- .../listing/language-listing.component.html | 61 +- .../listing/language-listing.component.scss | 6 +- ...otification-template-editor.component.html | 533 ++++++++-------- ...otification-template-editor.component.scss | 6 +- ...tification-template-listing.component.html | 60 +- ...tification-template-listing.component.scss | 6 +- .../notification-listing.component.html | 46 +- .../notification-listing.component.scss | 6 +- .../prefilling-source-editor.component.html | 250 ++++---- .../prefilling-source-editor.component.scss | 6 +- .../prefilling-source-listing.component.html | 60 +- .../prefilling-source-listing.component.scss | 6 +- .../reference-type-editor.component.html | 291 ++++----- .../reference-type-editor.component.scss | 6 +- .../reference-type-listing.component.html | 67 +- .../reference-type-listing.component.scss | 6 +- .../editor/reference-editor.component.html | 278 ++++----- .../editor/reference-editor.component.scss | 6 +- .../listing/reference-listing.component.html | 10 +- .../editor/tenant-editor.component.html | 160 ++--- .../editor/tenant-editor.component.scss | 6 +- .../listing/tenant-listing.component.html | 60 +- .../user/listing/user-listing.component.html | 42 +- .../user/listing/user-listing.component.scss | 6 +- .../description-listing.component.html | 140 ++--- .../ui/dmp/listing/dmp-listing.component.html | 110 ++-- ...-inapp-notification-listing.component.html | 44 +- ...-inapp-notification-listing.component.scss | 6 +- .../supportive-material-editor.component.html | 131 ++-- .../supportive-material-editor.component.scss | 4 +- 45 files changed, 1793 insertions(+), 1744 deletions(-) diff --git a/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html b/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html index 011595c30..4ed9b6a9d 100644 --- a/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html +++ b/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html @@ -1,38 +1,38 @@ -
-
+
+
+
+
+
+

{{'DESCRIPTION-TEMPLATE-LISTING.TITLE' | translate}}

+ -
-
-

{{'DESCRIPTION-TEMPLATE-LISTING.TITLE' | translate}}

- +
+
+ +
-
-
- +
+ +
-
- -
+ + + + + + +
- - - - - - - - -
diff --git a/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.scss b/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.scss index 5040654c7..006eb5df1 100644 --- a/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.scss @@ -4,9 +4,9 @@ } .description-template-listing { - margin-top: 1.3rem; - margin-left: 1rem; - margin-right: 2rem; + // margin-top: 1.3rem; + // margin-left: 1rem; + // margin-right: 2rem; .mat-header-row { background: #f3f5f8; diff --git a/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.html b/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.html index 8a37502c1..0ff65f03e 100644 --- a/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.html @@ -1,58 +1,60 @@ -
-
+
+
+
-
-
- +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
-
- -
-
- -
-
- -
-
- -
+ + + {{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.NEW' | translate}} + + +
+
+
+ + {{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.FIELDS.NAME' | translate}} + +
+
+ + + + {{formGroup.get('name').getError('backendError').message}} + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+
+ +
- - - - {{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.NEW' | translate}} - - -
-
-
- - {{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.FIELDS.NAME' | translate}} - -
-
- - - - {{formGroup.get('name').getError('backendError').message}} - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
-
- -
-
\ No newline at end of file +
diff --git a/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.scss b/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.scss index dd84a6aa7..470188188 100644 --- a/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.scss @@ -1,5 +1,5 @@ .description-template-type-editor { - padding-top: 1em; + // padding-top: 1em; .editor-actions { margin-top: 30px; diff --git a/dmp-frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.html b/dmp-frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.html index 45491ae4f..4839f62a7 100644 --- a/dmp-frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.html +++ b/dmp-frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.html @@ -1,42 +1,43 @@ -
-
+
+
+
+
+
+

{{'DESCRIPTION-TEMPLATE-TYPE-LISTING.TITLE' | translate}}

+ -
-
-

{{'DESCRIPTION-TEMPLATE-TYPE-LISTING.TITLE' | translate}}

- +
+
+ +
+
-
-
- -
+ + + + + + +
- - - - - - - - -
+ diff --git a/dmp-frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.scss b/dmp-frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.scss index 6e1b48814..eca0e2e36 100644 --- a/dmp-frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.scss @@ -1,7 +1,7 @@ .description-template-type-listing { - margin-top: 1.3rem; - margin-left: 1rem; - margin-right: 2rem; + // margin-top: 1.3rem; + // margin-left: 1rem; + // margin-right: 2rem; .mat-header-row{ background: #f3f5f8; diff --git a/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.html b/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.html index 32d8c1851..432ee061e 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.html @@ -1,345 +1,338 @@ - -
-
-
-

{{'DMP-BLUEPRINT-EDITOR.TITLE.NEW' | translate}}

-

{{formGroup.get('label').value}}

-

- {{'DMP-BLUEPRINT-EDITOR.TITLE.CLONE' | translate}} - {{formGroup.get('label').value}} -

-

- {{'DMP-BLUEPRINT-EDITOR.TITLE.NEW-VERSION' | translate}} - {{formGroup.get('label').value}} -

-
-
-
- -
-
- -
-
- -
-
-
-
- - - -
-
- - {{'DMP-BLUEPRINT-EDITOR.FIELDS.NAME' | translate}} - - {{formGroup.get('label').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-

{{'DMP-BLUEPRINT-EDITOR.FIELDS.SECTIONS' | translate}}

+
+
+
+
+
+

{{'DMP-BLUEPRINT-EDITOR.TITLE.NEW' | translate}}

+

{{formGroup.get('label').value}}

+

+ {{'DMP-BLUEPRINT-EDITOR.TITLE.CLONE' | translate}} + {{formGroup.get('label').value}} +

+

+ {{'DMP-BLUEPRINT-EDITOR.TITLE.NEW-VERSION' | translate}} + {{formGroup.get('label').value}} +

+
+
+ +
+
+ +
+
+ +
+
+ + + +
+
+ + {{'DMP-BLUEPRINT-EDITOR.FIELDS.NAME' | translate}} + + {{formGroup.get('label').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+

{{'DMP-BLUEPRINT-EDITOR.FIELDS.SECTIONS' | translate}}

-
-
-
- - -
-
- {{'DMP-BLUEPRINT-EDITOR.FIELDS.SECTION-PREFIX' | translate}} {{sectionIndex + 1}} -
-
drag_indicator
+
+
+
+ + +
+
+ {{'DMP-BLUEPRINT-EDITOR.FIELDS.SECTION-PREFIX' | translate}} {{sectionIndex + 1}} +
+
drag_indicator
-
- +
+ +
-
- - -
-
- - {{'DMP-BLUEPRINT-EDITOR.FIELDS.SECTION-NAME' | translate}} - - {{section.get('label').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - + + +
+
+ + {{'DMP-BLUEPRINT-EDITOR.FIELDS.SECTION-NAME' | translate}} + + {{section.get('label').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'DMP-BLUEPRINT-EDITOR.FIELDS.SECTION-DESCRIPTION' | translate}} + + {{section.get('description').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ +
-
- - {{'DMP-BLUEPRINT-EDITOR.FIELDS.SECTION-DESCRIPTION' | translate}} - - {{section.get('description').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - +
+
+
+
+
+
+ {{fieldIndex + 1}} + drag_indicator +
+
+ +
+
+
+
+ {{fieldIndex + 1}} + drag_indicator +
+
+
+ +
+ + {{'DMP-BLUEPRINT-EDITOR.FIELDS.CATEGORY' | translate}} + + {{enumUtils.toDmpBlueprintFieldCategoryString(fieldCategory)}} + + {{field.get('category').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'DMP-BLUEPRINT-EDITOR.FIELDS.SYSTEM-FIELD-TYPE' | translate}} + + {{enumUtils.toDmpBlueprintSystemFieldTypeString(systemFieldType)}} + + {{field.get('systemFieldType').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'DMP-BLUEPRINT-EDITOR.FIELDS.DATA-TYPE' | translate}} + + + {{enumUtils.toDmpBlueprintExtraFieldDataTypeString(extraFieldDataType)}} + + + {{field.get('dataType').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'DMP-BLUEPRINT-EDITOR.FIELDS.REFERENCE-TYPE' | translate}} + + {{field.get('referenceTypeId').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'DMP-BLUEPRINT-EDITOR.FIELDS.FIELD-LABEL' | translate}} + + {{field.get('label').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'DMP-BLUEPRINT-EDITOR.FIELDS.FIELD-PLACEHOLDER' | translate}} + + {{field.get('placeholder').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'DMP-BLUEPRINT-EDITOR.FIELDS.FIELD-DESCRIPTION' | translate}} + + {{field.get('description').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'DMP-BLUEPRINT-EDITOR.FIELDS.SEMANTICS' | translate}} + + + {{field.get('semantics').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+
+
+
+
+ {{'DMP-BLUEPRINT-EDITOR.FIELDS.FIELD-REQUIRED' | translate}} + {{field.get('required').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} +
+
+ +
+
+
+
+ {{'DMP-BLUEPRINT-EDITOR.FIELDS-REQUIRED' | translate}} + {{section.get('fields').getError('backendError').message}} +
-
- + +
+
+
+
+ + {{'DMP-BLUEPRINT-EDITOR.FIELDS.DESCRIPTION-TEMPLATES' | translate}} + + {{section.get('hasTemplates').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} +
+
+ +
+
+
-
-
-
-
+ +
+
+
+
- {{fieldIndex + 1}} - drag_indicator + {{descriptionTemplateIndex + 1}} + drag_indicator
-
- {{fieldIndex + 1}} - drag_indicator -
+ {{descriptionTemplateIndex + 1}} + drag_indicator +
+
- -
- - {{'DMP-BLUEPRINT-EDITOR.FIELDS.CATEGORY' | translate}} - - {{enumUtils.toDmpBlueprintFieldCategoryString(fieldCategory)}} - - {{field.get('category').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} +
+ + {{'DMP-BLUEPRINT-EDITOR.FIELDS.DESCRIPTION-TEMPLATE' | translate}} + + {{descriptionTemplate.get('descriptionTemplateGroupId').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
- - {{'DMP-BLUEPRINT-EDITOR.FIELDS.SYSTEM-FIELD-TYPE' | translate}} - - {{enumUtils.toDmpBlueprintSystemFieldTypeString(systemFieldType)}} - - {{field.get('systemFieldType').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} +
+ + {{'DMP-BLUEPRINT-EDITOR.FIELDS.DESCRIPTION-TEMPLATE-LABEL' | translate}} + + {{descriptionTemplate.get('label').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
- - {{'DMP-BLUEPRINT-EDITOR.FIELDS.DATA-TYPE' | translate}} - - - {{enumUtils.toDmpBlueprintExtraFieldDataTypeString(extraFieldDataType)}} - - - {{field.get('dataType').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} +
+ + {{'DMP-BLUEPRINT-EDITOR.FIELDS.DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY' | translate}} + + {{descriptionTemplate.get('minMultiplicity').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
- - {{'DMP-BLUEPRINT-EDITOR.FIELDS.REFERENCE-TYPE' | translate}} - - {{field.get('referenceTypeId').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'DMP-BLUEPRINT-EDITOR.FIELDS.FIELD-LABEL' | translate}} - - {{field.get('label').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'DMP-BLUEPRINT-EDITOR.FIELDS.FIELD-PLACEHOLDER' | translate}} - - {{field.get('placeholder').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'DMP-BLUEPRINT-EDITOR.FIELDS.FIELD-DESCRIPTION' | translate}} - - {{field.get('description').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'DMP-BLUEPRINT-EDITOR.FIELDS.SEMANTICS' | translate}} - - - {{field.get('semantics').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} +
+ + {{'DMP-BLUEPRINT-EDITOR.FIELDS.DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY' | translate}} + + {{descriptionTemplate.get('maxMultiplicity').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
+
-
- {{'DMP-BLUEPRINT-EDITOR.FIELDS.FIELD-REQUIRED' | translate}} - {{field.get('required').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} -
-
-
-
-
- {{'DMP-BLUEPRINT-EDITOR.FIELDS-REQUIRED' | translate}} - {{section.get('fields').getError('backendError').message}} -
-
- -
-
-
-
- - {{'DMP-BLUEPRINT-EDITOR.FIELDS.DESCRIPTION-TEMPLATES' | translate}} - - {{section.get('hasTemplates').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} -
-
- +
+ {{section.get('descriptionTemplates').getError('backendError').message}}
-
- -
-
-
- -
-
-
- {{descriptionTemplateIndex + 1}} - drag_indicator -
-
- -
-
-
-
- {{descriptionTemplateIndex + 1}} - drag_indicator -
- -
-
-
- - {{'DMP-BLUEPRINT-EDITOR.FIELDS.DESCRIPTION-TEMPLATE' | translate}} - - {{descriptionTemplate.get('descriptionTemplateGroupId').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'DMP-BLUEPRINT-EDITOR.FIELDS.DESCRIPTION-TEMPLATE-LABEL' | translate}} - - {{descriptionTemplate.get('label').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'DMP-BLUEPRINT-EDITOR.FIELDS.DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY' | translate}} - - {{descriptionTemplate.get('minMultiplicity').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'DMP-BLUEPRINT-EDITOR.FIELDS.DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY' | translate}} - - {{descriptionTemplate.get('maxMultiplicity').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
-
-
-
-
- -
-
-
+
+
+ + {{'DMP-BLUEPRINT-EDITOR.FIELDS.PREFILLING-SOURCES' | translate}} + + {{section.get('prefillingSourcesIds').getError('backendError').message}} +
- {{section.get('descriptionTemplates').getError('backendError').message}}
-
-
-
- - {{'DMP-BLUEPRINT-EDITOR.FIELDS.PREFILLING-SOURCES' | translate}} - - {{section.get('prefillingSourcesIds').getError('backendError').message}} - -
-
- + - + + +
-
-
-
-
-
- - {{'DMP-BLUEPRINT-EDITOR.SECTIONS-REQUIRED' | translate}} - {{formGroup.get('definition').get('sections').getError('backendError').message}} +
+
+
+ + {{'DMP-BLUEPRINT-EDITOR.SECTIONS-REQUIRED' | translate}} + {{formGroup.get('definition').get('sections').getError('backendError').message}} +
-
-
-
- +
+
+ +
+
+
+ +
-
-
- -
-
- - - + + + +
-
\ No newline at end of file +
+ diff --git a/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.html b/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.html index a6b6ac261..fc68bb314 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.html +++ b/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.html @@ -1,38 +1,39 @@ -
-
+
+
+
+
-
-
-

{{'DMP-BLUEPRINT-LISTING.TITLE' | translate}}

- +
+

{{'DMP-BLUEPRINT-LISTING.TITLE' | translate}}

+ -
-
- +
+
+ +
+ +
+ +
-
- -
-
+ - - - - - - - + + + + +
diff --git a/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.scss b/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.scss index 4380a8f0c..24a1e3c86 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.scss @@ -4,9 +4,9 @@ } .dmp-blueprint-listing { - margin-top: 1.3rem; - margin-left: 1rem; - margin-right: 2rem; + // margin-top: 1.3rem; + // margin-left: 1rem; + // margin-right: 2rem; .mat-header-row { background: #f3f5f8; diff --git a/dmp-frontend/src/app/ui/admin/entity-locks/lock-listing.component.html b/dmp-frontend/src/app/ui/admin/entity-locks/lock-listing.component.html index 82149675d..926da068e 100644 --- a/dmp-frontend/src/app/ui/admin/entity-locks/lock-listing.component.html +++ b/dmp-frontend/src/app/ui/admin/entity-locks/lock-listing.component.html @@ -1,31 +1,34 @@ -
-
+
+
+
-
-
-

{{'LOCK-LISTING.TITLE' | translate}}

- +
+
+

{{'LOCK-LISTING.TITLE' | translate}}

+ +
+ + + + + + + +
- - - - - - - -
+ diff --git a/dmp-frontend/src/app/ui/admin/entity-locks/lock-listing.component.scss b/dmp-frontend/src/app/ui/admin/entity-locks/lock-listing.component.scss index 39bd26c9f..24af2627e 100644 --- a/dmp-frontend/src/app/ui/admin/entity-locks/lock-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/entity-locks/lock-listing.component.scss @@ -8,9 +8,9 @@ } .lock-listing { - margin-top: 1.3rem; - margin-left: 1rem; - margin-right: 2rem; + // margin-top: 1.3rem; + // margin-left: 1rem; + // margin-right: 2rem; .mat-header-row{ background: #f3f5f8; diff --git a/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.html b/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.html index 393981919..828bf809b 100644 --- a/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.html +++ b/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.html @@ -1,9 +1,15 @@ -
- -
-
Warning: Danger zone. It might delete Dataset tags if not careful
- - +
+
+
+
+ +
+
Warning: Danger zone. It might delete Dataset tags if not careful
+ + +
+
- +
+ diff --git a/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.scss b/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.scss index 780978d9c..700a1f153 100644 --- a/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.scss +++ b/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.scss @@ -1,5 +1,5 @@ .root { - padding-bottom: 2em; + // padding-bottom: 2em; .button { margin: 5px; diff --git a/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.html b/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.html index 3bc5faa99..4ac6d8e08 100644 --- a/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.html @@ -1,76 +1,78 @@ -
-
-
-
-

{{'LANGUAGE-EDITOR.NEW' | translate}}

- +
+
+
+
+
+

{{'LANGUAGE-EDITOR.NEW' | translate}}

+ +
+
+ +
+
+ +
+
+ +
-
- -
-
- -
-
- -
-
-
- - - {{'LANGUAGE-EDITOR.NEW' | translate}} - - -
-
- - {{'LANGUAGE-EDITOR.FIELDS.CODE' | translate}} - - {{formGroup.get('code').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - + + + + {{'LANGUAGE-EDITOR.NEW' | translate}} + + +
+
+ + {{'LANGUAGE-EDITOR.FIELDS.CODE' | translate}} + + {{formGroup.get('code').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'LANGUAGE-EDITOR.FIELDS.CODE' | translate}} + + + {{languageCode}} + + + {{formGroup.get('code').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'LANGUAGE-EDITOR.FIELDS.ORDINAL' | translate}} + + {{formGroup.get('ordinal').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'LANGUAGE-EDITOR.FIELDS.PAYLOAD' | translate}} + + {{formGroup.get('payload').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + + {{'LANGUAGE-EDITOR.FIELDS.OVERRIDE' | translate}} + + +
-
- - {{'LANGUAGE-EDITOR.FIELDS.CODE' | translate}} - - - {{languageCode}} - - - {{formGroup.get('code').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'LANGUAGE-EDITOR.FIELDS.ORDINAL' | translate}} - - {{formGroup.get('ordinal').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'LANGUAGE-EDITOR.FIELDS.PAYLOAD' | translate}} - - {{formGroup.get('payload').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - - {{'LANGUAGE-EDITOR.FIELDS.OVERRIDE' | translate}} - - -
-
- - - + + + +
-
\ No newline at end of file +
diff --git a/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.scss b/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.scss index 66f9e4fa8..52bf8c001 100644 --- a/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.scss @@ -1,7 +1,7 @@ .tenant-editor { - margin-top: 1.3rem; - margin-left: 1em; - margin-right: 3em; + // margin-top: 1.3rem; + // margin-left: 1em; + // margin-right: 3em; .remove { background-color: white; diff --git a/dmp-frontend/src/app/ui/admin/language/listing/language-listing.component.html b/dmp-frontend/src/app/ui/admin/language/listing/language-listing.component.html index 94d9f035b..8030c609d 100644 --- a/dmp-frontend/src/app/ui/admin/language/listing/language-listing.component.html +++ b/dmp-frontend/src/app/ui/admin/language/listing/language-listing.component.html @@ -1,36 +1,37 @@ -
-
+
+
+
+
+
+

{{'LANGUAGE-LISTING.TITLE' | translate}}

+ -
-
-

{{'LANGUAGE-LISTING.TITLE' | translate}}

- +
+
+ +
+
+ + + + + + + -
-
- -
- - - - - - - -
diff --git a/dmp-frontend/src/app/ui/admin/language/listing/language-listing.component.scss b/dmp-frontend/src/app/ui/admin/language/listing/language-listing.component.scss index e5a0263b1..f3ec27f26 100644 --- a/dmp-frontend/src/app/ui/admin/language/listing/language-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/language/listing/language-listing.component.scss @@ -1,7 +1,7 @@ .language-listing { - margin-top: 1.3rem; - margin-left: 1rem; - margin-right: 2rem; + // margin-top: 1.3rem; + // margin-left: 1rem; + // margin-right: 2rem; .mat-header-row{ background: #f3f5f8; diff --git a/dmp-frontend/src/app/ui/admin/notification-template/editor/notification-template-editor.component.html b/dmp-frontend/src/app/ui/admin/notification-template/editor/notification-template-editor.component.html index ef7805ef3..f635766fa 100644 --- a/dmp-frontend/src/app/ui/admin/notification-template/editor/notification-template-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/notification-template/editor/notification-template-editor.component.html @@ -1,277 +1,278 @@ -
-
-
-
-

{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.NEW' | translate}}

- +
+
+
+
+
+

{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.NEW' | translate}}

+ +
+
+ +
+
+ +
+
+ +
-
- -
-
- -
-
- -
-
-
- - - {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.NEW' | translate}} - - -
-
- - {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.NOTIFICATION-TYPE' | translate}} - - - {{enumUtils.toNotificationTypeString(type)}} - - - {{formGroup.get('notificationType').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - + + + + {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.NEW' | translate}} + + +
+
+ + {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.NOTIFICATION-TYPE' | translate}} + + + {{enumUtils.toNotificationTypeString(type)}} + + + {{formGroup.get('notificationType').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.LANGUAGE' | translate}} + + + {{language.code}} + + + {{formGroup.get('languageId').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.KIND' | translate}} + + + {{enumUtils.toNotificationTemplateKindString(kind)}} + + + {{formGroup.get('kind').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.CHANNEL' | translate}} + + + {{enumUtils.toNotificationTemplateChannelString(channel)}} + + + {{formGroup.get('channel').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
-
- - {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.LANGUAGE' | translate}} - - - {{language.code}} - - - {{formGroup.get('languageId').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.KIND' | translate}} - - - {{enumUtils.toNotificationTemplateKindString(kind)}} - - - {{formGroup.get('kind').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.CHANNEL' | translate}} - - - {{enumUtils.toNotificationTemplateChannelString(channel)}} - - - {{formGroup.get('channel').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- -
-

{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.SUBJECT-SECTION' | translate}}

-
- - {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.SUBJECT-TEXT' | translate}} - - {{formGroup.get('value').get('subjectText').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - + +
+

{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.SUBJECT-SECTION' | translate}}

+
+ + {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.SUBJECT-TEXT' | translate}} + + {{formGroup.get('value').get('subjectText').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.SUBJECT-KEY' | translate}} + + {{formGroup.get('value').get('subjectKey').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
-
- - {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.SUBJECT-KEY' | translate}} - - {{formGroup.get('value').get('subjectKey').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
-

{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.SUBJECT-FIELD-OPTIONS' | translate}} - -

- - - - +

{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.SUBJECT-FIELD-OPTIONS' | translate}} + +

+ + + + - -
-

{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BODY-SECTION' | translate}}

-
- - {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BODY-KEY' | translate}} - - {{formGroup.get('value').get('bodyKey').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BODY-TEXT' | translate}} - - {{formGroup.get('value').get('bodyText').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} -
-
-

{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BODY-FIELD-OPTIONS' | translate}} - -

- - - - - -
-

{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.EXTRA-OPTIONS' | translate}}

+
-

{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.ALLOW-ATTACHMENTS' | translate}} - - {{formGroup.get('value').get('allowAttachments').getError('backendError').message}} -

+

{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BODY-SECTION' | translate}}

+
+ + {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BODY-KEY' | translate}} + + {{formGroup.get('value').get('bodyKey').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BODY-TEXT' | translate}} + + {{formGroup.get('value').get('bodyText').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} +
-
- - {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.PRIORITY-KEY' | translate}} - - {{formGroup.get('value').get('priorityKey').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.CC' | translate}} - - - {{field}} - - - - - {{formGroup.get('value').get('cc').getError('backendError').message}} - -
-
- - {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.CC-MODE' | translate}} - - - {{enumUtils.toEmailOverrideModeString(emailOverrideMode)}} - - - {{formGroup.get('value').get('ccMode').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BCC' | translate}} - - - {{field}} - - - - - {{formGroup.get('value').get('bcc').getError('backendError').message}} - -
-
- - {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BCC-MODE' | translate}} - - - {{enumUtils.toEmailOverrideModeString(emailOverrideMode)}} - - - {{formGroup.get('value').get('bccMode').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.EXTRA-DATA-KEYS' | translate}} - - - {{field}} - - - - - {{formGroup.get('value').get('extraDataKeys').getError('backendError').message}} - -
-
- - - +

{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BODY-FIELD-OPTIONS' | translate}} + +

+ + + + + +
+

{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.EXTRA-OPTIONS' | translate}}

+
+

{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.ALLOW-ATTACHMENTS' | translate}} + + {{formGroup.get('value').get('allowAttachments').getError('backendError').message}} +

+
+
+ + {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.PRIORITY-KEY' | translate}} + + {{formGroup.get('value').get('priorityKey').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.CC' | translate}} + + + {{field}} + + + + + {{formGroup.get('value').get('cc').getError('backendError').message}} + +
+
+ + {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.CC-MODE' | translate}} + + + {{enumUtils.toEmailOverrideModeString(emailOverrideMode)}} + + + {{formGroup.get('value').get('ccMode').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BCC' | translate}} + + + {{field}} + + + + + {{formGroup.get('value').get('bcc').getError('backendError').message}} + +
+
+ + {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BCC-MODE' | translate}} + + + {{enumUtils.toEmailOverrideModeString(emailOverrideMode)}} + + + {{formGroup.get('value').get('bccMode').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.EXTRA-DATA-KEYS' | translate}} + + + {{field}} + + + + + {{formGroup.get('value').get('extraDataKeys').getError('backendError').message}} + +
+
+ + + +
- diff --git a/dmp-frontend/src/app/ui/admin/notification-template/editor/notification-template-editor.component.scss b/dmp-frontend/src/app/ui/admin/notification-template/editor/notification-template-editor.component.scss index 60e3c667a..631286384 100644 --- a/dmp-frontend/src/app/ui/admin/notification-template/editor/notification-template-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/notification-template/editor/notification-template-editor.component.scss @@ -1,7 +1,7 @@ .notification-template-editor { - margin-top: 1.3rem; - margin-left: 1em; - margin-right: 3em; + // margin-top: 1.3rem; + // margin-left: 1em; + // margin-right: 3em; .remove { background-color: white; diff --git a/dmp-frontend/src/app/ui/admin/notification-template/listing/notification-template-listing.component.html b/dmp-frontend/src/app/ui/admin/notification-template/listing/notification-template-listing.component.html index 616f548b7..fdd880880 100644 --- a/dmp-frontend/src/app/ui/admin/notification-template/listing/notification-template-listing.component.html +++ b/dmp-frontend/src/app/ui/admin/notification-template/listing/notification-template-listing.component.html @@ -1,36 +1,38 @@ -
-
+
+
+
-
-
-

{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-LISTING.TITLE' | translate}}

- +
+
+

{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-LISTING.TITLE' | translate}}

+ +
+
+ +
-
- -
+ + + + + + + +
- - - - - - - -
diff --git a/dmp-frontend/src/app/ui/admin/notification-template/listing/notification-template-listing.component.scss b/dmp-frontend/src/app/ui/admin/notification-template/listing/notification-template-listing.component.scss index 1bf5a1acb..8fac5d938 100644 --- a/dmp-frontend/src/app/ui/admin/notification-template/listing/notification-template-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/notification-template/listing/notification-template-listing.component.scss @@ -1,7 +1,7 @@ .notification-template-listing { - margin-top: 1.3rem; - margin-left: 1rem; - margin-right: 2rem; + // margin-top: 1.3rem; + // margin-left: 1rem; + // margin-right: 2rem; .mat-header-row{ background: #f3f5f8; diff --git a/dmp-frontend/src/app/ui/admin/notification/notification-listing.component.html b/dmp-frontend/src/app/ui/admin/notification/notification-listing.component.html index a56c1ce91..208c3ccb8 100644 --- a/dmp-frontend/src/app/ui/admin/notification/notification-listing.component.html +++ b/dmp-frontend/src/app/ui/admin/notification/notification-listing.component.html @@ -1,31 +1,33 @@ -
-
- -
-
-

{{'NOTIFICATION-SERVICE.NOTIFICATION-LISTING.TITLE' | translate}}

- +
+
+
+
+
+

{{'NOTIFICATION-SERVICE.NOTIFICATION-LISTING.TITLE' | translate}}

+ +
+ + + + + + + +
- - - - - - - -
+ diff --git a/dmp-frontend/src/app/ui/admin/notification/notification-listing.component.scss b/dmp-frontend/src/app/ui/admin/notification/notification-listing.component.scss index 2f0e6a92f..f361cff88 100644 --- a/dmp-frontend/src/app/ui/admin/notification/notification-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/notification/notification-listing.component.scss @@ -8,9 +8,9 @@ } .notification-listing { - margin-top: 1.3rem; - margin-left: 1rem; - margin-right: 2rem; + // margin-top: 1.3rem; + // margin-left: 1rem; + // margin-right: 2rem; .mat-header-row{ background: #f3f5f8; diff --git a/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html b/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html index cd8b0001b..fdadd6bd4 100644 --- a/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html @@ -1,151 +1,153 @@ -
-
+
+
+
-
-
-

{{'PREFILLING-SOURCE-EDITOR.NEW' | translate}}

- +
+
+

{{'PREFILLING-SOURCE-EDITOR.NEW' | translate}}

+ +
+
+ +
+
+ +
+
+ +
-
- -
-
- -
-
- -
-
-
- - - {{'PREFILLING-SOURCE-EDITOR.NEW' | translate}} - - -
-
- - {{'PREFILLING-SOURCE-EDITOR.FIELDS.LABEL' | translate}} - - {{formGroup.get('label').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - + + + + {{'PREFILLING-SOURCE-EDITOR.NEW' | translate}} + + +
+
+ + {{'PREFILLING-SOURCE-EDITOR.FIELDS.LABEL' | translate}} + + {{formGroup.get('label').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
-
- - - - - {{'PREFILLING-SOURCE-EDITOR.FIELDS.FIXED-VALUE-FIELDS' | translate}} - - -
- + + + + + {{'PREFILLING-SOURCE-EDITOR.FIELDS.FIXED-VALUE-FIELDS' | translate}} + + +
+ +
+
+
+
+
+ {{'PREFILLING-SOURCE-EDITOR.FIELDS.FIELD' | translate}} {{fieldIndex + 1}} +
+
+ +
+
+
+
+ +
+
+ + {{'PREFILLING-SOURCE-EDITOR.FIELDS.FIXED-VALUE' | translate}} + + {{field.get('fixedValue').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+
+
+ +
+
+ + + + + {{'PREFILLING-SOURCE-EDITOR.FIELDS.FIELDS' | translate}} + + +
-
+
{{'PREFILLING-SOURCE-EDITOR.FIELDS.FIELD' | translate}} {{fieldIndex + 1}}
-
+
+ + {{'PREFILLING-SOURCE-EDITOR.FIELDS.CODE' | translate}} + + {{field.get('code').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
-
- - {{'PREFILLING-SOURCE-EDITOR.FIELDS.FIXED-VALUE' | translate}} - - {{field.get('fixedValue').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
- + +
-
- - - - - {{'PREFILLING-SOURCE-EDITOR.FIELDS.FIELDS' | translate}} - - - -
-
-
-
-
- {{'PREFILLING-SOURCE-EDITOR.FIELDS.FIELD' | translate}} {{fieldIndex + 1}} -
-
- -
-
-
-
- - {{'PREFILLING-SOURCE-EDITOR.FIELDS.CODE' | translate}} - - {{field.get('code').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- -
-
-
+ + + + + + {{'PREFILLING-SOURCE-EDITOR.FIELDS.SOURCE-CONFIGURATION' | translate}} + + + +
+ + {{'PREFILLING-SOURCE-EDITOR.FIELDS.GET-SOURCE-CONFIGURATION' | translate}} + {{formGroup.get('definition').get('getEnabled').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} +
- - -
- - + + - - - {{'PREFILLING-SOURCE-EDITOR.FIELDS.SOURCE-CONFIGURATION' | translate}} - - - -
- - {{'PREFILLING-SOURCE-EDITOR.FIELDS.GET-SOURCE-CONFIGURATION' | translate}} - {{formGroup.get('definition').get('getEnabled').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
- - - - - - {{'PREFILLING-SOURCE-EDITOR.FIELDS.GET-SOURCE-CONFIGURATION' | translate}} - - - - - - + + + {{'PREFILLING-SOURCE-EDITOR.FIELDS.GET-SOURCE-CONFIGURATION' | translate}} + + + + + + +
-
\ No newline at end of file +
diff --git a/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.scss b/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.scss index 09a802a50..df9e3a45f 100644 --- a/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.scss @@ -1,7 +1,7 @@ .prefilling-source-editor { - margin-top: 1.3rem; - margin-left: 1em; - margin-right: 3em; + // margin-top: 1.3rem; + // margin-left: 1em; + // margin-right: 3em; .remove { background-color: white; diff --git a/dmp-frontend/src/app/ui/admin/prefilling-source/listing/prefilling-source-listing.component.html b/dmp-frontend/src/app/ui/admin/prefilling-source/listing/prefilling-source-listing.component.html index 307834601..72d63cda8 100644 --- a/dmp-frontend/src/app/ui/admin/prefilling-source/listing/prefilling-source-listing.component.html +++ b/dmp-frontend/src/app/ui/admin/prefilling-source/listing/prefilling-source-listing.component.html @@ -1,36 +1,38 @@ -
-
+
+
+
-
-
-

{{'PREFILLING-SOURCE-LISTING.TITLE' | translate}}

- +
+
+

{{'PREFILLING-SOURCE-LISTING.TITLE' | translate}}

+ +
+
+ +
-
- -
+ + + + + + + +
- - - - - - - -
diff --git a/dmp-frontend/src/app/ui/admin/prefilling-source/listing/prefilling-source-listing.component.scss b/dmp-frontend/src/app/ui/admin/prefilling-source/listing/prefilling-source-listing.component.scss index 76392cf77..b00010bdd 100644 --- a/dmp-frontend/src/app/ui/admin/prefilling-source/listing/prefilling-source-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/prefilling-source/listing/prefilling-source-listing.component.scss @@ -4,9 +4,9 @@ } .prefilling-source-listing { - margin-top: 1.3rem; - margin-left: 1rem; - margin-right: 2rem; + // margin-top: 1.3rem; + // margin-left: 1rem; + // margin-right: 2rem; .mat-header-row { background: #f3f5f8; diff --git a/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html b/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html index 368faa968..0f2a3a01e 100644 --- a/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html @@ -1,150 +1,151 @@ -
-
+
+
+
+
+
+

{{'REFERENCE-TYPE-EDITOR.NEW' | translate}}

+ +
-
-
-

{{'REFERENCE-TYPE-EDITOR.NEW' | translate}}

- +
+ +
+
+ +
+
+ +
-
- -
-
- -
-
- -
+ + + {{'REFERENCE-TYPE-EDITOR.NEW' | translate}} + + +
+
+
+ + {{'REFERENCE-TYPE-EDITOR.FIELDS.NAME' | translate}} + + {{formGroup.get('name').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'REFERENCE-TYPE-EDITOR.FIELDS.CODE' | translate}} + + {{formGroup.get('code').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+ +
+
+
+

{{'REFERENCE-TYPE-EDITOR.FIELDS.FIELDS' | translate}}

+
+
+ +
+
+
+ +
+
+
+
+
+ {{fieldIndex + 1}} +
+
+ + {{'REFERENCE-TYPE-EDITOR.FIELDS.LABEL' | translate}} + + {{field.get('label').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'REFERENCE-TYPE-EDITOR.FIELDS.DESCRIPTION' | translate}} + + {{field.get('description').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'REFERENCE-TYPE-EDITOR.FIELDS.CODE' | translate}} + + {{field.get('code').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'REFERENCE-TYPE-EDITOR.FIELDS.DATA-TYPE' | translate}} + + + {{enumUtils.toReferenceFieldDataTypeString(fieldDataType)}} + + + {{field.get('dataType').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ +
+
+
+
+ +
+
+
+
+

{{'REFERENCE-TYPE-EDITOR.FIELDS.SOURCES' | translate}}

+
+
+ +
+
+
+
+
+
+
+
+ {{'REFERENCE-TYPE-EDITOR.FIELDS.SOURCE-CONFIGURATION' | translate}} {{sourceIndex + 1}} +
+
+ +
+
+ + +
+
+ {{'REFERENCE-TYPE-EDITOR.SOURCES-REQUIRED' | translate}} + {{formGroup.get('definition').get('sources').getError('backendError').message}} +
+
+
+ +
- - - - {{'REFERENCE-TYPE-EDITOR.NEW' | translate}} - - -
-
-
- - {{'REFERENCE-TYPE-EDITOR.FIELDS.NAME' | translate}} - - {{formGroup.get('name').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'REFERENCE-TYPE-EDITOR.FIELDS.CODE' | translate}} - - {{formGroup.get('code').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
- -
-
-
-

{{'REFERENCE-TYPE-EDITOR.FIELDS.FIELDS' | translate}}

-
-
- -
-
-
- -
-
-
-
-
- {{fieldIndex + 1}} -
-
- - {{'REFERENCE-TYPE-EDITOR.FIELDS.LABEL' | translate}} - - {{field.get('label').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'REFERENCE-TYPE-EDITOR.FIELDS.DESCRIPTION' | translate}} - - {{field.get('description').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'REFERENCE-TYPE-EDITOR.FIELDS.CODE' | translate}} - - {{field.get('code').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'REFERENCE-TYPE-EDITOR.FIELDS.DATA-TYPE' | translate}} - - - {{enumUtils.toReferenceFieldDataTypeString(fieldDataType)}} - - - {{field.get('dataType').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- -
-
-
-
- -
-
-
-
-

{{'REFERENCE-TYPE-EDITOR.FIELDS.SOURCES' | translate}}

-
-
- -
-
-
-
-
-
-
-
- {{'REFERENCE-TYPE-EDITOR.FIELDS.SOURCE-CONFIGURATION' | translate}} {{sourceIndex + 1}} -
-
- -
-
- - -
-
- {{'REFERENCE-TYPE-EDITOR.SOURCES-REQUIRED' | translate}} - {{formGroup.get('definition').get('sources').getError('backendError').message}} -
-
-
- -
-
\ No newline at end of file +
diff --git a/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.scss b/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.scss index a6f1e5ed7..f6de3e6aa 100644 --- a/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.scss @@ -1,7 +1,7 @@ .reference-type-editor { - margin-top: 1.3rem; - margin-left: 1em; - margin-right: 3em; + // margin-top: 1.3rem; + // margin-left: 1em; + // margin-right: 3em; .remove { background-color: white; diff --git a/dmp-frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.html b/dmp-frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.html index 32e3296e4..b23b56f55 100644 --- a/dmp-frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.html +++ b/dmp-frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.html @@ -1,42 +1,45 @@ -
-
+
+
+
-
-
-

{{'REFERENCE-TYPE-LISTING.TITLE' | translate}}

- +
+
+

{{'REFERENCE-TYPE-LISTING.TITLE' | translate}}

+ -
-
- +
+
+ +
+ + + + + + + + +
- - - - - - - - -
+ diff --git a/dmp-frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.scss b/dmp-frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.scss index cd02faad1..321b424be 100644 --- a/dmp-frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.scss @@ -1,7 +1,7 @@ .reference-type-listing { - margin-top: 1.3rem; - margin-left: 1rem; - margin-right: 2rem; + // margin-top: 1.3rem; + // margin-left: 1rem; + // margin-right: 2rem; .mat-header-row{ background: #f3f5f8; diff --git a/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.html b/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.html index af08ae91f..974f05ed3 100644 --- a/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.html @@ -1,148 +1,150 @@ -
-
-
-
-

{{'REFERENCE-EDITOR.NEW' | translate}}

- +
+
+
+
+
+

{{'REFERENCE-EDITOR.NEW' | translate}}

+ +
+
+ +
+
+ +
+
+ +
-
- -
-
- -
-
- -
-
-
- - - {{'REFERENCE-EDITOR.NEW' | translate}} - - -
-
- - {{'REFERENCE-EDITOR.FIELDS.LABEL' | translate}} - - {{formGroup.get('label').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'REFERENCE-EDITOR.FIELDS.REFERENCE' | translate}} - - {{formGroup.get('reference').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'REFERENCE-EDITOR.FIELDS.TYPE' | translate}} - - - {{formGroup.get('type').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'REFERENCE-EDITOR.FIELDS.SOURCE' | translate}} - - {{formGroup.get('source').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'REFERENCE-EDITOR.FIELDS.SOURCE-TYPE' | translate}} - - - {{enumUtils.toReferenceSourceTypeString(sourceType)}} - - - {{formGroup.get('sourceType').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'REFERENCE-EDITOR.FIELDS.ABBREVIATION' | translate}} - - {{formGroup.get('abbreviation').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - -
- {{formGroup.get('description').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED'| translate}} + + + + {{'REFERENCE-EDITOR.NEW' | translate}} + + +
+
+ + {{'REFERENCE-EDITOR.FIELDS.LABEL' | translate}} + + {{formGroup.get('label').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'REFERENCE-EDITOR.FIELDS.REFERENCE' | translate}} + + {{formGroup.get('reference').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'REFERENCE-EDITOR.FIELDS.TYPE' | translate}} + + + {{formGroup.get('type').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'REFERENCE-EDITOR.FIELDS.SOURCE' | translate}} + + {{formGroup.get('source').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'REFERENCE-EDITOR.FIELDS.SOURCE-TYPE' | translate}} + + + {{enumUtils.toReferenceSourceTypeString(sourceType)}} + + + {{formGroup.get('sourceType').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'REFERENCE-EDITOR.FIELDS.ABBREVIATION' | translate}} + + {{formGroup.get('abbreviation').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + +
+ {{formGroup.get('description').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED'| translate}} +
-
- -
-

- {{'REFERENCE-EDITOR.FIELDS.FIELDS' | translate}} - -

-
-
-
-
- {{fieldIndex + 1}} -
-
- - {{'REFERENCE-EDITOR.FIELDS.CODE' | translate}} - - {{field.get('code').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'REFERENCE-EDITOR.FIELDS.DATA-TYPE' | translate}} - - - {{enumUtils.toReferenceFieldDataTypeString(dataType)}} - - - {{field.get('dataType').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'REFERENCE-EDITOR.FIELDS.VALUE' | translate}} - - {{field.get('value').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- + +
+

+ {{'REFERENCE-EDITOR.FIELDS.FIELDS' | translate}} + +

+
+
+
+
+ {{fieldIndex + 1}} +
+
+ + {{'REFERENCE-EDITOR.FIELDS.CODE' | translate}} + + {{field.get('code').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'REFERENCE-EDITOR.FIELDS.DATA-TYPE' | translate}} + + + {{enumUtils.toReferenceFieldDataTypeString(dataType)}} + + + {{field.get('dataType').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'REFERENCE-EDITOR.FIELDS.VALUE' | translate}} + + {{field.get('value').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ +
-
- - - + + + +
-
\ No newline at end of file +
diff --git a/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.scss b/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.scss index 306d4650e..150fc824d 100644 --- a/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.scss @@ -1,7 +1,7 @@ .reference-editor { - margin-top: 1.3rem; - margin-left: 1em; - margin-right: 3em; + // margin-top: 1.3rem; + // margin-left: 1em; + // margin-right: 3em; .remove { background-color: white; diff --git a/dmp-frontend/src/app/ui/admin/reference/listing/reference-listing.component.html b/dmp-frontend/src/app/ui/admin/reference/listing/reference-listing.component.html index 5cfb20b66..73dfbf2b3 100644 --- a/dmp-frontend/src/app/ui/admin/reference/listing/reference-listing.component.html +++ b/dmp-frontend/src/app/ui/admin/reference/listing/reference-listing.component.html @@ -1,7 +1,8 @@ -
-
+
-
+
+
+

{{'REFERENCE-LISTING.TITLE' | translate}}

@@ -33,6 +34,9 @@
+
+ + diff --git a/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.html b/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.html index 134366881..5baacd3e2 100644 --- a/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.html @@ -1,81 +1,85 @@ -
-
-
-

{{'TENANT-EDITOR.NEW' | translate}}

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

{{'TENANT-EDITOR.NEW' | translate}}

+ +
+
+ +
+
+ +
+
+ +
+
-
- - - {{'TENANT-EDITOR.NEW' | translate}} - - -
-
- - {{'TENANT-EDITOR.FIELDS.NAME' | translate}} - - {{formGroup.get('name').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'TENANT-EDITOR.FIELDS.CODE' | translate}} - - {{formGroup.get('code').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
-

{{'TENANT-EDITOR.FIELDS.DESCRIPTION' | translate}}

-
- - -
- {{formGroup.get('description').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED'| translate}} + + + + {{'TENANT-EDITOR.NEW' | translate}} + + +
+
+ + {{'TENANT-EDITOR.FIELDS.NAME' | translate}} + + {{formGroup.get('name').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'TENANT-EDITOR.FIELDS.CODE' | translate}} + + {{formGroup.get('code').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+

{{'TENANT-EDITOR.FIELDS.DESCRIPTION' | translate}}

+
+ + +
+ {{formGroup.get('description').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED'| translate}} +
+
+
+ +
+ + +
+
+ +
-
- -
- - -
-
- - -
-
- - - -
\ No newline at end of file + + + +
+
+
diff --git a/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.scss b/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.scss index 66f9e4fa8..52bf8c001 100644 --- a/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.scss @@ -1,7 +1,7 @@ .tenant-editor { - margin-top: 1.3rem; - margin-left: 1em; - margin-right: 3em; + // margin-top: 1.3rem; + // margin-left: 1em; + // margin-right: 3em; .remove { background-color: white; diff --git a/dmp-frontend/src/app/ui/admin/tenant/listing/tenant-listing.component.html b/dmp-frontend/src/app/ui/admin/tenant/listing/tenant-listing.component.html index 7e147010a..81f514a0d 100644 --- a/dmp-frontend/src/app/ui/admin/tenant/listing/tenant-listing.component.html +++ b/dmp-frontend/src/app/ui/admin/tenant/listing/tenant-listing.component.html @@ -1,36 +1,38 @@ -
-
+
+
+
-
-
-

{{'TENANT-LISTING.TITLE' | translate}}

- +
+
+

{{'TENANT-LISTING.TITLE' | translate}}

+ +
+
+ +
-
- -
+ + + + + + + +
- - - - - - - -
diff --git a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.html b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.html index 503c93efd..8f858355f 100644 --- a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.html +++ b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.html @@ -1,27 +1,27 @@ -
-
+
+
+
+
+
+

{{'USER-LISTING.TITLE' | translate}}

+ -
-
-

{{'USER-LISTING.TITLE' | translate}}

- +
+
+ +
+
-
-
- -
+ + + + + +
- - - - - - - -
diff --git a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss index 243385ef3..c80c597fd 100644 --- a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss @@ -1,7 +1,7 @@ .user-listing { - margin-top: 1.3rem; - margin-left: 1rem; - margin-right: 2rem; + // margin-top: 1.3rem; + // margin-left: 1rem; + // margin-right: 2rem; .mat-header-row{ background: #f3f5f8; diff --git a/dmp-frontend/src/app/ui/description/listing/description-listing.component.html b/dmp-frontend/src/app/ui/description/listing/description-listing.component.html index 3be3468cf..077b492b1 100644 --- a/dmp-frontend/src/app/ui/description/listing/description-listing.component.html +++ b/dmp-frontend/src/app/ui/description/listing/description-listing.component.html @@ -1,77 +1,79 @@ -
-
-
-
- - -
-

{{'DESCRIPTION-LISTING.TEXT-INFO' | translate}} {{'DESCRIPTION-LISTING.LINK-PUBLIC-DATASETS' | translate}} {{'DESCRIPTION-LISTING.TEXT-INFO-REST' | translate}}

-

{{'DESCRIPTION-LISTING.TEXT-INFO-PAR' | translate}} -

- - -
-
-
-

{{(isPublic ? 'DESCRIPTION-LISTING.TITLE-EXPLORE' : 'DESCRIPTION-LISTING.TITLE') | translate}}

-
-
- -
-
- - -
-
-
-
-
- - {{'DMP-LISTING.SORT-BY' | translate}}: - - - {{enumUtils.toRecentActivityOrderString(order.UpdatedAt)}} - - {{enumUtils.toRecentActivityOrderString(order.Label)}} - {{enumUtils.toRecentActivityOrderString(order.Status)}} - - - - -
- -
- {{ 'DESCRIPTION-LISTING.ACTIONS.TAKE-A-TOUR'| translate }} -
- - - - search - - {{formGroup.get('like').getError('backendError').message}} - - +
+
+
+
+
+ + +
+

{{'DESCRIPTION-LISTING.TEXT-INFO' | translate}} {{'DESCRIPTION-LISTING.LINK-PUBLIC-DATASETS' | translate}} {{'DESCRIPTION-LISTING.TEXT-INFO-REST' | translate}}

+

{{'DESCRIPTION-LISTING.TEXT-INFO-PAR' | translate}} +

+ +
-
-
- -
-
- +

{{(isPublic ? 'DESCRIPTION-LISTING.TITLE-EXPLORE' : 'DESCRIPTION-LISTING.TITLE') | translate}}

+
+
+
-
- {{'DESCRIPTION-LISTING.EMPTY-LIST' | translate}} + + +
+
+
+
+
+ + {{'DMP-LISTING.SORT-BY' | translate}}: + + + {{enumUtils.toRecentActivityOrderString(order.UpdatedAt)}} + + {{enumUtils.toRecentActivityOrderString(order.Label)}} + {{enumUtils.toRecentActivityOrderString(order.Status)}} + + + + +
+ +
+ {{ 'DESCRIPTION-LISTING.ACTIONS.TAKE-A-TOUR'| translate }} +
+ + + + search + + {{formGroup.get('like').getError('backendError').message}} + + +
+
+
+
+
+ +
+
+ +
+
+
+ {{'DESCRIPTION-LISTING.EMPTY-LIST' | translate}} +
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html index 411032d18..0468d49e8 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html +++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html @@ -1,63 +1,65 @@ -
-
-
-
-

{{'DMP-LISTING.TEXT-INFO' | translate}}

-

{{'DMP-LISTING.TEXT-INFO-QUESTION' | translate}} {{'DMP-LISTING.LINK-ZENODO' | translate}} {{'DMP-LISTING.GET-IDEA' | translate}}

-
-
{{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}
- -
-
-
-

{{(isPublic ? 'GENERAL.TITLES.EXPLORE-PLANS' : 'GENERAL.TITLES.PLANS') | translate}}

- - -
-
-
-
-
- - {{'DMP-LISTING.SORT-BY' | translate}}: - - - {{enumUtils.toRecentActivityOrderString(order.UpdatedAt)}} - - {{enumUtils.toRecentActivityOrderString(order.Label)}} - {{enumUtils.toRecentActivityOrderString(order.Status)}} - - -
-
{{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}
- - search - - - {{formGroup.get('like').getError('backendError').message}} - +
+
+
+
+
+

{{'DMP-LISTING.TEXT-INFO' | translate}}

+

{{'DMP-LISTING.TEXT-INFO-QUESTION' | translate}} {{'DMP-LISTING.LINK-ZENODO' | translate}} {{'DMP-LISTING.GET-IDEA' | translate}}

+
+
{{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}
+ +
+

{{(isPublic ? 'GENERAL.TITLES.EXPLORE-PLANS' : 'GENERAL.TITLES.PLANS') | translate}}

+ +
-
-
- +
+
+
+
+ + {{'DMP-LISTING.SORT-BY' | translate}}: + + + {{enumUtils.toRecentActivityOrderString(order.UpdatedAt)}} + + {{enumUtils.toRecentActivityOrderString(order.Label)}} + {{enumUtils.toRecentActivityOrderString(order.Status)}} + + +
+
{{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}
+ + search + + + {{formGroup.get('like').getError('backendError').message}} + +
+
+
+
+
+ +
+
+ +
+
+
+ {{'DMP-LISTING.EMPTY-LIST' | translate}} +
-
- -
-
-
- {{'DMP-LISTING.EMPTY-LIST' | translate}}
-
diff --git a/dmp-frontend/src/app/ui/inapp-notification/listing/mine-inapp-notification-listing.component.html b/dmp-frontend/src/app/ui/inapp-notification/listing/mine-inapp-notification-listing.component.html index 6cd3006ed..01be871df 100644 --- a/dmp-frontend/src/app/ui/inapp-notification/listing/mine-inapp-notification-listing.component.html +++ b/dmp-frontend/src/app/ui/inapp-notification/listing/mine-inapp-notification-listing.component.html @@ -1,28 +1,30 @@ -
-
+
+
+
-
-
-

{{'NOTIFICATION-SERVICE.INAPP-NOTIFICATION-LISTING.TITLE' | translate}}

- +
+
+

{{'NOTIFICATION-SERVICE.INAPP-NOTIFICATION-LISTING.TITLE' | translate}}

+ +
+ + + + + + + +
- - - - - - - -
diff --git a/dmp-frontend/src/app/ui/inapp-notification/listing/mine-inapp-notification-listing.component.scss b/dmp-frontend/src/app/ui/inapp-notification/listing/mine-inapp-notification-listing.component.scss index 977565d41..18ad89f0b 100644 --- a/dmp-frontend/src/app/ui/inapp-notification/listing/mine-inapp-notification-listing.component.scss +++ b/dmp-frontend/src/app/ui/inapp-notification/listing/mine-inapp-notification-listing.component.scss @@ -1,7 +1,7 @@ .inapp-notification-listing { - margin-top: 1.3rem; - margin-left: 1rem; - margin-right: 2rem; + // margin-top: 1.3rem; + // margin-left: 1rem; + // margin-right: 2rem; .mat-header-row{ background: #f3f5f8; diff --git a/dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.html b/dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.html index 82e7ea6c5..9b527197c 100644 --- a/dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.html +++ b/dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.html @@ -1,63 +1,72 @@ -
-
-
- -
-
- - {{'SUPPORTIVE-MATERIAL-EDITOR.FIELDS.MATERIAL-TYPE' | translate}} - - - {{enumUtils.toSupportiveMaterialTypeString(type)}} - - - {{formGroup.get('type').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
- - {{'SUPPORTIVE-MATERIAL-EDITOR.FIELDS.LANGUAGE' | translate}} - - - {{languageCode}} - - - {{formGroup.get('languageCode').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
+
+
+
+
+ +
+ +
+
+
+ + {{'SUPPORTIVE-MATERIAL-EDITOR.FIELDS.MATERIAL-TYPE' | translate}} + + + {{enumUtils.toSupportiveMaterialTypeString(type)}} + + + {{formGroup.get('type').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'SUPPORTIVE-MATERIAL-EDITOR.FIELDS.LANGUAGE' | translate}} + + + {{languageCode}} + + + {{formGroup.get('languageCode').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+
+
+ + {{formGroup.get('payload').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} +
+
+
+ +
-
-
- - {{formGroup.get('payload').getError('backendError').message}} - {{'GENERAL.VALIDATION.REQUIRED' | translate}} -
-
- - +
- -
\ No newline at end of file +
+
+ + diff --git a/dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.scss b/dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.scss index 3fa3dcea1..e56eb5f2b 100644 --- a/dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.scss +++ b/dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.scss @@ -1,7 +1,7 @@ .supportive-material-editor { //padding-top: 5em; - padding-bottom: 2em; - margin-top: 1em; + // padding-bottom: 2em; + // margin-top: 1em; .material{ //width: 80px; From 0b8f2e2fa71031e2206c0318a8557f5aa082d5a7 Mon Sep 17 00:00:00 2001 From: Sofia Papacharalampous Date: Fri, 29 Mar 2024 16:26:48 +0200 Subject: [PATCH 2/2] styling changes *annotations --- .../annotation-dialog.component.html | 254 +++++++++--------- 1 file changed, 127 insertions(+), 127 deletions(-) diff --git a/dmp-frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.html b/dmp-frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.html index dc6c4d8af..3137400d4 100644 --- a/dmp-frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.html +++ b/dmp-frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.html @@ -1,48 +1,46 @@
-
- -
+
+
close
-
+
-
-
-
- - {{'ANNOTATION-DIALOG.THREADS.NEW-THREAD' | translate}} - - - add_reaction - - {{threadFormGroup.get('text').getError('backendError')?.message}} - {{'COMMONS.VALIDATION.REQUIRED' | translate}} - -
- -
- - {{'ANNOTATION-DIALOG.THREADS.PROTECTION.TITLE' | translate}} - - {{enumUtils.toAnnotationProtectionTypeString(enumValue)}} - - {{threadFormGroup.get('protectionType').getError('backendError')?.message}} - {{'COMMONS.VALIDATION.REQUIRED' | translate}} - -
- -
-
-
- -
-
- + +
+
+ + {{'ANNOTATION-DIALOG.THREADS.NEW-THREAD' | translate}} + + + {{threadFormGroup.get('text').getError('backendError')?.message}} + {{'COMMONS.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{'ANNOTATION-DIALOG.THREADS.PROTECTION.TITLE' | translate}} + + {{enumUtils.toAnnotationProtectionTypeString(enumValue)}} + + {{threadFormGroup.get('protectionType').getError('backendError')?.message}} + {{'COMMONS.VALIDATION.REQUIRED' | translate}} + +
+
+
+
+ +
+
+ +
-
+
@@ -55,9 +53,9 @@
-
+
-
+
{{getAnnotationProtectionType(thread)}} @@ -65,9 +63,9 @@
-
+
-
+
globe @@ -76,43 +74,99 @@
-
+
-
-
-
-
-
-
- profile-picture -
-
-
- {{getParentAnnotation(thread).author.name}} -
{{getParentAnnotation(thread).timeStamp | date: "d MMMM, y 'at' h:mm a"}}
+
+
+
+
+
+
+
+ profile-picture
-
-
{{getParentAnnotation(thread).payload}}
-
-
-
- +
+
+ {{getParentAnnotation(thread).author.name}} +
{{getParentAnnotation(thread).timeStamp | date: "d MMMM, y 'at' h:mm a"}}
-
-
-
- - - - - - +
+
{{getParentAnnotation(thread).payload}}
+
+
+ +
+
+
+
+ + + + + + +
+
+ + +
+
+
+
+
+
+
+
+
+
+
+ profile-picture +
+
+
+ {{annotation.author.name}} +
{{annotation.timeStamp | date:"d MMMM, y 'at' h:mm a"}}
+ +
+ +
+
{{annotation.payload}}
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + {{'ANNOTATION-DIALOG.THREADS.REPLY' | translate}} + + + +
+
+ +
+
+
+
@@ -121,60 +175,6 @@
- - - -
-
-
-
-
-
-
-
-
-
- profile-picture -
-
-
- {{annotation.author.name}} -
{{annotation.timeStamp | date:"d MMMM, y 'at' h:mm a"}}
- -
- -
-
{{annotation.payload}}
-
-
-
-
-
-
-
-
- -
-
- - -
-
- - {{'ANNOTATION-DIALOG.THREADS.REPLY' | translate}} - - - add_reaction - - -
- -
-
-
-