diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.html index e29759bbf0..7ef5d44ce1 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.html +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.html @@ -35,43 +35,36 @@

{{ 'New amendment' | translate }}

{{ 'Select paragraphs' | translate }} -
- +
-
- - -
-
- - {{ 'Line' | translate }} {{ paragraph.lineFrom }}: - - - {{ 'Line' | translate }} {{ paragraph.lineFrom }} - {{ paragraph.lineTo }}: - -
-
+ + +
+
+ + {{ 'Line' | translate }} {{ paragraph.lineFrom }}: + + + {{ 'Line' | translate }} {{ paragraph.lineFrom }} - {{ paragraph.lineTo }}: +
-
- +
+
+
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.scss b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.scss index fb8bc1de1e..a39f2434aa 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.scss +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.scss @@ -1,6 +1,6 @@ .amendment-create-wizard-wrapper { .paragraph-scroll { - height: calc(100vh - 160px); + height: calc(100vh - 245px); } .paragraph-row { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/tags/components/tag-list/tag-list.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/tags/components/tag-list/tag-list.component.html index 635db245f8..3eb559e809 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/tags/components/tag-list/tag-list.component.html +++ b/client/src/app/site/pages/meetings/pages/motions/pages/tags/components/tag-list/tag-list.component.html @@ -15,6 +15,7 @@

{{ 'Tags' | translate }}

[hiddenInMobile]="['menu']" [(selectedRows)]="selectedRows" [filterProps]="['name']" + [addBottomSpacer]="hasInteractionState | async" >
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/tags/components/tag-list/tag-list.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/tags/components/tag-list/tag-list.component.ts index 5e202b6180..05d6f6978f 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/tags/components/tag-list/tag-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/tags/components/tag-list/tag-list.component.ts @@ -2,11 +2,13 @@ import { ChangeDetectorRef, Component, OnInit, TemplateRef, ViewChild } from '@a import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; +import { map, Observable } from 'rxjs'; import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; import { BaseMeetingListViewComponent } from 'src/app/site/pages/meetings/base/base-meeting-list-view.component'; import { MeetingComponentServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-component-service-collector.service'; import { PromptService } from 'src/app/ui/modules/prompt-dialog'; +import { InteractionService } from '../../../../../interaction/services/interaction.service'; import { ViewTag } from '../../../../modules'; import { TagControllerService } from '../../../../modules/tags/services'; @@ -25,6 +27,10 @@ export class TagListComponent extends BaseMeetingListViewComponent impl name: [``, [Validators.required]] }); + public get hasInteractionState(): Observable { + return this.interactionService.isConfStateNone.pipe(map(isNone => !isNone)); + } + /** * Holds the tag that's currently being edited, or null. */ @@ -37,7 +43,8 @@ export class TagListComponent extends BaseMeetingListViewComponent impl private dialog: MatDialog, private formBuilder: UntypedFormBuilder, private promptService: PromptService, - private cd: ChangeDetectorRef + private cd: ChangeDetectorRef, + private interactionService: InteractionService ) { super(componentServiceCollector, translate); } diff --git a/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.html b/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.html index fedd2ff250..1b74dba76c 100644 --- a/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.html +++ b/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.ts b/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.ts index 2872b66d27..4adcdd3626 100644 --- a/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.ts +++ b/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.ts @@ -54,6 +54,9 @@ export class FilterMenuComponent implements OnInit { @Input() public service!: FilterListService; + @Input() + public showSpacer = false; + public constructor(private cd: ChangeDetectorRef) {} /** diff --git a/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.html b/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.html index ca7ddb4578..c64ce53b2f 100644 --- a/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.html +++ b/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.html @@ -96,6 +96,7 @@ *ngIf="filterService" (dismissed)="this.filterMenu.close()" [service]="filterService" + [showSpacer]="showSpacer" > diff --git a/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.ts b/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.ts index c2a5c25783..dc15a0d2cf 100644 --- a/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.ts +++ b/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.ts @@ -117,6 +117,9 @@ export class SortFilterBarComponent { @Input() public totalCount = 0; + @Input() + public showSpacer = false; + public get sortOptions(): OsSortOption[] { return this.sortService.sortOptions; } diff --git a/client/src/app/ui/modules/list/components/view-list/view-list.component.html b/client/src/app/ui/modules/list/components/view-list/view-list.component.html index 7699e88dc5..657e5ad78b 100644 --- a/client/src/app/ui/modules/list/components/view-list/view-list.component.html +++ b/client/src/app/ui/modules/list/components/view-list/view-list.component.html @@ -9,6 +9,7 @@ [sortService]="sortService!" [searchService]="searchService!" [searchFieldInput]="searchFieldValue" + [showSpacer]="addBottomSpacer" (searchFieldChanged)="searchFilterUpdated.emit($event)" >