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

Merge pull request #4228 from emanuelschuetze/ui 

UI improvements for motions
This commit is contained in:
Emanuel Schütze 2019-01-31 14:18:20 +01:00 committed by GitHub
parent 9c6a21469b effd82eb75
commit a3d8a8aee6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
client/src/app/site/motions/components/motion-detail/motion-detail.component.html
View File

@ -394,7 +394,7 @@
</div>
<!-- Selecting statute paragraphs for amendment -->
<div class="statute-amendment-selector" *ngIf="editMotion && statuteParagraphs.length > 0 && statutesEnabled">
<div class="statute-amendment-selector" *ngIf="newMotion && statuteParagraphs.length > 0 && statutesEnabled">
<mat-checkbox formControlName="statute_amendment" (change)="onStatuteAmendmentChange($event)">
{{ 'Statute amendment' | translate }}
</mat-checkbox>
@ -509,7 +509,20 @@
<editor formControlName="reason" [init]="tinyMceSettings" *ngIf="editMotion"></editor>
</div>
<div class="extra-data">
<!-- Category form -->
<div class="content-field" *ngIf="newMotion && categoryObserver.value.length > 0">
<os-search-value-selector
ngDefaultControl
[form]="contentForm"
[formControl]="contentForm.get('category_id')"
[multiple]="false"
[includeNone]="true"
listname="{{ 'Category' | translate }}"
[InputListValues]="categoryObserver"
></os-search-value-selector>
</div>
<div class="extra-data" *osPerms="'motion.can_manage'">
<!-- Attachments -->
<div *ngIf="motion.hasAttachments() || editMotion" class="content-field">
<div *ngIf="!editMotion">
@ -532,19 +545,6 @@
</div>
</div>
<!-- Category form -->
<div class="content-field" *ngIf="newMotion && categoryObserver.value.length > 0">
<os-search-value-selector
ngDefaultControl
[form]="contentForm"
[formControl]="contentForm.get('category_id')"
[multiple]="false"
[includeNone]="true"
listname="{{ 'Category' | translate }}"
[InputListValues]="categoryObserver"
></os-search-value-selector>
</div>
<!-- Parent item -->
<div class="content-field" *ngIf="newMotion && agendaItemObserver.value.length > 0">
<os-search-value-selector

1
client/src/app/site/motions/components/motion-detail/motion-detail.component.scss
View File

@ -51,6 +51,7 @@ span {
.statute-amendment-selector {
mat-form-field {
margin-left: 20px;
width: calc(100% - 20px);
}
}