From 3e1c1abe14f7dcaeec16f7b90f3e7601285f4901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Wed, 21 Jun 2017 19:32:02 +0200
Subject: [PATCH] Added new logo placeholder for web interface header logo.

---
 CHANGELOG                                   |  4 ++--
 openslides/core/config_variables.py         | 13 ++++++++++++-
 openslides/core/static/js/core/site.js      |  1 +
 openslides/core/static/templates/index.html |  3 ++-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5d047bdd0..03b7c8a40 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -51,8 +51,8 @@ Users:
 Core:
 - No reload on logoff. OpenSlides is now a full single page
   application [#3172].
-- Adding support for choosing image files as logos for projector and
-  PDF [#3184, #3207, #3208].
+- Adding support for choosing image files as logos for projector,
+  PDF and web interface header [#3184, #3207, #3208, #3310].
 - Fixing error when clearing empty chat [#3199].
 - Added notify system [#3212].
 - Enhanced performance esp. for server restart and first connection of all
diff --git a/openslides/core/config_variables.py b/openslides/core/config_variables.py
index aeea09aba..c43354e8a 100644
--- a/openslides/core/config_variables.py
+++ b/openslides/core/config_variables.py
@@ -251,7 +251,8 @@ def get_config_variables():
             'logo_projector_main',
             'logo_projector_header',
             'logo_pdf_header',
-            'logo_pdf_footer'],
+            'logo_pdf_footer',
+            'logo_web_header'],
         weight=300,
         group='Logo',
         hidden=True)
@@ -296,3 +297,13 @@ def get_config_variables():
         weight=311,
         group='Logo',
         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)
diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js
index e369aa5ec..fb5ff3b28 100644
--- a/openslides/core/static/js/core/site.js
+++ b/openslides/core/static/js/core/site.js
@@ -1906,6 +1906,7 @@ angular.module('OpenSlidesApp.core.site', [
         gettext('Projector header image');
         gettext('PDF header logo');
         gettext('PDF footer logo');
+        gettext('Web interface header logo');
 
         // Mark the string 'Default projector' here, because it does not appear in the templates.
         gettext('Default projector');
diff --git a/openslides/core/static/templates/index.html b/openslides/core/static/templates/index.html
index bb613ef54..e1ff6f6e1 100644
--- a/openslides/core/static/templates/index.html
+++ b/openslides/core/static/templates/index.html
@@ -29,7 +29,8 @@
     <!-- Logo -->
     <div class="title">
       <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>
     </div>