BRANDING: extent with possibility to override short product name in error page etc.

c6ff268f · David Schmitz · dd6085a8 · c6ff268f · c6ff268f · c6ff268f
Commit c6ff268f authored Aug 14, 2023 by David Schmitz
--- a/flowspy/settings.py.dist
+++ b/flowspy/settings.py.dist
@@ -255,6 +255,7 @@ BRANDING = {
    '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',
+    'product_name_short' : 'FoD',
 }
 SETTINGS_EXPORT = [

--- a/templates/500.html
+++ b/templates/500.html
@@ -2,7 +2,8 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>GEANT's FoD</title>
+<!--<title>GEANT's FoD</title>-->
+<title>{{ settings.BRANDING.name }}'s {{ settings.BRANDING.product_name_short|default:'FoD' }}</title>
 <meta http-equiv="Pragma" content="no-cache">
 <meta http-equiv="expires" content="Wed, 26 Feb 1997 08:21:57 GMT">

--- a/templates/base.html
+++ b/templates/base.html
@@ -6,7 +6,7 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{{ settings.BRANDING.name }} FoD :: {% block title %}{% endblock %}</title>
+    <title>{{ settings.BRANDING.name }} {{ settings.BRANDING.product_name_short|default:'FoD' }} :: {% block title %}{% endblock %}</title>
 	<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
 	<META HTTP-EQUIV="expires" CONTENT="Wed, 26 Feb 1997 08:21:57 GMT">
 	<link REL="SHORTCUT ICON" HREF="{% get_static_prefix %}/{{ settings.BRANDING.favicon }}">

--- a/templates/django_registration/activation_complete.txt
+++ b/templates/django_registration/activation_complete.txt
 Your account with username {{ user.username }} has been activated.
-You may login to FoD using the following URL:
+You may login to {{ settings.BRANDING.product_name_short|default:'FoD' }} using the following URL:
 http://{{ site.domain }}{% url 'login' %}

--- a/templates/flowspy/route_details.html
+++ b/templates/flowspy/route_details.html
@@ -84,7 +84,7 @@ function myreloadPage() {
               {% endif %}
             </div>
             {% endif %}
-	     <br> FoD Rule Id: {{ route.id }}
+	     <br> {{ settings.BRANDING.product_name_short|default:'FoD' }} Rule Id: {{ route.id }}
        </div>
        <div>
            <h2>Statistics</h2>