+
diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts
index 6b95c425c..cef6fa4fb 100644
--- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts
+++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts
@@ -170,6 +170,11 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
*/
public reasonRequired: boolean;
+ /**
+ * Value of the config variable `motions_hide_referring_motions`
+ */
+ public showReferringMotions: boolean;
+
/**
* Value of the config variable `motions_min_supporters`
*/
@@ -470,6 +475,9 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
this.configService
.get
('motions_reason_required')
.subscribe(required => (this.reasonRequired = required));
+ this.configService
+ .get('motions_hide_referring_motions')
+ .subscribe(show => (this.showReferringMotions = !show));
this.configService
.get('motions_min_supporters')
.subscribe(supporters => (this.minSupporters = supporters));
diff --git a/client/src/app/slides/motions/motion/motion-slide.component.html b/client/src/app/slides/motions/motion/motion-slide.component.html
index 29c4a918e..262223356 100644
--- a/client/src/app/slides/motions/motion/motion-slide.component.html
+++ b/client/src/app/slides/motions/motion/motion-slide.component.html
@@ -11,22 +11,24 @@
{{ data.data.recommender }}
{{ getRecommendationLabel() }}
-
{{ getTitleWithChanges() }}
- Motion {{ data.data.identifier }}
+
+ {{ data.data.identifier }}:
+ {{ getTitleWithChanges() }}
+
+
+
+
+ Referring motions:
+
+ {{ getIdentifierOrTitle(titleInformation) }},
+
+
diff --git a/client/src/assets/styles/projector.scss b/client/src/assets/styles/projector.scss
index b93c98187..dfc1b56de 100644
--- a/client/src/assets/styles/projector.scss
+++ b/client/src/assets/styles/projector.scss
@@ -22,8 +22,8 @@
}
.slidetitle {
- border-bottom: 4px solid #d3d3d3;
- margin-bottom: 40px;
+ border-bottom: 2px solid #d3d3d3;
+ padding-bottom: 20px;
h1 {
margin-bottom: 0;
diff --git a/client/src/styles.scss b/client/src/styles.scss
index 473ecf050..23bc5a234 100644
--- a/client/src/styles.scss
+++ b/client/src/styles.scss
@@ -834,6 +834,10 @@ button.mat-menu-item.selected {
margin-right: 3px;
}
+.nowrap {
+ white-space: nowrap;
+}
+
.white {
color: white;
}
diff --git a/openslides/motions/config_variables.py b/openslides/motions/config_variables.py
index b1e96d8dd..96171a9de 100644
--- a/openslides/motions/config_variables.py
+++ b/openslides/motions/config_variables.py
@@ -125,13 +125,23 @@ def get_config_variables():
subgroup="General",
)
+ yield ConfigVariable(
+ name="motions_hide_referring_motions",
+ default_value=False,
+ input_type="boolean",
+ label="Hide referring motions",
+ weight=328,
+ group="Motions",
+ subgroup="General",
+ )
+
yield ConfigVariable(
name="motions_show_sequential_numbers",
default_value=True,
input_type="boolean",
label="Show the sequential number for a motion",
help_text="In motion list, motion detail and PDF.",
- weight=328,
+ weight=329,
group="Motions",
subgroup="General",
)
diff --git a/openslides/motions/projector.py b/openslides/motions/projector.py
index 3b94c2b39..4315dce1f 100644
--- a/openslides/motions/projector.py
+++ b/openslides/motions/projector.py
@@ -154,6 +154,7 @@ async def motion_slide(
* amendment_paragraphs
* is_child
* show_meta_box
+ * show_referring_motions
* reason
* modified_final_version
* recommendation
@@ -180,6 +181,9 @@ async def motion_slide(
show_meta_box = not await get_config(
all_data, "motions_disable_sidebox_on_projector"
)
+ show_referring_motions = not await get_config(
+ all_data, "motions_hide_referring_motions"
+ )
line_length = await get_config(all_data, "motions_line_length")
line_numbering_mode = await get_config(all_data, "motions_default_line_numbering")
motions_preamble = await get_config(all_data, "motions_preamble")
@@ -213,6 +217,7 @@ async def motion_slide(
"base_statute": base_statute,
"is_child": bool(motion["parent_id"]),
"show_meta_box": show_meta_box,
+ "show_referring_motions": show_referring_motions,
"change_recommendations": change_recommendations,
"amendments": amendments,
"line_length": line_length,
@@ -261,6 +266,7 @@ async def motion_slide(
)
]
+ if show_referring_motions:
# Add recommendation-referencing motions
return_value[
"recommendation_referencing_motions"
diff --git a/tests/unit/motions/test_projector.py b/tests/unit/motions/test_projector.py
index bd8965598..74582f715 100644
--- a/tests/unit/motions/test_projector.py
+++ b/tests/unit/motions/test_projector.py
@@ -293,6 +293,7 @@ async def test_motion_slide(all_data):
"base_statute": None,
"is_child": False,
"show_meta_box": True,
+ "show_referring_motions": True,
"reason": "",
"submitter": ["Administrator"],
"line_length": 85,
@@ -319,6 +320,7 @@ async def test_amendment_slide(all_data):
"base_statute": None,
"is_child": True,
"show_meta_box": True,
+ "show_referring_motions": True,
"reason": "",
"submitter": ["Administrator"],
"line_length": 85,
@@ -345,6 +347,7 @@ async def test_statute_amendment_slide(all_data):
"base_statute": {"title": "§1 Preamble", "text": "