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

Merge pull request #1207 from emanuelschuetze/fix-1138

Browse Source 
Fixed #1138: Wrong file for projectors logo
This commit is contained in:
Oskar Hahn 2014-01-27 23:34:53 -08:00
commit 484963af4e
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/core/signals.py
View File

@ -64,7 +64,7 @@ def setup_general_config_page(sender, **kwargs):
default_value=True, default_value=True,
form_field=forms.BooleanField( form_field=forms.BooleanField(
label=ugettext_lazy('Show logo on projector'), label=ugettext_lazy('Show logo on projector'),
help_text=ugettext_lazy('You can find and replace the logo under "openslides/static/img/projector/static/img/logo-projector.png".'), help_text=ugettext_lazy('You can find and replace the logo under "openslides/projector/static/img/logo-projector.png".'),
required=False)) required=False))
projector_enable_title = ConfigVariable( projector_enable_title = ConfigVariable(

BIN
openslides/projector/static/img/logo-projector.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

2
openslides/projector/templates/projector.html
View File

@ -45,7 +45,7 @@
<body> <body>
<div id="header"> <div id="header">
{% if 'projector_enable_logo'|get_config %} {% if 'projector_enable_logo'|get_config %}
<img id="logo" alt="Logo" src="/static/img/logo.png"> <img id="logo" alt="Logo" src="{% static 'img/logo-projector.png' %}">
{% endif %} {% endif %}
{% if 'projector_enable_title'|get_config %} {% if 'projector_enable_title'|get_config %}
<div id="eventdata"> <div id="eventdata">