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

styling changes 

1. description template > fixed import dialog
2. description template editor > fixed autocomplete input for editors on screen resize
This commit is contained in:
Sofia Papacharalampous 2024-04-02 14:46:25 +03:00
parent 340692a3b5
commit bc16f8a2c4
3 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html
View File

@ -134,18 +134,16 @@
<div class="col-12"> <div class="col-12">
<div class="row justify-content-end"> <div class="row justify-content-end">
<div class="col d-flex justify-content-end" style="overflow: hidden;"> <div class="col-12 col-lg-4 d-flex justify-content-end" style="overflow: hidden;">
<div style="min-width: 20em;max-width: 25em;"> <!-- <mat-form-field>
<!-- <mat-form-field> <input matInput #email placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS'| translate}}" (focus)="onUserFieldFocus()" (blur)="onUserFieldBlur()" (keyup.enter)="addUser(email)">
<input matInput #email placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS'| translate}}" (focus)="onUserFieldFocus()" (blur)="onUserFieldBlur()" (keyup.enter)="addUser(email)"> </mat-form-field> -->
</mat-form-field> --> <mat-form-field class="full-width basic-info-input" *ngIf="!formGroup.disabled">
<mat-form-field class="full-width basic-info-input" *ngIf="!formGroup.disabled"> <mat-label>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS' | translate}}</mat-label>
<mat-label>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS' | translate}}</mat-label> <app-single-auto-complete [required]="false" [formControl]="userFormControl" (optionSelected)="addUser($event)" placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS' | translate}}" [configuration]="userService.singleAutocompleteConfiguration">
<app-single-auto-complete [required]="false" [formControl]="userFormControl" (optionSelected)="addUser($event)" placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS' | translate}}" [configuration]="userService.singleAutocompleteConfiguration"> </app-single-auto-complete>
</app-single-auto-complete> <mat-error *ngIf="formGroup.get('type').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
<mat-error *ngIf="formGroup.get('type').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error> </mat-form-field>
</mat-form-field>
</div>
</div> </div>
<!-- <div class="col-auto"> <!-- <div class="col-auto">

62
dmp-frontend/src/app/ui/admin/description-template/listing/import-description-template/import-description-template.dialog.component.html
View File

@ -1,5 +1,5 @@
<div class="confirmation-dialog"> <div class="container-fluid">
<div class="row d-flex"> <div class="row d-flex mt-2">
<div class="confirmation-message col-auto align-self-center"> <div class="confirmation-message col-auto align-self-center">
<h4>{{ data.message }}</h4> <h4>{{ data.message }}</h4>
</div> </div>
@ -7,35 +7,37 @@
<mat-icon class="close-btn" (click)="cancel()">close</mat-icon> <mat-icon class="close-btn" (click)="cancel()">close</mat-icon>
</div> </div>
</div> </div>
<div class="row"> <mat-dialog-content>
<div class="col-12"> <div class="row">
<ngx-dropzone class="drop-file" (change)="selectXML($event)" [accept]="'text/xml'" [multiple]="false"> <div class="col-12">
<ngx-dropzone-preview class="file-preview" [removable]="true" *ngIf="hasBlueprint()" (removed)="onRemove()"> <ngx-dropzone class="drop-file" (change)="selectXML($event)" [accept]="'text/xml'" [multiple]="false">
<ngx-dropzone-label class="file-label">{{ selectedFileName }}</ngx-dropzone-label> <ngx-dropzone-preview class="file-preview" [removable]="true" *ngIf="hasBlueprint()" (removed)="onRemove()">
</ngx-dropzone-preview> <ngx-dropzone-label class="file-label">{{ selectedFileName }}</ngx-dropzone-label>
</ngx-dropzone> </ngx-dropzone-preview>
</ngx-dropzone>
</div>
</div> </div>
</div> <div class="row">
<div class="row"> <div class="col-12 d-flex justify-content-center attach-btn">
<div class="col-12 d-flex justify-content-center attach-btn"> <button mat-button type="button" class="col-auto attach-file" (click)="imgFileInput.click()">
<button mat-button type="button" class="col-auto attach-file" (click)="imgFileInput.click()"> <mat-icon class="mr-2">input</mat-icon>
<mat-icon class="mr-2">input</mat-icon> <span *ngIf="!hasBlueprint()">{{'DESCRIPTION-TEMPLATE-LISTING.IMPORT.UPLOAD-FILE' | translate}}</span>
<span *ngIf="!hasBlueprint()">{{'GENERAL.START-NEW-DMP-DIALOG.UPLOAD-FILE' | translate}}</span> <span *ngIf="hasBlueprint()">{{'DESCRIPTION-TEMPLATE-LISTING.IMPORT.REPLACE-FILE' | translate}}</span>
<span *ngIf="hasBlueprint()">{{'GENERAL.START-NEW-DMP-DIALOG.REPLACE-FILE' | translate}}</span> </button>
</button> <input class="hidden" type="file" #imgFileInput (change)="selectXML($event)" accept="text/xml" />
<input class="hidden" type="file" #imgFileInput (change)="selectXML($event)" accept="text/xml" /> </div>
</div> </div>
</div> <div class="row">
<div class="row"> <mat-form-field class="col-12">
<mat-form-field class="col-12"> <input matInput placeholder="{{'DESCRIPTION-TEMPLATE-LISTING.IMPORT.UPLOAD-XML-NAME'| translate}}" name="datasetBlueprintName" [(ngModel)]="data.name">
<input matInput placeholder="{{'DESCRIPTION-TEMPLATE-LISTING.IMPORT.UPLOAD-XML-NAME'| translate}}" name="datasetBlueprintName" [(ngModel)]="data.name"> </mat-form-field>
</mat-form-field> <div class="col-auto">
<div class="col-auto"> <button mat-button type="button" class="cancel-btn" (click)="cancel()">{{ data.cancelButton }}</button>
<button mat-button type="button" class="cancel-btn" (click)="cancel()">{{ data.cancelButton }}</button> </div>
<div class="col"></div>
<div class="col-auto">
<button mat-button color="primary" class="next-btn" type="button" (click)="confirm()" [disabled]="!hasBlueprint()">{{ data.confirmButton }}</button>
</div>
</div> </div>
<div class="col"></div> </mat-dialog-content>
<div class="col-auto">
<button mat-button color="primary" class="next-btn" type="button" (click)="confirm()" [disabled]="!hasBlueprint()">{{ data.confirmButton }}</button>
</div>
</div>
</div> </div>

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

@ -773,7 +773,9 @@
"UPLOAD-XML": "Import", "UPLOAD-XML": "Import",
"UPLOAD-XML-FILE-TITLE": "Import Description Template", "UPLOAD-XML-FILE-TITLE": "Import Description Template",
"UPLOAD-XML-NAME": "Name Of Description Template", "UPLOAD-XML-NAME": "Name Of Description Template",
"UPLOAD-XML-FILE-CANCEL": "Cancel" "UPLOAD-XML-FILE-CANCEL": "Cancel",
"UPLOAD-FILE": "Upload File",
"REPLACE-FILE": "Replace File"
} }
}, },
"DESCRIPTION-TEMPLATE-TYPE-LISTING": { "DESCRIPTION-TEMPLATE-TYPE-LISTING": {