ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Emanuel Schuetze 2016-03-08 21:06:56 +01:00
parent 21d9898645
commit 85326d75f2
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
openslides/core/signals.py
View File

@ -152,14 +152,29 @@ def setup_general_config(sender, **kwargs):
group=ugettext_lazy('Projector')) group=ugettext_lazy('Projector'))
yield ConfigVariable( yield ConfigVariable(
name='projector_backgroundcolor', name='projector_header_backgroundcolor',
default_value='#317796', default_value='#317796',
input_type='colorpicker', 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, weight=160,
group=ugettext_lazy('Projector')) 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( yield ConfigVariable(
name='projector_default_countdown', name='projector_default_countdown',
default_value=60, default_value=60,

3
openslides/core/static/css/projector.css
View File

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

7
openslides/core/static/templates/projector.html
View File

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