ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4919 from emanuelschuetze/fixes

Browse Source 
Enhance meta-text-block layout and wording
This commit is contained in:
Sean 2019-08-15 12:50:10 +02:00 committed by GitHub
commit 7fa94ab942
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/app/shared/components/meta-text-block/meta-text-block.component.scss
View File

@ -29,5 +29,6 @@
mat-card-content { mat-card-content {
padding: 15px; padding: 15px;
word-wrap: break-word;
} }
} }

1
client/src/app/site/motions/modules/motion-detail/components/motion-comments/motion-comments.component.html
View File

@ -17,7 +17,6 @@
</ng-container> </ng-container>
<form [formGroup]="commentForms[section.id]" *ngIf="isCommentEdited(section)"> <form [formGroup]="commentForms[section.id]" *ngIf="isCommentEdited(section)">
<!-- The HTML Editor --> <!-- The HTML Editor -->
<h4 translate>Comment</h4>
<editor formControlName="comment" [init]="tinyMceSettings"></editor> <editor formControlName="comment" [init]="tinyMceSettings"></editor>
</form> </form>
</ng-container> </ng-container>

1
client/src/app/site/motions/modules/motion-detail/components/personal-note/personal-note.component.html
View File

@ -40,7 +40,6 @@
</ng-container> </ng-container>
<form [formGroup]="personalNoteForm" *ngIf="isEditMode"> <form [formGroup]="personalNoteForm" *ngIf="isEditMode">
<!-- The HTML Editor --> <!-- The HTML Editor -->
<h4 translate>Personal note</h4>
<editor formControlName="note" [init]="tinyMceSettings"></editor> <editor formControlName="note" [init]="tinyMceSettings"></editor>
</form> </form>
</ng-container> </ng-container>

2
client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html
View File

@ -192,7 +192,7 @@
> >
<span *ngSwitchCase="'Favorites'"><mat-icon>star</mat-icon></span> <span *ngSwitchCase="'Favorites'"><mat-icon>star</mat-icon></span>
<span *ngSwitchCase="'No category'"><mat-icon>block</mat-icon></span> <span *ngSwitchCase="'No category'"><mat-icon>block</mat-icon></span>
<span *ngSwitchCase="'Personal Note'"><mat-icon>speaker_notes</mat-icon></span> <span *ngSwitchCase="'Personal notes'"><mat-icon>speaker_notes</mat-icon></span>
<span *ngSwitchDefault> <span *ngSwitchDefault>
<span *ngIf="tile.prefix"> <span *ngIf="tile.prefix">
{{ tile.prefix }} {{ tile.prefix }}

2
client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts
View File

@ -311,7 +311,7 @@ export class MotionListComponent extends BaseListViewComponent<ViewMotion> imple
} }
this.addToTileInfo('Favorites', 'star', true, favoriteMotions); this.addToTileInfo('Favorites', 'star', true, favoriteMotions);
this.addToTileInfo('Personal Note', 'hasNote', true, motionsWithNotes); this.addToTileInfo('Personal notes', 'hasNotes', true, motionsWithNotes);
this.addToTileInfo('No category', 'category', null, motionsWithoutCategory); this.addToTileInfo('No category', 'category', null, motionsWithoutCategory);
this.createCategoryTiles(Array.from(localCategories)); this.createCategoryTiles(Array.from(localCategories));

2
client/src/app/site/motions/services/motion-multiselect.service.ts
View File

@ -27,7 +27,7 @@ import { ViewMotion } from '../models/view-motion';
providedIn: 'root' providedIn: 'root'
}) })
export class MotionMultiselectService { export class MotionMultiselectService {
private messageForSpinner = 'Motions are in process. Please wait...'; private messageForSpinner = this.translate.instant('Motions are in process. Please wait...');
/** /**
* Does nothing. * Does nothing.