Merge pull request #3692 from emanuelschuetze/issue3588

New config to hide motion meta information box on projector (Fixed #3588)
This commit is contained in:
Emanuel Schütze 2018-04-11 08:02:42 +02:00 committed by GitHub
commit 5a8bfbd403
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 7 deletions

View File

@ -50,7 +50,8 @@ Motions:
- Added multiselect filter for motion comments [#3372]. - Added multiselect filter for motion comments [#3372].
- Added support for pinning personal notes to the window [#3360]. - Added support for pinning personal notes to the window [#3360].
- Clear identifier on state reset [#3356]. - 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] - Show motion identifier in (current) list of speakers [#3442]
- Added navigation between single motions [#3459]. - Added navigation between single motions [#3459].
- Improved the multiselect state filter [#3459]. - Improved the multiselect state filter [#3459].

View File

@ -88,6 +88,15 @@ def get_config_variables():
group='Motions', group='Motions',
subgroup='General') 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( yield ConfigVariable(
name='motions_disable_recommendation_on_projector', name='motions_disable_recommendation_on_projector',
default_value=False, default_value=False,

View File

@ -3,10 +3,6 @@
@import "pollresults"; @import "pollresults";
@import "sidebox"; @import "sidebox";
#motioncontent {
width: calc(100% - 230px);
}
/* TODO: why do the projector has these extra diff related classes? /* TODO: why do the projector has these extra diff related classes?
* -> Unify the site and projector in the _diff.scss and _line-numbers.scss*/ * -> Unify the site and projector in the _diff.scss and _line-numbers.scss*/
ol.os-split-after, ul.os-split-after { ol.os-split-after, ul.os-split-after {

View File

@ -2624,6 +2624,7 @@ angular.module('OpenSlidesApp.motions.site', [
gettext('Line length'); gettext('Line length');
gettext('The maximum number of characters per line. Relevant when line numbering is enabled. Min: 40'); gettext('The maximum number of characters per line. Relevant when line numbering is enabled. Min: 40');
gettext('Hide reason on projector'); gettext('Hide reason on projector');
gettext('Hide meta information box on projector');
gettext('Hide recommendation on projector'); gettext('Hide recommendation on projector');
gettext('Stop submitting new motions by non-staff users'); gettext('Stop submitting new motions by non-staff users');
gettext('Allow to disable versioning'); gettext('Allow to disable versioning');

View File

@ -1,5 +1,5 @@
<div ng-controller="SlideMotionCtrl" class="content"> <div ng-controller="SlideMotionCtrl" class="content">
<div id="sidebox"> <div id="sidebox" ng-if="!config('motions_disable_sidebox_on_projector')">
<!-- State --> <!-- State -->
<h3 translate>State</h3> <h3 translate>State</h3>
{{ motion.getStateName() }} {{ motion.getStateName() }}
@ -65,7 +65,8 @@
</div> </div>
</div> </div>
<div id="motioncontent" class="scrollcontent"> <div ng-style="{'width': config('motions_disable_sidebox_on_projector') ? '100%' : 'calc(100% - 230px)'}"
class="scrollcontent">
<!-- Title --> <!-- Title -->
<div id="title"> <div id="title">
<h1>{{ motion.getTitleWithChanges(mode) }}</h1> <h1>{{ motion.getTitleWithChanges(mode) }}</h1>