From b45d27fa3312d4b410c13fcd9b21ad9d81a3f69d Mon Sep 17 00:00:00 2001
From: Norbert Kwizera <norkans7@gmail.com>
Date: Fri, 5 Jan 2024 17:00:58 +0200
Subject: [PATCH] Switch to use new header logo

---
 templates/base_admin_dashboard.html |  9 +++++++
 templates/public_base.html          | 38 +++++++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/templates/base_admin_dashboard.html b/templates/base_admin_dashboard.html
index f7530a6b0..27f290509 100644
--- a/templates/base_admin_dashboard.html
+++ b/templates/base_admin_dashboard.html
@@ -92,10 +92,19 @@
                         <div class="level-left">
                             <div style="justify-content: start;" class="level-item square-logo">
                                 <div style="width:360px">
+                                    {% if org|config:"has_new_brand" %}
+                                    <img src="{{ STATIC_URL }}/img/U-Report_Logo.png" alt="{{ org.name }}" class="logo">
+                                    {% else %}
                                     {% thumbnail org.get_logo "x180" format="PNG" as im %}
                                         <img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
                                     {% endthumbnail %}
+                                    {% endif %}
                                 </div>
+                                {% if org|config:"has_new_brand" %}
+                                <div class="flex-1 text-center font-bold text-2xl flex-center-y mx-4 mt-8" style="font-family:'Noto Sans', sans-serif;">
+                                    {{ org.name }}
+                                </div>
+                                {% endif %}
                             </div>
                         </div>
                     {% endif %}
diff --git a/templates/public_base.html b/templates/public_base.html
index 4ddefb1d0..852417aec 100644
--- a/templates/public_base.html
+++ b/templates/public_base.html
@@ -32,8 +32,7 @@
             {% endthumbnail %}
         {% endblock meta-extra %}
         <!-- Google fonts we use -->
-        <link href="https://fonts.googleapis.com/css?family=Livvic:300,400,700|Montserrat:300,400,700&display=swap"
-              rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css2?family=Livvic:wght@300;400;700&family=Montserrat:wght@300;400;700&family=Noto+Sans:ital,wght@0,400;0,700;1,400&display=swap" rel="stylesheet">
         <!-- Font awesome icons -->
         <link rel="stylesheet"
               href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/all.min.css">
@@ -595,6 +594,40 @@
             </div>
         </ul>
         <!-- header menu -->
+        {% if org|config:"has_new_brand" %}
+        <div class="md:flex max-w-page mx-auto justify-around mt-5 mb-12 hidden border-b pb-6">
+            <a href="{% url 'public.index' %}" class="flex-initial text-center">
+                <div style="width:360px">
+                    <img src="{{ STATIC_URL }}/img/U-Report_Logo.png" alt="{{ org.name }}" class="logo">
+                </div>
+            </a>
+            <div class="flex-1 text-center font-bold text-2xl flex-center-y" style="font-family:'Noto Sans', sans-serif;">
+                <a href="{% url 'public.index' %}" class="flex-initial text-center">
+                    {{ org.name }}
+                </a>
+            </div>
+            <div class="md:flex flex-1">
+                <div class="flex-1 text-center font-bold text-2xl flex-center-y">
+                    <div>
+                        <a href="{% url 'public.opinions' %}"
+                            class="hover:text-gray-750 hover:border-dark1 pb-2 border-b-2 border-black">
+                        {% trans "Opinions" %}
+                        </a>
+                    </div>
+                </div>
+
+                <div class="flex-1 text-center font-bold text-2xl flex-center-y">
+                    <div>
+                        <a href="{% url 'public.stories' %}"
+                            class="hover:text-gray-750 hover:border-dark1 pb-2 border-b-2 border-black">
+                            {% trans "Stories" %}
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        {% else %}
         <div class="md:flex max-w-page mx-auto justify-around mt-5 mb-12 px-home hidden border-b pb-6">
             <div class="flex-1 text-center font-bold text-2xl flex-center-y">
                 <div>
@@ -620,6 +653,7 @@
                 </div>
             </div>
         </div>
+        {% endif %}
     </div>
     <!-- mobile header -->
     <div class="md:hidden block">