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

This commit is contained in:
Efstratios Giannopoulos 2024-03-29 16:54:03 +02:00
commit eba8bc9cb6
46 changed files with 1920 additions and 1871 deletions

View File

@ -1,7 +1,7 @@
<div class="row description-template-listing"> <div class="container-fluid">
<div class="col-md-8 offset-md-2"> <div class="row description-template-listing">
<div class="col-md-10 offset-md-1">
<div class="row mb-4 mt-3"> <div class="row mb-4 mt-4">
<div class="col"> <div class="col">
<h4>{{'DESCRIPTION-TEMPLATE-LISTING.TITLE' | translate}}</h4> <h4>{{'DESCRIPTION-TEMPLATE-LISTING.TITLE' | translate}}</h4>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -32,7 +32,7 @@
<mat-icon>download</mat-icon> <mat-icon>download</mat-icon>
</button> --> </button> -->
</app-hybrid-listing> </app-hybrid-listing>
</div>
</div> </div>
</div> </div>

View File

@ -4,9 +4,9 @@
} }
.description-template-listing { .description-template-listing {
margin-top: 1.3rem; // margin-top: 1.3rem;
margin-left: 1rem; // margin-left: 1rem;
margin-right: 2rem; // margin-right: 2rem;
.mat-header-row { .mat-header-row {
background: #f3f5f8; background: #f3f5f8;

View File

@ -1,7 +1,8 @@
<div class="row description-template-type-editor"> <div class="container-fluid">
<div class="col-md-8 offset-md-2 colums-gapped"> <div class="row description-template-type-editor">
<div class="col-md-10 offset-md-1 colums-gapped">
<div class="row justify-content-between align-items-center"> <div class="row justify-content-between align-items-center mb-4 mt-4">
<div class="col"> <div class="col">
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
</div> </div>
@ -35,14 +36,14 @@
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<form (ngSubmit)="formSubmit()" [formGroup]="formGroup" *ngIf="formGroup"> <form (ngSubmit)="formSubmit()" [formGroup]="formGroup" *ngIf="formGroup">
<div class="info-grid"> <div class="row">
<div class="info-grid-label"> <div class="col-12 pt-1 pb-1">
<span> <span>
{{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.FIELDS.NAME' | translate}} {{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.FIELDS.NAME' | translate}}
</span> </span>
</div> </div>
<div class="info-grid-value"> <div class="col-12 mt-1">
<mat-form-field class="col-lg-6"> <mat-form-field class="w-100">
<input matInput placeholder="{{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.FIELDS.NAME' | translate}}" type="text" name="name" [formControl]="formGroup.get('name')" required> <input matInput placeholder="{{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.FIELDS.NAME' | translate}}" type="text" name="name" [formControl]="formGroup.get('name')" required>
<mat-error *ngIf="formGroup.get('name').hasError('backendError')"> <mat-error *ngIf="formGroup.get('name').hasError('backendError')">
{{formGroup.get('name').getError('backendError').message}}</mat-error> {{formGroup.get('name').getError('backendError').message}}</mat-error>
@ -55,4 +56,5 @@
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
</div> </div>
</div>
</div> </div>

View File

@ -1,5 +1,5 @@
.description-template-type-editor { .description-template-type-editor {
padding-top: 1em; // padding-top: 1em;
.editor-actions { .editor-actions {
margin-top: 30px; margin-top: 30px;

View File

@ -1,7 +1,7 @@
<div class="row description-template-type-listing"> <div class="container-fluid">
<div class="col-md-8 offset-md-2"> <div class="row description-template-type-listing">
<div class="col-md-10 offset-md-1">
<div class="row mb-4 mt-3"> <div class="row mb-4 mt-4">
<div class="col"> <div class="col">
<h4>{{'DESCRIPTION-TEMPLATE-TYPE-LISTING.TITLE' | translate}}</h4> <h4>{{'DESCRIPTION-TEMPLATE-TYPE-LISTING.TITLE' | translate}}</h4>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -33,10 +33,11 @@
<mat-icon>download</mat-icon> <mat-icon>download</mat-icon>
</button> --> </button> -->
</app-hybrid-listing> </app-hybrid-listing>
</div>
</div> </div>
</div> </div>
<ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected"> <ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected">

View File

@ -1,7 +1,7 @@
.description-template-type-listing { .description-template-type-listing {
margin-top: 1.3rem; // margin-top: 1.3rem;
margin-left: 1rem; // margin-left: 1rem;
margin-right: 2rem; // margin-right: 2rem;
.mat-header-row{ .mat-header-row{
background: #f3f5f8; background: #f3f5f8;

View File

@ -1,7 +1,8 @@
<!-- <div class="main-content"> --> <div class="container-fluid">
<div class="container-fluid dmp-blueprint-editor d-flex flex-column"> <div class="row dmp-blueprint-editor">
<div class="row align-items-center mb-4" *ngIf="formGroup"> <div class="col-md-10 offset-md-1">
<div class="col-auto"> <div class="row align-items-center mt-4 mb-4" *ngIf="formGroup">
<div class="col-md col-12">
<h3 *ngIf="!isFinalized && !isNewVersion && isNew">{{'DMP-BLUEPRINT-EDITOR.TITLE.NEW' | translate}}</h3> <h3 *ngIf="!isFinalized && !isNewVersion && isNew">{{'DMP-BLUEPRINT-EDITOR.TITLE.NEW' | translate}}</h3>
<h3 *ngIf="!isClone && !isNewVersion && !isNew">{{formGroup.get('label').value}}</h3> <h3 *ngIf="!isClone && !isNewVersion && !isNew">{{formGroup.get('label').value}}</h3>
<h3 *ngIf="isClone"> <h3 *ngIf="isClone">
@ -13,31 +14,21 @@
{{formGroup.get('label').value}} {{formGroup.get('label').value}}
</h3> </h3>
</div> </div>
<div class="col"></div> <div class="col-md-auto mb-md-0 col-12 mb-2" *ngIf="!isNew">
<div class="col-auto" *ngIf="!isNew">
<button [disabled]="isLocked" mat-button class="action-btn" type="button" (click)="delete()"> <button [disabled]="isLocked" mat-button class="action-btn" type="button" (click)="delete()">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
{{'DMP-BLUEPRINT-EDITOR.ACTIONS.DELETE' | translate}} {{'DMP-BLUEPRINT-EDITOR.ACTIONS.DELETE' | translate}}
</button> </button>
</div> </div>
<div class="col-auto" *ngIf="formGroup.get('status').value==1"> <div class="col-md-auto col-12" *ngIf="formGroup.get('status').value==1">
<button mat-button class="finalize-btn" (click)="downloadXML()" type="button">{{'DMP-BLUEPRINT-EDITOR.ACTIONS.DOWNLOAD-XML' | translate }}</button> <button mat-button class="finalize-btn" (click)="downloadXML()" type="button">{{'DMP-BLUEPRINT-EDITOR.ACTIONS.DOWNLOAD-XML' | translate }}</button>
</div> </div>
<div *ngIf="formGroup.get('status').value!=1" class="col-auto"> <div *ngIf="formGroup.get('status').value!=1" class="col-auto">
<button mat-button class="finalize-btn" (click)="finalize()" [disabled]="!this.isFormValid()" type="button">{{'DMP-BLUEPRINT-EDITOR.ACTIONS.FINALIZE' | translate }}</button> <button mat-button class="finalize-btn" (click)="finalize()" [disabled]="!this.isFormValid()" type="button">{{'DMP-BLUEPRINT-EDITOR.ACTIONS.FINALIZE' | translate }}</button>
</div> </div>
</div> </div>
<div class="">
<form *ngIf="formGroup" (ngSubmit)="formSubmit()"> <form *ngIf="formGroup" (ngSubmit)="formSubmit()">
<mat-card class="pt-3 pb-3"> <mat-card class="pt-3 pb-3">
<!-- <mat-card-header>
<mat-card-title *ngIf="isNew">
<h4>{{'DMP-BLUEPRINT-EDITOR.TITLE.NEW' | translate}}</h4>
</mat-card-title>
<mat-card-title *ngIf="!isNew">
<h4>{{formGroup.get('label').value}}</h4>
</mat-card-title>
</mat-card-header> -->
<mat-card-content> <mat-card-content>
<div class="row"> <div class="row">
<div class="col-6"> <div class="col-6">
@ -342,4 +333,6 @@
</mat-card> </mat-card>
</form> </form>
</div> </div>
</div>
</div> </div>

View File

@ -1,7 +1,8 @@
<div class="row dmp-blueprint-listing"> <div class="container-fluid">
<div class="col-md-8 offset-md-2"> <div class="row dmp-blueprint-listing">
<div class="col-md-10 offset-md-1">
<div class="row mb-4 mt-4">
<div class="row mb-4 mt-3">
<div class="col"> <div class="col">
<h4>{{'DMP-BLUEPRINT-LISTING.TITLE' | translate}}</h4> <h4>{{'DMP-BLUEPRINT-LISTING.TITLE' | translate}}</h4>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -32,7 +33,7 @@
<mat-icon>download</mat-icon> <mat-icon>download</mat-icon>
</button> --> </button> -->
</app-hybrid-listing> </app-hybrid-listing>
</div>
</div> </div>
</div> </div>

View File

@ -4,9 +4,9 @@
} }
.dmp-blueprint-listing { .dmp-blueprint-listing {
margin-top: 1.3rem; // margin-top: 1.3rem;
margin-left: 1rem; // margin-left: 1rem;
margin-right: 2rem; // margin-right: 2rem;
.mat-header-row { .mat-header-row {
background: #f3f5f8; background: #f3f5f8;

View File

@ -1,7 +1,8 @@
<div class="row lock-listing"> <div class="container-fluid">
<div class="col-md-8 offset-md-2"> <div class="row lock-listing">
<div class="col-md-10 offset-md-1">
<div class="row mb-4 mt-3"> <div class="row mb-4 mt-4">
<div class="col"> <div class="col">
<h4>{{'LOCK-LISTING.TITLE' | translate}}</h4> <h4>{{'LOCK-LISTING.TITLE' | translate}}</h4>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -24,8 +25,10 @@
</app-hybrid-listing> </app-hybrid-listing>
</div> </div>
</div>
</div> </div>
<ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected"> <ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected">

View File

@ -8,9 +8,9 @@
} }
.lock-listing { .lock-listing {
margin-top: 1.3rem; // margin-top: 1.3rem;
margin-left: 1rem; // margin-left: 1rem;
margin-right: 2rem; // margin-right: 2rem;
.mat-header-row{ .mat-header-row{
background: #f3f5f8; background: #f3f5f8;

View File

@ -1,9 +1,15 @@
<div class="row root"> <div class="container-fluid">
<mat-card class="col-md-3 offset-md-4"> <div class="row root">
<div> <div class="col-md-10 offset-md-1">
<div class="mt-4 mb-4"></div>
<mat-card class="p-2">
<div class="mt-2">
<div style="color: red;">Warning: Danger zone. It might delete Dataset tags if not careful</div> <div style="color: red;">Warning: Danger zone. It might delete Dataset tags if not careful</div>
<button mat-raised-button color="primary" (click)="generateIndex($event)" class="lightblue-btn button">Generate Index</button> <button mat-raised-button color="primary" (click)="generateIndex($event)" class="lightblue-btn button">Generate Index</button>
<button mat-raised-button color="primary" (click)="clearIndex($event)" class="lightblue-btn button">Clear Index</button> <button mat-raised-button color="primary" (click)="clearIndex($event)" class="lightblue-btn button">Clear Index</button>
</div> </div>
</mat-card> </mat-card>
</div>
</div>
</div> </div>

View File

@ -1,5 +1,5 @@
.root { .root {
padding-bottom: 2em; // padding-bottom: 2em;
.button { .button {
margin: 5px; margin: 5px;

View File

@ -1,7 +1,8 @@
<div class="tenant-editor"> <div class="container-fluid">
<div class="col-md-8 offset-md-2 colums-gapped"> <div class="row tenant-editor">
<div class="row align-items-center mb-4" *ngIf="formGroup"> <div class="col-md-10 offset-md-1 colums-gapped">
<div class="col-auto"> <div class="row align-items-center mt-4 mb-4" *ngIf="formGroup">
<div class="col">
<h3 *ngIf="isNew && !isClone">{{'LANGUAGE-EDITOR.NEW' | translate}}</h3> <h3 *ngIf="isNew && !isClone">{{'LANGUAGE-EDITOR.NEW' | translate}}</h3>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
</div> </div>
@ -73,4 +74,5 @@
</mat-card> </mat-card>
</form> </form>
</div> </div>
</div>
</div> </div>

View File

@ -1,7 +1,7 @@
.tenant-editor { .tenant-editor {
margin-top: 1.3rem; // margin-top: 1.3rem;
margin-left: 1em; // margin-left: 1em;
margin-right: 3em; // margin-right: 3em;
.remove { .remove {
background-color: white; background-color: white;

View File

@ -1,7 +1,7 @@
<div class="row language-listing"> <div class="container-fluid">
<div class="col-md-8 offset-md-2"> <div class="row language-listing">
<div class="col-md-10 offset-md-1">
<div class="row mb-4 mt-3"> <div class="row mb-4 mt-4">
<div class="col"> <div class="col">
<h4>{{'LANGUAGE-LISTING.TITLE' | translate}}</h4> <h4>{{'LANGUAGE-LISTING.TITLE' | translate}}</h4>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -32,6 +32,7 @@
</app-hybrid-listing> </app-hybrid-listing>
</div> </div>
</div>
</div> </div>
<ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected"> <ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected">

View File

@ -1,7 +1,7 @@
.language-listing { .language-listing {
margin-top: 1.3rem; // margin-top: 1.3rem;
margin-left: 1rem; // margin-left: 1rem;
margin-right: 2rem; // margin-right: 2rem;
.mat-header-row{ .mat-header-row{
background: #f3f5f8; background: #f3f5f8;

View File

@ -1,6 +1,7 @@
<div class="notification-template-editor"> <div class="container-fluid">
<div class="row notification-template-editor">
<div class="col-md-10 offset-md-1 colums-gapped"> <div class="col-md-10 offset-md-1 colums-gapped">
<div class="row align-items-center mb-4" *ngIf="formGroup"> <div class="row align-items-center mt-4 mb-4" *ngIf="formGroup">
<div class="col-auto"> <div class="col-auto">
<h3 *ngIf="isNew && !isClone">{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.NEW' | translate}}</h3> <h3 *ngIf="isNew && !isClone">{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.NEW' | translate}}</h3>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -273,5 +274,5 @@
</form> </form>
</div> </div>
</div>
</div> </div>

View File

@ -1,7 +1,7 @@
.notification-template-editor { .notification-template-editor {
margin-top: 1.3rem; // margin-top: 1.3rem;
margin-left: 1em; // margin-left: 1em;
margin-right: 3em; // margin-right: 3em;
.remove { .remove {
background-color: white; background-color: white;

View File

@ -1,7 +1,8 @@
<div class="row notification-template-listing"> <div class="container-fluid">
<div class="col-md-8 offset-md-2"> <div class="row notification-template-listing">
<div class="col-md-10 offset-md-1">
<div class="row mb-4 mt-3"> <div class="row mb-4 mt-4">
<div class="col"> <div class="col">
<h4>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-LISTING.TITLE' | translate}}</h4> <h4>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-LISTING.TITLE' | translate}}</h4>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -32,6 +33,7 @@
</app-hybrid-listing> </app-hybrid-listing>
</div> </div>
</div>
</div> </div>
<ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected"> <ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected">

View File

@ -1,7 +1,7 @@
.notification-template-listing { .notification-template-listing {
margin-top: 1.3rem; // margin-top: 1.3rem;
margin-left: 1rem; // margin-left: 1rem;
margin-right: 2rem; // margin-right: 2rem;
.mat-header-row{ .mat-header-row{
background: #f3f5f8; background: #f3f5f8;

View File

@ -1,7 +1,7 @@
<div class="row notification-listing"> <div class="container-fluid">
<div class="col-md-8 offset-md-2"> <div class="row notification-listing">
<div class="col-md-10 offset-md-1">
<div class="row mb-4 mt-3"> <div class="row mb-4 mt-4">
<div class="col"> <div class="col">
<h4>{{'NOTIFICATION-SERVICE.NOTIFICATION-LISTING.TITLE' | translate}}</h4> <h4>{{'NOTIFICATION-SERVICE.NOTIFICATION-LISTING.TITLE' | translate}}</h4>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -24,8 +24,10 @@
</app-hybrid-listing> </app-hybrid-listing>
</div> </div>
</div>
</div> </div>
<ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected"> <ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected">

View File

@ -8,9 +8,9 @@
} }
.notification-listing { .notification-listing {
margin-top: 1.3rem; // margin-top: 1.3rem;
margin-left: 1rem; // margin-left: 1rem;
margin-right: 2rem; // margin-right: 2rem;
.mat-header-row{ .mat-header-row{
background: #f3f5f8; background: #f3f5f8;

View File

@ -1,7 +1,8 @@
<div class="prefilling-source-editor"> <div class="container-fluid">
<div class="row prefilling-source-editor">
<div class="col-md-10 offset-md-1 colums-gapped" *ngIf="formGroup"> <div class="col-md-10 offset-md-1 colums-gapped" *ngIf="formGroup">
<div class="row justify-content-between align-items-center"> <div class="row justify-content-between align-items-center mt-4 mb-4">
<div class="col"> <div class="col">
<h3 *ngIf="isNew">{{'PREFILLING-SOURCE-EDITOR.NEW' | translate}}</h3> <h3 *ngIf="isNew">{{'PREFILLING-SOURCE-EDITOR.NEW' | translate}}</h3>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -148,4 +149,5 @@
</form> </form>
</div> </div>
</div>
</div> </div>

View File

@ -1,7 +1,7 @@
.prefilling-source-editor { .prefilling-source-editor {
margin-top: 1.3rem; // margin-top: 1.3rem;
margin-left: 1em; // margin-left: 1em;
margin-right: 3em; // margin-right: 3em;
.remove { .remove {
background-color: white; background-color: white;

View File

@ -1,7 +1,8 @@
<div class="row prefilling-source-listing"> <div class="container-fluid">
<div class="col-md-8 offset-md-2"> <div class="row prefilling-source-listing">
<div class="col-md-10 offset-md-1">
<div class="row mb-4 mt-3"> <div class="row mb-4 mt-4">
<div class="col"> <div class="col">
<h4>{{'PREFILLING-SOURCE-LISTING.TITLE' | translate}}</h4> <h4>{{'PREFILLING-SOURCE-LISTING.TITLE' | translate}}</h4>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -32,6 +33,7 @@
</app-hybrid-listing> </app-hybrid-listing>
</div> </div>
</div>
</div> </div>
<ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected"> <ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected">

View File

@ -4,9 +4,9 @@
} }
.prefilling-source-listing { .prefilling-source-listing {
margin-top: 1.3rem; // margin-top: 1.3rem;
margin-left: 1rem; // margin-left: 1rem;
margin-right: 2rem; // margin-right: 2rem;
.mat-header-row { .mat-header-row {
background: #f3f5f8; background: #f3f5f8;

View File

@ -1,6 +1,6 @@
<div class="reference-type-editor"> <div class="container-fluid">
<div class="col-md-8 offset-md-2 colums-gapped"> <div class="row reference-type-editor">
<div class="col-md-10 offset-md-1 colums-gapped">
<div class="row justify-content-between align-items-center"> <div class="row justify-content-between align-items-center">
<div class="col"> <div class="col">
<h3 *ngIf="isNew">{{'REFERENCE-TYPE-EDITOR.NEW' | translate}}</h3> <h3 *ngIf="isNew">{{'REFERENCE-TYPE-EDITOR.NEW' | translate}}</h3>
@ -147,4 +147,5 @@
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
</div> </div>
</div>
</div> </div>

View File

@ -1,7 +1,7 @@
.reference-type-editor { .reference-type-editor {
margin-top: 1.3rem; // margin-top: 1.3rem;
margin-left: 1em; // margin-left: 1em;
margin-right: 3em; // margin-right: 3em;
.remove { .remove {
background-color: white; background-color: white;

View File

@ -1,7 +1,8 @@
<div class="row reference-type-listing"> <div class="container-fluid">
<div class="col-md-8 offset-md-2"> <div class="row reference-type-listing">
<div class="col-md-10 offset-md-1">
<div class="row mb-4 mt-3"> <div class="row mb-4 mt-4">
<div class="col"> <div class="col">
<h4>{{'REFERENCE-TYPE-LISTING.TITLE' | translate}}</h4> <h4>{{'REFERENCE-TYPE-LISTING.TITLE' | translate}}</h4>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -35,8 +36,10 @@
</app-hybrid-listing> </app-hybrid-listing>
</div> </div>
</div>
</div> </div>
<ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected"> <ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected">

View File

@ -1,7 +1,7 @@
.reference-type-listing { .reference-type-listing {
margin-top: 1.3rem; // margin-top: 1.3rem;
margin-left: 1rem; // margin-left: 1rem;
margin-right: 2rem; // margin-right: 2rem;
.mat-header-row{ .mat-header-row{
background: #f3f5f8; background: #f3f5f8;

View File

@ -1,6 +1,7 @@
<div class="reference-editor"> <div class="container-fluid">
<div class="col-md-8 offset-md-2 colums-gapped"> <div class="row reference-editor">
<div class="row align-items-center mb-4" *ngIf="formGroup"> <div class="col-md-10 offset-md-1 colums-gapped">
<div class="row align-items-center mt-4 mb-4" *ngIf="formGroup">
<div class="col-auto"> <div class="col-auto">
<h3 *ngIf="isNew && !isClone">{{'REFERENCE-EDITOR.NEW' | translate}}</h3> <h3 *ngIf="isNew && !isClone">{{'REFERENCE-EDITOR.NEW' | translate}}</h3>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -145,4 +146,5 @@
</mat-card> </mat-card>
</form> </form>
</div> </div>
</div>
</div> </div>

View File

@ -1,7 +1,7 @@
.reference-editor { .reference-editor {
margin-top: 1.3rem; // margin-top: 1.3rem;
margin-left: 1em; // margin-left: 1em;
margin-right: 3em; // margin-right: 3em;
.remove { .remove {
background-color: white; background-color: white;

View File

@ -1,7 +1,8 @@
<div class="row tenant-listing"> <div class="container-fluid">
<div class="col-md-8 offset-md-2">
<div class="row mb-4 mt-3"> <div class="row">
<div class="col-md-10 offset-md-1">
<div class="row mb-4 mt-4">
<div class="col"> <div class="col">
<h4>{{'REFERENCE-LISTING.TITLE' | translate}}</h4> <h4>{{'REFERENCE-LISTING.TITLE' | translate}}</h4>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -33,6 +34,9 @@
</div> </div>
</div> </div>
</div>
<ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected"> <ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected">

View File

@ -1,5 +1,7 @@
<div class="tenant-editor"> <div class="container-fluid">
<div class="row align-items-center mb-4" *ngIf="formGroup"> <div class="row">
<div class="col-md-10 offset-md-1 tenant-editor">
<div class="row align-items-center mb-4 mt-4" *ngIf="formGroup">
<div class="col-auto"> <div class="col-auto">
<h3 *ngIf="isNew && !isClone">{{'TENANT-EDITOR.NEW' | translate}}</h3> <h3 *ngIf="isNew && !isClone">{{'TENANT-EDITOR.NEW' | translate}}</h3>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -78,4 +80,6 @@
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
</form> </form>
</div>
</div>
</div> </div>

View File

@ -1,7 +1,7 @@
.tenant-editor { .tenant-editor {
margin-top: 1.3rem; // margin-top: 1.3rem;
margin-left: 1em; // margin-left: 1em;
margin-right: 3em; // margin-right: 3em;
.remove { .remove {
background-color: white; background-color: white;

View File

@ -1,7 +1,8 @@
<div class="row tenant-listing"> <div class="container-fluid">
<div class="col-md-8 offset-md-2"> <div class="row tenant-listing">
<div class="col-md-10 offset-md-1">
<div class="row mb-4 mt-3"> <div class="row mb-4 mt-4">
<div class="col"> <div class="col">
<h4>{{'TENANT-LISTING.TITLE' | translate}}</h4> <h4>{{'TENANT-LISTING.TITLE' | translate}}</h4>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -32,6 +33,7 @@
</app-hybrid-listing> </app-hybrid-listing>
</div> </div>
</div>
</div> </div>
<ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected"> <ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected">

View File

@ -1,7 +1,7 @@
<div class="row user-listing"> <div class="container-fluid">
<div class="col-md-8 offset-md-2"> <div class="row user-listing">
<div class="col-md-10 offset-md-1">
<div class="row mb-4 mt-3"> <div class="row mb-4 mt-4">
<div class="col"> <div class="col">
<h4>{{'USER-LISTING.TITLE' | translate}}</h4> <h4>{{'USER-LISTING.TITLE' | translate}}</h4>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -21,7 +21,7 @@
<app-user-settings-picker [key]="userSettingsKey" [userPreference]="lookup" (onSettingSelected)="changeSetting($event)" [autoSelectUserSettings]="autoSelectUserSettings" user-preference-settings /> <app-user-settings-picker [key]="userSettingsKey" [userPreference]="lookup" (onSettingSelected)="changeSetting($event)" [autoSelectUserSettings]="autoSelectUserSettings" user-preference-settings />
</app-hybrid-listing> </app-hybrid-listing>
</div>
</div> </div>
</div> </div>

View File

@ -1,7 +1,7 @@
.user-listing { .user-listing {
margin-top: 1.3rem; // margin-top: 1.3rem;
margin-left: 1rem; // margin-left: 1rem;
margin-right: 2rem; // margin-right: 2rem;
.mat-header-row{ .mat-header-row{
background: #f3f5f8; background: #f3f5f8;

View File

@ -1,28 +1,26 @@
<div class="container form-container"> <div class="container form-container">
<div class="row d-flex justify-content-between align-items-center m-0"> <div class="row d-flex justify-content-between align-items-center">
<!-- <div class="col-auto"><a class="logo"><img class="logo" src="../../../assets/images/new-dmp-logo.png" onerror="this.style.display='none'"></a></div> --> <div class="col-auto ml-auto" (click)="close()">
<div class="col-auto ml-auto close-btn" (click)="close()">
<mat-icon class="close-icon">close</mat-icon> <mat-icon class="close-icon">close</mat-icon>
</div> </div>
</div> </div>
<div class="annotation-viewer row"> <div class="row">
<!-- Create New Thread --> <!-- Create New Thread -->
<!-- <div *ngIf="this.canEdit && !this.isDeleted" class="col-12"> -->
<div class="col-12"> <div class="col-12">
<form class="row p-2 mt-2 mb-3 ml-0 pr-3 mr-0 new-thread" [formGroup]="threadFormGroup"> <form [formGroup]="threadFormGroup">
<div class="row mt-2 mb-3">
<div class="col-12 col-md mb-2"> <div class="col-12 col-md mb-2">
<mat-form-field appearance="outline" class="w-100"> <mat-form-field appearance="outline" class="w-100">
<mat-label>{{'ANNOTATION-DIALOG.THREADS.NEW-THREAD' | translate}}</mat-label> <mat-label>{{'ANNOTATION-DIALOG.THREADS.NEW-THREAD' | translate}}</mat-label>
<input matInput formControlName="text" required> <input matInput formControlName="text" required>
<mat-icon matSuffix class="material-symbols-outlined"> <!-- <mat-icon matSuffix class="material-symbols-outlined">
add_reaction add_reaction
</mat-icon> </mat-icon> -->
<mat-error *ngIf="threadFormGroup.get('text').hasError('backendError')">{{threadFormGroup.get('text').getError('backendError')?.message}}</mat-error> <mat-error *ngIf="threadFormGroup.get('text').hasError('backendError')">{{threadFormGroup.get('text').getError('backendError')?.message}}</mat-error>
<mat-error *ngIf="threadFormGroup.get('text').hasError('required')">{{'COMMONS.VALIDATION.REQUIRED' | translate}}</mat-error> <mat-error *ngIf="threadFormGroup.get('text').hasError('required')">{{'COMMONS.VALIDATION.REQUIRED' | translate}}</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="col-12 col-md-auto">
<div class="col-12 col-md-auto pl-md-0 pr-md-0">
<mat-form-field class="w-100 protection-input"> <mat-form-field class="w-100 protection-input">
<mat-label>{{'ANNOTATION-DIALOG.THREADS.PROTECTION.TITLE' | translate}}</mat-label> <mat-label>{{'ANNOTATION-DIALOG.THREADS.PROTECTION.TITLE' | translate}}</mat-label>
<mat-select name="thread-protectionType" formControlName="protectionType" required> <mat-select name="thread-protectionType" formControlName="protectionType" required>
@ -32,7 +30,6 @@
<mat-error *ngIf="threadFormGroup.get('protectionType').hasError('required')">{{'COMMONS.VALIDATION.REQUIRED' | translate}}</mat-error> <mat-error *ngIf="threadFormGroup.get('protectionType').hasError('required')">{{'COMMONS.VALIDATION.REQUIRED' | translate}}</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="col-12 send-msg mt-1"> <div class="col-12 send-msg mt-1">
<div class="row"> <div class="row">
<div class="col-auto pr-1"> <div class="col-auto pr-1">
@ -43,6 +40,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</form> </form>
</div> </div>
<div class="col-12 pt-2 gr-color" *ngIf="threads?.size > 0"> <div class="col-12 pt-2 gr-color" *ngIf="threads?.size > 0">
@ -55,9 +53,9 @@
</div> </div>
<div class="col-12"> <div class="col-12">
<ng-container *ngFor="let thread of threads"> <ng-container *ngFor="let thread of threads">
<div class="row" *ngIf="getParentAnnotation(thread).protectionType === annotationProtectionTypeEnum.Private" matTooltip="{{'ANNOTATION-DIALOG.PROTECTION.PRIVATE' | translate}}"> <div class="row" *ngIf="getParentAnnotation(thread).protectionType === annotationProtectionTypeEnum.Private">
<div class="col-auto ml-auto"> <div class="col-auto ml-auto">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center" matTooltip="{{'ANNOTATION-DIALOG.PROTECTION.PRIVATE' | translate}}">
<img src="/assets/images/annotations/eye-hide.png"> <img src="/assets/images/annotations/eye-hide.png">
<div class="ml-1 mt-1"> <div class="ml-1 mt-1">
{{getAnnotationProtectionType(thread)}} {{getAnnotationProtectionType(thread)}}
@ -65,9 +63,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row ml-auto" *ngIf="getParentAnnotation(thread).protectionType === annotationProtectionTypeEnum.EntityAccessors" matTooltip="{{'ANNOTATION-DIALOG.PROTECTION.ENTITY-ACCESSORS' | translate}}"> <div class="row ml-auto" *ngIf="getParentAnnotation(thread).protectionType === annotationProtectionTypeEnum.EntityAccessors">
<div class="col-auto ml-auto"> <div class="col-auto ml-auto">
<div class="d-flex aling-items center"> <div class="d-flex aling-items center" matTooltip="{{'ANNOTATION-DIALOG.PROTECTION.ENTITY-ACCESSORS' | translate}}">
<img src="/assets/images/annotations/globe.png" alt="globe"> <img src="/assets/images/annotations/globe.png" alt="globe">
<!-- <i class="material-icons protection-icon icon-{{getAnnotationProtectionType(thread)}}"></i> --> <!-- <i class="material-icons protection-icon icon-{{getAnnotationProtectionType(thread)}}"></i> -->
<span class="ml-1"> <span class="ml-1">
@ -76,15 +74,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row pt-1 pb-1 mt-1 comment-wrapper"> <div class="row mt-2 mb-2">
<!-- Parent Thread --> <!-- Parent Thread -->
<div class="col-12"> <div class="col-12">
<div class="row m-0 h-100"> <div class="container">
<div class="col pt-1"> <div class="row comment-wrapper pt-1 pb-2 h-100">
<div class="col-12 pt-1">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="row h-100"> <div class="row h-100">
<div class="col-auto p-0"> <div class="col-auto pr-0">
<img class="profile-picture" src="/assets/images/annotations/user-profile-2.png" alt="profile-picture"> <img class="profile-picture" src="/assets/images/annotations/user-profile-2.png" alt="profile-picture">
</div> </div>
<div class="col"> <div class="col">
@ -114,16 +113,9 @@
</ng-container> </ng-container>
</div> </div>
</div> </div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- Previous Replies --> <!-- Previous Replies -->
<ng-container *ngIf="this.showRepliesPerThread[thread]"> <div *ngIf="this.showRepliesPerThread[thread]" class="row">
<div *ngFor="let annotation of annotationsPerThread[thread]; let i = index;" class="col-12"> <div *ngFor="let annotation of annotationsPerThread[thread]; let i = index;" class="col-12">
<div class="row m-0 h-100"> <div class="row m-0 h-100">
<div class="col-auto pr-0 pl-0"> <div class="col-auto pr-0 pl-0">
@ -153,20 +145,20 @@
</div> </div>
</div> </div>
</div> </div>
</ng-container>
</div> </div>
<div class="row mb-2">
<!-- Type reply in thread --> <!-- Type reply in thread -->
<ng-container *ngIf="this.replyEnabledPerThread[thread]"> <div *ngIf="this.replyEnabledPerThread[thread]" class="row">
<div class="col-12 mt-2"> <div class="col-12 mt-2">
<div class="row new-reply mr-0"> <div class="row new-reply mr-0">
<mat-form-field appearance="outline" class="col pl-0"> <div class="col">
<mat-form-field appearance="outline" class="w-100">
<mat-label>{{'ANNOTATION-DIALOG.THREADS.REPLY' | translate}}</mat-label> <mat-label>{{'ANNOTATION-DIALOG.THREADS.REPLY' | translate}}</mat-label>
<input matInput [formControl]="this.threadReplyTextsFG[thread.toString()].get('replyText')" required> <input matInput [formControl]="this.threadReplyTextsFG[thread.toString()].get('replyText')" required>
<mat-icon matSuffix class="material-symbols-outlined"> <!-- <mat-icon matSuffix class="material-symbols-outlined">
add_reaction add_reaction
</mat-icon> </mat-icon> -->
</mat-form-field> </mat-form-field>
</div>
<div class="col-auto p-0 send-msg"> <div class="col-auto p-0 send-msg">
<button class="form-field-margin" mat-icon-button color="black" (click)="replyThread(thread)" matTooltip="{{'ANNOTATION-DIALOG.THREADS.REPLY' | translate}}"> <button class="form-field-margin" mat-icon-button color="black" (click)="replyThread(thread)" matTooltip="{{'ANNOTATION-DIALOG.THREADS.REPLY' | translate}}">
<img class="paper-plane" src="/assets/images/annotations/paper-plane.png" alt="paper-plane"> <img class="paper-plane" src="/assets/images/annotations/paper-plane.png" alt="paper-plane">
@ -174,7 +166,15 @@
</div> </div>
</div> </div>
</div> </div>
</ng-container> </div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</ng-container> </ng-container>
</div> </div>

View File

@ -1,6 +1,7 @@
<div class="main-content listing-main-container h-100"> <div class="container-fluid">
<div class="container-fluid"> <div class="row">
<div class="d-flex flex-direction-row"> <div class="col-md-10 offset-md-1">
<div class="d-flex flex-direction-row mb-4 mt-4">
<div *ngIf="hasListingItems && listingItems && listingItems.length === 0 && !hasLikeCriteria()" class="card mt-0"> <div *ngIf="hasListingItems && listingItems && listingItems.length === 0 && !hasLikeCriteria()" class="card mt-0">
<!-- <div class="card mt-0" [style.display]="isVisible ? 'block' : 'none'"> --> <!-- <div class="card mt-0" [style.display]="isVisible ? 'block' : 'none'"> -->
<!-- <a class="col-auto d-flex" (click)="closeCard()"><span class="ml-auto pt-3 material-icons clear-icon">clear</span></a> --> <!-- <a class="col-auto d-flex" (click)="closeCard()"><span class="ml-auto pt-3 material-icons clear-icon">clear</span></a> -->
@ -76,4 +77,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>

View File

@ -1,7 +1,8 @@
<div class="main-content listing-main-container h-100">
<div class="container-fluid"> <div class="container-fluid">
<div class="d-flex flex-direction-row"> <div class="row">
<div *ngIf="hasListingItems && listingItems && listingItems.length === 0 && !hasLikeCriteria()" class="card mt-0"> <div class="col-md-10 offset-md-1">
<div class="d-flex flex-direction-row mb-4 mt-4">
<div *ngIf="hasListingItems && listingItems && listingItems.length === 0 && !hasLikeCriteria()" class="card">
<div class="card-content info-text mb-0"> <div class="card-content info-text mb-0">
<p>{{'DMP-LISTING.TEXT-INFO' | translate}}</p> <p>{{'DMP-LISTING.TEXT-INFO' | translate}}</p>
<p class="mt-4 pt-2">{{'DMP-LISTING.TEXT-INFO-QUESTION' | translate}} <a class="zenodo-link" href="https://zenodo.org/communities/liber-dmp-cat/?page=1&size=20" target="_blank">{{'DMP-LISTING.LINK-ZENODO' | translate}}</a> {{'DMP-LISTING.GET-IDEA' | translate}}</p> <p class="mt-4 pt-2">{{'DMP-LISTING.TEXT-INFO-QUESTION' | translate}} <a class="zenodo-link" href="https://zenodo.org/communities/liber-dmp-cat/?page=1&size=20" target="_blank">{{'DMP-LISTING.LINK-ZENODO' | translate}}</a> {{'DMP-LISTING.GET-IDEA' | translate}}</p>
@ -60,4 +61,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>

View File

@ -1,7 +1,8 @@
<div class="row inapp-notification-listing"> <div class="container-fluid">
<div class="col-md-8 offset-md-2"> <div class="row inapp-notification-listing">
<div class="col-md-10 offset-md-1">
<div class="row mb-4 mt-3"> <div class="row mb-4 mt-4">
<div class="col"> <div class="col">
<h4>{{'NOTIFICATION-SERVICE.INAPP-NOTIFICATION-LISTING.TITLE' | translate}}</h4> <h4>{{'NOTIFICATION-SERVICE.INAPP-NOTIFICATION-LISTING.TITLE' | translate}}</h4>
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -24,6 +25,7 @@
</app-hybrid-listing> </app-hybrid-listing>
</div> </div>
</div>
</div> </div>
<ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected"> <ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected">

View File

@ -1,7 +1,7 @@
.inapp-notification-listing { .inapp-notification-listing {
margin-top: 1.3rem; // margin-top: 1.3rem;
margin-left: 1rem; // margin-left: 1rem;
margin-right: 2rem; // margin-right: 2rem;
.mat-header-row{ .mat-header-row{
background: #f3f5f8; background: #f3f5f8;

View File

@ -1,7 +1,11 @@
<div class="supportive-material-editor"> <div class="container-fluid">
<div class="row supportive-material-editor">
<div class="col-md-10 offset-md-1">
<div class="mt-4"></div>
<form *ngIf="formGroup" (ngSubmit)="formSubmit()"> <form *ngIf="formGroup" (ngSubmit)="formSubmit()">
<div> <div>
<mat-card class="col-md-8 offset-md-2 p-3"> <mat-card class="p-1">
<div class="container-fluid mt-3">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<mat-form-field class="w-100"> <mat-form-field class="w-100">
@ -54,10 +58,15 @@
<mat-error *ngIf="formGroup.get('payload').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error> <mat-error *ngIf="formGroup.get('payload').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
</div> </div>
</div> </div>
</div>
</mat-card> </mat-card>
<button mat-fab class="mat-fab-bottom-right save-btn" matTooltip="{{'SUPPORTIVE-MATERIAL-EDITOR.ACTIONS.SAVE' | translate}}" type="submit"> <button mat-fab class="mat-fab-bottom-right save-btn" matTooltip="{{'SUPPORTIVE-MATERIAL-EDITOR.ACTIONS.SAVE' | translate}}" type="submit">
<mat-icon class="mat-24">save</mat-icon> <mat-icon class="mat-24">save</mat-icon>
</button> </button>
</div> </div>
</form> </form>
</div>
</div>
</div> </div>

View File

@ -1,7 +1,7 @@
.supportive-material-editor { .supportive-material-editor {
//padding-top: 5em; //padding-top: 5em;
padding-bottom: 2em; // padding-bottom: 2em;
margin-top: 1em; // margin-top: 1em;
.material{ .material{
//width: 80px; //width: 80px;