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

Fixes lowercase on finalize button

This commit is contained in:
apapachristou 2019-06-21 18:36:16 +03:00
parent 3d2dea572f
commit 0296b18022
5 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,10 @@
.saveAndFinalizeButton{ .saveAndFinalizeButton{
float:right; float:right;
} }
.finalizeButton{
float: right;
text-transform: uppercase;
}
.saveButton{ .saveButton{
float:right; float:right;
margin-right: 15px; margin-right: 15px;

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

@ -97,9 +97,9 @@
</button> </button>
<button *ngIf="datasetWizardModel.status == 0 || isNew" mat-raised-button [disabled]="!formGroup.valid" class="saveButton" color="primary" (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" color="primary" <button *ngIf="datasetWizardModel.status == 0 || isNew" mat-raised-button [disabled]="!formGroup.valid" class="finalizeButton" color="primary"
(click)="saveFinalize();" (click)="saveFinalize();"
type="button">{{ 'DATASET-WIZARD.ACTIONS.SAVE-AND-FINALISE' | translate }}</button> type="button">{{ 'DATASET-WIZARD.ACTIONS.FINALIZE' | translate }}</button>
<div class="fill-space"></div> <div class="fill-space"></div>
</div> </div>
</div> </div>

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

@ -12,25 +12,31 @@
.deleteButton { .deleteButton {
margin-top: 15px; margin-top: 15px;
margin-bottom: 15px; margin-bottom: 15px;
margin-right: 15px; margin-right: 15px;
text-transform: uppercase; 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; 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; text-transform: uppercase;
} }
.saveAndFinalizeButton { .saveAndFinalizeButton {
margin-top: 15px; margin-top: 15px;
margin-bottom: 15px; margin-bottom: 15px;
margin-right: 15px; margin-right: 15px;
}
.finalizeButton {
margin-top: 15px;
margin-bottom: 15px;
margin-right: 15px;
text-transform: uppercase;
} }
.downloadPDF { .downloadPDF {
margin-top: 15px; margin-top: 15px;

4
dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.scss
View File

@ -1,6 +1,10 @@
.saveAndFinalizeButton{ .saveAndFinalizeButton{
float:right; float:right;
} }
.finalizeButton{
float: right;
text-transform: uppercase;
}
.saveButton{ .saveButton{
float:right; float:right;
margin-right: 15px; margin-right: 15px;

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

@ -323,7 +323,8 @@
"GO-TO-PROJECT": "Go to Dataset Project", "GO-TO-PROJECT": "Go to Dataset Project",
"GO-TO-DMP": "Go to Dataset DMP", "GO-TO-DMP": "Go to Dataset DMP",
"SAVE": "Save", "SAVE": "Save",
"SAVE-AND-FINALISE": "Save and Finalise", "SAVE-AND-FINALISE": "Save and Finalize",
"FINALIZE": "Finalize",
"DOWNLOAD-PDF": "Download PDF", "DOWNLOAD-PDF": "Download PDF",
"DOWNLOAD-XML": "Download XML", "DOWNLOAD-XML": "Download XML",
"DOWNLOAD-DOCX": "Download DOCX", "DOWNLOAD-DOCX": "Download DOCX",