From b20810ac116a71c7adee614d11b52e3a3e456083 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Fri, 10 Nov 2023 13:50:14 +0100 Subject: [PATCH 01/19] Fix invalid use of matInput --- .../base-search-selector/base-search-selector.component.html | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.html b/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.html index e4512c3c50..2cd0813581 100644 --- a/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.html +++ b/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.html @@ -18,7 +18,6 @@
Date: Fri, 10 Nov 2023 14:39:38 +0100 Subject: [PATCH 02/19] Auto migration of form fields --- .../user-components/user-components.module.ts | 6 ++--- .../pages/login-mask/login-mask.module.ts | 4 +-- .../reset-password-confirm.module.ts | 4 +-- .../reset-password/reset-password.module.ts | 4 +-- .../list-of-speakers-content.module.ts | 2 +- .../point-of-order-dialog.component.scss | 2 +- .../point-of-order-dialog.module.ts | 6 ++--- .../agenda-content-object-form.module.ts | 4 +-- .../attachment-control.module.ts | 2 +- ...participant-search-selector.component.scss | 2 +- .../participant-search-selector.module.ts | 2 +- .../base-poll-form.component.html | 9 ++----- .../meetings/modules/poll/poll.module.ts | 6 ++--- .../topic-poll-dialog.component.scss | 4 +-- .../modules/topic-poll/topic-poll.module.ts | 6 ++--- .../pages/topic-detail/topic-detail.module.ts | 6 ++--- .../pages/topic-import/topic-import.module.ts | 4 +-- .../agenda-item-list.module.ts | 6 ++--- .../agenda-item-info-dialog.component.scss | 2 +- .../assignment-poll/assignment-poll.module.ts | 6 ++--- .../assignment-detail.module.ts | 2 +- .../assignment-detail.component.scss | 2 +- .../assignment-poll-detail.component.scss | 2 +- .../chat-group-dialog.module.ts | 4 +-- .../chat-group-list/chat-group-list.module.ts | 4 +-- .../meetings/pages/history/history.module.ts | 8 +++--- .../pages/home/pages/start/start.module.ts | 4 +-- .../mediafile-list/mediafile-list.module.ts | 4 +-- .../mediafile-upload.module.ts | 2 +- ...settings-group-detail-field.component.scss | 7 ++--- .../meeting-settings-group-detail.module.ts | 6 ++--- .../modules/motion-poll/motion-poll.module.ts | 6 ++--- .../pages/categories/categories.module.ts | 4 +-- .../motions/pages/comments/comments.module.ts | 4 +-- .../motion-block-create-dialog.module.ts | 4 +-- .../motion-block-edit-dialog.module.ts | 4 +-- .../motion-block-list.component.scss | 2 +- .../motion-extension-field.component.scss | 2 +- .../motion-manage-submitters.component.scss | 2 +- ...hange-recommendation-dialog.component.scss | 2 +- ...ion-change-recommendation-dialog.module.ts | 4 +-- .../motion-detail/motion-detail.module.ts | 6 ++--- .../motion-list-info-dialog.module.ts | 4 +-- .../motion-poll-detail.component.scss | 2 +- .../statute-paragraph-list.component.scss | 2 +- .../statute-paragraphs.module.ts | 4 +-- .../pages/motions/pages/tags/tags.module.ts | 4 +-- .../pages/workflows/workflows.module.ts | 4 +-- .../modules/groups/groups.module.ts | 4 +-- .../participant-detail-manage.module.ts | 2 +- .../participant-detail.module.ts | 2 +- .../participant-list-info-dialog.module.ts | 6 ++--- .../participant-presence.module.ts | 4 +-- .../projector-countdown-dialog.component.scss | 2 +- .../projector-countdown-dialog.module.ts | 4 +-- .../projector-edit-dialog.component.scss | 5 ++-- .../projector-edit-dialog.module.ts | 6 ++--- .../projector-list/projector-list.module.ts | 4 +-- .../account-search-selector.module.ts | 2 +- .../account-search-selector.component.ts | 4 +-- .../account-detail/account-detail.module.ts | 4 +-- .../pages/account-list/account-list.module.ts | 2 +- .../modules/committee-components.module.ts | 2 +- .../committee-detail-edit.module.ts | 4 +-- .../committee-detail-meeting.module.ts | 6 ++--- .../pages/designs/designs.module.ts | 2 +- .../theme-builder-dialog.module.ts | 4 +-- .../organization-mediafile-list.module.ts | 4 +-- .../organization-tag-dialog.module.ts | 4 +-- .../organization-tags.module.ts | 2 +- .../settings-detail/settings-detail.module.ts | 6 ++--- .../app/ui/base/base-form-field-control.ts | 2 +- .../choice-dialog.component.scss | 2 +- .../color-form-field.module.ts | 4 +-- .../color-form-field.component.scss | 2 +- .../datepicker/datepicker.component.scss | 2 +- .../datepicker/datepicker.component.ts | 2 +- .../daterangepicker.component.scss | 2 +- .../daterangepicker.component.ts | 2 +- .../modules/datepicker/datepicker.module.ts | 4 +-- .../ui/modules/file-list/file-list.module.ts | 2 +- .../import-list/import-list.component.ts | 2 +- .../backend-import-list.component.ts | 2 +- .../modules/import-list/import-list.module.ts | 2 +- .../media-upload-content.module.ts | 4 +-- .../base-search-selector.component.ts | 8 +++--- .../list-search-selector.component.ts | 2 +- .../repo-search-selector.component.ts | 2 +- .../search-selector/search-selector.module.ts | 2 +- client/src/assets/styles/components.scss | 8 +++--- client/src/styles.scss | 27 +------------------ 91 files changed, 166 insertions(+), 194 deletions(-) diff --git a/client/src/app/site/modules/user-components/user-components.module.ts b/client/src/app/site/modules/user-components/user-components.module.ts index 163c169400..0f8e733e2c 100644 --- a/client/src/app/site/modules/user-components/user-components.module.ts +++ b/client/src/app/site/modules/user-components/user-components.module.ts @@ -8,10 +8,10 @@ import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/lega import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatSelectModule } from '@angular/material/select'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { IconContainerModule } from 'src/app/ui/modules/icon-container'; diff --git a/client/src/app/site/pages/login/pages/login-mask/login-mask.module.ts b/client/src/app/site/pages/login/pages/login-mask/login-mask.module.ts index 8eb0cc7931..b8a4b7d41d 100644 --- a/client/src/app/site/pages/login/pages/login-mask/login-mask.module.ts +++ b/client/src/app/site/pages/login/pages/login-mask/login-mask.module.ts @@ -5,8 +5,8 @@ import { MatExpansionModule } from '@angular/material/expansion'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; import { SpinnerModule } from 'src/app/ui/modules/spinner'; diff --git a/client/src/app/site/pages/login/pages/reset-password-confirm/reset-password-confirm.module.ts b/client/src/app/site/pages/login/pages/reset-password-confirm/reset-password-confirm.module.ts index cd1375ec61..e742c7fcf8 100644 --- a/client/src/app/site/pages/login/pages/reset-password-confirm/reset-password-confirm.module.ts +++ b/client/src/app/site/pages/login/pages/reset-password-confirm/reset-password-confirm.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { ResetPasswordConfirmComponent } from './components/reset-password-confirm/reset-password-confirm.component'; diff --git a/client/src/app/site/pages/login/pages/reset-password/reset-password.module.ts b/client/src/app/site/pages/login/pages/reset-password/reset-password.module.ts index ff4a9f153e..4f431a93f4 100644 --- a/client/src/app/site/pages/login/pages/reset-password/reset-password.module.ts +++ b/client/src/app/site/pages/login/pages/reset-password/reset-password.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.module.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.module.ts index 3db1248ff8..b25caab70c 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.module.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.module.ts @@ -5,7 +5,7 @@ import { MatExpansionModule } from '@angular/material/expansion'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/components/point-of-order-dialog/point-of-order-dialog.component.scss b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/components/point-of-order-dialog/point-of-order-dialog.component.scss index 79fabdec3d..c778f2f84d 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/components/point-of-order-dialog/point-of-order-dialog.component.scss +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/components/point-of-order-dialog/point-of-order-dialog.component.scss @@ -1,6 +1,6 @@ .edit-form { width: 100%; - .mat-form-field { + .mat-mdc-form-field { width: 100%; } } diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/point-of-order-dialog.module.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/point-of-order-dialog.module.ts index b9fdc1d944..dc3fa01ce7 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/point-of-order-dialog.module.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/point-of-order-dialog.module.ts @@ -3,9 +3,9 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatSelectModule } from '@angular/material/select'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { PointOfOrderDialogComponent } from './components/point-of-order-dialog/point-of-order-dialog.component'; diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/agenda-content-object-form.module.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/agenda-content-object-form.module.ts index e4058af465..89bf3366e7 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/agenda-content-object-form.module.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/agenda-content-object-form.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatSelectModule } from '@angular/material/select'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/attachment-control.module.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/attachment-control.module.ts index 7fd3bb6aea..2b3a3c0a32 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/attachment-control.module.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/attachment-control.module.ts @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; import { MediaUploadContentModule } from 'src/app/ui/modules/media-upload-content/media-upload-content.module'; diff --git a/client/src/app/site/pages/meetings/modules/participant-search-selector/components/participant-search-selector/participant-search-selector.component.scss b/client/src/app/site/pages/meetings/modules/participant-search-selector/components/participant-search-selector/participant-search-selector.component.scss index 32c8e04ac4..cb1b10fa48 100644 --- a/client/src/app/site/pages/meetings/modules/participant-search-selector/components/participant-search-selector/participant-search-selector.component.scss +++ b/client/src/app/site/pages/meetings/modules/participant-search-selector/components/participant-search-selector/participant-search-selector.component.scss @@ -4,7 +4,7 @@ .search-users { display: grid; - .mat-form-field { + .mat-mdc-form-field { width: 100%; } } diff --git a/client/src/app/site/pages/meetings/modules/participant-search-selector/participant-search-selector.module.ts b/client/src/app/site/pages/meetings/modules/participant-search-selector/participant-search-selector.module.ts index 129416c5cb..06e2d45028 100644 --- a/client/src/app/site/pages/meetings/modules/participant-search-selector/participant-search-selector.module.ts +++ b/client/src/app/site/pages/meetings/modules/participant-search-selector/participant-search-selector.module.ts @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; diff --git a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html index 165c5f1dc1..d79f6f29f2 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html +++ b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html @@ -149,7 +149,7 @@

- + @@ -157,12 +157,7 @@

- - {{ - 'Voting ends after short (some seconds/minutes) or long (some days/weeks) time period.' - | translate - }} - + Voting ends after short (some seconds/minutes) or long (some days/weeks) time period.

diff --git a/client/src/app/site/pages/meetings/modules/poll/poll.module.ts b/client/src/app/site/pages/meetings/modules/poll/poll.module.ts index 4b3e53f79c..fb488006db 100644 --- a/client/src/app/site/pages/meetings/modules/poll/poll.module.ts +++ b/client/src/app/site/pages/meetings/modules/poll/poll.module.ts @@ -3,11 +3,11 @@ import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyProgressBarModule as MatProgressBarModule } from '@angular/material/legacy-progress-bar'; import { MatLegacyRadioModule as MatRadioModule } from '@angular/material/legacy-radio'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatSelectModule } from '@angular/material/select'; import { NgChartsModule } from 'ng2-charts'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.scss b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.scss index 8e3cb1029a..a6226b27d8 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.scss +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.scss @@ -2,8 +2,8 @@ margin-top: 20px !important; overflow: hidden; - .mat-form-field, - .mat-select { + .mat-mdc-form-field, + .mat-mdc-select { width: 100%; } } diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/topic-poll.module.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/topic-poll.module.ts index 5f9df6ae38..9306d718d7 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/topic-poll.module.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/topic-poll.module.ts @@ -6,11 +6,11 @@ import { MatIconModule } from '@angular/material/icon'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatSelectModule } from '@angular/material/select'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { ProjectorButtonModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/projector-button.module'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/topic-detail.module.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/topic-detail.module.ts index 1b9c72e416..96b0bc185c 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/topic-detail.module.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/topic-detail.module.ts @@ -3,11 +3,11 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatSelectModule } from '@angular/material/select'; import { RouterModule } from '@angular/router'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/topic-import.module.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/topic-import.module.ts index c99a68a286..102e963518 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/topic-import.module.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/topic-import.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { RouterModule } from '@angular/router'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/agenda-item-list.module.ts b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/agenda-item-list.module.ts index 501d12c33d..3ec06fb078 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/agenda-item-list.module.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/agenda-item-list.module.ts @@ -3,10 +3,10 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatSelectModule } from '@angular/material/select'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; import { DirectivesModule } from 'src/app/ui/directives'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/components/agenda-item-info-dialog/agenda-item-info-dialog.component.scss b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/components/agenda-item-info-dialog/agenda-item-info-dialog.component.scss index 317c762520..d5001a6925 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/components/agenda-item-info-dialog/agenda-item-info-dialog.component.scss +++ b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/components/agenda-item-info-dialog/agenda-item-info-dialog.component.scss @@ -1,6 +1,6 @@ .item-dialog-form { display: inline-block; - .mat-form-field { + .mat-mdc-form-field { width: 100%; } } diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/assignment-poll.module.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/assignment-poll.module.ts index 633053665a..1ba013c27a 100644 --- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/assignment-poll.module.ts +++ b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/assignment-poll.module.ts @@ -7,11 +7,11 @@ import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/lega import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatSelectModule } from '@angular/material/select'; import { RouterModule } from '@angular/router'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; diff --git a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/assignment-detail.module.ts b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/assignment-detail.module.ts index d546a5492f..cb99849a82 100644 --- a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/assignment-detail.module.ts +++ b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/assignment-detail.module.ts @@ -5,7 +5,7 @@ import { MatIconModule } from '@angular/material/icon'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; diff --git a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.scss b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.scss index d7c1b64dbf..81bf9a6798 100644 --- a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.scss +++ b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.scss @@ -64,7 +64,7 @@ padding: 15px 25px 0 25px; width: auto; - .mat-form-field { + .mat-mdc-form-field { width: 100%; } } diff --git a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-polls/components/assignment-poll-detail/assignment-poll-detail.component.scss b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-polls/components/assignment-poll-detail/assignment-poll-detail.component.scss index d38b492a62..5a649caa54 100644 --- a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-polls/components/assignment-poll-detail/assignment-poll-detail.component.scss +++ b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-polls/components/assignment-poll-detail/assignment-poll-detail.component.scss @@ -4,7 +4,7 @@ } .named-result-table { - .mat-form-field { + .mat-mdc-form-field { font-size: 14px; width: 100%; } diff --git a/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/chat-group-dialog.module.ts b/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/chat-group-dialog.module.ts index 7348409234..6b2f4b3f98 100644 --- a/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/chat-group-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/chat-group-dialog.module.ts @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; diff --git a/client/src/app/site/pages/meetings/pages/chat/pages/chat-group-list/chat-group-list.module.ts b/client/src/app/site/pages/meetings/pages/chat/pages/chat-group-list/chat-group-list.module.ts index 16b9b8fe5a..5c8d2f7e17 100644 --- a/client/src/app/site/pages/meetings/pages/chat/pages/chat-group-list/chat-group-list.module.ts +++ b/client/src/app/site/pages/meetings/pages/chat/pages/chat-group-list/chat-group-list.module.ts @@ -6,8 +6,8 @@ import { MatBadgeModule } from '@angular/material/badge'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/meetings/pages/history/history.module.ts b/client/src/app/site/pages/meetings/pages/history/history.module.ts index 8aca781c99..daabdd899a 100644 --- a/client/src/app/site/pages/meetings/pages/history/history.module.ts +++ b/client/src/app/site/pages/meetings/pages/history/history.module.ts @@ -3,10 +3,10 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; -import { MatLegacyOptionModule as MatOptionModule } from '@angular/material/legacy-core'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatOptionModule } from '@angular/material/core'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatSelectModule } from '@angular/material/select'; import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { HeadBarModule } from 'src/app/ui/modules/head-bar'; diff --git a/client/src/app/site/pages/meetings/pages/home/pages/start/start.module.ts b/client/src/app/site/pages/meetings/pages/home/pages/start/start.module.ts index 9341721c0e..5a0e897aa4 100644 --- a/client/src/app/site/pages/meetings/pages/home/pages/start/start.module.ts +++ b/client/src/app/site/pages/meetings/pages/home/pages/start/start.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { EditorModule } from 'src/app/ui/modules/editor/editor.module'; import { HeadBarModule } from 'src/app/ui/modules/head-bar'; diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/mediafile-list.module.ts b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/mediafile-list.module.ts index 0543e4f406..64f69f4971 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/mediafile-list.module.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/mediafile-list.module.ts @@ -4,8 +4,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { RouterModule } from '@angular/router'; diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-upload/mediafile-upload.module.ts b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-upload/mediafile-upload.module.ts index b325c06687..a6c6ddbe71 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-upload/mediafile-upload.module.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-upload/mediafile-upload.module.ts @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { HeadBarModule } from 'src/app/ui/modules/head-bar'; diff --git a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.scss b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.scss index 23dd544271..977eae10f9 100644 --- a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.scss +++ b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.scss @@ -6,14 +6,15 @@ flex: 2; } - .mat-form-field { + .mat-mdc-form-field { + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ .mat-form-field-subscript-wrapper { position: static; } } /* Full width form fields */ - .mat-form-field { + .mat-mdc-form-field { width: 100%; } @@ -21,7 +22,7 @@ margin-left: -20px; display: flex; - .mat-form-field { + .mat-mdc-form-field { flex: 1; box-sizing: border-box; padding-left: 20px; diff --git a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/meeting-settings-group-detail.module.ts b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/meeting-settings-group-detail.module.ts index fdeb3f8920..e328d3058f 100644 --- a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/meeting-settings-group-detail.module.ts +++ b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/meeting-settings-group-detail.module.ts @@ -5,10 +5,10 @@ import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatSelectModule } from '@angular/material/select'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; // time picker because angular still doesnt offer one!! import { NgxMaterialTimepickerModule } from 'ngx-material-timepicker'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/motion-poll.module.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/motion-poll.module.ts index c365f3f22f..63095084fa 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/motion-poll.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/motion-poll.module.ts @@ -7,12 +7,12 @@ import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/lega import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner'; import { MatLegacyRadioModule as MatRadioModule } from '@angular/material/legacy-radio'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatSelectModule } from '@angular/material/select'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { RouterModule } from '@angular/router'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/categories/categories.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/categories/categories.module.ts index c863185fb4..97ce9850fe 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/categories/categories.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/categories/categories.module.ts @@ -6,8 +6,8 @@ import { MatIconModule } from '@angular/material/icon'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; import { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/comments/comments.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/comments/comments.module.ts index d9ff9bdb90..93d73f3819 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/comments/comments.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/comments/comments.module.ts @@ -6,8 +6,8 @@ import { MatIconModule } from '@angular/material/icon'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { CommaSeparatedListingModule } from 'src/app/ui/modules/comma-separated-listing'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/motion-block-create-dialog.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/motion-block-create-dialog.module.ts index 42943e9212..9bc919b469 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/motion-block-create-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/motion-block-create-dialog.module.ts @@ -4,8 +4,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { AgendaContentObjectFormModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/agenda-content-object-form.module'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/motion-block-edit-dialog.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/motion-block-edit-dialog.module.ts index 65c7b0f50d..1ef49fe160 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/motion-block-edit-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/motion-block-edit-dialog.module.ts @@ -4,8 +4,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { MotionBlockEditDialogComponent } from './components/motion-block-edit-dialog/motion-block-edit-dialog.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-list/motion-block-list.component.scss b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-list/motion-block-list.component.scss index 452fdaf72d..b7717c93c0 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-list/motion-block-list.component.scss +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-list/motion-block-list.component.scss @@ -5,7 +5,7 @@ margin: 0; } - .mat-form-field { + .mat-mdc-form-field { width: 100%; } } diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-extension-field/motion-extension-field.component.scss b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-extension-field/motion-extension-field.component.scss index df6f5afe92..88b12f0bab 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-extension-field/motion-extension-field.component.scss +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-extension-field/motion-extension-field.component.scss @@ -1,3 +1,3 @@ -.extension-container .mat-form-field { +.extension-container .mat-mdc-form-field { display: block; } diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-manage-submitters/motion-manage-submitters.component.scss b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-manage-submitters/motion-manage-submitters.component.scss index 0db1e05e56..b9c87b21e5 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-manage-submitters/motion-manage-submitters.component.scss +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-manage-submitters/motion-manage-submitters.component.scss @@ -1,6 +1,6 @@ .search-users { display: grid; - .mat-form-field { + .mat-mdc-form-field { width: 100%; } } diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.scss b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.scss index 05eb9874a0..9dfd2cb716 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.scss +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.scss @@ -1,5 +1,5 @@ .motion-content { - .mat-form-field { + .mat-mdc-form-field { width: 100%; } } diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/motion-change-recommendation-dialog.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/motion-change-recommendation-dialog.module.ts index bee352a750..ec668272c8 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/motion-change-recommendation-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/motion-change-recommendation-dialog.module.ts @@ -4,8 +4,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyRadioModule as MatRadioModule } from '@angular/material/legacy-radio'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { EditorModule } from 'src/app/ui/modules/editor'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/motion-detail.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/motion-detail.module.ts index 09b9c136c8..a6521bb2cb 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/motion-detail.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/motion-detail.module.ts @@ -8,13 +8,13 @@ import { MatIconModule } from '@angular/material/icon'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatLegacyProgressBarModule as MatProgressBarModule } from '@angular/material/legacy-progress-bar'; import { MatLegacyRadioModule as MatRadioModule } from '@angular/material/legacy-radio'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatSelectModule } from '@angular/material/select'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { MatStepperModule } from '@angular/material/stepper'; import { RouterModule } from '@angular/router'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/motion-list-info-dialog.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/motion-list-info-dialog.module.ts index caa81ca5ce..b3f69ce1b5 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/motion-list-info-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/motion-list-info-dialog.module.ts @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatSelectModule } from '@angular/material/select'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-detail/motion-poll-detail.component.scss b/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-detail/motion-poll-detail.component.scss index 0ad2f12b41..f41e54fc4e 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-detail/motion-poll-detail.component.scss +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-detail/motion-poll-detail.component.scss @@ -2,7 +2,7 @@ .named-result-table { grid-area: names; - .mat-form-field { + .mat-mdc-form-field { font-size: 14px; width: 100%; } diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/statute-paragraphs/components/statute-paragraph-list/statute-paragraph-list.component.scss b/client/src/app/site/pages/meetings/pages/motions/pages/statute-paragraphs/components/statute-paragraph-list/statute-paragraph-list.component.scss index fc96549eca..fffbf2d6ef 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/statute-paragraphs/components/statute-paragraph-list/statute-paragraph-list.component.scss +++ b/client/src/app/site/pages/meetings/pages/motions/pages/statute-paragraphs/components/statute-paragraph-list/statute-paragraph-list.component.scss @@ -4,7 +4,7 @@ .mat-card { margin-bottom: 20px; - .mat-form-field { + .mat-mdc-form-field { width: 100%; } } diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/statute-paragraphs/statute-paragraphs.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/statute-paragraphs/statute-paragraphs.module.ts index 8b4bd2deb5..dd5eb78442 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/statute-paragraphs/statute-paragraphs.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/statute-paragraphs/statute-paragraphs.module.ts @@ -6,8 +6,8 @@ import { MatExpansionModule } from '@angular/material/expansion'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/tags/tags.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/tags/tags.module.ts index ba8cfadebc..7d72b960e0 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/tags/tags.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/tags/tags.module.ts @@ -4,8 +4,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { HeadBarModule } from 'src/app/ui/modules/head-bar'; import { ListModule } from 'src/app/ui/modules/list'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/workflows.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/workflows.module.ts index 931318b64d..46686e5e46 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/workflows.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/workflows.module.ts @@ -8,8 +8,8 @@ import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-c import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; diff --git a/client/src/app/site/pages/meetings/pages/participants/modules/groups/groups.module.ts b/client/src/app/site/pages/meetings/pages/participants/modules/groups/groups.module.ts index 92fc89b759..b3691eb950 100644 --- a/client/src/app/site/pages/meetings/pages/participants/modules/groups/groups.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/modules/groups/groups.module.ts @@ -5,8 +5,8 @@ import { MatExpansionModule } from '@angular/material/expansion'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/pages/participant-detail-manage/participant-detail-manage.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/pages/participant-detail-manage/participant-detail-manage.module.ts index 0475e0a244..de4378c3ec 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/pages/participant-detail-manage/participant-detail-manage.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/pages/participant-detail-manage/participant-detail-manage.module.ts @@ -5,7 +5,7 @@ import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { MatStepperModule } from '@angular/material/stepper'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/participant-detail.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/participant-detail.module.ts index bf19f05879..cbe9f8cd56 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/participant-detail.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/participant-detail.module.ts @@ -4,7 +4,7 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { RouterModule } from '@angular/router'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/participant-list-info-dialog.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/participant-list-info-dialog.module.ts index 5d9e43e2e7..546023faf4 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/participant-list-info-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/participant-list-info-dialog.module.ts @@ -3,9 +3,9 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatSelectModule } from '@angular/material/select'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-presence/participant-presence.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-presence/participant-presence.module.ts index f4020eb630..0b51db3c1e 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-presence/participant-presence.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-presence/participant-presence.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { HeadBarModule } from 'src/app/ui/modules/head-bar'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/components/projector-countdown-dialog/projector-countdown-dialog.component.scss b/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/components/projector-countdown-dialog/projector-countdown-dialog.component.scss index ef0ee7122e..7363f8392d 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/components/projector-countdown-dialog/projector-countdown-dialog.component.scss +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/components/projector-countdown-dialog/projector-countdown-dialog.component.scss @@ -1,3 +1,3 @@ -.mat-form-field { +.mat-mdc-form-field { width: 100%; } diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/projector-countdown-dialog.module.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/projector-countdown-dialog.module.ts index 85adea15a6..0303d88092 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/projector-countdown-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/projector-countdown-dialog.module.ts @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { ProjectorCountdownDialogComponent } from './components/projector-countdown-dialog/projector-countdown-dialog.component'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/components/projector-edit-dialog/projector-edit-dialog.component.scss b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/components/projector-edit-dialog/projector-edit-dialog.component.scss index 74386580f5..6c27cc8e0a 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/components/projector-edit-dialog/projector-edit-dialog.component.scss +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/components/projector-edit-dialog/projector-edit-dialog.component.scss @@ -12,7 +12,7 @@ form { grid-template-columns: 40% 60%; } - .mat-form-field { + .mat-mdc-form-field { width: 100%; } } @@ -36,11 +36,12 @@ form { } .color-picker-form { + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ .mat-form-field-wrapper { padding-bottom: 0; } } - + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ .mat-form-field-underline { display: none; } diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/projector-edit-dialog.module.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/projector-edit-dialog.module.ts index c06a177551..d354f47c50 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/projector-edit-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/projector-edit-dialog.module.ts @@ -6,10 +6,10 @@ import { MatIconModule } from '@angular/material/icon'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyRadioModule as MatRadioModule } from '@angular/material/legacy-radio'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatSelectModule } from '@angular/material/select'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { MatSliderModule } from '@angular/material/slider'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/projector-list.module.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/projector-list.module.ts index 4e49e7c7d2..af286a7724 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/projector-list.module.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/projector-list.module.ts @@ -4,8 +4,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; diff --git a/client/src/app/site/pages/organization/modules/account-search-selector/account-search-selector.module.ts b/client/src/app/site/pages/organization/modules/account-search-selector/account-search-selector.module.ts index fb0ef3d749..160f6f0dd3 100644 --- a/client/src/app/site/pages/organization/modules/account-search-selector/account-search-selector.module.ts +++ b/client/src/app/site/pages/organization/modules/account-search-selector/account-search-selector.module.ts @@ -4,7 +4,7 @@ import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatSelectModule } from '@angular/material/select'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; diff --git a/client/src/app/site/pages/organization/modules/account-search-selector/components/account-search-selector/account-search-selector.component.ts b/client/src/app/site/pages/organization/modules/account-search-selector/components/account-search-selector/account-search-selector.component.ts index cbc7c6178c..3c40c48dbe 100644 --- a/client/src/app/site/pages/organization/modules/account-search-selector/components/account-search-selector/account-search-selector.component.ts +++ b/client/src/app/site/pages/organization/modules/account-search-selector/components/account-search-selector/account-search-selector.component.ts @@ -1,8 +1,8 @@ import { FocusMonitor } from '@angular/cdk/a11y'; import { Component, ElementRef, Input, OnDestroy, OnInit } from '@angular/core'; import { NgControl, UntypedFormBuilder } from '@angular/forms'; -import { MatLegacyOptionSelectionChange as MatOptionSelectionChange } from '@angular/material/legacy-core'; -import { MatLegacyFormFieldControl as MatFormFieldControl } from '@angular/material/legacy-form-field'; +import { MatOptionSelectionChange } from '@angular/material/core'; +import { MatFormFieldControl } from '@angular/material/form-field'; import { distinctUntilChanged } from 'rxjs'; import { OML } from 'src/app/domain/definitions/organization-permission'; import { Selectable } from 'src/app/domain/interfaces/selectable'; diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/account-detail.module.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/account-detail.module.ts index 80b1077547..db109b49fd 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/account-detail.module.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/account-detail.module.ts @@ -4,10 +4,10 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatSelectModule } from '@angular/material/select'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { RouterModule } from '@angular/router'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/account-list.module.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/account-list.module.ts index 83f8ed46b5..cb8419db5a 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/account-list.module.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/account-list.module.ts @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { RouterModule } from '@angular/router'; diff --git a/client/src/app/site/pages/organization/pages/committees/modules/committee-components.module.ts b/client/src/app/site/pages/organization/pages/committees/modules/committee-components.module.ts index 3bdc3a1c80..c6995a3cdf 100644 --- a/client/src/app/site/pages/organization/pages/committees/modules/committee-components.module.ts +++ b/client/src/app/site/pages/organization/pages/committees/modules/committee-components.module.ts @@ -5,7 +5,7 @@ import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { RouterModule } from '@angular/router'; diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-edit/committee-detail-edit.module.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-edit/committee-detail-edit.module.ts index 025bf7c985..1392505f3e 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-edit/committee-detail-edit.module.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-edit/committee-detail-edit.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { AccountSearchSelectorModule } from 'src/app/site/pages/organization/modules/account-search-selector'; import { HeadBarModule } from 'src/app/ui/modules/head-bar'; diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/committee-detail-meeting.module.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/committee-detail-meeting.module.ts index 9d5096f6d1..e4cfe93107 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/committee-detail-meeting.module.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/committee-detail-meeting.module.ts @@ -3,9 +3,9 @@ import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatSelectModule } from '@angular/material/select'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { AccountSearchSelectorModule } from 'src/app/site/pages/organization/modules/account-search-selector'; import { DirectivesModule } from 'src/app/ui/directives'; diff --git a/client/src/app/site/pages/organization/pages/designs/designs.module.ts b/client/src/app/site/pages/organization/pages/designs/designs.module.ts index 9a9debcf43..9f461149b4 100644 --- a/client/src/app/site/pages/organization/pages/designs/designs.module.ts +++ b/client/src/app/site/pages/organization/pages/designs/designs.module.ts @@ -4,7 +4,7 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/theme-builder-dialog.module.ts b/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/theme-builder-dialog.module.ts index ebe3d51590..82b32d61b3 100644 --- a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/theme-builder-dialog.module.ts +++ b/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/theme-builder-dialog.module.ts @@ -4,8 +4,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { ColorFormFieldModule } from 'src/app/ui/modules/color-form-field/color-form-field.module'; diff --git a/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/organization-mediafile-list.module.ts b/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/organization-mediafile-list.module.ts index b306a98a62..fe7bb9bea8 100644 --- a/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/organization-mediafile-list.module.ts +++ b/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/organization-mediafile-list.module.ts @@ -4,8 +4,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { MediafileListServiceModule } from 'src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-service.module'; diff --git a/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/organization-tag-dialog.module.ts b/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/organization-tag-dialog.module.ts index b8a65aebde..565dd95616 100644 --- a/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/organization-tag-dialog.module.ts +++ b/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/organization-tag-dialog.module.ts @@ -4,8 +4,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; diff --git a/client/src/app/site/pages/organization/pages/organization-tags/organization-tags.module.ts b/client/src/app/site/pages/organization/pages/organization-tags/organization-tags.module.ts index 5046adbf2b..67b5bea6ad 100644 --- a/client/src/app/site/pages/organization/pages/organization-tags/organization-tags.module.ts +++ b/client/src/app/site/pages/organization/pages/organization-tags/organization-tags.module.ts @@ -4,7 +4,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/settings-detail.module.ts b/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/settings-detail.module.ts index 8208a2a3b2..f0a50599e4 100644 --- a/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/settings-detail.module.ts +++ b/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/settings-detail.module.ts @@ -3,9 +3,9 @@ import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatSelectModule } from '@angular/material/select'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; import { HeadBarModule } from 'src/app/ui/modules/head-bar'; diff --git a/client/src/app/ui/base/base-form-field-control.ts b/client/src/app/ui/base/base-form-field-control.ts index 550f6180da..32630e39de 100644 --- a/client/src/app/ui/base/base-form-field-control.ts +++ b/client/src/app/ui/base/base-form-field-control.ts @@ -8,7 +8,7 @@ import { UntypedFormControl, UntypedFormGroup } from '@angular/forms'; -import { MatLegacyFormFieldControl as MatFormFieldControl } from '@angular/material/legacy-form-field'; +import { MatFormFieldControl } from '@angular/material/form-field'; import { distinctUntilChanged, Subject, Subscription } from 'rxjs'; /** diff --git a/client/src/app/ui/modules/choice-dialog/components/choice-dialog/choice-dialog.component.scss b/client/src/app/ui/modules/choice-dialog/components/choice-dialog/choice-dialog.component.scss index c3dd284f3d..afa6d79c37 100644 --- a/client/src/app/ui/modules/choice-dialog/components/choice-dialog/choice-dialog.component.scss +++ b/client/src/app/ui/modules/choice-dialog/components/choice-dialog/choice-dialog.component.scss @@ -1,4 +1,4 @@ -.mat-form-field { +.mat-mdc-form-field { width: 100%; } diff --git a/client/src/app/ui/modules/color-form-field/color-form-field.module.ts b/client/src/app/ui/modules/color-form-field/color-form-field.module.ts index 90b8d226e7..c6013f8698 100644 --- a/client/src/app/ui/modules/color-form-field/color-form-field.module.ts +++ b/client/src/app/ui/modules/color-form-field/color-form-field.module.ts @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; diff --git a/client/src/app/ui/modules/color-form-field/components/color-form-field/color-form-field.component.scss b/client/src/app/ui/modules/color-form-field/components/color-form-field/color-form-field.component.scss index 1a591931fc..5d9972dcdf 100644 --- a/client/src/app/ui/modules/color-form-field/components/color-form-field/color-form-field.component.scss +++ b/client/src/app/ui/modules/color-form-field/components/color-form-field/color-form-field.component.scss @@ -10,7 +10,7 @@ .grid-start { flex: 1; - .mat-form-field { + .mat-mdc-form-field { width: 100%; } } diff --git a/client/src/app/ui/modules/datepicker/components/datepicker/datepicker.component.scss b/client/src/app/ui/modules/datepicker/components/datepicker/datepicker.component.scss index 80107cc2a2..2ebe6aaeb1 100644 --- a/client/src/app/ui/modules/datepicker/components/datepicker/datepicker.component.scss +++ b/client/src/app/ui/modules/datepicker/components/datepicker/datepicker.component.scss @@ -2,7 +2,7 @@ margin-left: -20px; display: flex; - .mat-form-field { + .mat-mdc-form-field { flex: 1; box-sizing: border-box; padding-left: 20px; diff --git a/client/src/app/ui/modules/datepicker/components/datepicker/datepicker.component.ts b/client/src/app/ui/modules/datepicker/components/datepicker/datepicker.component.ts index a05c95eded..379388d5d6 100644 --- a/client/src/app/ui/modules/datepicker/components/datepicker/datepicker.component.ts +++ b/client/src/app/ui/modules/datepicker/components/datepicker/datepicker.component.ts @@ -1,7 +1,7 @@ import { FocusMonitor } from '@angular/cdk/a11y'; import { ChangeDetectionStrategy, Component, ElementRef, Optional, Self, ViewEncapsulation } from '@angular/core'; import { NgControl, UntypedFormBuilder, UntypedFormControl } from '@angular/forms'; -import { MatLegacyFormFieldControl as MatFormFieldControl } from '@angular/material/legacy-form-field'; +import { MatFormFieldControl } from '@angular/material/form-field'; import { BaseDatepickerComponent } from '../base-datepicker/base-datepicker.component'; diff --git a/client/src/app/ui/modules/datepicker/components/daterangepicker/daterangepicker.component.scss b/client/src/app/ui/modules/datepicker/components/daterangepicker/daterangepicker.component.scss index 80107cc2a2..2ebe6aaeb1 100644 --- a/client/src/app/ui/modules/datepicker/components/daterangepicker/daterangepicker.component.scss +++ b/client/src/app/ui/modules/datepicker/components/daterangepicker/daterangepicker.component.scss @@ -2,7 +2,7 @@ margin-left: -20px; display: flex; - .mat-form-field { + .mat-mdc-form-field { flex: 1; box-sizing: border-box; padding-left: 20px; diff --git a/client/src/app/ui/modules/datepicker/components/daterangepicker/daterangepicker.component.ts b/client/src/app/ui/modules/datepicker/components/daterangepicker/daterangepicker.component.ts index bc5def9790..3f611def27 100644 --- a/client/src/app/ui/modules/datepicker/components/daterangepicker/daterangepicker.component.ts +++ b/client/src/app/ui/modules/datepicker/components/daterangepicker/daterangepicker.component.ts @@ -1,7 +1,7 @@ import { FocusMonitor } from '@angular/cdk/a11y'; import { ChangeDetectionStrategy, Component, ElementRef, Optional, Self, ViewEncapsulation } from '@angular/core'; import { NgControl, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; -import { MatLegacyFormFieldControl as MatFormFieldControl } from '@angular/material/legacy-form-field'; +import { MatFormFieldControl } from '@angular/material/form-field'; import { BaseDatepickerComponent } from '../base-datepicker/base-datepicker.component'; import { DatepickerComponent } from '../datepicker/datepicker.component'; diff --git a/client/src/app/ui/modules/datepicker/datepicker.module.ts b/client/src/app/ui/modules/datepicker/datepicker.module.ts index f844a77e77..0f0cd9d747 100644 --- a/client/src/app/ui/modules/datepicker/datepicker.module.ts +++ b/client/src/app/ui/modules/datepicker/datepicker.module.ts @@ -4,8 +4,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DatepickerComponent } from './components/datepicker/datepicker.component'; diff --git a/client/src/app/ui/modules/file-list/file-list.module.ts b/client/src/app/ui/modules/file-list/file-list.module.ts index 002aaf3c11..6c92f4538d 100644 --- a/client/src/app/ui/modules/file-list/file-list.module.ts +++ b/client/src/app/ui/modules/file-list/file-list.module.ts @@ -4,7 +4,7 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { RouterModule } from '@angular/router'; diff --git a/client/src/app/ui/modules/import-list/components/import-list/import-list.component.ts b/client/src/app/ui/modules/import-list/components/import-list/import-list.component.ts index df6b16359c..8ea123b876 100644 --- a/client/src/app/ui/modules/import-list/components/import-list/import-list.component.ts +++ b/client/src/app/ui/modules/import-list/components/import-list/import-list.component.ts @@ -14,7 +14,7 @@ import { ViewEncapsulation } from '@angular/core'; import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; -import { MatLegacySelectChange as MatSelectChange } from '@angular/material/legacy-select'; +import { MatSelectChange } from '@angular/material/select'; import { MatTab, MatTabChangeEvent } from '@angular/material/tabs'; import { marker as _ } from '@colsen1991/ngx-translate-extract-marker'; import { auditTime, distinctUntilChanged, firstValueFrom, map, Observable, of } from 'rxjs'; diff --git a/client/src/app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component.ts b/client/src/app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component.ts index 3b16a75478..6992c2c201 100644 --- a/client/src/app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component.ts +++ b/client/src/app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component.ts @@ -14,7 +14,7 @@ import { ViewEncapsulation } from '@angular/core'; import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; -import { MatLegacySelectChange as MatSelectChange } from '@angular/material/legacy-select'; +import { MatSelectChange } from '@angular/material/select'; import { MatTab, MatTabChangeEvent } from '@angular/material/tabs'; import { marker as _ } from '@colsen1991/ngx-translate-extract-marker'; import { TranslateService } from '@ngx-translate/core'; diff --git a/client/src/app/ui/modules/import-list/import-list.module.ts b/client/src/app/ui/modules/import-list/import-list.module.ts index b46ce576bd..1adbeae5d8 100644 --- a/client/src/app/ui/modules/import-list/import-list.module.ts +++ b/client/src/app/ui/modules/import-list/import-list.module.ts @@ -7,7 +7,7 @@ import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/lega import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatSelectModule } from '@angular/material/select'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { MatTabsModule } from '@angular/material/tabs'; import { ScrollingTableModule } from 'src/app/ui/modules/scrolling-table'; diff --git a/client/src/app/ui/modules/media-upload-content/media-upload-content.module.ts b/client/src/app/ui/modules/media-upload-content/media-upload-content.module.ts index 36afd43320..45cab19f6b 100644 --- a/client/src/app/ui/modules/media-upload-content/media-upload-content.module.ts +++ b/client/src/app/ui/modules/media-upload-content/media-upload-content.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; import { PipesModule } from 'src/app/ui/pipes/pipes.module'; diff --git a/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts b/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts index 967ce8e1f4..3bc02fb540 100644 --- a/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts +++ b/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts @@ -12,10 +12,10 @@ import { import { OnInit } from '@angular/core'; import { UntypedFormControl } from '@angular/forms'; import { - MatLegacyOption as MatOption, - MatLegacyOptionSelectionChange as MatOptionSelectionChange -} from '@angular/material/legacy-core'; -import { MatLegacySelect as MatSelect } from '@angular/material/legacy-select'; + MatOption, + MatOptionSelectionChange +} from '@angular/material/core'; +import { MatSelect } from '@angular/material/select'; import { marker as _ } from '@colsen1991/ngx-translate-extract-marker'; import { BehaviorSubject, debounceTime, distinctUntilChanged, Observable } from 'rxjs'; import { Id } from 'src/app/domain/definitions/key-types'; diff --git a/client/src/app/ui/modules/search-selector/components/list-search-selector/list-search-selector.component.ts b/client/src/app/ui/modules/search-selector/components/list-search-selector/list-search-selector.component.ts index 9c51e4d9e9..997a3ae199 100644 --- a/client/src/app/ui/modules/search-selector/components/list-search-selector/list-search-selector.component.ts +++ b/client/src/app/ui/modules/search-selector/components/list-search-selector/list-search-selector.component.ts @@ -9,7 +9,7 @@ import { ViewEncapsulation } from '@angular/core'; import { NgControl, UntypedFormBuilder } from '@angular/forms'; -import { MatLegacyFormFieldControl as MatFormFieldControl } from '@angular/material/legacy-form-field'; +import { MatFormFieldControl } from '@angular/material/form-field'; import { auditTime, distinctUntilChanged, Observable } from 'rxjs'; import { Selectable } from '../../../../../domain/interfaces/selectable'; diff --git a/client/src/app/ui/modules/search-selector/components/repo-search-selector/repo-search-selector.component.ts b/client/src/app/ui/modules/search-selector/components/repo-search-selector/repo-search-selector.component.ts index 78351d6df1..07818ca278 100644 --- a/client/src/app/ui/modules/search-selector/components/repo-search-selector/repo-search-selector.component.ts +++ b/client/src/app/ui/modules/search-selector/components/repo-search-selector/repo-search-selector.component.ts @@ -1,7 +1,7 @@ import { FocusMonitor } from '@angular/cdk/a11y'; import { Component, ElementRef, Input, OnDestroy, OnInit, Optional, Self, ViewEncapsulation } from '@angular/core'; import { NgControl, UntypedFormBuilder } from '@angular/forms'; -import { MatLegacyFormFieldControl as MatFormFieldControl } from '@angular/material/legacy-form-field'; +import { MatFormFieldControl } from '@angular/material/form-field'; import { map, OperatorFunction } from 'rxjs'; import { ModelRequestService, SubscribeToConfig } from 'src/app/site/services/model-request.service'; diff --git a/client/src/app/ui/modules/search-selector/search-selector.module.ts b/client/src/app/ui/modules/search-selector/search-selector.module.ts index 0e36b429d7..a50df745a4 100644 --- a/client/src/app/ui/modules/search-selector/search-selector.module.ts +++ b/client/src/app/ui/modules/search-selector/search-selector.module.ts @@ -5,7 +5,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatSelectModule } from '@angular/material/select'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { DirectivesModule } from 'src/app/ui/directives'; diff --git a/client/src/assets/styles/components.scss b/client/src/assets/styles/components.scss index 076a52bd14..d53ddc5351 100644 --- a/client/src/assets/styles/components.scss +++ b/client/src/assets/styles/components.scss @@ -31,7 +31,7 @@ .os-card { margin-bottom: 20px !important; - + /* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version.*/ .mat-select-arrow-wrapper { visibility: hidden; } @@ -40,7 +40,7 @@ .os-form-card { padding: 27px; - .mat-form-field { + .mat-mdc-form-field { width: 100%; padding: 10px 0; } @@ -50,8 +50,8 @@ margin-top: 20px !important; margin-bottom: 20px !important; - .mat-form-field, - .mat-select { + .mat-mdc-form-field, + .mat-mdc-select { width: 100%; } } diff --git a/client/src/styles.scss b/client/src/styles.scss index 94710a6b8b..727fa0fdc5 100644 --- a/client/src/styles.scss +++ b/client/src/styles.scss @@ -77,6 +77,7 @@ @extend .regular-shadow; } +/* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ .projector-card .mat-form-field-infix { width: 290px; } @@ -330,32 +331,6 @@ button.mat-menu-item.selected { } } -/** - * Fix to enable multi line mat hints. See: - * https://github.com/angular/components/issues/5227 - */ -.mat-form-field { - .mat-form-field-wrapper { - padding-bottom: 0; - - .mat-form-field-underline { - position: initial !important; - display: block; - margin-top: -1px; - } - - .mat-form-field-subscript-wrapper, - .mat-form-field-ripple { - position: initial !important; - display: table; - } - - .mat-form-field-subscript-wrapper { - min-height: calc(1em + 1px); - } - } -} - .fake-button-no-touch { width: 40px; height: 40px; From 77d73d8c124afc94a492dbf7f257d643219ba97a Mon Sep 17 00:00:00 2001 From: Elblinator Date: Fri, 10 Nov 2023 15:57:03 +0100 Subject: [PATCH 03/19] part of inserting mat-label and linting --- .../user-detail-view.component.html | 42 +++++++------------ .../user-password-form.component.html | 9 +--- .../user-components/user-components.module.ts | 6 +-- .../login-mask/login-mask.component.html | 12 ++---- .../pages/login-mask/login-mask.module.ts | 4 +- .../reset-password-confirm.component.html | 10 +---- .../reset-password-confirm.module.ts | 2 +- .../reset-password.component.html | 11 +---- .../reset-password/reset-password.module.ts | 2 +- .../list-of-speakers-content.module.ts | 2 +- .../point-of-order-dialog.module.ts | 4 +- .../agenda-content-object-form.module.ts | 2 +- .../agenda-content-object-form.component.html | 5 ++- .../attachment-control.module.ts | 2 +- .../attachment-control.component.html | 4 +- ...participant-search-selector.component.html | 2 +- .../participant-search-selector.module.ts | 2 +- .../base-poll-form.component.html | 40 +++++++++--------- .../check-input/check-input.component.html | 10 +---- .../meetings/modules/poll/poll.module.ts | 4 +- .../topic-poll-dialog.component.html | 9 +--- .../modules/topic-poll/topic-poll.module.ts | 6 +-- .../topic-detail/topic-detail.component.html | 15 +++---- .../pages/topic-detail/topic-detail.module.ts | 4 +- .../topic-import/topic-import.component.html | 2 +- .../pages/topic-import/topic-import.module.ts | 2 +- .../agenda-item-list.module.ts | 2 +- .../agenda-item-info-dialog.component.html | 14 ++++--- .../assignment-poll/assignment-poll.module.ts | 4 +- .../assignment-detail.module.ts | 2 +- .../chat-group-dialog.module.ts | 4 +- .../chat-group-list/chat-group-list.module.ts | 4 +- .../meetings/pages/history/history.module.ts | 6 +-- .../pages/home/pages/start/start.module.ts | 2 +- .../mediafile-list/mediafile-list.module.ts | 4 +- .../mediafile-upload.module.ts | 2 +- .../meeting-settings-group-detail.module.ts | 6 +-- .../modules/motion-poll/motion-poll.module.ts | 6 +-- .../pages/categories/categories.module.ts | 4 +- .../motions/pages/comments/comments.module.ts | 4 +- .../motion-block-create-dialog.module.ts | 4 +- .../motion-block-edit-dialog.module.ts | 4 +- ...ion-change-recommendation-dialog.module.ts | 4 +- .../motion-detail/motion-detail.module.ts | 6 +-- .../motion-list-info-dialog.module.ts | 2 +- .../statute-paragraphs.module.ts | 4 +- .../pages/motions/pages/tags/tags.module.ts | 4 +- .../pages/workflows/workflows.module.ts | 4 +- .../modules/groups/groups.module.ts | 4 +- .../participant-detail-view.component.html | 33 +++++---------- .../participant-detail-manage.module.ts | 2 +- .../participant-detail.module.ts | 2 +- .../participant-list-info-dialog.module.ts | 4 +- .../participant-presence.module.ts | 2 +- .../projector-countdown-dialog.module.ts | 4 +- .../projector-edit-dialog.module.ts | 6 +-- .../projector-list/projector-list.module.ts | 4 +- .../account-search-selector.module.ts | 2 +- .../account-detail/account-detail.module.ts | 4 +- .../pages/account-list/account-list.module.ts | 2 +- .../modules/committee-components.module.ts | 2 +- .../committee-detail-edit.module.ts | 2 +- .../committee-detail-meeting.module.ts | 4 +- .../pages/designs/designs.module.ts | 2 +- .../theme-builder-dialog.module.ts | 4 +- .../organization-mediafile-list.module.ts | 4 +- .../organization-tag-dialog.module.ts | 4 +- .../organization-tags.module.ts | 2 +- .../settings-detail/settings-detail.module.ts | 4 +- .../color-form-field.module.ts | 4 +- .../modules/datepicker/datepicker.module.ts | 4 +- .../ui/modules/file-list/file-list.module.ts | 2 +- .../modules/import-list/import-list.module.ts | 2 +- .../media-upload-content.module.ts | 2 +- .../base-search-selector.component.ts | 5 +-- .../search-selector/search-selector.module.ts | 2 +- 76 files changed, 185 insertions(+), 242 deletions(-) diff --git a/client/src/app/site/modules/user-components/components/user-detail-view/user-detail-view.component.html b/client/src/app/site/modules/user-components/components/user-detail-view/user-detail-view.component.html index c3fcb49965..302461cb01 100644 --- a/client/src/app/site/modules/user-components/components/user-detail-view/user-detail-view.component.html +++ b/client/src/app/site/modules/user-components/components/user-detail-view/user-detail-view.component.html @@ -50,36 +50,27 @@

{{ 'Personal information' | translate }}

- + {{ 'Title' | translate }} + - + {{ 'Given name' | translate }} + - + {{ 'Surname' | translate }} +
- + {{ 'Email' | translate }} + {{ 'Please enter a valid email address!' | translate }} @@ -87,13 +78,15 @@

{{ 'Personal information' | translate }}

- + {{ 'Pronoun' | translate }} + {{ 'max. 32 characters allowed' | translate }} - + {{ 'Gender' | translate }} + - {{ gender | translate }} @@ -105,7 +98,8 @@

{{ 'Personal information' | translate }}

- + {{ 'Username' | translate }} + 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 ed6f94b0b9..841d88e274 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 @@ -47,7 +47,7 @@

{{ 'Name' | translate }} - +

diff --git a/client/src/app/site/pages/meetings/pages/participants/modules/groups/components/group-list/group-list.component.html b/client/src/app/site/pages/meetings/pages/participants/modules/groups/components/group-list/group-list.component.html index eebcc7c794..6a9bf01140 100644 --- a/client/src/app/site/pages/meetings/pages/participants/modules/groups/components/group-list/group-list.component.html +++ b/client/src/app/site/pages/meetings/pages/participants/modules/groups/components/group-list/group-list.component.html @@ -87,12 +87,7 @@

{{ 'New group name' | translate }} - + {{ 'Required' | translate }} {{ 'Must be unique' | translate }} @@ -100,11 +95,7 @@

{{ 'External ID' | translate }} - +

diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/pages/participant-detail-manage/components/participant-create-wizard/participant-create-wizard.component.html b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/pages/participant-detail-manage/components/participant-create-wizard/participant-create-wizard.component.html index 8a60f2be72..8f009f4276 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/pages/participant-detail-manage/components/participant-create-wizard/participant-create-wizard.component.html +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/pages/participant-detail-manage/components/participant-create-wizard/participant-create-wizard.component.html @@ -43,44 +43,25 @@

{{ 'Personal information' | translate }}

{{ 'Given name' | translate }} - + {{ 'Surname' | translate }} - + {{ 'Email' | translate }} - + {{ 'Please enter a valid email address!' | translate }} {{ 'Username' | translate }} - + diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/components/projector-countdown-dialog/projector-countdown-dialog.component.html b/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/components/projector-countdown-dialog/projector-countdown-dialog.component.html index 9d60def824..33a6dfece5 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/components/projector-countdown-dialog/projector-countdown-dialog.component.html +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/components/projector-countdown-dialog/projector-countdown-dialog.component.html @@ -7,12 +7,7 @@

{{ 'Countdown title' | translate }} - + diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/components/projector-edit-dialog/projector-edit-dialog.component.html b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/components/projector-edit-dialog/projector-edit-dialog.component.html index 70da5b4ecd..e37bbe8905 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/components/projector-edit-dialog/projector-edit-dialog.component.html +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/components/projector-edit-dialog/projector-edit-dialog.component.html @@ -103,10 +103,7 @@

{{ 'Resolution and size' | translate }}

{{ 'Projection defaults' | translate }}

{{ 'Projection defaults' | translate }} - + {{ 'Add to meetings' | translate }}: {{ user?.getFullName() }}
{{ 'Group name' | translate }} - +
diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail/account-detail.component.html b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail/account-detail.component.html index c6a9bb9521..6dc2fba3c1 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail/account-detail.component.html +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail/account-detail.component.html @@ -44,11 +44,7 @@

{{ 'Organization specific information' | translate }}

}" > {{ 'Default structure level' | translate }} - + @@ -58,23 +54,15 @@

{{ 'Organization specific information' | translate }}

form37: true }" > - {{ 'Default number' | translate }} - + {{ 'Default number' | translate }} + {{ 'Default vote weight' | translate }} - + Please select a vote weight bigger than zero. diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-edit/components/committee-detail-edit/committee-detail-edit.component.html b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-edit/components/committee-detail-edit/committee-detail-edit.component.html index 831c2295a0..15d3ee6f5e 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-edit/components/committee-detail-edit/committee-detail-edit.component.html +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-edit/components/committee-detail-edit/committee-detail-edit.component.html @@ -41,9 +41,7 @@

{{ editCommitteeLabel | translate }}

{{ 'Committee managers' | translate }} - + diff --git a/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/components/organization-mediafile-list/organization-mediafile-list.component.html b/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/components/organization-mediafile-list/organization-mediafile-list.component.html index dee4331b08..30dbfabf75 100644 --- a/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/components/organization-mediafile-list/organization-mediafile-list.component.html +++ b/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/components/organization-mediafile-list/organization-mediafile-list.component.html @@ -101,13 +101,7 @@

{{ 'Edit details for' | translate }}

{{ 'New file name' | translate }} - + {{ 'Required' | translate }}
diff --git a/client/src/app/ui/modules/file-list/components/file-list/file-list.component.html b/client/src/app/ui/modules/file-list/components/file-list/file-list.component.html index cf9be0491b..d94cd2a8fc 100644 --- a/client/src/app/ui/modules/file-list/components/file-list/file-list.component.html +++ b/client/src/app/ui/modules/file-list/components/file-list/file-list.component.html @@ -166,13 +166,7 @@

{{ 'Edit details for' | translate }}

{{ 'New file name' | translate }} - + {{ 'Required' | translate }}
From 9ebfb71a94cedd1be67700d8a3af7f0f84fae9f2 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Mon, 13 Nov 2023 13:58:36 +0100 Subject: [PATCH 06/19] Update test field label names --- client/tests/integration/login.spec.ts | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/client/tests/integration/login.spec.ts b/client/tests/integration/login.spec.ts index bbdc71c07d..64ac058370 100644 --- a/client/tests/integration/login.spec.ts +++ b/client/tests/integration/login.spec.ts @@ -52,8 +52,8 @@ test.describe(`Testing the internal sign in process with saml enabled`, () => { await page.goto(`/login`); await expect(page).toHaveURL(`/login`); await page.getByText(`Internal login`).click(); - await page.getByLabel(`Username *`).fill(`admin`); - await page.getByLabel(`Password *`).fill(`admin`); + await page.getByLabel(`Username`).fill(`admin`); + await page.getByLabel(`Password`).fill(`admin`); await page.getByRole(`button`, { name: `Login`, exact: true }).click(); await expect(page).not.toHaveURL(`/login`); }); @@ -62,8 +62,8 @@ test.describe(`Testing the internal sign in process with saml enabled`, () => { await page.goto(`/login`); await expect(page).toHaveURL(`/login`); await page.getByText(`Internal login`).click(); - await page.getByLabel(`Username *`).fill(username); - await page.getByLabel(`Password *`).fill(username); + await page.getByLabel(`Username`).fill(username); + await page.getByLabel(`Password`).fill(username); await page.getByRole(`button`, { name: `Login`, exact: true }).click(); await expect(page).not.toHaveURL(`/login`); await expect(page).toHaveURL(`/${meetingId}`); @@ -73,8 +73,8 @@ test.describe(`Testing the internal sign in process with saml enabled`, () => { await page.goto(`/login`); await expect(page).toHaveURL(`/login`); await page.getByText(`Internal login`).click(); - await page.getByLabel(`Username *`).fill(DELEGATE_NAME); - await page.getByLabel(`Password *`).fill(DELEGATE_NAME); + await page.getByLabel(`Username`).fill(DELEGATE_NAME); + await page.getByLabel(`Password`).fill(DELEGATE_NAME); await page.getByRole(`button`, { name: `Login`, exact: true }).click(); await expect(page).not.toHaveURL(`/login`); await expect(page).toHaveURL(`/${DEFAULT_MEETING_ID}`); @@ -122,8 +122,8 @@ test.describe(`Testing the sign in and out process`, () => { test(`signs in as superadmin`, async ({ page }) => { await page.goto(`/login`); await expect(page).toHaveURL(`/login`); - await page.getByLabel(`Username *`).fill(`admin`); - await page.getByLabel(`Password *`).fill(`admin`); + await page.getByLabel(`Username`).fill(`admin`); + await page.getByLabel(`Password`).fill(`admin`); await page.getByRole(`button`, { name: `Login` }).click(); await expect(page).not.toHaveURL(`/login`); }); @@ -131,8 +131,8 @@ test.describe(`Testing the sign in and out process`, () => { test(`signs in as meeting admin`, async ({ page }) => { await page.goto(`/login`); await expect(page).toHaveURL(`/login`); - await page.getByLabel(`Username *`).fill(username); - await page.getByLabel(`Password *`).fill(username); + await page.getByLabel(`Username`).fill(username); + await page.getByLabel(`Password`).fill(username); await page.getByRole(`button`, { name: `Login` }).click(); await expect(page).not.toHaveURL(`/login`); await expect(page).toHaveURL(`/${meetingId}`); @@ -141,8 +141,8 @@ test.describe(`Testing the sign in and out process`, () => { test(`signs in as delegate`, async ({ page }) => { await page.goto(`/login`); await expect(page).toHaveURL(`/login`); - await page.getByLabel(`Username *`).fill(DELEGATE_NAME); - await page.getByLabel(`Password *`).fill(DELEGATE_NAME); + await page.getByLabel(`Username`).fill(DELEGATE_NAME); + await page.getByLabel(`Password`).fill(DELEGATE_NAME); await page.getByRole(`button`, { name: `Login` }).click(); await expect(page).not.toHaveURL(`/login`); await expect(page).toHaveURL(`/${DEFAULT_MEETING_ID}`); @@ -170,8 +170,8 @@ test.describe(`Testing the sign in and out process`, () => { const loginDelegate = async () => { await page.goto(`/login`); await expect(page).toHaveURL(`/login`); - await page.getByLabel(`Username *`).fill(DELEGATE_NAME); - await page.getByLabel(`Password *`).fill(DELEGATE_NAME); + await page.getByLabel(`Username`).fill(DELEGATE_NAME); + await page.getByLabel(`Password`).fill(DELEGATE_NAME); await page.getByRole(`button`, { name: `Login` }).click(); }; loginDelegate(); From 42ac634e16b90434ea245b18fa0967f246c50d63 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Mon, 27 Nov 2023 16:23:50 +0100 Subject: [PATCH 07/19] Update default appearance --- client/src/app/openslides-main-module/openslides-main.module.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/src/app/openslides-main-module/openslides-main.module.ts b/client/src/app/openslides-main-module/openslides-main.module.ts index ad33ba6995..e35b502372 100644 --- a/client/src/app/openslides-main-module/openslides-main.module.ts +++ b/client/src/app/openslides-main-module/openslides-main.module.ts @@ -1,5 +1,6 @@ import { HttpClientModule } from '@angular/common/http'; import { APP_INITIALIZER, NgModule } from '@angular/core'; +import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field'; import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar'; import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @@ -43,6 +44,7 @@ const NOT_LAZY_LOADED_MODULES = [MatSnackBarModule, GlobalSpinnerModule, WaitFor ], providers: [ { provide: APP_INITIALIZER, useFactory: AppLoaderFactory, deps: [AppLoadService], multi: true }, + { provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: { appearance: `outline` } }, httpInterceptorProviders ], bootstrap: [OpenSlidesMainComponent] From 1535030c758c48a3439086f26954698fc88225fb Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Tue, 5 Dec 2023 12:44:07 +0100 Subject: [PATCH 08/19] Revert "Update default appearance" This reverts commit 42ac634e16b90434ea245b18fa0967f246c50d63. --- client/src/app/openslides-main-module/openslides-main.module.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/client/src/app/openslides-main-module/openslides-main.module.ts b/client/src/app/openslides-main-module/openslides-main.module.ts index e35b502372..ad33ba6995 100644 --- a/client/src/app/openslides-main-module/openslides-main.module.ts +++ b/client/src/app/openslides-main-module/openslides-main.module.ts @@ -1,6 +1,5 @@ import { HttpClientModule } from '@angular/common/http'; import { APP_INITIALIZER, NgModule } from '@angular/core'; -import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field'; import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar'; import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @@ -44,7 +43,6 @@ const NOT_LAZY_LOADED_MODULES = [MatSnackBarModule, GlobalSpinnerModule, WaitFor ], providers: [ { provide: APP_INITIALIZER, useFactory: AppLoaderFactory, deps: [AppLoadService], multi: true }, - { provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: { appearance: `outline` } }, httpInterceptorProviders ], bootstrap: [OpenSlidesMainComponent] From 49ac36217608be76576e15d797815427e9ed67f8 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Tue, 5 Dec 2023 13:11:34 +0100 Subject: [PATCH 09/19] Fix projector size input --- .../projector-edit-dialog/projector-edit-dialog.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/components/projector-edit-dialog/projector-edit-dialog.component.scss b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/components/projector-edit-dialog/projector-edit-dialog.component.scss index 6c27cc8e0a..e44b55c903 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/components/projector-edit-dialog/projector-edit-dialog.component.scss +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/components/projector-edit-dialog/projector-edit-dialog.component.scss @@ -20,7 +20,7 @@ form { .grid-form { width: 100%; display: grid; - grid-template-columns: auto 50px; + grid-template-columns: auto 100px; .grid-start { grid-column-start: 1; From ec9742b9fe284ad250df546c6b756b447db44e75 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Fri, 8 Dec 2023 10:14:25 +0100 Subject: [PATCH 10/19] Fix theme builder dialog --- client/src/app/infrastructure/utils/dialog-settings.ts | 4 ++-- .../components/theme-builder-dialog.component.html | 4 ++-- .../components/theme-builder-dialog.component.scss | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/client/src/app/infrastructure/utils/dialog-settings.ts b/client/src/app/infrastructure/utils/dialog-settings.ts index f0e05ce02a..77897e6096 100644 --- a/client/src/app/infrastructure/utils/dialog-settings.ts +++ b/client/src/app/infrastructure/utils/dialog-settings.ts @@ -14,10 +14,10 @@ export const largeDialogSettings = { /** * Settings to display a medium dialog. - * `width='750px'` + * `width='804px'` */ export const mediumDialogSettings = { - width: `750px`, + width: `804px`, ...generalSettings }; diff --git a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/components/theme-builder-dialog.component.html b/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/components/theme-builder-dialog.component.html index 95b8bccd67..a22321d860 100644 --- a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/components/theme-builder-dialog.component.html +++ b/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/components/theme-builder-dialog.component.html @@ -13,7 +13,7 @@

{{ 'Color set' | translate }}
-
+
@@ -53,7 +53,7 @@

{{ 'Color set' | translate }}

Voting colors

-
+
diff --git a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/components/theme-builder-dialog.component.scss b/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/components/theme-builder-dialog.component.scss index c23e26400e..ccd5145321 100644 --- a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/components/theme-builder-dialog.component.scss +++ b/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/components/theme-builder-dialog.component.scss @@ -7,3 +7,7 @@ flex: 1; } } + +.color-picker-row { + flex-wrap: wrap; +} From 299e23cca584a1b3c5ccbbfb0b8c512cef33cfc8 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Fri, 8 Dec 2023 10:15:08 +0100 Subject: [PATCH 11/19] Fix meeting edit margin --- .../meeting-edit/meeting-edit.component.html | 30 ++++++++++--------- .../meeting-edit/meeting-edit.component.scss | 4 +++ 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.html b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.html index fd8c01958e..d97c43db83 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.html +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.html @@ -19,20 +19,22 @@

{{ editMeetingLabel | translate }}

- - {{ 'Duplicate from' | translate }} - - - {{ 'Participants and administrators are copied completely and cannot be edited here.' | translate }} - - +

+ + {{ 'Duplicate from' | translate }} + + + {{ 'Participants and administrators are copied completely and cannot be edited here.' | translate }} + + +

{{ 'Language' | translate }} diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.scss b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.scss index cb510af033..ebe81b2c90 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.scss +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.scss @@ -11,4 +11,8 @@ mat-form-field { display: block; } + + p.has-hint { + margin-top: 0; + } } From 3c1e1dd55c68a496c56a4ea1d4b173de9ba77381 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Fri, 8 Dec 2023 10:22:28 +0100 Subject: [PATCH 12/19] Fix poll create hint --- .../base-poll-form/base-poll-form.component.html | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html index 4c1d5e6cc8..7fa9c00d77 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html +++ b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html @@ -154,12 +154,7 @@

- - {{ - 'Voting ends after short (some seconds/minutes) or long (some days/weeks) time period.' - | translate - }} - + Voting ends after short (some seconds/minutes) or long (some days/weeks) time period.

From 52ee7a0d6b63a7bf58b5723b5093f5001d0a17fe Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Fri, 8 Dec 2023 10:37:31 +0100 Subject: [PATCH 13/19] Fix analog poll dialog margins --- .../components/base-poll-form/base-poll-form.component.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.scss b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.scss index 3333457522..3c28f3461d 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.scss +++ b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.scss @@ -22,3 +22,7 @@ grid-row: 2 / 3; } } + +.mat-divider { + margin-bottom: 16px; +} From e141139594b8afb27bad40f7f766a805928b3414 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Fri, 8 Dec 2023 13:50:39 +0100 Subject: [PATCH 14/19] Fix file upload inputs in table --- .../attachment-control/attachment-control.component.html | 2 +- .../components/mediafile-upload/mediafile-upload.component.html | 2 +- .../media-upload-content/media-upload-content.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/components/attachment-control/attachment-control.component.html b/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/components/attachment-control/attachment-control.component.html index 9303cefc3a..39b200396c 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/components/attachment-control/attachment-control.component.html +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/components/attachment-control/attachment-control.component.html @@ -34,7 +34,7 @@

>
- + {{ 'Access groups' | translate }} {{ 'Upload files' | translate }}

>
- + {{ 'Access groups' | translate }}
{{ 'Title' | translate }}
- +
From b85b482a69596bcc4cbb6b585d0870f2692f2923 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Fri, 8 Dec 2023 14:09:59 +0100 Subject: [PATCH 15/19] Improve history page filter --- .../components/history-list/history-list.component.html | 2 +- .../components/history-list/history-list.component.scss | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/client/src/app/site/pages/meetings/pages/history/components/history-list/history-list.component.html b/client/src/app/site/pages/meetings/pages/history/components/history-list/history-list.component.html index 3fefc5eb91..b15653ddf1 100644 --- a/client/src/app/site/pages/meetings/pages/history/components/history-list/history-list.component.html +++ b/client/src/app/site/pages/meetings/pages/history/components/history-list/history-list.component.html @@ -7,7 +7,7 @@
- + {{ 'Module' | translate }} diff --git a/client/src/app/site/pages/meetings/pages/history/components/history-list/history-list.component.scss b/client/src/app/site/pages/meetings/pages/history/components/history-list/history-list.component.scss index f681dd0538..61ad3bc8a9 100644 --- a/client/src/app/site/pages/meetings/pages/history/components/history-list/history-list.component.scss +++ b/client/src/app/site/pages/meetings/pages/history/components/history-list/history-list.component.scss @@ -23,3 +23,7 @@ display: inline-block; vertical-align: middle; } + +.history-module-form-field { + width: 120px; +} From 197d9c76253a793780bd50708016f8b9f7d46594 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Fri, 8 Dec 2023 14:14:31 +0100 Subject: [PATCH 16/19] Create chat input margins --- .../chat-group-dialog.component.html | 48 +++++++++++-------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/components/chat-group-dialog/chat-group-dialog.component.html b/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/components/chat-group-dialog/chat-group-dialog.component.html index 26a70d66e8..eb69e1d761 100644 --- a/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/components/chat-group-dialog/chat-group-dialog.component.html +++ b/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/components/chat-group-dialog/chat-group-dialog.component.html @@ -9,29 +9,35 @@

- - {{ 'Name' | translate }} - - {{ 'Required' | translate }} - +

+ + {{ 'Name' | translate }} + + {{ 'Required' | translate }} + +

- - {{ 'Groups with read permissions' | translate }} - - - - {{ 'Groups with write permissions' | translate }} - - +

+ + {{ 'Groups with read permissions' | translate }} + + +

+

+ + {{ 'Groups with write permissions' | translate }} + + +

From 2e4a1b2496d2ac44064227161f354cbcfa978d3d Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Fri, 8 Dec 2023 14:21:57 +0100 Subject: [PATCH 17/19] Fix meeting settings suffix --- .../meeting-settings-group-detail-field.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.html b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.html index c89662ad23..57108578e9 100644 --- a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.html +++ b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.html @@ -17,8 +17,8 @@ {{ setting.label | translate }} - - error + + error {{ error }} From 0067a380255532b6328ff15e46e7ede1a69bc00b Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Fri, 8 Dec 2023 14:57:18 +0100 Subject: [PATCH 18/19] Fix linter error --- .../base-poll-form/base-poll-form.component.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html index 7fa9c00d77..f9943cca01 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html +++ b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html @@ -154,7 +154,12 @@

- Voting ends after short (some seconds/minutes) or long (some days/weeks) time period. +

From c599071159ffd0d300e62b384534d4ba11328ae1 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Thu, 14 Dec 2023 13:55:29 +0100 Subject: [PATCH 19/19] Fix vote form --- .../base-poll-form.component.html | 60 ++++++++++--------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html index f9943cca01..5d7f139d43 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html +++ b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html @@ -129,39 +129,43 @@

- - {{ PollPropertyVerbose.onehundred_percent_base | translate }} - - - - {{ - (isCreatedList || pollMethod === 'yna' - ? alternativePercentBases[option.key] - : option.value - ) | translate - }} - - - - - - - {{ 'Voting duration' | translate }} - - +
+ + {{ PollPropertyVerbose.onehundred_percent_base | translate }} + + - {{ option.value | translate }} + {{ + (isCreatedList || pollMethod === 'yna' + ? alternativePercentBases[option.key] + : option.value + ) | translate + }} - - +
+
+ + + {{ 'Voting duration' | translate }} + + + + {{ option.value | translate }} + + + + + + +