UI improvements for motions
This commit is contained in:
parent
9c6a21469b
commit
effd82eb75
@ -394,7 +394,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Selecting statute paragraphs for amendment -->
|
<!-- 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)">
|
<mat-checkbox formControlName="statute_amendment" (change)="onStatuteAmendmentChange($event)">
|
||||||
{{ 'Statute amendment' | translate }}
|
{{ 'Statute amendment' | translate }}
|
||||||
</mat-checkbox>
|
</mat-checkbox>
|
||||||
@ -509,7 +509,20 @@
|
|||||||
<editor formControlName="reason" [init]="tinyMceSettings" *ngIf="editMotion"></editor>
|
<editor formControlName="reason" [init]="tinyMceSettings" *ngIf="editMotion"></editor>
|
||||||
</div>
|
</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 -->
|
<!-- Attachments -->
|
||||||
<div *ngIf="motion.hasAttachments() || editMotion" class="content-field">
|
<div *ngIf="motion.hasAttachments() || editMotion" class="content-field">
|
||||||
<div *ngIf="!editMotion">
|
<div *ngIf="!editMotion">
|
||||||
@ -532,19 +545,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</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 -->
|
<!-- Parent item -->
|
||||||
<div class="content-field" *ngIf="newMotion && agendaItemObserver.value.length > 0">
|
<div class="content-field" *ngIf="newMotion && agendaItemObserver.value.length > 0">
|
||||||
<os-search-value-selector
|
<os-search-value-selector
|
||||||
|
@ -51,6 +51,7 @@ span {
|
|||||||
.statute-amendment-selector {
|
.statute-amendment-selector {
|
||||||
mat-form-field {
|
mat-form-field {
|
||||||
margin-left: 20px;
|
margin-left: 20px;
|
||||||
|
width: calc(100% - 20px);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user