small ui fixes

1 month ago · 15cc2d16ca
parent aed0f9de8e
commit 15cc2d16ca
5 changed files with 16 additions and 10 deletions
--- a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/field-set-title/field-set-title.component.html
+++ b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/field-set-title/field-set-title.component.html
@ -13,12 +13,12 @@

 <div *ngIf="fieldSet.extendedDescription  && !isChild" class="col-12 mt-3 mb-3">
 	<div *ngIf="!showExtendedDescription" (click)="showExtendedDescription = !showExtendedDescription">
-		<span class="more d-flex justify-content-center">{{'DATASET-EDITOR.QUESTION.EXTENDED-DESCRIPTION.VIEW-MORE' | translate}}</span>
+		<span class="more d-flex justify-content-center">{{'DESCRIPTION-EDITOR.ACTIONS.VIEW-MORE' | translate}}</span>
 	</div>
 	<div *ngIf="showExtendedDescription">
 		<h6 [innerHTML]="fieldSet.extendedDescription"></h6>
 		<span class="more d-flex justify-content-center" (click)="showExtendedDescription = !showExtendedDescription">
-			{{'DATASET-EDITOR.QUESTION.EXTENDED-DESCRIPTION.VIEW-LESS' | translate}}
+			{{'DESCRIPTION-EDITOR.ACTIONS.VIEW-LESS' | translate}}
 		</span>
 	</div>
 </div>
--- a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.html
+++ b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.html
@ -37,7 +37,7 @@
 					<mat-icon>add_circle</mat-icon>
 				</button>
 				<span class="mt-1" *ngIf="fieldSet?.multiplicity?.placeholder">{{fieldSet.multiplicity.placeholder}}</span>
-				<span class="mt-1" *ngIf="!fieldSet?.multiplicity?.placeholder">{{('DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-ADD-ONE-FIELD' + (fieldSet.multiplicity.tableView?'-TABLEVIEW':'')) | translate}}</span>
+				<span class="mt-1" *ngIf="!fieldSet?.multiplicity?.placeholder">{{('DESCRIPTION-EDITOR.ACTIONS.MULTIPLICITY-ADD-ONE-FIELD' + (fieldSet.multiplicity.tableView?'-TABLEVIEW':'')) | translate}}</span>
 			</span>
 		</div>
 	</div>
@ -65,7 +65,7 @@
 							<mat-icon>add_circle</mat-icon>
 						</button>
 						<span class="mt-1" *ngIf="fieldSet.multiplicity.placeholder">{{fieldSet.multiplicity.placeholder}}</span>
-						<span class="mt-1" *ngIf="!fieldSet.multiplicity.placeholder">{{('DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-ADD-ONE-FIELD' + (fieldSet.multiplicity.tableView?'-TABLEVIEW':'')) | translate}}</span>
+						<span class="mt-1" *ngIf="!fieldSet.multiplicity.placeholder">{{('DESCRIPTION-EDITOR.ACTIONS.MULTIPLICITY-ADD-ONE-FIELD' + (fieldSet.multiplicity.tableView?'-TABLEVIEW':'')) | translate}}</span>
 					</span>
 				</td>
 			</tr>
@ -75,6 +75,6 @@
 <!-- comment only on top level fieldset -->
 <div class="row">
 	<div *ngIf="fieldSet.hasCommentField && propertiesFormGroup?.get('items')?.at(0)?.get('comment')" class="col-12">
-		<rich-text-editor-component [form]="propertiesFormGroup?.get('items')?.at(0)?.get('comment')" [id]="'editor1'" [placeholder]="'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.COMMENT-PLACEHOLDER' | translate" [wrapperClasses]="'mb-2'" [editable]="!propertiesFormGroup?.get('items')?.at(0)?.get('comment').disabled"></rich-text-editor-component>
+		<rich-text-editor-component [form]="propertiesFormGroup?.get('items')?.at(0)?.get('comment')" [id]="'editor1'" [placeholder]="'DESCRIPTION-EDITOR.FIELDS.COMMENT-PLACEHOLDER' | translate" [wrapperClasses]="'mb-2'" [editable]="!propertiesFormGroup?.get('items')?.at(0)?.get('comment').disabled"></rich-text-editor-component>
 	</div>
 </div>
--- a/dmp-frontend/src/app/ui/description/overview/description-overview.component.html
+++ b/dmp-frontend/src/app/ui/description/overview/description-overview.component.html
@ -12,7 +12,7 @@
 						<p class="col description-label p-0 ml-3 mb-0">{{ description.label }}</p>
 					</div>
 					<div class="row d-flex align-items-center mt-3 mb-4 label-txt">
-						<div *ngIf="canEdit" class="d-flex">
+						<div *ngIf="!isPublicView" class="d-flex">
 							<p class="ml-0 mb-0 label2-txt">
 								{{ enumUtils.toDmpUserRolesString(dmpService.getCurrentUserRolesInDmp(description?.dmp?.dmpUsers)) }}
 							</p>
--- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html
+++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html
@ -90,7 +90,7 @@
 										<li *ngFor="let description of descriptionsInSection(section.id); let descriptionIndex = index" (click)="editDescription(description.id, false)" class="active-description">
 											<div class="d-flex flex-direction-row">
 												<div class="label" matTooltip="{{description.label}}">{{'DMP-EDITOR.DESCRIPTION' | translate}}: {{ description.label }}</div>
-												<mat-icon *ngIf="description.status !== descriptionStatusEnum.Finalized && canDeleteSection(section.id)" [ngClass]="{'drag-handle-disabled': formGroup.disabled}" class="ml-2 mr-2 remove-description size-16" matTooltip="{{'DMP-EDITOR.ACTIONS.DELETE' | translate}}" (click)="$event.stopPropagation(); removeDescription(description.id)">close</mat-icon>
+												<mat-icon *ngIf="description.status !== descriptionStatusEnum.Finalized && canDeleteSection(section.id) && !formGroup.disabled" [ngClass]="{'drag-handle-disabled': formGroup.disabled}" class="ml-2 mr-2 remove-description size-16" matTooltip="{{'DMP-EDITOR.ACTIONS.DELETE' | translate}}" (click)="$event.stopPropagation(); removeDescription(description.id)">close</mat-icon>
 												<mat-icon *ngIf="description.status === descriptionStatusEnum.Finalized" class="ml-2 mr-2 status-icon check-icon size-16" matTooltip="{{'TYPES.DESCRIPTION-STATUS.FINALISED' | translate}}">check</mat-icon>
 											</div>
 										</li>
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@ -383,7 +383,6 @@
 						"MULTIPLICITY-ADD-ONE-FIELD": "Add more",
 						"MULTIPLICITY-ADD-ONE-FIELD-TABLEVIEW": "Add row",
 						"ORDER": "Order",
-						"COMMENT-PLACEHOLDER": "Please Specify",
 						"COMMENT-HINT": "Provide additional information or justification about your selection",
 						"SEMANTICS": "Semantics",
 						"EXPORT": "Include in Export"
@ -859,6 +858,9 @@
 				"DESCRIPTION-TEMPLATE-VERSION": "Version"
 			}
 		},
+		"FIELDS": {
+			"COMMENT-PLACEHOLDER": "Please Specify"
+		},
 		"ACTIONS": {
 			"BACK-TO": "Back to",
 			"EXPORT": "Export",
@ -871,9 +873,13 @@
 			"REVERSE": "Undo Finalization",
 			"UNDO-FINALIZATION-QUESTION": "Undo finalization?",
 			"CONFIRM": "Yes",
-			"REJECT": "No"
+			"REJECT": "No",
+			"MULTIPLICITY-ADD-ONE-FIELD": "Add more",
+			"MULTIPLICITY-ADD-ONE-FIELD-TABLEVIEW": "Add row",
+			"VIEW-MORE": "View more",
+			"VIEW-LESS": "View less"
 		},
-		"MESSAGES":{
+		"MESSAGES": {
 			"MISSING-FIELDS": "There are some required fields left unfilled. Please check the Plan and make sure that all required questions are answered and URLs are provided with valid input. (Missing fields are marked in red color)"
 		},
 		"LOCKED-DIALOG": {