MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Fixes: dataset editor submit buttons, Adds: translate

This commit is contained in:
apapachristou 2019-06-03 15:54:09 +03:00
parent ba96f41a7e
commit 988fdc3ebb
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html
View File

@ -43,7 +43,7 @@
<mat-tab> <mat-tab>
<ng-template mat-tab-label class="tab-label"> <ng-template mat-tab-label class="tab-label">
<i class="material-icons-outlined mr-2">view_agenda</i> <i class="material-icons-outlined mr-2">view_agenda</i>
DATASET DETAILS {{'DATASET-PROFILE-EDITOR.STEPS.PAGES.DATASET-DETAILS' | translate}}
</ng-template> </ng-template>
<form *ngIf="formGroup" [formGroup]="formGroup" class="p-3"> <form *ngIf="formGroup" [formGroup]="formGroup" class="p-3">
<mat-form-field class="col-md-6"> <mat-form-field class="col-md-6">
@ -68,7 +68,7 @@
<mat-tab> <mat-tab>
<ng-template mat-tab-label> <ng-template mat-tab-label>
<mat-icon class="mr-2">work_outline</mat-icon> <mat-icon class="mr-2">work_outline</mat-icon>
EXTERNAL REFERENCES {{'DATASET-PROFILE-EDITOR.STEPS.PAGES.EXTERNAL-REFERENCES' | translate}}
</ng-template> </ng-template>
<form *ngIf="formGroup" [formGroup]="formGroup" class="p-3"> <form *ngIf="formGroup" [formGroup]="formGroup" class="p-3">
<app-dataset-external-references-editor-component [formGroup]="formGroup" <app-dataset-external-references-editor-component [formGroup]="formGroup"
@ -79,7 +79,7 @@
<ng-template mat-tab-label> <ng-template mat-tab-label>
<div class="d-flex"> <div class="d-flex">
<mat-icon class="mr-2">library_books</mat-icon> <mat-icon class="mr-2">library_books</mat-icon>
DESCRIPTION {{'DATASET-PROFILE-EDITOR.STEPS.PAGES.DESCRIPTION' | translate}}
</div> </div>
</ng-template> </ng-template>
<app-dataset-description-form <app-dataset-description-form
@ -92,12 +92,12 @@
</mat-tab-group> </mat-tab-group>
<div class="actions"> <div class="actions">
<button mat-raised-button (click)="cancel()" type="button" class="cancelButton"> <button mat-raised-button (click)="cancel()" type="button" class="cancelButton" color="primary">
{{'DMP-EDITOR.ACTIONS.CANCEL' | translate}} {{'DMP-EDITOR.ACTIONS.CANCEL' | translate}}
</button> </button>
<button *ngIf="datasetWizardModel.status == 0 || isNew" mat-raised-button class="saveButton" (click)="save();" <button *ngIf="datasetWizardModel.status == 0 || isNew" mat-raised-button [disabled]="!formGroup.valid" class="saveButton" color="primary" (click)="save();"
type="button">{{ 'DATASET-WIZARD.ACTIONS.SAVE' | translate }}</button> type="button">{{ 'DATASET-WIZARD.ACTIONS.SAVE' | translate }}</button>
<button *ngIf="datasetWizardModel.status == 0 || isNew" mat-raised-button [disabled]="!formGroup.valid" class="saveAndFinalizeButton" <button *ngIf="datasetWizardModel.status == 0 || isNew" mat-raised-button [disabled]="!formGroup.valid" class="saveAndFinalizeButton" color="primary"
(click)="saveFinalize();" (click)="saveFinalize();"
type="button">{{ 'DATASET-WIZARD.ACTIONS.SAVE-AND-FINALISE' | translate }}</button> type="button">{{ 'DATASET-WIZARD.ACTIONS.SAVE-AND-FINALISE' | translate }}</button>
<div class="fill-space"></div> <div class="fill-space"></div>

19
dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss
View File

@ -12,17 +12,20 @@
.deleteButton { .deleteButton {
margin-top: 15px; margin-top: 15px;
margin-bottom: 15px; margin-bottom: 15px;
margin-right: 15px; margin-right: 15px;
text-transform: uppercase;
} }
.cancelButton { .cancelButton {
margin-top: 15px; margin-top: 15px;
margin-bottom: 15px; margin-bottom: 15px;
margin-right: 15px; margin-right: 15px;
text-transform: uppercase;
} }
.saveButton { .saveButton {
margin-top: 15px; margin-top: 15px;
margin-bottom: 15px; margin-bottom: 15px;
margin-right: 15px; margin-right: 15px;
text-transform: uppercase;
} }
.saveAndFinalizeButton { .saveAndFinalizeButton {
margin-top: 15px; margin-top: 15px;
@ -55,11 +58,11 @@
justify-content: flex-end; justify-content: flex-end;
} }
.actions > button { // .actions > button {
background-color: #0070c0 !important; // background-color: #0070c0;
color: #ffffff; // color: #ffffff;
text-transform: uppercase; // text-transform: uppercase;
} // }
.more-horiz { .more-horiz {
font-size: 28px; font-size: 28px;

5
dmp-frontend/src/assets/i18n/en.json
View File

@ -105,7 +105,10 @@
"PAGES": { "PAGES": {
"TITLE": "Page Description", "TITLE": "Page Description",
"PAGE-PREFIX": "Page", "PAGE-PREFIX": "Page",
"PAGE-INPUT-TITLE": "Page Title" "PAGE-INPUT-TITLE": "Page Title",
"DATASET-DETAILS": "Dataset Details",
"EXTERNAL-REFERENCES": "External References",
"DESCRIPTION": "Description"
}, },
"FORM": { "FORM": {
"TITLE": "Form Description", "TITLE": "Form Description",