- - - chevron_left -

{{'DMP-WIZARD.ACTIONS.BACK' | translate}}

- -
-
-
- - -

Dataset Label dataset label

-
-
- -
-

- Owner - -

+
+ + chevron_left +

{{'DMP-WIZARD.ACTIONS.BACK' | translate}}

+ +
+
+
+ +

{{ dataset.label }}

-
- -
- public - - Public +
+
+

+ {{ roleDisplayFromList(dataset.users) }} +

- -
- - -
{{'GENERAL.STATUSES.EDIT' | translate}} : - - 03/07/2020 -
- -
-
- - - - - - - -
-
{{'DATASET-LISTING.TOOLTIP.PART-OF' | translate}}
-
-
- -
-
{{'DMP-OVERVIEW.GRANT' | translate}}
-
Label
+ +
+ +
{{'DMP-OVERVIEW.GRANT' | translate}}
+
Grant label
{{'DMP-OVERVIEW.RESEARCHERS' | translate}}
-
- +
- - -
-
-
-
+ + + + + + +
-
\ No newline at end of file diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss index 2370e3179..cc76c8022 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss @@ -52,11 +52,16 @@ .dmp-btn { width: 35em; - padding: 0 1em; + height: 2.3em; background-color: #129D99; border-radius: 4px; + flex-direction: rows; justify-content: space-between; - color: #212121; + border: none; +} + +.dmp-btn, .dmp-btn > mat-icon { + color: #ffffff; opacity: 0.8; } @@ -68,13 +73,6 @@ font-weight: 700; } -.add-dataset-btn { - border: none; - font: Bold 0.875em Open Sans; - color: #444444; - background-color: transparent; -} - .frame-btn { border: 1px solid #212121; color: black; @@ -176,6 +174,8 @@ .dmp-btn-label { margin-right: 1em; overflow: hidden; + color: #FFFFFF; + opacity: 0.8; } .doi-label { @@ -269,7 +269,7 @@ align-items: center; } -.dataset-label, .dmp-btn, .add-dataset-btn, +.dataset-label, .dmp-btn, .doi-panel, .researcher { display: flex; align-items: center; 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 5029a259a..e7cbd4742 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 @@ -172,7 +172,7 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { } isDraftDataset(dataset: DatasetOverviewModel) { - // return dataset.status == DatasetStatus.Draft; + return dataset.status == DatasetStatus.Draft; } editClicked(dataset: DatasetOverviewModel) { @@ -212,6 +212,10 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { public getOrcidPath(): string { return this.configurationService.orcidPath; - } + } + + // showPublishButton(dataset: DatasetOverviewModel) { + // return this.isFinalizedDmp(dmp) && !dmp.isPublic && this.hasPublishButton; + // } } diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html index 14334cf22..cd5c4e1f2 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html @@ -78,7 +78,7 @@
{{'DMP-OVERVIEW.RESEARCHERS' | translate}}
- +
 
{{ researcher.name }},
{{ researcher.name }}
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index 453e3c1e8..11ed9caaf 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -567,7 +567,7 @@ } }, "DATASET-OVERVIEW": { - "DATASET-AUTHORS": "Dataset Authors", + "DATASET-AUTHORS": "Dataset description Authors", "ERROR": { "DELETED-DATASET": "The requested dataset is deleted", "FORBIDEN-DATASET": "You are not allowed to access this dataset" diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json index ee404a301..dc4e1e6e4 100644 --- a/dmp-frontend/src/assets/i18n/es.json +++ b/dmp-frontend/src/assets/i18n/es.json @@ -565,7 +565,7 @@ } }, "DATASET-OVERVIEW": { - "DATASET-AUTHORS": "Dataset Autores", + "DATASET-AUTHORS": "Descripciones del Dataset Autores", "ERROR": { "DELETED-DATASET": "El Dataset solicitado está borrado", "FORBIDEN-DATASET": "No tiene permiso para acceder a esto Dataset"