Merge remote-tracking branch 'origin/ui-redesign' into ui-redesign
# Conflicts: # dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.html
|
@ -1,24 +1,24 @@
|
|||
<!-- custom add: isStepUnique -->
|
||||
<div *ngIf="currentTourStep && !isOrbShowing">
|
||||
<div class="guided-tour-user-input-mask" (click)="backdropClick($event)"></div>
|
||||
<div class="guided-tour-spotlight-overlay"
|
||||
[style.top.px]="overlayTop"
|
||||
<div class="guided-tour-spotlight-overlay"
|
||||
[style.top.px]="overlayTop"
|
||||
[style.left.px]="overlayLeft"
|
||||
[style.height.px]="currentTourStep.isStepUnique ? overlayWidth : overlayHeight"
|
||||
[style.height.px]="currentTourStep.isStepUnique ? overlayWidth : overlayHeight"
|
||||
[style.width.px]="overlayWidth">
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="currentTourStep && !isOrbShowing">
|
||||
<div #tourStep *ngIf="currentTourStep"
|
||||
class="tour-step tour-{{ currentTourStep.orientation }}"
|
||||
<div #tourStep *ngIf="currentTourStep"
|
||||
class="tour-step tour-{{ currentTourStep.orientation }}"
|
||||
[ngClass]="{ 'page-tour-step': !currentTourStep.selector }"
|
||||
[style.top.px]="(currentTourStep.selector && selectedElementRect ? topPosition : null)"
|
||||
[style.left.px]="(currentTourStep.selector && selectedElementRect ? leftPosition : null)"
|
||||
[style.width.px]="(currentTourStep.selector && selectedElementRect ? calculatedTourStepWidth : null)"
|
||||
[style.transform]="(currentTourStep.selector && selectedElementRect ? transform : null)">
|
||||
<div *ngIf="currentTourStep.selector" class="tour-arrow"></div>
|
||||
<div class="tour-block d-flex">
|
||||
<div class="col-11">
|
||||
<div class="row tour-block d-flex">
|
||||
<div class="col p-0">
|
||||
<h3 class="tour-title" *ngIf="currentTourStep.title && currentTourStep.selector">
|
||||
{{currentTourStep.title}}
|
||||
</h3>
|
||||
|
@ -36,7 +36,10 @@
|
|||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="argos-present-img col-2"></div>
|
||||
<div class="col-auto p-0 d-flex align-items-end">
|
||||
<img src="../../../assets/splash/assets/img/2_Sign_in/Png/Sign In - Copy.png" width="190px" height="210px">
|
||||
<!-- <div class="argos-present-img"></div> -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -90,12 +90,12 @@ ngx-guided-tour {
|
|||
// transform: translateX(-50%);
|
||||
// left: 50%;
|
||||
/*custom add*/
|
||||
transform: scale(2);
|
||||
left: 494px;
|
||||
transform: scale(2);
|
||||
left: 494px;
|
||||
}
|
||||
/*custom add*/
|
||||
margin-top: 20px;
|
||||
margin-left: 10px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
&.tour-bottom-right, &.tour-top-right {
|
||||
|
@ -153,7 +153,7 @@ ngx-guided-tour {
|
|||
/*custom add*/
|
||||
font-weight: lighter !important;
|
||||
font-size: 16px !important;
|
||||
padding: 28px 74px 0px 65px;
|
||||
padding: 28px 5px 0px 65px;
|
||||
overflow: auto;
|
||||
text-align: left;
|
||||
color: #212121;
|
||||
|
@ -171,7 +171,7 @@ ngx-guided-tour {
|
|||
|
||||
.tour-buttons {
|
||||
overflow: hidden; // clearfix
|
||||
padding: 10px 70px 30px 65px; /*custom add*/
|
||||
padding: 10px 70px 30px 65px; /*custom add*/
|
||||
|
||||
button.link-button {
|
||||
padding-left: 0;
|
||||
|
@ -195,7 +195,7 @@ ngx-guided-tour {
|
|||
// padding-left: 0;
|
||||
border-left: 0;
|
||||
|
||||
/*custom add*/
|
||||
/*custom add*/
|
||||
padding: 0;
|
||||
float: right;
|
||||
width: 133px;
|
||||
|
@ -214,7 +214,7 @@ ngx-guided-tour {
|
|||
// padding-left: 10px;
|
||||
// padding-right: 10px;
|
||||
|
||||
/*custom add*/
|
||||
/*custom add*/
|
||||
float: left;
|
||||
padding: 10px 0px;;
|
||||
width: 101px;
|
||||
|
@ -234,7 +234,7 @@ ngx-guided-tour {
|
|||
|
||||
/*custom add*/
|
||||
.argos-present-img {
|
||||
background: url("../../../assets/splash/assets/img/argos\ present.png") no-repeat;
|
||||
background: url("../../../assets/splash/assets/img/2_Sign_in/Svg/Sign\ In.svg") no-repeat;
|
||||
min-width: 176px;
|
||||
height: 220px;
|
||||
position: relative;
|
||||
|
|
|
@ -234,7 +234,7 @@ span.facebookIcon {
|
|||
|
||||
span.twitterIcon {
|
||||
background: url("../../../../assets/images/argos-login/NoPath\ -\ Copy\ \(5\).png") no-repeat;
|
||||
|
||||
|
||||
}
|
||||
|
||||
span.googleIcon, span.facebookIcon, span.twitterIcon {
|
||||
|
@ -318,8 +318,9 @@ span.zenodoIcon {
|
|||
// }
|
||||
|
||||
.laptop-img {
|
||||
background: url("../../../../assets/splash/assets/img/laptop.png") no-repeat;
|
||||
width: 116px;
|
||||
// background: url("../../../../assets/splash/assets/img/laptop.png") no-repeat;
|
||||
background: url("../../../../assets/splash/assets/img/1_Main/Png/Who\ \ \ Benefits\ Small.png") no-repeat;
|
||||
width: 164px;
|
||||
height: 200px;
|
||||
position: relative;
|
||||
top: -140px;
|
||||
|
|
|
@ -13,7 +13,8 @@
|
|||
</p>
|
||||
<div class="d-flex">
|
||||
<button type="button" class="col-auto align-self-center normal-btn" (click)="openNewDmpDialog()">{{'DASHBOARD.START-YOUR-FIRST-DMP' | translate}}</button>
|
||||
<img class="col-auto ml-auto laptop-img" src="../../../assets/splash/assets/img/laptop.png" width="116" height="139">
|
||||
<!-- <img class="col-auto ml-auto laptop-img" src="../../../assets/splash/assets/img/laptop.png" width="116" height="139"> -->
|
||||
<img class="col-auto ml-auto laptop-img">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -3,19 +3,6 @@
|
|||
{{'DATASET-EDITOR.TITLE.INTRO' | translate}}
|
||||
</div>
|
||||
<div class="col-12 card">
|
||||
<!-- Template Field -->
|
||||
<div class="heading">1.0 {{'DATASET-EDITOR.FIELDS.PROFILE' | translate}}*</div>
|
||||
<div class="profile-form">
|
||||
<mat-form-field>
|
||||
<mat-select placeholder="{{'DATASET-WIZARD.FIRST-STEP.PROFILE'| translate}}" [required]="true" [compareWith]="compareWith" [formControl]="formGroup.get('profile')">
|
||||
<mat-option *ngFor="let profile of availableProfiles" [value]="profile">
|
||||
{{profile.label}}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
<mat-error *ngIf="formGroup.get('profile').hasError('backendError')">{{formGroup.get('profile').getError('backendError').message}}</mat-error>
|
||||
<mat-error *ngIf="formGroup.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<!-- Title Field -->
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
|
@ -62,12 +49,25 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- External Fields -->
|
||||
<app-dataset-external-references-editor-component (formChanged)="onFormChanged($event)" [formGroup]="formGroup" [viewOnly]="viewOnly"></app-dataset-external-references-editor-component>
|
||||
<!-- Template Field -->
|
||||
<div class="heading">1.5 {{'DATASET-EDITOR.FIELDS.PROFILE' | translate}}*</div>
|
||||
<div class="profile-form">
|
||||
<mat-form-field>
|
||||
<mat-select placeholder="{{'DATASET-WIZARD.FIRST-STEP.PROFILE'| translate}}" [required]="true" [compareWith]="compareWith" [formControl]="formGroup.get('profile')">
|
||||
<mat-option *ngFor="let profile of availableProfiles" [value]="profile">
|
||||
{{profile.label}}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
<mat-error *ngIf="formGroup.get('profile').hasError('backendError')">{{formGroup.get('profile').getError('backendError').message}}</mat-error>
|
||||
<mat-error *ngIf="formGroup.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<!-- Template Form -->
|
||||
<div *ngIf="hasProfileId() && formGroup.get('datasetProfileDefinition') !== null">
|
||||
<app-dataset-description [form]="formGroup.get('datasetProfileDefinition')" [visibilityRules]="formGroup.get('datasetProfileDefinition').get('rules').value" [datasetProfileId]="getProfileId()" (formChanged)="onFormChanged($event)"></app-dataset-description>
|
||||
</div>
|
||||
<!-- <app-dataset-description [form]="formGroup.get('datasetProfileDefinition')" [visibilityRules]="formGroup.get('datasetProfileDefinition').get('rules')" [datasetProfileId]="formGroup.get('profile').value">
|
||||
</app-dataset-description> -->
|
||||
|
||||
<!-- Tags field -->
|
||||
<!-- <div class="row">
|
||||
|
|
|
@ -92,7 +92,7 @@
|
|||
<mat-icon class="status-icon check-icon">check</mat-icon>{{'TYPES.DATASET-STATUS.FINALISED' | translate}}
|
||||
</span>
|
||||
<ul class="dataset-list">
|
||||
<li *ngIf="!isNewDataset" [ngClass]="{'active': this.step === i + stepsBeforeDatasets}">{{ dataset.get('label').value }} (9)</li>
|
||||
<li *ngIf="!isNewDataset" [ngClass]="{'active': this.step === i + stepsBeforeDatasets}">{{ dataset.get('label').value }} (5)</li>
|
||||
<li *ngIf="isNewDataset" [ngClass]="{'active': this.step === i + stepsBeforeDatasets}">{{ dataset.get('label').value }}</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
|
After (image error) Size: 55 KiB |
After (image error) Size: 42 KiB |
After (image error) Size: 57 KiB |
After (image error) Size: 395 KiB |
After (image error) Size: 48 KiB |
After (image error) Size: 48 KiB |
After (image error) Size: 54 KiB |
After (image error) Size: 28 KiB |
After (image error) Size: 155 KiB |
After (image error) Size: 205 KiB |
After (image error) Size: 457 KiB |
After (image error) Size: 310 KiB |
After (image error) Size: 482 KiB |
After (image error) Size: 158 KiB |
After (image error) Size: 183 KiB |
After (image error) Size: 196 KiB |
After (image error) Size: 185 KiB |
After (image error) Size: 277 KiB |
After (image error) Size: 241 KiB |
After (image error) Size: 5.0 MiB |
After (image error) Size: 2.8 MiB |
After (image error) Size: 2.0 MiB |
Before (image error) Size: 471 KiB After (image error) Size: 471 KiB |
Before (image error) Size: 240 KiB After (image error) Size: 240 KiB |
Before (image error) Size: 287 KiB After (image error) Size: 287 KiB |
Before (image error) Size: 483 KiB After (image error) Size: 483 KiB |
Before (image error) Size: 25 KiB After (image error) Size: 25 KiB |
Before (image error) Size: 63 KiB After (image error) Size: 63 KiB |
Before (image error) Size: 109 KiB After (image error) Size: 109 KiB |
Before (image error) Size: 178 KiB After (image error) Size: 178 KiB |
Before (image error) Size: 106 KiB After (image error) Size: 106 KiB |
Before (image error) Size: 102 KiB After (image error) Size: 102 KiB |
Before (image error) Size: 103 KiB After (image error) Size: 103 KiB |
After (image error) Size: 27 KiB |
After (image error) Size: 260 KiB |
After (image error) Size: 2.5 MiB |
|
@ -88,7 +88,8 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="col-auto ml-auto">
|
||||
<img src="assets/img/1.png" width="363" height="330">
|
||||
<!-- <img src="assets/img/1.png" width="363" height="330"> -->
|
||||
<img src="assets/img/1_Main/Png/Plan and follow your data.png" width="363" height="445">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -128,7 +129,9 @@
|
|||
<div class="row features-layout">
|
||||
<div class="col">
|
||||
<div class="row feature-img">
|
||||
<div class="col-auto"><img src="assets/img/Asset 15.svg" width="84" height="107"></div>
|
||||
<!-- <div class="col-auto"><img src="assets/img/Asset 15.svg" width="84" height="107"></div> -->
|
||||
<!-- <div class="col-auto"><img src="assets/img/1_Main/Png/Produce DMP outputs.png" width="84" height="107"></div> -->
|
||||
<div class="col-auto"><img src="assets/img/1_Main/Svg/Asset 77.svg" width="84" height="107"></div>
|
||||
</div>
|
||||
<div class="row justify-content-center">
|
||||
<div class="feature-subtitle">Produce DMP outputs</div>
|
||||
|
@ -142,7 +145,9 @@
|
|||
</div>
|
||||
<div class="col">
|
||||
<div class="row feature-img">
|
||||
<img src="assets/img/Asset 14.svg" width="84" height="107">
|
||||
<!-- <img src="assets/img/Asset 14.svg" width="84" height="107"> -->
|
||||
<!-- <img src="assets/img/1_Main/Png/Update DMPs.png" width="84" height="107"> -->
|
||||
<img src="assets/img/1_Main/Svg/Asset 76.svg" width="84" height="107">
|
||||
</div>
|
||||
<div class="row justify-content-center">
|
||||
<div class="feature-subtitle">Update DMPs</div>
|
||||
|
@ -158,7 +163,9 @@
|
|||
<div class="row features-layout">
|
||||
<div class="col">
|
||||
<div class="row feature-img">
|
||||
<img src="assets/img/Asset 12.svg" width="84" height="107">
|
||||
<!-- <img src="assets/img/Asset 12.svg" width="84" height="107"> -->
|
||||
<!-- <img src="assets/img/1_Main/Png/Re-use datasets _ templates.png" width="84" height="107"> -->
|
||||
<img src="assets/img/1_Main/Svg/Asset 75.svg" width="84" height="107">
|
||||
</div>
|
||||
<div class="row justify-content-center">
|
||||
<div class="feature-subtitle">Re-use datasets & templates</div>
|
||||
|
@ -172,7 +179,9 @@
|
|||
</div>
|
||||
<div class="col">
|
||||
<div class="row feature-img">
|
||||
<img src="assets/img/Asset 10.svg" width="84" height="107">
|
||||
<!-- <img src="assets/img/Asset 10.svg" width="84" height="107"> -->
|
||||
<!-- <img src="assets/img/1_Main/Png/Import and Export DMPs.png" width="84" height="107"> -->
|
||||
<img src="assets/img/1_Main/Svg/Asset 74.svg" width="84" height="107">
|
||||
</div>
|
||||
<div class="row justify-content-center">
|
||||
<div class="feature-subtitle">Import and Export DMPs</div>
|
||||
|
@ -188,7 +197,9 @@
|
|||
<div class="row features-layout">
|
||||
<div class="col">
|
||||
<div class="row feature-img">
|
||||
<img src="assets/img/Asset 11.svg" width="84" height="107">
|
||||
<!-- <img src="assets/img/Asset 11.svg" width="84" height="107"> -->
|
||||
<!-- <img src="assets/img/1_Main/Png/Customise dataset descriptions.png" width="84" height="107"> -->
|
||||
<img src="assets/img/1_Main/Svg/Asset 73.svg" width="84" height="107">
|
||||
</div>
|
||||
<div class="row justify-content-center">
|
||||
<div class="feature-subtitle">Customise dataset descriptions</div>
|
||||
|
@ -202,7 +213,9 @@
|
|||
</div>
|
||||
<div class="col">
|
||||
<div class="row feature-img">
|
||||
<img src="assets/img/Asset 13.svg" width="84" height="107">
|
||||
<!-- <img src="assets/img/Asset 13.svg" width="84" height="107"> -->
|
||||
<!-- <img src="assets/img/1_Main/Png/Connect with OpenAIRE _ EOSC.png" width="84" height="107"> -->
|
||||
<img src="assets/img/1_Main/Svg/Asset 72.svg" width="84" height="107">
|
||||
</div>
|
||||
<div class="row justify-content-center">
|
||||
<div class="feature-subtitle">Connect with OpenAIRE & EOSC</div>
|
||||
|
@ -228,7 +241,8 @@
|
|||
<div class="col">
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-auto">
|
||||
<img src="assets/img/2 - Copy.png" width="116" height="139">
|
||||
<!-- <img src="assets/img/2 - Copy.png" width="116" height="139"> -->
|
||||
<img src="assets/img/1_Main/Png/Who Benefits copy.png" width="119" height="139">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -315,7 +329,8 @@
|
|||
<div class="container">
|
||||
<div class="row justify-content-around">
|
||||
<div class="col-auto">
|
||||
<img class="mirror" src="assets/img/3.png" width="311" height="309">
|
||||
<!-- <img class="mirror" src="assets/img/1_Main_PreviousVersion/Png/3.png" width="311" height="309"> -->
|
||||
<img class="mirror" src="assets/img/1_Main/Png/co-branding-m.png" width="311" height="360">
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<div class="row">
|
||||
|
|