add and use settings.RADIO_META_DEFAULT_IMAGE_PATH

diff --git a/panikweb/base/templates/base.html b/panikweb/base/templates/base.html
index 4ae228b1156909d9ba8af69bac4c45561479dd20..eecc697bfd8d46cbe41ac0e26ccde5d2c3aec86b 100644 (file)
--- a/panikweb/base/templates/base.html
+++ b/panikweb/base/templates/base.html
@@ -18,14 +18,17 @@
       <meta name="description" content="{{ radio_meta_description }}" />
 
       <meta property="og:title" content="{{ radio_long_name }}" />
-      <meta property="og:image" content="{{ site_url }}{% static 'img/Radio_Panik_Logo_2016-01.png' %}" />
       <meta property="og:description" content="{{ radio_meta_description }}" />
 
       <meta name="twitter:card" content="summary" />
       <meta name="twitter:title" content="{{ radio_long_name }}" />
-      <meta name="twitter:image" content="{{ site_url }}{% static 'img/Radio_Panik_Logo_2016-01.png' %}" />
       <meta name="twitter:description" content="{{ radio_meta_description }}" />
 
+      {% if radio_meta_default_image_path %}
+        <meta property="og:image" content="{{ site_url }}{{ radio_meta_default_image_path }}" />
+        <meta name="twitter:image" content="{{ site_url }}{{ radio_meta_default_image_path }}" />
+      {% endif %}
+
     {% endblock %}
 
     <link rel="alternate" type="application/rss+xml"  href="{% url 'rss-feed' %}" title="News rss feed">

diff --git a/panikweb/base/templates/emissions/emission_detail.html b/panikweb/base/templates/emissions/emission_detail.html
index 01f49e62b39b67814ceaeb9da9e7c703fd8788ab..ce384ca2a01a8cee2cd7f64955e0e8d233b63680 100644 (file)
--- a/panikweb/base/templates/emissions/emission_detail.html
+++ b/panikweb/base/templates/emissions/emission_detail.html
@@ -14,8 +14,10 @@
     {% endthumbnail %}
   {% else %}
     <meta name="twitter:card" content="summary">
-    <meta property="og:image" content="{{ site_url }}{% static 'img/Radio_Panik_Logo_2016-01.png' %}" />
-    <meta name="twitter:image" content="{{ site_url }}{% static 'img/Radio_Panik_Logo_2016-01.png' %}" />
+    {% if radio_meta_default_image_path %}
+      <meta property="og:image" content="{{ site_url }}{{ radio_meta_default_image_path }}" />
+      <meta name="twitter:image" content="{{ site_url }}{{ radio_meta_default_image_path }}" />
+    {% endif %}
   {% endif %}
   {% if emission.subtitle %}
     <meta property="og:description" content="{{ emission.subtitle }}" />

diff --git a/panikweb/base/templates/emissions/episode_detail.html b/panikweb/base/templates/emissions/episode_detail.html
index aeecfcd019249c4afeb9427b9cb02620c640abe2..11e849bb7ce48b718ff6c5873a1a37d670b117c0 100644 (file)
--- a/panikweb/base/templates/emissions/episode_detail.html
+++ b/panikweb/base/templates/emissions/episode_detail.html
@@ -19,8 +19,10 @@
     {% endthumbnail %}
   {% else %}
     <meta name="twitter:card" content="summary">
-    <meta property="og:image" content="{{ site_url }}{% static 'img/Radio_Panik_Logo_2016-01.png' %}" />
-    <meta name="twitter:image" content="{{ site_url }}{% static 'img/Radio_Panik_Logo_2016-01.png' %}" />
+    {% if radio_meta_default_image_path %}
+      <meta property="og:image" content="{{ site_url }}{{ radio_meta_default_image_path }}" />
+      <meta name="twitter:image" content="{{ site_url }}{{ radio_meta_default_image_path }}" />
+    {% endif %}
   {% endif %}
   {% if episode.subtitle %}
     <meta property="og:description" content="{{ episode.subtitle }}" />

diff --git a/panikweb/base/templates/emissions/newsitem_detail.html b/panikweb/base/templates/emissions/newsitem_detail.html
index f175ede5d0b78491e829924e8b3191911a715710..0c03a64c9a70a9216770da39ee0fcffafee659b0 100644 (file)
--- a/panikweb/base/templates/emissions/newsitem_detail.html
+++ b/panikweb/base/templates/emissions/newsitem_detail.html
@@ -19,12 +19,13 @@
     {% endthumbnail %}
   {% else %}
     <meta name="twitter:card" content="summary">
-    <meta property="og:image" content="{{ site_url }}% static 'img/Radio_Panik_Logo_2016-01.png' %}" />
-    <meta name="twitter:image" content="{{ site_url }}{% static 'img/Radio_Panik_Logo_2016-01.png' %}" />
+    {% if radio_meta_default_image_path %}
+      <meta property="og:image" content="{{ site_url }}{{ radio_meta_default_image_path }}" />
+      <meta name="twitter:image" content="{{ site_url }}{{ radio_meta_default_image_path }}" />
+    {% endif %}
   {% endif %}
 {% endblock %}
 
-
 {% block main %}
   <div class="detail news">
     <div class="wrapper navigation">

diff --git a/panikweb/context_processors.py b/panikweb/context_processors.py
index e4447ef2b3e4f1ff0fced6e49a0a03a20fbcbcdc..1187eff598e21a4f48e2f8e68365e77b809b3a42 100644 (file)
--- a/panikweb/context_processors.py
+++ b/panikweb/context_processors.py
@@ -9,6 +9,7 @@ def panikweb(request):
         'radio_name': settings.RADIO_NAME,
         'radio_long_name': settings.RADIO_LONG_NAME or settings.RADIO_NAME,
         'radio_meta_description': settings.RADIO_META_DESCRIPTION or '',
+        'radio_meta_default_image_path': settings.RADIO_META_DEFAULT_IMAGE_PATH,
         'pwa_settings': cache_during_request(PwaSettings.singleton),
         'section': request.path.strip('/').split('/')[0],
     }

diff --git a/panikweb/settings.py b/panikweb/settings.py
index 2c177d65778b9276ab46af80dc19ae01bf84cdbb..9a0d38b92818bfae680f7b2efd18a9a7d529d916 100644 (file)
--- a/panikweb/settings.py
+++ b/panikweb/settings.py
@@ -239,6 +239,7 @@ COMBO_CELL_ASSET_SLOTS = {}
 RADIO_NAME = 'Example Radio'
 RADIO_LONG_NAME = 'Example Radio'
 RADIO_META_DESCRIPTION = None
+RADIO_META_DEFAULT_IMAGE_PATH = None
 WEBSITE_BASE_URL = 'https://www.example.net/'
 PODCASTS_DEFAULT_IMAGE_PATH = ''