MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

This commit is contained in:
Thomas Georgios Giannos 2024-07-08 12:23:24 +03:00
parent 2712a3d20e 74c7d892cb
commit 86849ebe7a
44 changed files with 122 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.html
View File

@ -1,5 +1,5 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row dmp-blueprint-editor"> <div class="row plan-blueprint-editor">
<div class="col-md-10 offset-md-1"> <div class="col-md-10 offset-md-1">
<div class="row align-items-center mt-4 mb-4" *ngIf="formGroup"> <div class="row align-items-center mt-4 mb-4" *ngIf="formGroup">
<div class="col-md col-12"> <div class="col-md col-12">

2
dmp-frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.scss
View File

@ -4,7 +4,7 @@
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
.dmp-blueprint-editor { .plan-blueprint-editor {
// margin-top: 1.3rem; // margin-top: 1.3rem;
// margin-left: 1em; // margin-left: 1em;
// margin-right: 3em; // margin-right: 3em;

2
dmp-frontend/src/app/ui/admin/plan-blueprint/listing/filters/plan-blueprint-listing-filters.component.scss
View File

@ -1,4 +1,4 @@
.dmp-blueprint-listing-filters { .plan-blueprint-listing-filters {
} }

2
dmp-frontend/src/app/ui/admin/plan-blueprint/listing/plan-blueprint-listing.component.html
View File

@ -1,5 +1,5 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row dmp-blueprint-listing"> <div class="row plan-blueprint-listing">
<div class="col-md-10 offset-md-1"> <div class="col-md-10 offset-md-1">
<div class="row mb-4 mt-4"> <div class="row mb-4 mt-4">
<div class="col"> <div class="col">

2
dmp-frontend/src/app/ui/admin/plan-blueprint/listing/plan-blueprint-listing.component.scss
View File

@ -3,7 +3,7 @@
border-radius: 4px; border-radius: 4px;
} }
.dmp-blueprint-listing { .plan-blueprint-listing {
// margin-top: 1.3rem; // margin-top: 1.3rem;
// margin-left: 1rem; // margin-left: 1rem;
// margin-right: 2rem; // margin-right: 2rem;

16
dmp-frontend/src/app/ui/dashboard/dashboard.component.scss
View File

@ -155,7 +155,7 @@
padding-left: 3rem; padding-left: 3rem;
} }
.dmp-card, .plan-card,
.description-card { .description-card {
min-width: 712px; min-width: 712px;
/* min-height: 308px; */ /* min-height: 308px; */
@ -182,7 +182,7 @@ input[type="text"] {
padding-left: 15px; padding-left: 15px;
} }
.dmp-label { .plan-label {
background: var(--primary-color) 0% 0% no-repeat padding-box; background: var(--primary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px; border-radius: 4px 0px;
opacity: 1; opacity: 1;
@ -213,7 +213,7 @@ input[type="text"] {
// padding-bottom: 0.4rem; // padding-bottom: 0.4rem;
} }
.dmp-subtitle, .plan-subtitle,
.description-subtitle { .description-subtitle {
.icon-align { .icon-align {
@ -225,7 +225,7 @@ input[type="text"] {
} }
.description-card-actions, .description-card-actions,
.dmp-card-actions { .plan-card-actions {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
border-top: 1px solid #dbdbdb; border-top: 1px solid #dbdbdb;
@ -234,24 +234,24 @@ input[type="text"] {
} }
.description-card-actions a, .description-card-actions a,
.dmp-card-actions a { .plan-card-actions a {
color: #848484 !important; color: #848484 !important;
text-decoration: none !important; text-decoration: none !important;
} }
.description-card-actions a:hover, .description-card-actions a:hover,
.dmp-card-actions a:hover { .plan-card-actions a:hover {
color: var(--primary-color) !important; color: var(--primary-color) !important;
} }
.dmp-description-descriptions-title { .plan-description-descriptions-title {
color: #000000; color: #000000;
opacity: 0.6; opacity: 0.6;
padding-top: 1.5rem; padding-top: 1.5rem;
padding-bottom: 0.8rem; padding-bottom: 0.8rem;
} }
.dmp-description-descriptions-name { .plan-description-descriptions-name {
color: #000000; color: #000000;
opacity: 0.6; opacity: 0.6;
font-weight: 700; font-weight: 700;

2
dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
View File

@ -31,7 +31,7 @@
<!-- End of Search Filter --> <!-- End of Search Filter -->
</div> </div>
<div *ngFor="let item of listingItems; let i = index"> <div *ngFor="let item of listingItems; let i = index">
<app-dmp-listing-item-component *ngIf="item.plan" [showDivider]="i != (listingItems.length - 1)" [dmp]="item.plan" [isPublic]="false"></app-dmp-listing-item-component> <app-plan-listing-item-component *ngIf="item.plan" [showDivider]="i != (listingItems.length - 1)" [dmp]="item.plan" [isPublic]="false"></app-plan-listing-item-component>
<app-description-listing-item-component *ngIf="item?.description" [showDivider]="i != (listingItems.length - 1)" [description]="item?.description" [isPublic]="false" ></app-description-listing-item-component> <app-description-listing-item-component *ngIf="item?.description" [showDivider]="i != (listingItems.length - 1)" [description]="item?.description" [isPublic]="false" ></app-description-listing-item-component>
</div> </div>
<div class="text-muted d-flex justify-content-center mt-5" *ngIf="listingItems && listingItems.length > 0 && this.lookup.page.offset >= currentPage*pageSize"> <div class="text-muted d-flex justify-content-center mt-5" *ngIf="listingItems && listingItems.length > 0 && this.lookup.page.offset >= currentPage*pageSize">

14
dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.scss
View File

@ -13,7 +13,7 @@ input[type="text"] {
padding-left: 15px; padding-left: 15px;
} }
.dmp-label { .plan-label {
background: var(--primary-color) 0% 0% no-repeat padding-box; background: var(--primary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px; border-radius: 4px 0px;
opacity: 1; opacity: 1;
@ -31,7 +31,7 @@ input[type="text"] {
} }
.description-card-actions, .description-card-actions,
.dmp-card-actions { .plan-card-actions {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
border-top: 1px solid #dbdbdb; border-top: 1px solid #dbdbdb;
@ -40,7 +40,7 @@ input[type="text"] {
} }
.description-card-actions, .description-card-actions,
.dmp-card-actions { .plan-card-actions {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
border-top: 1px solid #dbdbdb; border-top: 1px solid #dbdbdb;
@ -49,24 +49,24 @@ input[type="text"] {
} }
.description-card-actions a, .description-card-actions a,
.dmp-card-actions a { .plan-card-actions a {
color: #848484 !important; color: #848484 !important;
text-decoration: none !important; text-decoration: none !important;
} }
.description-card-actions a:hover, .description-card-actions a:hover,
.dmp-card-actions a:hover { .plan-card-actions a:hover {
color: var(--primary-color) !important; color: var(--primary-color) !important;
} }
.dmp-description-descriptions-title { .plan-description-descriptions-title {
color: #000000; color: #000000;
opacity: 0.6; opacity: 0.6;
padding-top: 1.5rem; padding-top: 1.5rem;
padding-bottom: 0.8rem; padding-bottom: 0.8rem;
} }
.dmp-description-descriptions-name { .plan-description-descriptions-name {
color: #000000; color: #000000;
opacity: 0.6; opacity: 0.6;
font-weight: 700; font-weight: 700;

4
dmp-frontend/src/app/ui/description/editor/description-base-fields-editor/description-base-fields-editor.component.scss
View File

@ -57,14 +57,14 @@
color: var(--primary-color-3) !important; color: var(--primary-color-3) !important;
} }
.dmp-link { .plan-link {
color: #3fafac; color: #3fafac;
font-weight: 400; font-weight: 400;
font-size: 16px; font-size: 16px;
cursor: pointer; cursor: pointer;
} }
.dmp-link:hover { .plan-link:hover {
text-decoration: underline; text-decoration: underline;
} }
} }

10
dmp-frontend/src/app/ui/description/editor/description-editor.component.html
View File

@ -15,9 +15,9 @@
<ng-template #viewOnlyTemplate> <ng-template #viewOnlyTemplate>
<div class="description-title">{{'DESCRIPTION-EDITOR.TITLE-PREVIEW-DESCRIPTION' | translate}}</div> <div class="description-title">{{'DESCRIPTION-EDITOR.TITLE-PREVIEW-DESCRIPTION' | translate}}</div>
</ng-template> </ng-template>
<div *ngIf="item?.plan?.id" class="d-flex flex-direction-row dmp-info"> <div *ngIf="item?.plan?.id" class="d-flex flex-direction-row plan-info">
<div class="col-auto description-to-dmp">{{'DESCRIPTION-EDITOR.TO-PLAN' | translate}}</div> <div class="col-auto description-to-plan">{{'DESCRIPTION-EDITOR.TO-PLAN' | translate}}</div>
<div class="dmp-title p-0">:&nbsp;{{ item?.plan?.label }}</div> <div class="plan-title p-0">:&nbsp;{{ item?.plan?.label }}</div>
<div class="col-auto d-flex align-items-center"> <div class="col-auto d-flex align-items-center">
<a [routerLink]="routerUtils.generateUrl(['/plans/overview/', item.plan.id])" target="_blank" class="pointer open-in-new-icon"> <a [routerLink]="routerUtils.generateUrl(['/plans/overview/', item.plan.id])" target="_blank" class="pointer open-in-new-icon">
<mat-icon class="size-18">open_in_new</mat-icon> <mat-icon class="size-18">open_in_new</mat-icon>
@ -86,11 +86,11 @@
<div class="row editor-content"> <div class="row editor-content">
<div style="width: 22em;" class="d-flex flex-column"> <div style="width: 22em;" class="d-flex flex-column">
<div class="stepper-back row"> <div class="stepper-back row">
<div class="col-auto d-flex align-items-center back-to-dmp" (click)="backToDmp(this.formGroup.get('planId').value)"> <div class="col-auto d-flex align-items-center back-to-plan" (click)="backToDmp(this.formGroup.get('planId').value)">
<mat-icon class="back-icon pointer">chevron_left</mat-icon> <mat-icon class="back-icon pointer">chevron_left</mat-icon>
<span class="pointer">{{'DESCRIPTION-EDITOR.ACTIONS.BACK-TO' | translate}}</span> <span class="pointer">{{'DESCRIPTION-EDITOR.ACTIONS.BACK-TO' | translate}}</span>
</div> </div>
<div class="col-auto dmp-label ml-1">{{'DESCRIPTION-EDITOR.PLAN' | translate}}</div> <div class="col-auto plan-label ml-1">{{'DESCRIPTION-EDITOR.PLAN' | translate}}</div>
</div> </div>
<div class="row stepper-title"> <div class="row stepper-title">
<div class="col-12 pl-0 mb-1"><span>{{'DESCRIPTION-EDITOR.TOC.TITLE' | translate}}</span></div> <div class="col-12 pl-0 mb-1"><span>{{'DESCRIPTION-EDITOR.TOC.TITLE' | translate}}</span></div>

10
dmp-frontend/src/app/ui/description/editor/description-editor.component.scss
View File

@ -202,7 +202,7 @@
align-items: center; align-items: center;
} }
.description-to-dmp { .description-to-plan {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0; padding: 0;
@ -213,11 +213,11 @@
line-height: 25px; line-height: 25px;
} }
.dmp-info { .plan-info {
padding-top: 0.75rem; padding-top: 0.75rem;
} }
.dmp-label { .plan-label {
min-width: 67px; min-width: 67px;
height: 37px; height: 37px;
background: var(--primary-color) 0% 0% no-repeat padding-box; background: var(--primary-color) 0% 0% no-repeat padding-box;
@ -229,7 +229,7 @@
justify-content: center; justify-content: center;
} }
.dmp-title { .plan-title {
text-align: left; text-align: left;
font-weight: 700; font-weight: 700;
font-size: 1rem; font-size: 1rem;
@ -345,7 +345,7 @@
} }
} }
.back-to-dmp:hover { .back-to-plan:hover {
background: #ececec; background: #ececec;
border-radius: 6px; border-radius: 6px;
} }

2
dmp-frontend/src/app/ui/description/listing/description-listing.component.scss
View File

@ -16,7 +16,7 @@
padding-bottom: 2em; padding-bottom: 2em;
} }
.explore-dmp-content { .explore-plan-content {
padding: 30px 15px; padding: 30px 15px;
} }

2
dmp-frontend/src/app/ui/description/listing/filtering/description-filter.component.html
View File

@ -1,5 +1,5 @@
<div class="dmp-criteria"> <div class="plan-criteria">
<div class="filters container-fluid"> <div class="filters container-fluid">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-10"> <div class="col-10">

4
dmp-frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.html
View File

@ -18,9 +18,9 @@
</div> </div>
<div class="d-flex flex-direction-row pt-3 pb-3"> <div class="d-flex flex-direction-row pt-3 pb-3">
<div class="col-auto description-subtitle pr-0">{{'DESCRIPTION-LISTING.PART-OF' | translate}} <div class="col-auto description-subtitle pr-0">{{'DESCRIPTION-LISTING.PART-OF' | translate}}
<div class="col-auto dmp-label ml-3">{{'DESCRIPTION-LISTING.PLAN' | translate}}</div> <div class="col-auto plan-label ml-3">{{'DESCRIPTION-LISTING.PLAN' | translate}}</div>
</div> </div>
<div class="col dmp-title">{{description.plan?.label}}</div> <div class="col plan-title">{{description.plan?.label}}</div>
</div> </div>
</a> </a>
<div class="description-card-actions"> <div class="description-card-actions">

18
dmp-frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.scss
View File

@ -77,7 +77,7 @@ p {
color: #08bd63; color: #08bd63;
} }
.dmp-card, .plan-card,
.description-card { .description-card {
min-width: 712px; min-width: 712px;
/* min-height: 308px; */ /* min-height: 308px; */
@ -112,7 +112,7 @@ input[type="text"] {
opacity: 0.6; opacity: 0.6;
} }
.dmp-label { .plan-label {
background: var(--primary-color) 0% 0% no-repeat padding-box; background: var(--primary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px; border-radius: 4px 0px;
opacity: 1; opacity: 1;
@ -135,7 +135,7 @@ input[type="text"] {
color: #212121; color: #212121;
} }
.dmp-title, .plan-title,
.description-title { .description-title {
text-align: left; text-align: left;
font-weight: 600; font-weight: 600;
@ -174,7 +174,7 @@ input[type="text"] {
// padding-bottom: 0.4rem; // padding-bottom: 0.4rem;
} }
.dmp-subtitle, .plan-subtitle,
.description-subtitle { .description-subtitle {
.icon-align { .icon-align {
@ -186,7 +186,7 @@ input[type="text"] {
} }
.description-card-actions, .description-card-actions,
.dmp-card-actions { .plan-card-actions {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
border-top: 1px solid #dbdbdb; border-top: 1px solid #dbdbdb;
@ -195,24 +195,24 @@ input[type="text"] {
} }
.description-card-actions a, .description-card-actions a,
.dmp-card-actions a { .plan-card-actions a {
color: #848484 !important; color: #848484 !important;
text-decoration: none !important; text-decoration: none !important;
} }
.description-card-actions a:hover, .description-card-actions a:hover,
.dmp-card-actions a:hover { .plan-card-actions a:hover {
color: var(--primary-color) !important; color: var(--primary-color) !important;
} }
.dmp-description-descriptions-title { .plan-description-descriptions-title {
color: #000000; color: #000000;
opacity: 0.6; opacity: 0.6;
padding-top: 1.5rem; padding-top: 1.5rem;
padding-bottom: 0.8rem; padding-bottom: 0.8rem;
} }
.dmp-description-descriptions-name { .plan-description-descriptions-name {
color: #000000; color: #000000;
opacity: 0.6; opacity: 0.6;
font-weight: 700; font-weight: 700;

4
dmp-frontend/src/app/ui/description/overview/description-overview.component.html
View File

@ -72,8 +72,8 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-12 col-lg-7"> <div class="col-12 col-lg-7">
<button class="w-100 dmp-btn p-1" (click)="dmpClicked(description.plan)"> <button class="w-100 plan-btn p-1" (click)="dmpClicked(description.plan)">
<div class="dmp-btn-label"> <div class="plan-btn-label">
{{ this.description.plan.label }} {{ this.description.plan.label }}
</div> </div>
<div class="w-auto"> <div class="w-auto">

10
dmp-frontend/src/app/ui/description/overview/description-overview.component.scss
View File

@ -59,7 +59,7 @@
align-self: center; align-self: center;
} }
.dmp-btn { .plan-btn {
width: 35em; width: 35em;
min-height: 2.3em; min-height: 2.3em;
background-color: var(--primary-color); background-color: var(--primary-color);
@ -69,8 +69,8 @@
border: none; border: none;
} }
.dmp-btn, .plan-btn,
.dmp-btn > mat-icon { .plan-btn > mat-icon {
color: #ffffff; color: #ffffff;
// opacity: 0.8; // opacity: 0.8;
} }
@ -185,7 +185,7 @@
margin-bottom: 1.875em; margin-bottom: 1.875em;
} }
.dmp-btn-label { .plan-btn-label {
margin-right: 1em; margin-right: 1em;
color: #ffffff; color: #ffffff;
opacity: 0.8; opacity: 0.8;
@ -294,7 +294,7 @@
} }
.description-label, .description-label,
.dmp-btn, .plan-btn,
.doi-panel, .doi-panel,
.researcher { .researcher {
display: flex; display: flex;

2
dmp-frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.html
View File

@ -16,7 +16,7 @@
</div> </div>
<div class="row mt-2"> <div class="row mt-2">
<div class="col-auto pb-4"> <div class="col-auto pb-4">
<span>{{'DASHBOARD.ADD-NEW-DESCRIPTION.OPTIONS-NOT-ENOUGH' | translate}}</span>&nbsp;<span class="new-dmp" (click)="startNewPlan()">{{'DASHBOARD.ADD-NEW-DESCRIPTION.START-NEW-PLAN' | translate}}</span> <span>{{'DASHBOARD.ADD-NEW-DESCRIPTION.OPTIONS-NOT-ENOUGH' | translate}}</span>&nbsp;<span class="new-plan" (click)="startNewPlan()">{{'DASHBOARD.ADD-NEW-DESCRIPTION.START-NEW-PLAN' | translate}}</span>
</div> </div>
</div> </div>
<div class="row"> <div class="row">

6
dmp-frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.scss
View File

@ -92,7 +92,7 @@ min-width: 101px;
flex-direction: row; flex-direction: row;
} }
.new-dmp { .new-plan {
text-align: left; text-align: left;
text-decoration: underline; text-decoration: underline;
letter-spacing: 0px; letter-spacing: 0px;
@ -100,11 +100,11 @@ min-width: 101px;
cursor: pointer; cursor: pointer;
} }
::ng-deep .dmp-form .mat-form-field-appearance-outline .mat-form-field-outline { ::ng-deep .plan-form .mat-form-field-appearance-outline .mat-form-field-outline {
// background: #fafafa !important; // background: #fafafa !important;
} }
::ng-deep .dmp-form .mat-form-field-appearance-outline .mat-form-field-infix { ::ng-deep .plan-form .mat-form-field-appearance-outline .mat-form-field-infix {
// font-size: 1rem; // font-size: 1rem;
// padding: 0.6em 0 1em 0 !important; // padding: 0.6em 0 1em 0 !important;
} }

2
dmp-frontend/src/app/ui/navbar/navbar.component.html
View File

@ -20,7 +20,7 @@
<div class="collapse navbar-collapse justify-content-end" id="navigation"> <div class="collapse navbar-collapse justify-content-end" id="navigation">
<div class="new-dmp-dialog col-md-auto ml-auto"> <div class="new-plan-dialog col-md-auto ml-auto">
<button type="button" class="normal-btn" (click)="openNewPlanDialog()">{{ 'NAV-BAR.START-NEW-PLAN' | translate }}</button> <button type="button" class="normal-btn" (click)="openNewPlanDialog()">{{ 'NAV-BAR.START-NEW-PLAN' | translate }}</button>
</div> </div>
<div class="col-md-auto pl-0" *ngIf="!(isAuthenticated() && onInvalidUrl())"> <div class="col-md-auto pl-0" *ngIf="!(isAuthenticated() && onInvalidUrl())">

2
dmp-frontend/src/app/ui/navbar/navbar.component.scss
View File

@ -146,7 +146,7 @@ $mat-card-header-size: 40px !default;
border-radius: 6px; border-radius: 6px;
} }
.new-dmp-dialog { .new-plan-dialog {
padding: 0em .5em 0em 0em; padding: 0em .5em 0em 0em;
} }
::ng-deep .mat-option-text { ::ng-deep .mat-option-text {

2
dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.html
View File

@ -1,4 +1,4 @@
<div class="dmp-invitation-dialog container-fluid" *ngIf="formGroup"> <div class="plan-invitation-dialog container-fluid" *ngIf="formGroup">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<h1 class="title">{{'PLAN-USER-INVITATION-DIALOG.TITLE' | translate}}</h1> <h1 class="title">{{'PLAN-USER-INVITATION-DIALOG.TITLE' | translate}}</h1>

2
dmp-frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.scss
View File

@ -1,4 +1,4 @@
.dmp-invitation-dialog { .plan-invitation-dialog {
padding: 2.5rem; padding: 2.5rem;
.form-container { .form-container {

2
dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.html
View File

@ -1,4 +1,4 @@
<div class="dmp-criteria"> <div class="plan-criteria">
<div class="filters container-fluid"> <div class="filters container-fluid">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-10"> <div class="col-10">

2
dmp-frontend/src/app/ui/plan/listing/filtering/plan-filter.component.scss
View File

@ -1,4 +1,4 @@
.dmp-criteria { .plan-criteria {
mat-form-field { mat-form-field {
padding-bottom: 5px; padding-bottom: 5px;
width: 100%; width: 100%;

16
dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.html
View File

@ -1,12 +1,12 @@
<div class="dmp-card"> <div class="plan-card">
<a [routerLink]="isPublic ? this.routerUtils.generateUrl(['/explore-plans/overview/public/', dmp.id]) : this.routerUtils.generateUrl(['/plans/overview/', dmp.id])" class="pointer"> <a [routerLink]="isPublic ? this.routerUtils.generateUrl(['/explore-plans/overview/public/', dmp.id]) : this.routerUtils.generateUrl(['/plans/overview/', dmp.id])" class="pointer">
<div class="d-flex flex-direction-row"> <div class="d-flex flex-direction-row">
<div class="col-auto dmp-label">{{ 'PLAN-LISTING.PLAN' | translate }}</div> <div class="col-auto plan-label">{{ 'PLAN-LISTING.PLAN' | translate }}</div>
<div *ngIf="!isPublic" class="col-auto ml-auto edited-date">{{ 'PLAN-LISTING.EDITED' | translate }}: {{ dmp.updatedAt | dateTimeFormatter: "d MMMM y" }}</div> <div *ngIf="!isPublic" class="col-auto ml-auto edited-date">{{ 'PLAN-LISTING.EDITED' | translate }}: {{ dmp.updatedAt | dateTimeFormatter: "d MMMM y" }}</div>
<div *ngIf="isPublic" class="col-auto ml-auto edited-date">{{ 'PLAN-LISTING.PUBLISHED' | translate }}: {{ dmp.finalizedAt | dateTimeFormatter: "d MMMM y" }}</div> <div *ngIf="isPublic" class="col-auto ml-auto edited-date">{{ 'PLAN-LISTING.PUBLISHED' | translate }}: {{ dmp.finalizedAt | dateTimeFormatter: "d MMMM y" }}</div>
</div> </div>
<div class="col-auto" [ngClass]="{'dmp-title': !isDraft, 'dmp-title-draft': isDraft}">{{dmp.label}}</div> <div class="col-auto" [ngClass]="{'plan-title': !isDraft, 'plan-title-draft': isDraft}">{{dmp.label}}</div>
<div class="dmp-subtitle"> <div class="plan-subtitle">
<span *ngIf="isUserPlanRelated()" class="col-auto">{{ enumUtils.toPlanUserRolesString(planService.getCurrentUserRolesInPlan(dmp?.planUsers)) }}</span> <span *ngIf="isUserPlanRelated()" class="col-auto">{{ enumUtils.toPlanUserRolesString(planService.getCurrentUserRolesInPlan(dmp?.planUsers)) }}</span>
<span *ngIf="isUserPlanRelated()">.</span> <span *ngIf="isUserPlanRelated()">.</span>
<span class="col-auto" *ngIf="dmp.status === planStatusEnum.Finalized && isPublic"><span class="material-icons icon-align">public</span>{{'TYPES.PLAN-VISIBILITY.PUBLIC' | translate}}</span> <span class="col-auto" *ngIf="dmp.status === planStatusEnum.Finalized && isPublic"><span class="material-icons icon-align">public</span>{{'TYPES.PLAN-VISIBILITY.PUBLIC' | translate}}</span>
@ -17,17 +17,17 @@
<span>.</span> <span>.</span>
<span class="col">{{ 'PLAN-LISTING.GRANT' | translate }}: {{referenceService.getReferencesForTypesFirstSafe(dmp?.planReferences, [this.referenceTypeService.getGrantReferenceType()])?.reference?.label}}</span> <span class="col">{{ 'PLAN-LISTING.GRANT' | translate }}: {{referenceService.getReferencesForTypesFirstSafe(dmp?.planReferences, [this.referenceTypeService.getGrantReferenceType()])?.reference?.label}}</span>
</div> </div>
<div class="col-auto dmp-description-descriptions-title">{{'PLAN-LISTING.CONTAINED-DESCRIPTIONS' | translate}}: ({{ dmp.descriptions?.length }}) <div class="col-auto plan-description-descriptions-title">{{'PLAN-LISTING.CONTAINED-DESCRIPTIONS' | translate}}: ({{ dmp.descriptions?.length }})
</div> </div>
<div *ngFor="let description of dmp.descriptions; let i = index; let last = last" [ngClass]="{'pb-3': i === dmp.descriptions?.length - 1}"> <div *ngFor="let description of dmp.descriptions; let i = index; let last = last" [ngClass]="{'pb-3': i === dmp.descriptions?.length - 1}">
<div *ngIf="i < 3"> <div *ngIf="i < 3">
<div class="col-auto dmp-description-descriptions-name" *ngIf="!last && i !== 2">{{description.label}},</div> <div class="col-auto plan-description-descriptions-name" *ngIf="!last && i !== 2">{{description.label}},</div>
<div class="col-auto dmp-description-descriptions-name" *ngIf="last || i == 2">{{description.label}}</div> <div class="col-auto plan-description-descriptions-name" *ngIf="last || i == 2">{{description.label}}</div>
</div> </div>
</div> </div>
<a class="d-flex justify-content-center pb-3 show-more" *ngIf="dmp.descriptions?.length > 3" [routerLink]="isPublic ? this.routerUtils.generateUrl(['/explore-plans/overview/public/', dmp.id]) : this.routerUtils.generateUrl(['/plans/overview/', dmp.id])"><u>{{'GENERAL.ACTIONS.SHOW-MORE' | translate}}</u></a> <a class="d-flex justify-content-center pb-3 show-more" *ngIf="dmp.descriptions?.length > 3" [routerLink]="isPublic ? this.routerUtils.generateUrl(['/explore-plans/overview/public/', dmp.id]) : this.routerUtils.generateUrl(['/plans/overview/', dmp.id])"><u>{{'GENERAL.ACTIONS.SHOW-MORE' | translate}}</u></a>
</a> </a>
<div class="dmp-card-actions"> <div class="plan-card-actions">
<a class="col-auto border-right pointer" *ngIf="canExportPlan(dmp) && fileTransformerService.availableFormatsFor(fileTransformerEntityTypeEnum.Dmp).length > 0" [matMenuTriggerFor]="exportMenu"><span class="material-icons icon-align pr-2">open_in_new</span>{{'PLAN-LISTING.ACTIONS.EXPORT' | translate}}</a> <a class="col-auto border-right pointer" *ngIf="canExportPlan(dmp) && fileTransformerService.availableFormatsFor(fileTransformerEntityTypeEnum.Dmp).length > 0" [matMenuTriggerFor]="exportMenu"><span class="material-icons icon-align pr-2">open_in_new</span>{{'PLAN-LISTING.ACTIONS.EXPORT' | translate}}</a>
<a class="col-auto border-right pointer" *ngIf="isDraftDmp(dmp) && canEditPlan(dmp)" [routerLink]="this.routerUtils.generateUrl(['/plans/edit/', dmp.id])" target="_blank"><span class="material-icons icon-align">add</span>{{'PLAN-LISTING.ACTIONS.ADD-DESCRIPTION-SHORT' | translate}}</a> <a class="col-auto border-right pointer" *ngIf="isDraftDmp(dmp) && canEditPlan(dmp)" [routerLink]="this.routerUtils.generateUrl(['/plans/edit/', dmp.id])" target="_blank"><span class="material-icons icon-align">add</span>{{'PLAN-LISTING.ACTIONS.ADD-DESCRIPTION-SHORT' | translate}}</a>
<a class="col-auto border-right pointer" *ngIf="canInvitePlanUsers(dmp)" (click)="inviteToDmp()"><span class="material-icons icon-align pr-2">group_add</span>{{'PLAN-LISTING.ACTIONS.INVITE-SHORT' | translate}}</a> <a class="col-auto border-right pointer" *ngIf="canInvitePlanUsers(dmp)" (click)="inviteToDmp()"><span class="material-icons icon-align pr-2">group_add</span>{{'PLAN-LISTING.ACTIONS.INVITE-SHORT' | translate}}</a>

22
dmp-frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.scss
View File

@ -111,7 +111,7 @@ p {
min-width: 74px; min-width: 74px;
} }
.dmp-card, .plan-card,
.description-card { .description-card {
min-width: 712px; min-width: 712px;
/* min-height: 308px; */ /* min-height: 308px; */
@ -147,7 +147,7 @@ input[type="text"] {
opacity: 0.6; opacity: 0.6;
} }
.dmp-label { .plan-label {
background: var(--primary-color) 0% 0% no-repeat padding-box; background: var(--primary-color) 0% 0% no-repeat padding-box;
border-radius: 4px 0px; border-radius: 4px 0px;
opacity: 1; opacity: 1;
@ -157,7 +157,7 @@ input[type="text"] {
line-height: 2.4; line-height: 2.4;
} }
.dmp-title, .plan-title,
.description-title { .description-title {
text-align: left; text-align: left;
font-weight: 600; font-weight: 600;
@ -169,7 +169,7 @@ input[type="text"] {
} }
.description-subtitle, .description-subtitle,
.dmp-subtitle { .plan-subtitle {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
text-align: left; text-align: left;
@ -180,7 +180,7 @@ input[type="text"] {
color: #848484; color: #848484;
} }
.dmp-title-draft, .plan-title-draft,
.description-title-draft { .description-title-draft {
text-align: left; text-align: left;
font-weight: 600; font-weight: 600;
@ -196,7 +196,7 @@ input[type="text"] {
vertical-align: middle; vertical-align: middle;
} }
.dmp-subtitle, .plan-subtitle,
.description-subtitle { .description-subtitle {
.icon-align { .icon-align {
@ -208,7 +208,7 @@ input[type="text"] {
} }
.description-card-actions, .description-card-actions,
.dmp-card-actions { .plan-card-actions {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
border-top: 1px solid #dbdbdb; border-top: 1px solid #dbdbdb;
@ -217,24 +217,24 @@ input[type="text"] {
} }
.description-card-actions a, .description-card-actions a,
.dmp-card-actions a { .plan-card-actions a {
color: #848484 !important; color: #848484 !important;
text-decoration: none !important; text-decoration: none !important;
} }
.description-card-actions a:hover, .description-card-actions a:hover,
.dmp-card-actions a:hover { .plan-card-actions a:hover {
color: var(--primary-color) !important; color: var(--primary-color) !important;
} }
.dmp-description-descriptions-title { .plan-description-descriptions-title {
color: #000000; color: #000000;
opacity: 0.6; opacity: 0.6;
padding-top: 1.5rem; padding-top: 1.5rem;
padding-bottom: 0.8rem; padding-bottom: 0.8rem;
} }
.dmp-description-descriptions-name { .plan-description-descriptions-name {
color: #000000; color: #000000;
opacity: 0.6; opacity: 0.6;
font-weight: 700; font-weight: 700;

4
dmp-frontend/src/app/ui/plan/listing/plan-listing.component.html
View File

@ -4,7 +4,7 @@
<div *ngIf="hasLoadedListingItems && !hasListingItems && !hasFilters" class="col-12 card mt-0"> <div *ngIf="hasLoadedListingItems && !hasListingItems && !hasFilters" class="col-12 card mt-0">
<div class="card-content info-text mb-0"> <div class="card-content info-text mb-0">
<p>{{'PLAN-LISTING.TEXT-INFO' | translate}}</p> <p>{{'PLAN-LISTING.TEXT-INFO' | translate}}</p>
<p class="mt-4 pt-2">{{'PLAN-LISTING.TEXT-INFO-QUESTION' | translate}} <a class="zenodo-link" href="https://zenodo.org/communities/liber-dmp-cat/?page=1&size=20" target="_blank">{{'PLAN-LISTING.LINK-ZENODO' | translate}}</a> {{'PLAN-LISTING.GET-IDEA' | translate}}</p> <p class="mt-4 pt-2">{{'PLAN-LISTING.TEXT-INFO-QUESTION' | translate}} <a class="zenodo-link" href="https://zenodo.org/communities/liber-plan-cat/?page=1&size=20" target="_blank">{{'PLAN-LISTING.LINK-ZENODO' | translate}}</a> {{'PLAN-LISTING.GET-IDEA' | translate}}</p>
<div class="d-flex"> <div class="d-flex">
<div *ngIf="!isPublic" class="col left-content" (click)="restartTour()">{{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}</div> <div *ngIf="!isPublic" class="col left-content" (click)="restartTour()">{{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}</div>
<img class="col-auto ml-auto laptop-img" src="../../../assets/images/dashboard-popup.png"> <img class="col-auto ml-auto laptop-img" src="../../../assets/images/dashboard-popup.png">
@ -62,7 +62,7 @@
</div> </div>
<div class="col-md-12 col-sm-12 col-md-9"> <div class="col-md-12 col-sm-12 col-md-9">
<div *ngFor="let item of listingItems; let i = index"> <div *ngFor="let item of listingItems; let i = index">
<app-dmp-listing-item-component [showDivider]="i != (listingItems.length - 1)" [dmp]="item" [isPublic]="isPublic"></app-dmp-listing-item-component> <app-plan-listing-item-component [showDivider]="i != (listingItems.length - 1)" [dmp]="item" [isPublic]="isPublic"></app-plan-listing-item-component>
</div> </div>
<div *ngIf="hasListingItems && this.lookup?.page?.offset < this.totalCount - 1 && this.pageSize < this.totalCount - 1" class="d-flex justify-content-center"> <div *ngIf="hasListingItems && this.lookup?.page?.offset < this.totalCount - 1 && this.pageSize < this.totalCount - 1" class="d-flex justify-content-center">
<button type="button" class="btn-load-more" (click)="loadMore()">{{'GENERAL.ACTIONS.LOAD-MORE' | translate}}</button> <button type="button" class="btn-load-more" (click)="loadMore()">{{'GENERAL.ACTIONS.LOAD-MORE' | translate}}</button>

4
dmp-frontend/src/app/ui/plan/listing/plan-listing.component.scss
View File

@ -42,7 +42,7 @@
color: #999999 !important; color: #999999 !important;
} }
.dmp-label { .plan-label {
color: #089dbb !important; color: #089dbb !important;
} }
@ -78,7 +78,7 @@
padding-bottom: 2em; padding-bottom: 2em;
} }
.explore-dmp-content { .explore-plan-content {
padding: 30px 15px; padding: 30px 15px;
} }

4
dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.html
View File

@ -1,6 +1,6 @@
<div class="start-new-dmp-dialog-wrapper"> <div class="start-new-plan-dialog-wrapper">
<div class="d-flex justify-content-between"> <div class="d-flex justify-content-between">
<div class="pl-0 col-auto"><a class="logo"><img class="logo" src="../../../assets/images/new-dmp-logo.png" onerror="this.style.display='none'"></a></div> <div class="pl-0 col-auto"><a class="logo"><img class="logo" src="../../../assets/images/new-plan-logo.png" onerror="this.style.display='none'"></a></div>
<div class="col-auto close-btn" (click)="close()"> <div class="col-auto close-btn" (click)="close()">
<mat-icon class="close-icon">close</mat-icon> <mat-icon class="close-icon">close</mat-icon>
</div> </div>

2
dmp-frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.scss
View File

@ -3,7 +3,7 @@
padding: 24px; padding: 24px;
} }
.start-new-dmp-dialog-wrapper { .start-new-plan-dialog-wrapper {
width: 33.0rem; width: 33.0rem;
min-height: 14rem; min-height: 14rem;
padding: 0.28rem 0.34rem 0.875rem 0.625rem; padding: 0.28rem 0.34rem 0.875rem 0.625rem;

10
dmp-frontend/src/app/ui/plan/overview/plan-overview.component.html
View File

@ -1,4 +1,4 @@
<div class="main-content dmp-overview pl-5 pr-5"> <div class="main-content plan-overview pl-5 pr-5">
<div class="container-fluid pl-0 pr-0"> <div class="container-fluid pl-0 pr-0">
<div *ngIf="dmp"> <div *ngIf="dmp">
<div class="row"> <div class="row">
@ -15,8 +15,8 @@
<div class="row"> <div class="row">
<div class="col-12 col-lg-8 pl-2"> <div class="col-12 col-lg-8 pl-2">
<div class="row align-items-center"> <div class="row align-items-center">
<div class="col-auto"><span class="dmp-logo">{{ 'PLAN-OVERVIEW.TITLE' | translate }}</span></div> <div class="col-auto"><span class="plan-logo">{{ 'PLAN-OVERVIEW.TITLE' | translate }}</span></div>
<div class="col-auto pr-0 d-flex"><span class="dmp-label">{{ dmp.label }}</span></div> <div class="col-auto pr-0 d-flex"><span class="plan-label">{{ dmp.label }}</span></div>
<div class="col-auto pr-0"><span style="font-weight: 700;">.</span></div> <div class="col-auto pr-0"><span style="font-weight: 700;">.</span></div>
<div class="col-auto d-flex"><button mat-button [matMenuTriggerFor]="versions" style="border-radius: 100px; background-color: #eaeaea;"> <div class="col-auto d-flex"><button mat-button [matMenuTriggerFor]="versions" style="border-radius: 100px; background-color: #eaeaea;">
<div class="pl-2 pr-1 d-flex align-items-center">{{'PLAN-OVERVIEW.VERSION' | translate}} {{selectedDmpVersion?.version}} <mat-icon class="ml-1">arrow_drop_down</mat-icon></div> <div class="pl-2 pr-1 d-flex align-items-center">{{'PLAN-OVERVIEW.VERSION' | translate}} {{selectedDmpVersion?.version}} <mat-icon class="ml-1">arrow_drop_down</mat-icon></div>
@ -76,7 +76,7 @@
</div> </div>
<ng-container *ngIf="referenceService.hasRerefenceOfTypes(dmp?.planReferences, [this.referenceTypeService.getGrantReferenceType()])"> <ng-container *ngIf="referenceService.hasRerefenceOfTypes(dmp?.planReferences, [this.referenceTypeService.getGrantReferenceType()])">
<div class="row header"><div class="col-auto">{{'PLAN-OVERVIEW.GRANT' | translate}}</div></div> <div class="row header"><div class="col-auto">{{'PLAN-OVERVIEW.GRANT' | translate}}</div></div>
<div class="row dmp-label"><div class="col-auto">{{referenceService.getReferencesForTypesFirstSafe(dmp?.planReferences, [this.referenceTypeService.getGrantReferenceType()])?.reference?.label}}</div></div> <div class="row plan-label"><div class="col-auto">{{referenceService.getReferencesForTypesFirstSafe(dmp?.planReferences, [this.referenceTypeService.getGrantReferenceType()])?.reference?.label}}</div></div>
</ng-container> </ng-container>
<div class="row header"><div class="col-auto">{{'DESCRIPTION-OVERVIEW.RESEARCHERS' | translate}}</div></div> <div class="row header"><div class="col-auto">{{'DESCRIPTION-OVERVIEW.RESEARCHERS' | translate}}</div></div>
<div class="row"> <div class="row">
@ -117,7 +117,7 @@
<ng-container *ngFor="let description of dmp.descriptions"> <ng-container *ngFor="let description of dmp.descriptions">
<div class="col-12 col-lg-7 mt-1"> <div class="col-12 col-lg-7 mt-1">
<a class="w-100 description" [routerLink]="isPublicView ? this.routerUtils.generateUrl(['/descriptions/overview/public/', description.id]) : this.routerUtils.generateUrl(['/descriptions/overview/' + description.id])" target="_blank"> <a class="w-100 description" [routerLink]="isPublicView ? this.routerUtils.generateUrl(['/descriptions/overview/public/', description.id]) : this.routerUtils.generateUrl(['/descriptions/overview/' + description.id])" target="_blank">
<button class="w-100" [ngClass]="{'dmp-btn': description.status === descriptionStatusEnum.Draft, 'dmp-finalized-btn': description.status === descriptionStatusEnum.Finalized}"> <button class="w-100" [ngClass]="{'plan-btn': description.status === descriptionStatusEnum.Draft, 'plan-finalized-btn': description.status === descriptionStatusEnum.Finalized}">
<div matTooltip="{{ description.label }}" class="d-flex align-items-center justify-content-between"> <div matTooltip="{{ description.label }}" class="d-flex align-items-center justify-content-between">
<div class="description-btn-label">{{ description.label }}</div> <div class="description-btn-label">{{ description.label }}</div>
<mat-icon>launch</mat-icon> <mat-icon>launch</mat-icon>

12
dmp-frontend/src/app/ui/plan/overview/plan-overview.component.scss
View File

@ -123,7 +123,7 @@
// ********TEXT******** // ********TEXT********
.dmp-logo { .plan-logo {
padding: 10px; padding: 10px;
min-width: 4.8em; min-width: 4.8em;
height: 2.6em; height: 2.6em;
@ -147,7 +147,7 @@
font-weight: 400; font-weight: 400;
} }
.dmp-label { .plan-label {
font-weight: bold; font-weight: bold;
} }
@ -168,7 +168,7 @@
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
.dmp-label, .plan-label,
.header { .header {
font-size: 1.25em; font-size: 1.25em;
color: #212121; color: #212121;
@ -289,7 +289,7 @@
.mat-mini-fab, .mat-mini-fab,
.mat-mini-fab-icon, .mat-mini-fab-icon,
.status-icon, .status-icon,
.dmp-logo, .plan-logo,
.frame-btn, .frame-btn,
.finalize-btn { .finalize-btn {
display: flex; display: flex;
@ -331,7 +331,7 @@
border-bottom: 1px solid #212121; border-bottom: 1px solid #212121;
} }
.dmp-btn { .plan-btn {
min-height: 2.3em; min-height: 2.3em;
background-color: var(--secondary-color); background-color: var(--secondary-color);
border-radius: 4px; border-radius: 4px;
@ -340,7 +340,7 @@
border: none; border: none;
} }
.dmp-finalized-btn { .plan-finalized-btn {
min-height: 2.3em; min-height: 2.3em;
background-color: #b2f772; background-color: #b2f772;
border-radius: 4px; border-radius: 4px;

2
dmp-frontend/src/app/ui/plan/plan-contact-prefill-dialog/plan-contact-prefill-dialog.component.html
View File

@ -1,4 +1,4 @@
<div class="dmp-contact-prefill-dialog"> <div class="plan-contact-prefill-dialog">
<div class="row mt-3"> <div class="row mt-3">
<div mat-dialog-title *ngIf="label"> <div mat-dialog-title *ngIf="label">
<span class="mr-3 title">{{'PLAN-CONTACT-PREFILL-DIALOG.TITLE' | translate}}{{label}}</span> <span class="mr-3 title">{{'PLAN-CONTACT-PREFILL-DIALOG.TITLE' | translate}}{{label}}</span>

2
dmp-frontend/src/app/ui/plan/plan-contact-prefill-dialog/plan-contact-prefill-dialog.component.scss
View File

@ -1,4 +1,4 @@
.dmp-contact-prefill-dialog { .plan-contact-prefill-dialog {
padding: 24px; padding: 24px;
overflow: hidden; overflow: hidden;

2
dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.html
View File

@ -1,4 +1,4 @@
<div class="dmp-delete-dialog"> <div class="plan-delete-dialog">
<div class="row mt-3"> <div class="row mt-3">
<div mat-dialog-title class="col-12 pr-1 d-flex justify-content-between"> <div mat-dialog-title class="col-12 pr-1 d-flex justify-content-between">
<span class="text-danger">{{'PLAN-DELETE-DIALOG.WARNING' | translate}}</span> <span class="text-danger">{{'PLAN-DELETE-DIALOG.WARNING' | translate}}</span>

2
dmp-frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.scss
View File

@ -4,7 +4,7 @@
// border-radius: 125px; // border-radius: 125px;
// } // }
.dmp-delete-dialog { .plan-delete-dialog {
padding: 24px; padding: 24px;
overflow: hidden; overflow: hidden;

4
dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html
View File

@ -12,7 +12,7 @@
<div class="ml-auto d-flex flex-row"> <div class="ml-auto d-flex flex-row">
<div *ngIf="formGroup.get('id').value" class="col-auto d-flex align-items-center"> <div *ngIf="formGroup.get('id').value" class="col-auto d-flex align-items-center">
<button [disabled]="isDirty()" [matTooltipDisabled]="!isDirty()" mat-raised-button class="dmp-export-btn" type="button" [matMenuTriggerFor]="exportMenu" (click)="$event.stopPropagation();" [matTooltip]="'PLAN-EDITOR.ACTIONS.EXPORT.CAN-NOT-EXPORT' | translate"> <button [disabled]="isDirty()" [matTooltipDisabled]="!isDirty()" mat-raised-button class="plan-export-btn" type="button" [matMenuTriggerFor]="exportMenu" (click)="$event.stopPropagation();" [matTooltip]="'PLAN-EDITOR.ACTIONS.EXPORT.CAN-NOT-EXPORT' | translate">
{{ 'PLAN-EDITOR.ACTIONS.EXPORT.EXPORT' | translate }} {{ 'PLAN-EDITOR.ACTIONS.EXPORT.EXPORT' | translate }}
<mat-icon [disabled]="isDirty()" style="width: 14px;">expand_more</mat-icon> <mat-icon [disabled]="isDirty()" style="width: 14px;">expand_more</mat-icon>
</button> </button>
@ -100,7 +100,7 @@
</rich-text-editor-component> </rich-text-editor-component>
</div> </div>
</div> </div>
<div class="dmp-blueprint-form" style="margin-top: 3%;"> <div class="plan-blueprint-form" style="margin-top: 3%;">
<div class="heading2">{{'PLAN-EDITOR.FIELDS.BLUEPRINT' | translate}} *</div> <div class="heading2">{{'PLAN-EDITOR.FIELDS.BLUEPRINT' | translate}} *</div>
<mat-form-field class="w-100"> <mat-form-field class="w-100">
<mat-label>{{'PLAN-EDITOR.FIELDS.BLUEPRINT' | translate}}</mat-label> <mat-label>{{'PLAN-EDITOR.FIELDS.BLUEPRINT' | translate}}</mat-label>

6
dmp-frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.scss
View File

@ -61,7 +61,7 @@
white-space: nowrap; white-space: nowrap;
} }
.save-btn, .dmp-export-btn { .save-btn, .plan-export-btn {
background: #ffffff 0% 0% no-repeat padding-box !important; background: #ffffff 0% 0% no-repeat padding-box !important;
border-radius: 30px; border-radius: 30px;
opacity: 1; opacity: 1;
@ -74,7 +74,7 @@
color: var(--primary-color); color: var(--primary-color);
} }
.dmp-stepper { .plan-stepper {
position: fixed; position: fixed;
// height: 100%; // height: 100%;
display: flex; display: flex;
@ -315,7 +315,7 @@ a:hover {
margin-top: -80px; margin-top: -80px;
} }
.dmp-blueprint-form { .plan-blueprint-form {
text-align: left; text-align: left;
font-weight: 400; font-weight: 400;
font-size: 16px; font-size: 16px;

2
dmp-frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component.html
View File

@ -13,7 +13,7 @@
<mat-panel-title> <mat-panel-title>
{{ 'PLAN-FINALISE-DIALOG.PLAN' | translate }} {{ 'PLAN-FINALISE-DIALOG.PLAN' | translate }}
</mat-panel-title> </mat-panel-title>
<mat-panel-description class="dmp-title"> <mat-panel-description class="plan-title">
{{ dmp.label }} {{ dmp.label }}
</mat-panel-description> </mat-panel-description>
</mat-expansion-panel-header> </mat-expansion-panel-header>

2
dmp-frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component.scss
View File

@ -59,7 +59,7 @@
padding: 0; padding: 0;
} }
.dmp-title { .plan-title {
font-weight: 500; font-weight: 500;
color: black; color: black;
} }

2
dmp-frontend/src/app/ui/sidebar/sidebar.component.html
View File

@ -6,7 +6,7 @@
<mat-list-item routerLinkActive="active" [isActiveMatchOptions]="{ paths: 'exact', queryParams: 'ignored' }" *ngFor="let groupMenuRoute of groupMenuItem.routes; let first = first" class="nav-item" [ngClass]="{'mt-4': first && firstGroup}"> <mat-list-item routerLinkActive="active" [isActiveMatchOptions]="{ paths: 'exact', queryParams: 'ignored' }" *ngFor="let groupMenuRoute of groupMenuItem.routes; let first = first" class="nav-item" [ngClass]="{'mt-4': first && firstGroup}">
<ng-container *ngIf="groupMenuRoute.routeType == routeType.System; else infoItems"> <ng-container *ngIf="groupMenuRoute.routeType == routeType.System; else infoItems">
<a class="new-dmp nav-link nav-row" *ngIf="groupMenuRoute.path !== '/descriptions'; else description" [routerLink]="[routerUtils.generateUrl(groupMenuRoute.path)]" [ngClass]="{'dmp-tour': groupMenuRoute.path == '/plans'}"> <a class="new-plan nav-link nav-row" *ngIf="groupMenuRoute.path !== '/descriptions'; else description" [routerLink]="[routerUtils.generateUrl(groupMenuRoute.path)]" [ngClass]="{'plan-tour': groupMenuRoute.path == '/plans'}">
<i class="material-symbols-outlined icon">{{ groupMenuRoute.icon }}</i> <i class="material-symbols-outlined icon">{{ groupMenuRoute.icon }}</i>
<i *ngIf="groupMenuRoute.path == '/plans'" class="material-symbols-outlined icon-mask">person</i> <i *ngIf="groupMenuRoute.path == '/plans'" class="material-symbols-outlined icon-mask">person</i>
<span [ngClass]="{'pl-0': groupMenuRoute.path == '/plans'}" style="text-wrap: wrap;">{{groupMenuRoute.title | translate}}</span> <span [ngClass]="{'pl-0': groupMenuRoute.path == '/plans'}" style="text-wrap: wrap;">{{groupMenuRoute.title | translate}}</span>

10
dmp-frontend/src/notification-service/core/enum/notification-type.enum.ts
View File

@ -1,15 +1,15 @@
export enum NotificationType { export enum NotificationType {
dmpInvitationExternalUserType = '065deecd-21bb-44af-9983-e660fdf24bc4', planInvitationExternalUserType = '065deecd-21bb-44af-9983-e660fdf24bc4',
dmpInvitationExistingUserType = '4904dea2-5079-46d3-83be-3a19c9ab45dc', planInvitationExistingUserType = '4904dea2-5079-46d3-83be-3a19c9ab45dc',
descriptionCreatedType = '8965b1d5-99a6-4acf-9016-c0d0ce341364', descriptionCreatedType = '8965b1d5-99a6-4acf-9016-c0d0ce341364',
dmpModifiedType = '4542262a-22f8-4baa-9db6-1c8e70ac1dbb', planModifiedType = '4542262a-22f8-4baa-9db6-1c8e70ac1dbb',
dmpFinalisedType = '90db0b46-42de-bd89-aebf-6f27efeb256e', planFinalisedType = '90db0b46-42de-bd89-aebf-6f27efeb256e',
descriptionAnnotationCreated = 'db1e99d2-a240-4e75-9bb2-ef25b234c1f0', descriptionAnnotationCreated = 'db1e99d2-a240-4e75-9bb2-ef25b234c1f0',
descriptionModifiedType = '4fdbfa80-7a71-4a69-b854-67cbb70648f1', descriptionModifiedType = '4fdbfa80-7a71-4a69-b854-67cbb70648f1',
descriptionFinalisedType = '33790bad-94d4-488a-8ee2-7f6295ca18ea', descriptionFinalisedType = '33790bad-94d4-488a-8ee2-7f6295ca18ea',
mergeAccountConfirmationType = 'bfe68845-cb05-4c5a-a03d-29161a7c9660', mergeAccountConfirmationType = 'bfe68845-cb05-4c5a-a03d-29161a7c9660',
removeCredentialConfirmationType = 'c9bc3f16-057e-4bba-8a5f-36bd835e5604', removeCredentialConfirmationType = 'c9bc3f16-057e-4bba-8a5f-36bd835e5604',
dmpDepositType = '55736f7a-83ab-4190-af43-9d031a6f9612', planDepositType = '55736f7a-83ab-4190-af43-9d031a6f9612',
descriptionTemplateInvitationType = '223bb607-efa1-4ce7-99ec-4beabfef9a8b', descriptionTemplateInvitationType = '223bb607-efa1-4ce7-99ec-4beabfef9a8b',
contactSupportType = '5b1d6c52-88f9-418b-9b8a-6f1f963d9ead', contactSupportType = '5b1d6c52-88f9-418b-9b8a-6f1f963d9ead',
publicContactSupportType = 'b542b606-acc6-4629-adef-4d8ee2f01222', publicContactSupportType = 'b542b606-acc6-4629-adef-4d8ee2f01222',

10
dmp-frontend/src/notification-service/core/formatting/enum-utils.service.ts
View File

@ -28,17 +28,17 @@ export class NotificationServiceEnumUtils extends BaseEnumUtilsService {
public toNotificationTypeString(value: NotificationType): string { public toNotificationTypeString(value: NotificationType): string {
switch (value) { switch (value) {
case NotificationType.dmpInvitationExternalUserType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PLAN-INVITATION-EXTERNAL-USER'); case NotificationType.planInvitationExternalUserType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PLAN-INVITATION-EXTERNAL-USER');
case NotificationType.dmpInvitationExistingUserType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PLAN-INVITATION-EXISTING-USER'); case NotificationType.planInvitationExistingUserType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PLAN-INVITATION-EXISTING-USER');
case NotificationType.dmpModifiedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PLAN-MODIFIED'); case NotificationType.planModifiedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PLAN-MODIFIED');
case NotificationType.dmpFinalisedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PLAN-FINALISED'); case NotificationType.planFinalisedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PLAN-FINALISED');
case NotificationType.descriptionCreatedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-CREATED'); case NotificationType.descriptionCreatedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-CREATED');
case NotificationType.descriptionModifiedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-MODIFIED'); case NotificationType.descriptionModifiedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-MODIFIED');
case NotificationType.descriptionFinalisedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-FINALISED'); case NotificationType.descriptionFinalisedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-FINALISED');
case NotificationType.descriptionAnnotationCreated: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-ANNOTATION-CREATED'); case NotificationType.descriptionAnnotationCreated: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-ANNOTATION-CREATED');
case NotificationType.mergeAccountConfirmationType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.MERGE-ACCOUNT-CONFIRMATION'); case NotificationType.mergeAccountConfirmationType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.MERGE-ACCOUNT-CONFIRMATION');
case NotificationType.removeCredentialConfirmationType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.REMOVE-CREDENTIAL-CONFIRMATION'); case NotificationType.removeCredentialConfirmationType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.REMOVE-CREDENTIAL-CONFIRMATION');
case NotificationType.dmpDepositType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PLAN-DEPOSIT'); case NotificationType.planDepositType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PLAN-DEPOSIT');
case NotificationType.descriptionTemplateInvitationType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-TEMPLATE-INVITATION'); case NotificationType.descriptionTemplateInvitationType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-TEMPLATE-INVITATION');
case NotificationType.contactSupportType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.CONTACT-SUPPORT'); case NotificationType.contactSupportType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.CONTACT-SUPPORT');
case NotificationType.publicContactSupportType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PUBLIC-CONTACT-SUPPORT'); case NotificationType.publicContactSupportType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PUBLIC-CONTACT-SUPPORT');