From 8c1c6241d19cf12f62545c82cc08162dc9db5d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Tue, 10 Apr 2018 15:43:21 +0200 Subject: [PATCH] New config to hide motion meta information box on projector (Fixed #3588). --- CHANGELOG | 3 ++- openslides/motions/config_variables.py | 9 +++++++++ openslides/motions/static/css/motions/_projector.scss | 4 ---- openslides/motions/static/js/motions/site.js | 1 + .../motions/static/templates/motions/slide_motion.html | 5 +++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index cfc5d0e66..c74dfd0ee 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -50,7 +50,8 @@ Motions: - Added multiselect filter for motion comments [#3372]. - Added support for pinning personal notes to the window [#3360]. - Clear identifier on state reset [#3356]. -- New config options to hide reason and recommendation on projector [#3432]. +- New config options to hide reason, recommendation and meta + information box on projector [#3432, #3692]. - Show motion identifier in (current) list of speakers [#3442] - Added navigation between single motions [#3459]. - Improved the multiselect state filter [#3459]. diff --git a/openslides/motions/config_variables.py b/openslides/motions/config_variables.py index a26721265..e933504d3 100644 --- a/openslides/motions/config_variables.py +++ b/openslides/motions/config_variables.py @@ -88,6 +88,15 @@ def get_config_variables(): group='Motions', subgroup='General') + yield ConfigVariable( + name='motions_disable_sidebox_on_projector', + default_value=False, + input_type='boolean', + label='Hide meta information box on projector', + weight=326, + group='Motions', + subgroup='General') + yield ConfigVariable( name='motions_disable_recommendation_on_projector', default_value=False, diff --git a/openslides/motions/static/css/motions/_projector.scss b/openslides/motions/static/css/motions/_projector.scss index fe689a678..21c509e85 100644 --- a/openslides/motions/static/css/motions/_projector.scss +++ b/openslides/motions/static/css/motions/_projector.scss @@ -3,10 +3,6 @@ @import "pollresults"; @import "sidebox"; -#motioncontent { - width: calc(100% - 230px); -} - /* TODO: why do the projector has these extra diff related classes? * -> Unify the site and projector in the _diff.scss and _line-numbers.scss*/ ol.os-split-after, ul.os-split-after { diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index 1b70870c8..bc8d124bf 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -2624,6 +2624,7 @@ angular.module('OpenSlidesApp.motions.site', [ gettext('Line length'); gettext('The maximum number of characters per line. Relevant when line numbering is enabled. Min: 40'); gettext('Hide reason on projector'); + gettext('Hide meta information box on projector'); gettext('Hide recommendation on projector'); gettext('Stop submitting new motions by non-staff users'); gettext('Allow to disable versioning'); diff --git a/openslides/motions/static/templates/motions/slide_motion.html b/openslides/motions/static/templates/motions/slide_motion.html index c0dcb0ae6..80d47ead9 100644 --- a/openslides/motions/static/templates/motions/slide_motion.html +++ b/openslides/motions/static/templates/motions/slide_motion.html @@ -1,5 +1,5 @@
- -
+

{{ motion.getTitleWithChanges(mode) }}