diff --git a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html index 5a61a4db0ffb704fcf2b7319ce7d387825928d9a..a5e15f8139ef8848afa77d35d4280eb612d0bc25 100644 --- a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html +++ b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html @@ -1,6 +1,6 @@ <mat-dialog-content> <mat-card> - <mat-slide-toggle [(ngModel)]="considerVotes">{{'topic-cloud-dialog.consider-Votes' | translate}}</mat-slide-toggle> + <mat-slide-toggle [(ngModel)]="considerVotes">{{'topic-cloud-dialog.consider-votes' | translate}}</mat-slide-toggle> <mat-slide-toggle [(ngModel)]="tagsLowerCase">{{'topic-cloud-dialog.tags-lowercase' | translate}}</mat-slide-toggle> </mat-card> @@ -13,7 +13,7 @@ <input #searchBox id="searchBox" (input)="searchKeyword()" [(ngModel)]="searchedKeyword" matInput type="text" placeholder="{{'topic-cloud-dialog.keyword-search' | translate}}"> - <button *ngIf="searchedKeyword !== ''" + <button *ngIf="searchedKeyword" (click)="searchedKeyword = ''; searchMode = false;" mat-button matSuffix mat-icon-button aria-label="topic-cloud-dialog.keyword-search"> <mat-icon>close</mat-icon> @@ -40,7 +40,7 @@ <mat-expansion-panel hideToggle *ngIf="searchMode && filteredKeywords.length === 0"> <mat-expansion-panel-header> <mat-panel-title fxLayoutAlign="center"> - {{'topic-cloud-dialog.no-Keywords-note' | translate}} + {{'topic-cloud-dialog.no-keywords-note' | translate}} </mat-panel-title> </mat-expansion-panel-header> </mat-expansion-panel> @@ -84,7 +84,7 @@ <mat-divider></mat-divider> <mat-form-field> - <mat-label>{{'topic-cloud-dialog.edit-keyword-tipp' | translate}}</mat-label> + <mat-label>{{'topic-cloud-dialog.edit-keyword-tip' | translate}}</mat-label> <input matInput id="{{'edit-input'+i}}" [(ngModel)]="newKeyword"> </mat-form-field> <!-- TODO: textinput and buttons in one row --> @@ -95,4 +95,4 @@ </div> </mat-expansion-panel> </mat-accordion> -</mat-dialog-content> \ No newline at end of file +</mat-dialog-content> diff --git a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts index 4a723a2e01ad47e67619c551468c3a1aa8d341aa..68662933ef099c24ceec1f676957abba80c95f26 100644 --- a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts +++ b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts @@ -178,8 +178,8 @@ export class TopicCloudAdministrationComponent implements OnInit { }); } - searchKeyword(): void{ - if (this.searchedKeyword){ + searchKeyword(): void { + if (!this.searchedKeyword){ this.searchMode = false; } else { this.filteredKeywords = this.keywords.filter(keyword => diff --git a/src/app/components/shared/_dialogs/topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component.html b/src/app/components/shared/_dialogs/topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component.html index 95a02fdaedfea49c13ee06d7037b39c21bcecaad..c015d809ac9baeb338f169ea5c6dc43b9d1e7ea1 100644 --- a/src/app/components/shared/_dialogs/topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component.html +++ b/src/app/components/shared/_dialogs/topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component.html @@ -1,4 +1,6 @@ -<h2 mat-dialog-title>{{'topic-cloud-confirm-dialog.confirm' | translate}} "{{data.topic}}"?</h2> +<h2 mat-dialog-title>{{'topic-cloud-confirm-dialog.confirm' | translate}}</h2> +<mat-divider></mat-divider> +<p>{{'topic-cloud-confirm-dialog.will-be-deleted' | translate }} '{{data.topic}}'.</p> <div mat-dialog-actions align="end"> <button class="primary" mat-raised-button [mat-dialog-close]="false">