Merge pull request #3538 from emanuelschuetze/improvements

Improvements

CHANGELOG

@@ -104,6 +104,7 @@ Core:
 - Added projector prioritization [#3425].
 - Use native twisted mode for daphne [#3487].
 - Save language selection to session storage [#3543]
+- Set default of projector resolution to 1220x915 [#2549].
 
 Mediafiles:
 - Fixed reloading of PDF on page change [#3274].

openslides/core/config_variables.py

@@ -45,14 +45,6 @@ def get_config_variables():
         group='General',
         subgroup='Event')
 
-    yield ConfigVariable(
-        name='general_event_organizer',
-        default_value='',
-        label='Event organizer',
-        weight=130,
-        group='General',
-        subgroup='Event')
-
     yield ConfigVariable(
         name='general_event_legal_notice',
         default_value='<a href="http://www.openslides.org">OpenSlides</a> is a '

openslides/core/migrations/0002_misc_features.py

@@ -209,7 +209,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='projector',
             name='height',
-            field=models.PositiveIntegerField(default=768),
+            field=models.PositiveIntegerField(default=915),
         ),
         migrations.AddField(
             model_name='projector',
@@ -219,7 +219,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='projector',
             name='width',
-            field=models.PositiveIntegerField(default=1024),
+            field=models.PositiveIntegerField(default=1220),
         ),
         migrations.AddField(
             model_name='projectiondefault',

openslides/core/static/css/core/_projector.scss

@@ -22,6 +22,7 @@ h1, h2, h3, h4, h5, h6 {
 h1 {
     font-size: 2.25em;
     line-height: 1.1em;
+    margin-bottom: 30px;
 }
 
 h2 {

tests/integration/core/test_views.py

@@ -60,8 +60,8 @@ class ProjectorAPI(TestCase):
             'scroll': 0,
             'name': 'Default projector',
             'blank': False,
-            'width': 1024,
-            'height': 768})
+            'width': 1220,
+            'height': 915})
 
 
 class VersionView(TestCase):