Added new logo placeholder for web interface header logo.

This commit is contained in:
Emanuel Schütze 2017-06-21 19:32:02 +02:00
parent 2aeaf251a2
commit 3e1c1abe14
4 changed files with 17 additions and 4 deletions

View File

@ -51,8 +51,8 @@ Users:
Core: Core:
- No reload on logoff. OpenSlides is now a full single page - No reload on logoff. OpenSlides is now a full single page
application [#3172]. application [#3172].
- Adding support for choosing image files as logos for projector and - Adding support for choosing image files as logos for projector,
PDF [#3184, #3207, #3208]. PDF and web interface header [#3184, #3207, #3208, #3310].
- Fixing error when clearing empty chat [#3199]. - Fixing error when clearing empty chat [#3199].
- Added notify system [#3212]. - Added notify system [#3212].
- Enhanced performance esp. for server restart and first connection of all - Enhanced performance esp. for server restart and first connection of all

View File

@ -251,7 +251,8 @@ def get_config_variables():
'logo_projector_main', 'logo_projector_main',
'logo_projector_header', 'logo_projector_header',
'logo_pdf_header', 'logo_pdf_header',
'logo_pdf_footer'], 'logo_pdf_footer',
'logo_web_header'],
weight=300, weight=300,
group='Logo', group='Logo',
hidden=True) hidden=True)
@ -296,3 +297,13 @@ def get_config_variables():
weight=311, weight=311,
group='Logo', group='Logo',
hidden=True) hidden=True)
yield ConfigVariable(
name='logo_web_header',
default_value={
'display_name': 'Web interface header logo',
'path': ''},
input_type='logo',
weight=311,
group='Logo',
hidden=True)

View File

@ -1906,6 +1906,7 @@ angular.module('OpenSlidesApp.core.site', [
gettext('Projector header image'); gettext('Projector header image');
gettext('PDF header logo'); gettext('PDF header logo');
gettext('PDF footer logo'); gettext('PDF footer logo');
gettext('Web interface header logo');
// Mark the string 'Default projector' here, because it does not appear in the templates. // Mark the string 'Default projector' here, because it does not appear in the templates.
gettext('Default projector'); gettext('Default projector');

View File

@ -29,7 +29,8 @@
<!-- Logo --> <!-- Logo -->
<div class="title"> <div class="title">
<a ui-sref="home"> <a ui-sref="home">
<img src="/static/img/openslides-logo-dark.png" alt="Logo" height="35"> <img src="/static/img/openslides-logo-dark.png" alt="OpenSlides Logo" height="35">
<img ng-if="config('logo_web_header').path" ng-src="{{ config('logo_web_header').path }}" alt="Logo" height="35">
</a> </a>
</div> </div>