diff --git a/client/src/app/shared/components/icon-container/icon-container.component.scss b/client/src/app/shared/components/icon-container/icon-container.component.scss index 98bdb2892..f41cb5c47 100644 --- a/client/src/app/shared/components/icon-container/icon-container.component.scss +++ b/client/src/app/shared/components/icon-container/icon-container.component.scss @@ -39,6 +39,7 @@ os-icon-container { margin: auto 5px; text-overflow: ellipsis; overflow: hidden; + width: 100%; } .break-lines { diff --git a/client/src/app/shared/components/list-view-table/list-view-table.component.ts b/client/src/app/shared/components/list-view-table/list-view-table.component.ts index 378eaf7f1..8a71f18dd 100644 --- a/client/src/app/shared/components/list-view-table/list-view-table.component.ts +++ b/client/src/app/shared/components/list-view-table/list-view-table.component.ts @@ -295,7 +295,7 @@ export class ListViewTableComponent
- {{ category.motions.length }} + {{ category.motions.length }}
diff --git a/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.html b/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.html index 7f193ff28..906d13d70 100644 --- a/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.html +++ b/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.html @@ -39,17 +39,52 @@ (dataSourceChange)="onDataSourceChange($event)" > -
+
- {{ motion.getTitle() }} -
+
+
+ + + star + - -
-
- - {{ getStateLabel(motion) }} - + + + attach_file + + + + + + {{ motion.identifier }} + · + + {{ motion.title }} + +
+ + +
+ + by + {{ motion.submitters }} + + + + + · + + Sequential number + {{ motion.id }} + +
+ + +
+ + {{ getStateLabel(motion) }} + +
diff --git a/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.scss b/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.scss index 988f2348a..baf07b192 100644 --- a/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.scss +++ b/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.scss @@ -1,4 +1,5 @@ @import '~assets/styles/tables.scss'; +@import '~app/site/motions/styles/motion-list-styles.scss'; .edit-form { overflow: hidden; diff --git a/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.ts b/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.ts index f7fe97182..a581bb0d9 100644 --- a/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.ts +++ b/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.ts @@ -12,6 +12,7 @@ import { StorageService } from 'app/core/core-services/storage.service'; import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service'; import { MotionBlockRepositoryService } from 'app/core/repositories/motions/motion-block-repository.service'; import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; +import { ConfigService } from 'app/core/ui-services/config.service'; import { PromptService } from 'app/core/ui-services/prompt.service'; import { ViewportService } from 'app/core/ui-services/viewport.service'; import { ColumnRestriction } from 'app/shared/components/list-view-table/list-view-table.component'; @@ -55,11 +56,6 @@ export class MotionBlockDetailComponent extends BaseListViewComponent('motions_show_sequential_numbers') + .subscribe(show => (this.showSequential = show)); } /** diff --git a/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.html b/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.html index 6b5a90f0c..82e1ae63f 100644 --- a/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.html +++ b/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.html @@ -6,6 +6,7 @@ -
- lock - {{ title }} +
+ +
+ {{ title }} +
+
diff --git a/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.ts b/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.ts index 9902245a7..ef5c91c64 100644 --- a/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.ts +++ b/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.ts @@ -71,7 +71,8 @@ export class MotionBlockListComponent extends BaseListViewComponent