From dd6085a862e41cb8f89a438eafe9889574f926b1 Mon Sep 17 00:00:00 2001
From: David Schmitz <schmitz@lrz.de>
Date: Mon, 14 Aug 2023 13:21:48 +0000
Subject: [PATCH] welcome page: fixed broken usage of BRANDING parameters on
the welcome page; extended BRANDING with possibility to override the
product_name on welcome page
---
flowspec/views.py | 3 +++
flowspy/settings.py.dist | 1 +
templates/welcome.html | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/flowspec/views.py b/flowspec/views.py
index fc9a575c..9482dac9 100644
--- a/flowspec/views.py
+++ b/flowspec/views.py
@@ -118,6 +118,9 @@ def welcome(request):
return render(
request,
'welcome.html',
+ {
+ 'BRANDING': settings.BRANDING
+ },
)
diff --git a/flowspy/settings.py.dist b/flowspy/settings.py.dist
index 57a0532e..84c981e5 100644
--- a/flowspy/settings.py.dist
+++ b/flowspy/settings.py.dist
@@ -254,6 +254,7 @@ BRANDING = {
'logo': 'fodlogo2.png',
'favicon': 'favicon.ico',
'contact_support': 'GÉANT OC at <a href=\'mailto:support@oc.geant.net\'>support@oc.geant.net</a> or +44 1223 733033.',
+ 'product_name' : 'Firewall-On-Demand',
}
SETTINGS_EXPORT = [
diff --git a/templates/welcome.html b/templates/welcome.html
index 2faf0882..6d3a48e7 100644
--- a/templates/welcome.html
+++ b/templates/welcome.html
@@ -31,7 +31,7 @@
<div class="item active">
<img src="{% static 'img/slide2.jpg' %}" alt="FoD" style="width:100%; height:100%; margin: auto; padding:auto;">
<div class="carousel-caption">
- <h2>{{ BRANDING.name }} - Firewall on Demand</h2>
+ <h2>{{ BRANDING.name }} - {{ BRANDING.product_name|default:'Firewall on Demand' }}</h2>
<h4>Protect your network, protect the network</h4>
<p>
<a href="{% url 'login' %}" type="button" class="btn btn-lg btn-outline btn-primary">{% trans "Join Now" %}</a>
--
GitLab