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

Styles: paginator position Dmp listing, Translates: Dmp listing

This commit is contained in:
apapachristou 2019-05-07 11:04:47 +03:00
parent 7414853a2e
commit caa6be46d8
5 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html
View File

@ -4,7 +4,7 @@
<div class="row" style="justify-content: center;">
<!-- Search Filter-->
<mat-form-field class="col-11 search">
<input matInput placeholder="{{'CRITERIA.PROJECTS.LIKE'| translate}}" name="projectCriteriaLike"
<input matInput placeholder="{{ 'CRITERIA.PROJECTS.LIKE'| translate }}" name="projectCriteriaLike"
[formControl]="formGroup.get('like')" (ngModelChange)="controlModified()">
<mat-error *ngIf="formGroup.get('like').hasError('backendError')">
{{formGroup.get('like').getError('backendError').message}}</mat-error>
@ -28,7 +28,7 @@
<h6 class="category-title">{{ 'DMP-RELATED-PROJECT.RELATED-PROJECT' | translate}}</h6>
<mat-form-field>
<app-multiple-auto-complete [formControl]="formGroup.get('projects')"
placeholder="{{'CRITERIA.DMP.SELECT-PROJECTS' | translate}}"
placeholder="{{ 'CRITERIA.DMP.SELECT-PROJECTS' | translate }}"
[configuration]="projectAutoCompleteConfiguration">
</app-multiple-auto-complete>
<mat-icon matSuffix class="style-icon">arrow_drop_down</mat-icon>
@ -40,7 +40,7 @@
<div *ngIf="showProject" class="col-10 filter-category">
<h6 class="category-title">{{ 'DMP-RELATED-COLLABORATOR.RELATED-COLLABORATOR' | translate}}</h6>
<mat-form-field>
<input matInput placeholder="Select collaborators">
<input matInput placeholder="{{ 'DMP-RELATED-COLLABORATOR.SELECT-COLLABORATORS' | translate }}">
<!-- <app-multiple-auto-complete [formControl]="formGroup.get('projects')"
placeholder="{{'CRITERIA.DMP.SELECT-PROJECTS' | translate}}"
[configuration]="projectAutoCompleteConfiguration">
@ -63,9 +63,9 @@
<!-- Related Organization Filter -->
<div *ngIf="showProject" class="col-10 filter-category">
<h6 class="category-title">RELATED ORGANIZATION</h6>
<h6 class="category-title">{{ 'DMP-RELATED-ORGANIZATION.RELATED-ORGANIZATION' | translate }}</h6>
<mat-form-field>
<input matInput placeholder="Select Organizations">
<input matInput placeholder="{{ 'DMP-RELATED-ORGANIZATION.SELECT-ORGANIZATIONS' | translate }}">
<!-- <app-multiple-auto-complete [formControl]="formGroup.get('projects')"
placeholder="Select Organizations"
[configuration]="projectAutoCompleteConfiguration">

40
dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss
View File

@ -17,6 +17,26 @@
}
}
.search ::ng-deep.mat-form-field-infix {
margin-left: 1em;
}
.filter-category {
background-color: #f6f6f6;
margin: 5px 0px;
}
.category-title {
color: #2e75b6;
margin-top: 8px;
margin-bottom: 12px;
}
.import {
margin: 10px;
padding: 0px;
}
.filters {
border: 1px solid #e4e4e4;
border-radius: 5px;
@ -94,23 +114,3 @@
.mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element {
background-color: #2e74b649;
}
.search ::ng-deep.mat-form-field-infix {
margin-left: 1em;
}
.filter-category {
background-color: #f6f6f6;
margin: 5px 0px;
}
.category-title {
color: #2e75b6;
margin-top: 8px;
margin-bottom: 12px;
}
.import {
margin: 10px;
padding: 0px;
}

9
dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts
View File

@ -46,16 +46,9 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
public projectService: ProjectService,
private dmpService: DmpService,
public formBuilder: FormBuilder,
private dialog: MatDialog,
fb: FormBuilder
private dialog: MatDialog
) {
super(new ValidationErrorModel());
this.options = fb.group({
getDrafts: false,
getFinalized: false,
getDmpStatuses: false,
floatLabel: 'auto',
});
}
ngOnInit() {

9
dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss
View File

@ -2,6 +2,15 @@
.mat-card {
margin: 1em 0;
}
.col-9 {
display: flex;
flex-direction: column;
}
}
::ng-deep .mat-paginator {
margin-top: auto;
}
::ng-deep .mat-paginator-container {

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

@ -321,7 +321,8 @@
"ACTIONS": {
"EDIT": "Edit",
"MAKE-IT-PUBLIC": "Make it public",
"VIEW": "View"
"VIEW": "View",
"NEW": "New Dataset Description"
}
},
"DATASET-PUBLIC-LISTING": {
@ -497,7 +498,8 @@
"USERS": {
"LABEL": "Search",
"ROLE": "Role"
}
},
"SELECT": "Select an option"
},
"DATASET-EDITOR": {
"TITLE": {
@ -641,7 +643,12 @@
"RELATED-PROJECT": "Related Project"
},
"DMP-RELATED-COLLABORATOR": {
"RELATED-COLLABORATOR": "Related Collaborator"
"RELATED-COLLABORATOR": "Related Collaborator",
"SELECT-COLLABORATORS": "Select Collaborators"
},
"DMP-RELATED-ORGANIZATION": {
"RELATED-ORGANIZATION": "Related Organization",
"SELECT-ORGANIZATIONS": "Select Organizations"
},
"DATASET-PROFILE": {
"PREVIEW": "Preview",