diff --git a/dmp-frontend/src/app/library/guided-tour/guided-tour.component.html b/dmp-frontend/src/app/library/guided-tour/guided-tour.component.html index 4438a2a72..3f8e8dc89 100644 --- a/dmp-frontend/src/app/library/guided-tour/guided-tour.component.html +++ b/dmp-frontend/src/app/library/guided-tour/guided-tour.component.html @@ -1,12 +1,17 @@ +
-
+
-
{{currentTourStep.title}} +

+ {{ currentTourStep.title }} +

diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss index 55e9eae24..cdba2f1cc 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss @@ -3,3 +3,7 @@ width: 100%; } } + +.deleteBtn{ + margin-right:2em; +} diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html index 85ff1e9f8..fa430ba7c 100644 --- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html +++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html @@ -26,7 +26,7 @@
{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}
{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}
-
{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}: {{activity.label}}
+
{{activity.label}}
{{ roleDisplay(activity.users) }} . diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html index 8fc40c152..d0246af86 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html @@ -101,7 +101,7 @@
{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}
{{'DATASET-LISTING.STATES.PUBLISHED' | translate}}: {{activity.publishedAt | date:"longDate"}}
-
{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}: {{activity.title}}
+
{{activity.title}}
{{ roleDisplay(activity.users) }} . diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html index 0770be123..725a12afb 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html @@ -28,7 +28,7 @@
{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}
{{'DATASET-LISTING.STATES.PUBLISHED' | translate}}: {{activity.dmpPublishedAt | date:"longDate"}}
-
{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}: {{activity.label}}
+
{{activity.label}}
{{ roleDisplay(activity.users) }} . diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html index 27231dc6c..72ec41e3c 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html +++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html @@ -5,7 +5,7 @@
{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{dataset.modified | date:"longDate"}}
{{'DATASET-LISTING.STATES.PUBLISHED' | translate}}: {{dataset.dmpPublishedAt | date:"longDate"}}
-
{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}: {{dataset.label}}
+
{{dataset.label}}
{{ roleDisplay(dataset.users) }} . diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts index 7832d54cb..62085aae5 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts @@ -90,9 +90,6 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { this.dataset = data; this.researchers = this.dataset.dmp.researchers; this.users = this.dataset.dmp.users; - // this.getDmpResearchers(); - // this.getDmpUsers(); - // this.getDatasetWizardModel(this.dataset.id); this.checkLockStatus(this.dataset.id); this.setIsUserOwner(); const breadCrumbs = []; @@ -118,10 +115,6 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { this.dataset = data; this.researchers = this.dataset.dmp.researchers; this.users = this.dataset.dmp.users; - // this.getDmpResearchers(); - // this.getDmpUsers(); - // this.getDatasetWizardModel(this.dataset.id); - // this.checkLockStatus(this.dataset.id); const breadCrumbs = []; 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 }); @@ -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) { this.lockService.checkLockStatus(id).pipe(takeUntil(this._destroyed)) .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])); } - // 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() { if (this.dataset) { 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 => { if (result) { - this.getDatasetWizardModel(this.dataset.id); - this.datasetWizardModel.status = DatasetStatus.Finalized; - this.datasetWizardService.createDataset(this.datasetWizardModel) + this.datasetWizardService.getSingle(dataset.id) + .pipe(takeUntil(this._destroyed)) + .subscribe(data => { + this.datasetWizardModel = data; + this.datasetWizardModel.status = DatasetStatus.Finalized; + this.datasetWizardService.createDataset(this.datasetWizardModel) .pipe(takeUntil(this._destroyed)) .subscribe( data => this.onUpdateCallbackSuccess(), error => this.onUpdateCallbackError(error) ); + }); } }); } @@ -515,14 +490,18 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { }); dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => { if (result) { - this.getDatasetWizardModel(this.dataset.id); - this.datasetWizardModel.status = DatasetStatus.Draft; - this.datasetWizardService.createDataset(this.datasetWizardModel) + this.datasetWizardService.getSingle(dataset.id) + .pipe(takeUntil(this._destroyed)) + .subscribe(data => { + this.datasetWizardModel = data; + this.datasetWizardModel.status = DatasetStatus.Draft; + this.datasetWizardService.createDataset(this.datasetWizardModel) .pipe(takeUntil(this._destroyed)) .subscribe( data => this.onUpdateCallbackSuccess(), error => this.onUpdateCallbackError(error) ); + }); } }); } diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html index 29f71e157..5a7032899 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html @@ -39,7 +39,7 @@
{{'DATASET-LISTING.TOOLTIP.PART-OF' | translate}}
{{'DATASET-LISTING.TOOLTIP.DMP' | translate}}
-
{{'DATASET-LISTING.TOOLTIP.DMP-FOR' | translate}}: {{ formGroup.get('label').value }}
+
{{ formGroup.get('label').value }}
open_in_new
diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.html b/dmp-frontend/src/app/ui/navbar/navbar.component.html index 5f7074c62..8056b8715 100644 --- a/dmp-frontend/src/app/ui/navbar/navbar.component.html +++ b/dmp-frontend/src/app/ui/navbar/navbar.component.html @@ -7,7 +7,7 @@
- + diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.scss b/dmp-frontend/src/app/ui/navbar/navbar.component.scss index d9c757679..7d0e29640 100644 --- a/dmp-frontend/src/app/ui/navbar/navbar.component.scss +++ b/dmp-frontend/src/app/ui/navbar/navbar.component.scss @@ -30,8 +30,8 @@ $mat-card-header-size: 40px !default; } .logo { - width: 98px; - height: 37px; + // width: 98px; + // height: 37px; margin-top: 15px; margin-left: 5px; } diff --git a/dmp-frontend/src/assets/splash/about/contributors.html b/dmp-frontend/src/assets/splash/about/contributors.html index e733e0660..de730366f 100644 --- a/dmp-frontend/src/assets/splash/about/contributors.html +++ b/dmp-frontend/src/assets/splash/about/contributors.html @@ -84,14 +84,14 @@

Turkish Higher Education Council Research Data and Open Data working group

-
+
- Flag of Austria + Flag of Austria

UNIVERSITY OF VIENNA

Gerda McNeill, Raman Ganguly, Mihaela Hubert

-
+
@@ -144,4 +144,4 @@ - \ No newline at end of file + diff --git a/dmp-frontend/src/assets/splash/assets/img/argos-logo-2.svg b/dmp-frontend/src/assets/splash/assets/img/argos-logo-2.svg new file mode 100644 index 000000000..559d53513 --- /dev/null +++ b/dmp-frontend/src/assets/splash/assets/img/argos-logo-2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/dmp-frontend/src/assets/splash/assets/img/flag-of-austria.png b/dmp-frontend/src/assets/splash/assets/img/flag-of-austria.png new file mode 100644 index 000000000..09b15db05 Binary files /dev/null and b/dmp-frontend/src/assets/splash/assets/img/flag-of-austria.png differ