Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign
This commit is contained in:
commit
9708a0c82d
|
@ -1,12 +1,17 @@
|
||||||
|
<!-- custom add: isStepUnique -->
|
||||||
<div *ngIf="currentTourStep && !isOrbShowing">
|
<div *ngIf="currentTourStep && !isOrbShowing">
|
||||||
<div class="guided-tour-user-input-mask" (click)="backdropClick($event)"></div>
|
<div class="guided-tour-user-input-mask" (click)="backdropClick($event)"></div>
|
||||||
<div class="guided-tour-spotlight-overlay" [style.top.px]="overlayTop" [style.left.px]="overlayLeft"
|
<div class="guided-tour-spotlight-overlay"
|
||||||
[style.height.px]="currentTourStep.isStepUnique ? overlayWidth : overlayHeight" [style.width.px]="overlayWidth">
|
[style.top.px]="overlayTop"
|
||||||
|
[style.left.px]="overlayLeft"
|
||||||
|
[style.height.px]="currentTourStep.isStepUnique ? overlayWidth : overlayHeight"
|
||||||
|
[style.width.px]="overlayWidth">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="currentTourStep && !isOrbShowing">
|
<div *ngIf="currentTourStep && !isOrbShowing">
|
||||||
<div #tourStep *ngIf="currentTourStep" class="tour-step tour-{{ currentTourStep.orientation }}" [ngClass]="{
|
<div #tourStep *ngIf="currentTourStep"
|
||||||
'page-tour-step': !currentTourStep.selector }"
|
class="tour-step tour-{{ currentTourStep.orientation }}"
|
||||||
|
[ngClass]="{ 'page-tour-step': !currentTourStep.selector }"
|
||||||
[style.top.px]="(currentTourStep.selector && selectedElementRect ? topPosition : null)"
|
[style.top.px]="(currentTourStep.selector && selectedElementRect ? topPosition : null)"
|
||||||
[style.left.px]="(currentTourStep.selector && selectedElementRect ? leftPosition : null)"
|
[style.left.px]="(currentTourStep.selector && selectedElementRect ? leftPosition : null)"
|
||||||
[style.width.px]="(currentTourStep.selector && selectedElementRect ? calculatedTourStepWidth : null)"
|
[style.width.px]="(currentTourStep.selector && selectedElementRect ? calculatedTourStepWidth : null)"
|
||||||
|
@ -17,6 +22,9 @@
|
||||||
<h3 class="tour-title" *ngIf="currentTourStep.title && currentTourStep.selector">
|
<h3 class="tour-title" *ngIf="currentTourStep.title && currentTourStep.selector">
|
||||||
{{currentTourStep.title}}
|
{{currentTourStep.title}}
|
||||||
</h3>
|
</h3>
|
||||||
|
<h2 class="tour-title" *ngIf="currentTourStep.title && !currentTourStep.selector">
|
||||||
|
{{ currentTourStep.title }}
|
||||||
|
</h2>
|
||||||
<div class="tour-buttons">
|
<div class="tour-buttons">
|
||||||
<button *ngIf="!guidedTourService.onResizeMessage" class="next-button"
|
<button *ngIf="!guidedTourService.onResizeMessage" class="next-button"
|
||||||
(click)="guidedTourService.nextStep()">
|
(click)="guidedTourService.nextStep()">
|
||||||
|
|
|
@ -14,7 +14,7 @@ ngx-guided-tour {
|
||||||
.guided-tour-spotlight-overlay {
|
.guided-tour-spotlight-overlay {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
box-shadow: 0 0 0 9999px rgba(0,0,0,.7), 0 0 1.5rem rgba(0,0,0,.5);
|
box-shadow: 0 0 0 9999px rgba(0,0,0,.7), 0 0 1.5rem rgba(0,0,0,.5);
|
||||||
border-radius: 44px;
|
border-radius: 44px; /*custom add*/
|
||||||
}
|
}
|
||||||
|
|
||||||
.tour-orb {
|
.tour-orb {
|
||||||
|
@ -56,7 +56,8 @@ ngx-guided-tour {
|
||||||
.tour-step {
|
.tour-step {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
&.page-tour-step {
|
&.page-tour-step {
|
||||||
max-width: 1043px;
|
// max-width: 400px;
|
||||||
|
max-width: 1043px; /*custom add*/
|
||||||
width: 50%;
|
width: 50%;
|
||||||
left: 50%;
|
left: 50%;
|
||||||
top: 50%;
|
top: 50%;
|
||||||
|
@ -85,14 +86,16 @@ ngx-guided-tour {
|
||||||
}
|
}
|
||||||
|
|
||||||
&.tour-bottom , &.tour-top {
|
&.tour-bottom , &.tour-top {
|
||||||
margin-top: 20px;
|
|
||||||
margin-left: 10px;
|
|
||||||
.tour-arrow::before {
|
.tour-arrow::before {
|
||||||
// transform: translateX(-50%);
|
// transform: translateX(-50%);
|
||||||
// left: 50%;
|
// left: 50%;
|
||||||
|
/*custom add*/
|
||||||
transform: scale(2);
|
transform: scale(2);
|
||||||
left: 494px;
|
left: 494px;
|
||||||
}
|
}
|
||||||
|
/*custom add*/
|
||||||
|
margin-top: 20px;
|
||||||
|
margin-left: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
&.tour-bottom-right, &.tour-top-right {
|
&.tour-bottom-right, &.tour-top-right {
|
||||||
|
@ -121,29 +124,36 @@ ngx-guided-tour {
|
||||||
}
|
}
|
||||||
|
|
||||||
&.tour-right {
|
&.tour-right {
|
||||||
margin-left: 10px;
|
margin-left: 10px; /*custom add*/
|
||||||
.tour-arrow::before {
|
.tour-arrow::before {
|
||||||
transform: scale(1.5);
|
transform: scale(1.5); /*custom add*/
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 0;
|
left: 0;
|
||||||
top: 5px;
|
top: 5px;
|
||||||
}
|
}
|
||||||
.tour-block {
|
.tour-block {
|
||||||
margin-top: -15px;
|
margin-top: -15px; /*custom add*/
|
||||||
margin-left: 10px;
|
margin-left: 10px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.tour-block {
|
.tour-block {
|
||||||
padding: 15px 25px;
|
// padding: 15px 25px;
|
||||||
|
|
||||||
|
/*custom add*/
|
||||||
|
padding: 15px 25px 15px 0px;
|
||||||
max-height: 348px;
|
max-height: 348px;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tour-title {
|
.tour-title {
|
||||||
|
// font-weight: bold !important;
|
||||||
|
// padding-bottom: 20px;
|
||||||
|
|
||||||
|
/*custom add*/
|
||||||
font-weight: lighter !important;
|
font-weight: lighter !important;
|
||||||
font-size: 16px !important;
|
font-size: 16px !important;
|
||||||
padding: 28px 45px 0px 65px;
|
padding: 28px 74px 0px 65px;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
color: #212121;
|
color: #212121;
|
||||||
|
@ -161,7 +171,7 @@ ngx-guided-tour {
|
||||||
|
|
||||||
.tour-buttons {
|
.tour-buttons {
|
||||||
overflow: hidden; // clearfix
|
overflow: hidden; // clearfix
|
||||||
padding: 10px 45px 30px 65px;
|
padding: 10px 70px 30px 65px; /*custom add*/
|
||||||
|
|
||||||
button.link-button {
|
button.link-button {
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
|
@ -182,8 +192,11 @@ ngx-guided-tour {
|
||||||
}
|
}
|
||||||
|
|
||||||
button.skip-button.link-button {
|
button.skip-button.link-button {
|
||||||
padding: 0;
|
// padding-left: 0;
|
||||||
border-left: 0;
|
border-left: 0;
|
||||||
|
|
||||||
|
/*custom add*/
|
||||||
|
padding: 0;
|
||||||
float: right;
|
float: right;
|
||||||
width: 133px;
|
width: 133px;
|
||||||
height: 40px;
|
height: 40px;
|
||||||
|
@ -192,20 +205,23 @@ ngx-guided-tour {
|
||||||
color: #129D99;
|
color: #129D99;
|
||||||
}
|
}
|
||||||
|
|
||||||
.back-button {
|
|
||||||
float: right;
|
|
||||||
}
|
|
||||||
|
|
||||||
.next-button {
|
.next-button {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
float: left;
|
// border-radius: 1px;
|
||||||
|
// float: right;
|
||||||
border: none;
|
border: none;
|
||||||
outline: none;
|
outline: none;
|
||||||
|
// padding-left: 10px;
|
||||||
|
// padding-right: 10px;
|
||||||
|
|
||||||
|
/*custom add*/
|
||||||
|
float: left;
|
||||||
padding: 10px 0px;;
|
padding: 10px 0px;;
|
||||||
width: 101px;
|
width: 101px;
|
||||||
background: #129D99 0% 0% no-repeat padding-box;
|
background: #129D99 0% 0% no-repeat padding-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*custom add*/
|
||||||
button.skip-button.link-button, .next-button {
|
button.skip-button.link-button, .next-button {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
@ -216,13 +232,14 @@ ngx-guided-tour {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*custom add*/
|
||||||
.argos-present-img {
|
.argos-present-img {
|
||||||
background: url("../../../assets/splash/assets/img/argos\ present.png") no-repeat;
|
background: url("../../../assets/splash/assets/img/argos\ present.png") no-repeat;
|
||||||
min-width: 176px;
|
min-width: 176px;
|
||||||
height: 220px;
|
height: 220px;
|
||||||
position: relative;
|
position: relative;
|
||||||
top: 110px;
|
top: 110px;
|
||||||
left: -65px;
|
left: -85px;
|
||||||
border-top: none;
|
border-top: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,6 @@ export class GuidedTourComponent implements AfterViewInit, OnDestroy {
|
||||||
@Input() public minimalTourStepWidth?= 500;
|
@Input() public minimalTourStepWidth?= 500;
|
||||||
@Input() public skipText?= 'Leave Tour';
|
@Input() public skipText?= 'Leave Tour';
|
||||||
@Input() public nextText?= 'Got it!';
|
@Input() public nextText?= 'Got it!';
|
||||||
@Input() public progressIndicator?: TemplateRef<any> = undefined;
|
|
||||||
@ViewChild('tourStep', { static: false }) public tourStep: ElementRef;
|
@ViewChild('tourStep', { static: false }) public tourStep: ElementRef;
|
||||||
public highlightPadding = 4;
|
public highlightPadding = 4;
|
||||||
public currentTourStep: TourStep = null;
|
public currentTourStep: TourStep = null;
|
||||||
|
@ -30,7 +29,7 @@ export class GuidedTourComponent implements AfterViewInit, OnDestroy {
|
||||||
constructor(
|
constructor(
|
||||||
public guidedTourService: GuidedTourService,
|
public guidedTourService: GuidedTourService,
|
||||||
private windowRef: WindowRefService,
|
private windowRef: WindowRefService,
|
||||||
private changeDetectorRef: ChangeDetectorRef,
|
private changeDetectorRef: ChangeDetectorRef, /*custom add*/
|
||||||
@Inject(DOCUMENT) private dom: any
|
@Inject(DOCUMENT) private dom: any
|
||||||
) { }
|
) { }
|
||||||
|
|
||||||
|
@ -63,7 +62,7 @@ export class GuidedTourComponent implements AfterViewInit, OnDestroy {
|
||||||
if (step && step.selector) {
|
if (step && step.selector) {
|
||||||
const selectedElement = this.dom.querySelector(step.selector);
|
const selectedElement = this.dom.querySelector(step.selector);
|
||||||
if (selectedElement) {
|
if (selectedElement) {
|
||||||
this.handleOrb();
|
this.handleOrb(); /*custom add*/
|
||||||
this.scrollToAndSetElement();
|
this.scrollToAndSetElement();
|
||||||
} else {
|
} else {
|
||||||
this.selectedElementRect = null;
|
this.selectedElementRect = null;
|
||||||
|
@ -86,6 +85,7 @@ export class GuidedTourComponent implements AfterViewInit, OnDestroy {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*custom add*/
|
||||||
ngAfterContentChecked() {
|
ngAfterContentChecked() {
|
||||||
this.changeDetectorRef.detectChanges();
|
this.changeDetectorRef.detectChanges();
|
||||||
}
|
}
|
||||||
|
@ -337,6 +337,9 @@ export class GuidedTourComponent implements AfterViewInit, OnDestroy {
|
||||||
|
|
||||||
public get overlayTop(): number {
|
public get overlayTop(): number {
|
||||||
if (this.selectedElementRect) {
|
if (this.selectedElementRect) {
|
||||||
|
// return this.selectedElementRect.top - this.getHighlightPadding();
|
||||||
|
|
||||||
|
/*custom add*/
|
||||||
let customTopOffset = 0;
|
let customTopOffset = 0;
|
||||||
if (this.currentTourStep.customTopOffset) {
|
if (this.currentTourStep.customTopOffset) {
|
||||||
customTopOffset = this.currentTourStep.customTopOffset;
|
customTopOffset = this.currentTourStep.customTopOffset;
|
||||||
|
|
|
@ -20,9 +20,10 @@ export interface TourStep {
|
||||||
useHighlightPadding?: boolean;
|
useHighlightPadding?: boolean;
|
||||||
/** Adds padding around tour highlighting in pixels, this overwrites the default for this step. Is not dependent on useHighlightPadding being true */
|
/** Adds padding around tour highlighting in pixels, this overwrites the default for this step. Is not dependent on useHighlightPadding being true */
|
||||||
highlightPadding?: number;
|
highlightPadding?: number;
|
||||||
/** True if the tour has no other step */
|
|
||||||
|
/** CUSTOM ADD: True if the tour has no other step */
|
||||||
isStepUnique?: boolean;
|
isStepUnique?: boolean;
|
||||||
/** Adds offset in pixels to the calculated overlayTop */
|
/** CUSTOM ADD: Adds offset in pixels to the calculated overlayTop */
|
||||||
customTopOffset?: number;
|
customTopOffset?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -77,33 +77,33 @@ export class GuidedTourService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// public backStep(): void {
|
public backStep(): void {
|
||||||
// if (this._currentTour.steps[this._currentTourStepIndex].closeAction) {
|
if (this._currentTour.steps[this._currentTourStepIndex].closeAction) {
|
||||||
// this._currentTour.steps[this._currentTourStepIndex].closeAction();
|
this._currentTour.steps[this._currentTourStepIndex].closeAction();
|
||||||
// }
|
}
|
||||||
// if (this._currentTour.steps[this._currentTourStepIndex - 1]) {
|
if (this._currentTour.steps[this._currentTourStepIndex - 1]) {
|
||||||
// this._currentTourStepIndex--;
|
this._currentTourStepIndex--;
|
||||||
// this._setFirstAndLast();
|
this._setFirstAndLast();
|
||||||
// if (this._currentTour.steps[this._currentTourStepIndex].action) {
|
if (this._currentTour.steps[this._currentTourStepIndex].action) {
|
||||||
// this._currentTour.steps[this._currentTourStepIndex].action();
|
this._currentTour.steps[this._currentTourStepIndex].action();
|
||||||
// setTimeout(() => {
|
setTimeout(() => {
|
||||||
// if (this._checkSelectorValidity()) {
|
if (this._checkSelectorValidity()) {
|
||||||
// this._guidedTourCurrentStepSubject.next(this.getPreparedTourStep(this._currentTourStepIndex));
|
this._guidedTourCurrentStepSubject.next(this.getPreparedTourStep(this._currentTourStepIndex));
|
||||||
// } else {
|
} else {
|
||||||
// this.backStep();
|
this.backStep();
|
||||||
// }
|
}
|
||||||
// });
|
});
|
||||||
// } else {
|
} else {
|
||||||
// if (this._checkSelectorValidity()) {
|
if (this._checkSelectorValidity()) {
|
||||||
// this._guidedTourCurrentStepSubject.next(this.getPreparedTourStep(this._currentTourStepIndex));
|
this._guidedTourCurrentStepSubject.next(this.getPreparedTourStep(this._currentTourStepIndex));
|
||||||
// } else {
|
} else {
|
||||||
// this.backStep();
|
this.backStep();
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// } else {
|
} else {
|
||||||
// this.resetTour();
|
this.resetTour();
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
public skipTour(): void {
|
public skipTour(): void {
|
||||||
if (this._currentTour.skipCallback) {
|
if (this._currentTour.skipCallback) {
|
||||||
|
|
|
@ -54,7 +54,7 @@
|
||||||
<mat-expansion-panel *ngFor="let section of dataModel.sections; let i=index;" #panel>
|
<mat-expansion-panel *ngFor="let section of dataModel.sections; let i=index;" #panel>
|
||||||
<mat-expansion-panel-header>
|
<mat-expansion-panel-header>
|
||||||
<mat-panel-title>{{i + 1}}. {{form.get('sections').get(''+i).get('title').value}}</mat-panel-title>
|
<mat-panel-title>{{i + 1}}. {{form.get('sections').get(''+i).get('title').value}}</mat-panel-title>
|
||||||
<div class="row">
|
<div class="row deleteBtn">
|
||||||
<!-- <span class="col">{{i + 1}}. {{form.get('sections').get(''+i).get('title').value}}</span> -->
|
<!-- <span class="col">{{i + 1}}. {{form.get('sections').get(''+i).get('title').value}}</span> -->
|
||||||
<button mat-icon-button type="button" class="deleteBtn col-auto" (click)="DeleteSectionInSection(i);" [disabled]="viewOnly">
|
<button mat-icon-button type="button" class="deleteBtn col-auto" (click)="DeleteSectionInSection(i);" [disabled]="viewOnly">
|
||||||
<mat-icon>delete</mat-icon>
|
<mat-icon>delete</mat-icon>
|
||||||
|
|
|
@ -4,5 +4,5 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.deleteBtn{
|
.deleteBtn{
|
||||||
margin-right:0.7em;
|
margin-right:2em;
|
||||||
}
|
}
|
|
@ -55,7 +55,7 @@
|
||||||
<mat-expansion-panel-header>
|
<mat-expansion-panel-header>
|
||||||
<mat-panel-title>{{i + 1}}. {{form.get('sections').get(''+i).get('title').value}}
|
<mat-panel-title>{{i + 1}}. {{form.get('sections').get(''+i).get('title').value}}
|
||||||
</mat-panel-title>
|
</mat-panel-title>
|
||||||
<button mat-icon-button type="button" (click)="DeleteSection(i);" [disabled]="viewOnly">
|
<button mat-icon-button type="button" class="deleteBtn" (click)="DeleteSection(i);" [disabled]="viewOnly">
|
||||||
<mat-icon>delete</mat-icon>
|
<mat-icon>delete</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
</mat-expansion-panel-header>
|
</mat-expansion-panel-header>
|
||||||
|
|
|
@ -3,3 +3,7 @@
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.deleteBtn{
|
||||||
|
margin-right:2em;
|
||||||
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
<div class="col-auto dataset-label">{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}</div>
|
<div class="col-auto dataset-label">{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}</div>
|
||||||
<div class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}</div>
|
<div class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto dataset-title">{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}: {{activity.label}}</div>
|
<div class="col-auto dataset-title">{{activity.label}}</div>
|
||||||
<div class="dataset-subtitle">
|
<div class="dataset-subtitle">
|
||||||
<span class="col-auto">{{ roleDisplay(activity.users) }}</span>
|
<span class="col-auto">{{ roleDisplay(activity.users) }}</span>
|
||||||
<span>.</span>
|
<span>.</span>
|
||||||
|
|
|
@ -101,7 +101,7 @@
|
||||||
<div *ngIf="!publicMode" class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}</div>
|
<div *ngIf="!publicMode" class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}</div>
|
||||||
<div *ngIf="publicMode" class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.PUBLISHED' | translate}}: {{activity.publishedAt | date:"longDate"}}</div>
|
<div *ngIf="publicMode" class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.PUBLISHED' | translate}}: {{activity.publishedAt | date:"longDate"}}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto dataset-title">{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}: {{activity.title}}</div>
|
<div class="col-auto dataset-title">{{activity.title}}</div>
|
||||||
<div class="dataset-subtitle">
|
<div class="dataset-subtitle">
|
||||||
<span class="col-auto">{{ roleDisplay(activity.users) }}</span>
|
<span class="col-auto">{{ roleDisplay(activity.users) }}</span>
|
||||||
<span>.</span>
|
<span>.</span>
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
<div *ngIf="!publicMode" class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}</div>
|
<div *ngIf="!publicMode" class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}</div>
|
||||||
<div *ngIf="publicMode" class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.PUBLISHED' | translate}}: {{activity.dmpPublishedAt | date:"longDate"}}</div>
|
<div *ngIf="publicMode" class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.PUBLISHED' | translate}}: {{activity.dmpPublishedAt | date:"longDate"}}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto dataset-title">{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}: {{activity.label}}</div>
|
<div class="col-auto dataset-title">{{activity.label}}</div>
|
||||||
<div class="dataset-subtitle">
|
<div class="dataset-subtitle">
|
||||||
<span class="col-auto">{{ roleDisplay(activity.users) }}</span>
|
<span class="col-auto">{{ roleDisplay(activity.users) }}</span>
|
||||||
<span>.</span>
|
<span>.</span>
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<div *ngIf="!isPublic" class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{dataset.modified | date:"longDate"}}</div>
|
<div *ngIf="!isPublic" class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{dataset.modified | date:"longDate"}}</div>
|
||||||
<div *ngIf="isPublic" class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.PUBLISHED' | translate}}: {{dataset.dmpPublishedAt | date:"longDate"}}</div>
|
<div *ngIf="isPublic" class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.PUBLISHED' | translate}}: {{dataset.dmpPublishedAt | date:"longDate"}}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto dataset-title">{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}: {{dataset.label}}</div>
|
<div class="col-auto dataset-title">{{dataset.label}}</div>
|
||||||
<div class="dataset-subtitle">
|
<div class="dataset-subtitle">
|
||||||
<span *ngIf="isUserDatasetRelated()" class="col-auto">{{ roleDisplay(dataset.users) }}</span>
|
<span *ngIf="isUserDatasetRelated()" class="col-auto">{{ roleDisplay(dataset.users) }}</span>
|
||||||
<span *ngIf="isUserDatasetRelated()">.</span>
|
<span *ngIf="isUserDatasetRelated()">.</span>
|
||||||
|
|
|
@ -90,9 +90,6 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
|
||||||
this.dataset = data;
|
this.dataset = data;
|
||||||
this.researchers = this.dataset.dmp.researchers;
|
this.researchers = this.dataset.dmp.researchers;
|
||||||
this.users = this.dataset.dmp.users;
|
this.users = this.dataset.dmp.users;
|
||||||
// this.getDmpResearchers();
|
|
||||||
// this.getDmpUsers();
|
|
||||||
// this.getDatasetWizardModel(this.dataset.id);
|
|
||||||
this.checkLockStatus(this.dataset.id);
|
this.checkLockStatus(this.dataset.id);
|
||||||
this.setIsUserOwner();
|
this.setIsUserOwner();
|
||||||
const breadCrumbs = [];
|
const breadCrumbs = [];
|
||||||
|
@ -118,10 +115,6 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
|
||||||
this.dataset = data;
|
this.dataset = data;
|
||||||
this.researchers = this.dataset.dmp.researchers;
|
this.researchers = this.dataset.dmp.researchers;
|
||||||
this.users = this.dataset.dmp.users;
|
this.users = this.dataset.dmp.users;
|
||||||
// this.getDmpResearchers();
|
|
||||||
// this.getDmpUsers();
|
|
||||||
// this.getDatasetWizardModel(this.dataset.id);
|
|
||||||
// this.checkLockStatus(this.dataset.id);
|
|
||||||
const breadCrumbs = [];
|
const breadCrumbs = [];
|
||||||
breadCrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.PUBLIC DATASETS'), url: "/explore" });
|
breadCrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.PUBLIC DATASETS'), url: "/explore" });
|
||||||
breadCrumbs.push({ parentComponentName: 'DatasetListingComponent', label: this.dataset.label, url: '/datasets/publicOverview/' + this.dataset.id });
|
breadCrumbs.push({ parentComponentName: 'DatasetListingComponent', label: this.dataset.label, url: '/datasets/publicOverview/' + this.dataset.id });
|
||||||
|
@ -138,14 +131,6 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
getDatasetWizardModel(id: string) {
|
|
||||||
this.datasetWizardService.getSingle(id)
|
|
||||||
.pipe(takeUntil(this._destroyed))
|
|
||||||
.subscribe(data => {
|
|
||||||
this.datasetWizardModel = data;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
checkLockStatus(id: string) {
|
checkLockStatus(id: string) {
|
||||||
this.lockService.checkLockStatus(id).pipe(takeUntil(this._destroyed))
|
this.lockService.checkLockStatus(id).pipe(takeUntil(this._destroyed))
|
||||||
.subscribe(lockStatus => this.lockStatus = lockStatus);
|
.subscribe(lockStatus => this.lockStatus = lockStatus);
|
||||||
|
@ -170,20 +155,6 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
|
||||||
this.router.navigateByUrl('/reload', { skipLocationChange: true }).then(() => this.router.navigate([path]));
|
this.router.navigateByUrl('/reload', { skipLocationChange: true }).then(() => this.router.navigate([path]));
|
||||||
}
|
}
|
||||||
|
|
||||||
// getDmpResearchers() {
|
|
||||||
// this.dmpService.getSingle(this.dataset.dmp.id).pipe(takeUntil(this._destroyed))
|
|
||||||
// .subscribe(data => {
|
|
||||||
// this.researchers = data.researchers;
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
|
|
||||||
// getDmpUsers() {
|
|
||||||
// this.dmpService.getSingle(this.dataset.dmp.id).pipe(takeUntil(this._destroyed))
|
|
||||||
// .subscribe(data => {
|
|
||||||
// this.users = data.users;
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
|
|
||||||
setIsUserOwner() {
|
setIsUserOwner() {
|
||||||
if (this.dataset) {
|
if (this.dataset) {
|
||||||
const principal: Principal = this.authentication.current();
|
const principal: Principal = this.authentication.current();
|
||||||
|
@ -487,14 +458,18 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
|
||||||
});
|
});
|
||||||
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
|
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
|
||||||
if (result) {
|
if (result) {
|
||||||
this.getDatasetWizardModel(this.dataset.id);
|
this.datasetWizardService.getSingle(dataset.id)
|
||||||
this.datasetWizardModel.status = DatasetStatus.Finalized;
|
.pipe(takeUntil(this._destroyed))
|
||||||
this.datasetWizardService.createDataset(this.datasetWizardModel)
|
.subscribe(data => {
|
||||||
|
this.datasetWizardModel = data;
|
||||||
|
this.datasetWizardModel.status = DatasetStatus.Finalized;
|
||||||
|
this.datasetWizardService.createDataset(this.datasetWizardModel)
|
||||||
.pipe(takeUntil(this._destroyed))
|
.pipe(takeUntil(this._destroyed))
|
||||||
.subscribe(
|
.subscribe(
|
||||||
data => this.onUpdateCallbackSuccess(),
|
data => this.onUpdateCallbackSuccess(),
|
||||||
error => this.onUpdateCallbackError(error)
|
error => this.onUpdateCallbackError(error)
|
||||||
);
|
);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -515,14 +490,18 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
|
||||||
});
|
});
|
||||||
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
|
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
|
||||||
if (result) {
|
if (result) {
|
||||||
this.getDatasetWizardModel(this.dataset.id);
|
this.datasetWizardService.getSingle(dataset.id)
|
||||||
this.datasetWizardModel.status = DatasetStatus.Draft;
|
.pipe(takeUntil(this._destroyed))
|
||||||
this.datasetWizardService.createDataset(this.datasetWizardModel)
|
.subscribe(data => {
|
||||||
|
this.datasetWizardModel = data;
|
||||||
|
this.datasetWizardModel.status = DatasetStatus.Draft;
|
||||||
|
this.datasetWizardService.createDataset(this.datasetWizardModel)
|
||||||
.pipe(takeUntil(this._destroyed))
|
.pipe(takeUntil(this._destroyed))
|
||||||
.subscribe(
|
.subscribe(
|
||||||
data => this.onUpdateCallbackSuccess(),
|
data => this.onUpdateCallbackSuccess(),
|
||||||
error => this.onUpdateCallbackError(error)
|
error => this.onUpdateCallbackError(error)
|
||||||
);
|
);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
<div class="col-auto dataset-part-of">{{'DATASET-LISTING.TOOLTIP.PART-OF' | translate}}
|
<div class="col-auto dataset-part-of">{{'DATASET-LISTING.TOOLTIP.PART-OF' | translate}}
|
||||||
<div class="col-auto dmp-label ml-3">{{'DATASET-LISTING.TOOLTIP.DMP' | translate}}</div>
|
<div class="col-auto dmp-label ml-3">{{'DATASET-LISTING.TOOLTIP.DMP' | translate}}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto dmp-title">{{'DATASET-LISTING.TOOLTIP.DMP-FOR' | translate}}: {{ formGroup.get('label').value }}</div>
|
<div class="col-auto dmp-title">{{ formGroup.get('label').value }}</div>
|
||||||
<div class="col d-flex align-items-center">
|
<div class="col d-flex align-items-center">
|
||||||
<a [routerLink]="['/overview/' + formGroup.get('id').value]" target="_blank" class="pointer"><span class="material-icons">open_in_new</span></a>
|
<a [routerLink]="['/overview/' + formGroup.get('id').value]" target="_blank" class="pointer"><span class="material-icons">open_in_new</span></a>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<div class="icon-bar2"></div>
|
<div class="icon-bar2"></div>
|
||||||
<div class="icon-bar3"></div>
|
<div class="icon-bar3"></div>
|
||||||
</div>
|
</div>
|
||||||
<a class="logo"><img src="../../../assets/splash/assets/img/argos-logo.svg"></a>
|
<a class="logo"><img src="../../../assets/splash/assets/img/argos-logo-2.svg"></a>
|
||||||
<button class="navbar-toggler ml-auto" type="button" [matMenuTriggerFor]="toggleMenu">
|
<button class="navbar-toggler ml-auto" type="button" [matMenuTriggerFor]="toggleMenu">
|
||||||
<mat-icon class="toggle-icon">view_headline</mat-icon>
|
<mat-icon class="toggle-icon">view_headline</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -30,8 +30,8 @@ $mat-card-header-size: 40px !default;
|
||||||
}
|
}
|
||||||
|
|
||||||
.logo {
|
.logo {
|
||||||
width: 98px;
|
// width: 98px;
|
||||||
height: 37px;
|
// height: 37px;
|
||||||
margin-top: 15px;
|
margin-top: 15px;
|
||||||
margin-left: 5px;
|
margin-left: 5px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,7 +86,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card flex-row">
|
<div class="card flex-row">
|
||||||
<img class="col-4 flag" alt="Flag of Austria" src="../assets/img/flag-of-germany.png">
|
<img class="col-4 flag" alt="Flag of Austria" src="../assets/img/flag-of-austria.png">
|
||||||
<div class="col-8 card-body pl-0" class="flex-column align-items-center">
|
<div class="col-8 card-body pl-0" class="flex-column align-items-center">
|
||||||
<p class="card-text-1">UNIVERSITY OF VIENNA</p>
|
<p class="card-text-1">UNIVERSITY OF VIENNA</p>
|
||||||
<p class="card-text-2">Gerda McNeill, Raman Ganguly, Mihaela Hubert</p>
|
<p class="card-text-2">Gerda McNeill, Raman Ganguly, Mihaela Hubert</p>
|
||||||
|
|
File diff suppressed because one or more lines are too long
After Width: | Height: | Size: 7.1 KiB |
Binary file not shown.
After Width: | Height: | Size: 19 KiB |
Loading…
Reference in New Issue