Merge pull request #2041 from emanuelschuetze/fix2020

New configs for font color in header and h1 on projector (Fixes #2020)

openslides/core/signals.py

@@ -152,14 +152,29 @@ def setup_general_config(sender, **kwargs):
         group=ugettext_lazy('Projector'))
 
     yield ConfigVariable(
-        name='projector_backgroundcolor',
+        name='projector_header_backgroundcolor',
         default_value='#317796',
         input_type='colorpicker',
-        label=ugettext_lazy('Background color of projector header'),
+        label=ugettext_lazy('Background color of projector header and footer'),
-        help_text=ugettext_lazy('Use web color names like "red" or hex numbers like "#ff0000".'),
         weight=160,
         group=ugettext_lazy('Projector'))
 
+    yield ConfigVariable(
+        name='projector_header_fontcolor',
+        default_value='#F5F5F5',
+        input_type='colorpicker',
+        label=ugettext_lazy('Font color of projector header and footer'),
+        weight=165,
+        group=ugettext_lazy('Projector'))
+
+    yield ConfigVariable(
+        name='projector_h1_fontcolor',
+        default_value='#317796',
+        input_type='colorpicker',
+        label=ugettext_lazy('Font color of projector headline'),
+        weight=170,
+        group=ugettext_lazy('Projector'))
+
     yield ConfigVariable(
         name='projector_default_countdown',
         default_value=60,

openslides/core/static/css/projector.css

@@ -32,7 +32,6 @@ body{
     top: 12px;
     height: 50px;
     overflow: hidden;
-    color: #F5F5F5;
 }
 #eventdata .title {
     font-size: 26px;
@@ -55,14 +54,12 @@ body{
     top: 25px;
     right: 50px;
     padding-left: 30px;
-    color: #fff;
 }
 #footer {
     font-family: 'Roboto Condensed Light';
     position: fixed;
     bottom: 0;
     height: 35px;
-    color: #F5F5F5;
     width: 100%;
     font-size: 16px;
     padding-left: 50px;

openslides/core/static/templates/projector.html

@@ -10,10 +10,13 @@
 
 <style type="text/css">
   #header, #footer {
-    background-color: {{ config('projector_backgroundcolor') }};
+    background-color: {{ config('projector_header_backgroundcolor') }};
+  }
+  #header, #footer, #currentTime {
+    color: {{ config('projector_header_fontcolor') }};
   }
   h1 {
-    color: {{ config('projector_backgroundcolor') }};
+    color: {{ config('projector_h1_fontcolor') }};
   }
 </style>