Merge 719e774 into 4d02a26

liqd · May 20, 2019 · 8d6e782 · 8d6e782
2 parents 4d02a26 + 719e774
commit 8d6e782
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/liqd_product/templates/a4dashboard/base_dashboard.html b/liqd_product/templates/a4dashboard/base_dashboard.html
@@ -1,5 +1,32 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n userindicator %}
+
+{% block header %}
+
+<header class="main-header" aria-label="{% trans 'Header' %}">
+    <div class="main-header__border-top main-header__border-top--platform"></div>
+    <div class="l-wrapper">
+        <div class="platform-brand main-header__brand">
+            {% spaceless %}
+                <a href="{% if view.organisation.partner %}{% url 'partner' partner_slug=view.organisation.partner.slug %}{% else %}/{% endif %}" class="platform-brand__link">{% if view.organisation.partner %}<span class="marked">{{ view.organisation.partner.name }}</span>{% else %}Beteiligung.in{% endif %}</a>
+            {% endspaceless %}
+        </div>
+        <nav class="main-header__nav">
+
+            <div class="main-header__mobile-menu main-header__mobile-menu--platform collapse" id="main-header-collapse">
+                <div class="main-header__user">
+                    {% userindicator %}
+                </div>
+            </div>
+            <button class="btn main-header__mobile-toggle btn--secondary-filled main-header__mobile-toggle--platform btn--square btn--small btn--attached-top" data-toggle="collapse" data-target="#main-header-collapse" aria-expanded="false" aria-controls="main-header-collapse">
+                {% trans 'Menu' %}
+                <i class="fa fa-bars" aria-hidden="true"></i>
+            </button>
+        </nav>
+    </div>
+</header>
+
+{% endblock %}
 
 {% block content %}
 

diff --git a/liqd_product/templates/base.html b/liqd_product/templates/base.html
@@ -34,7 +34,6 @@
         }
     </script>
     {% endif %}
-    {% block header %}{% endblock %}
 
     {% block extra_js %}
         {# Override this in templates to add extra javascript #}
@@ -45,7 +44,9 @@
     <div class="l-outer-wrapper">
         <a href="#main" class="sr-only sr-only-focusable">{% trans "Skip to content "%}</a>
 
+        {% block header %}
         {% include 'header.html' %}
+        {% endblock %}
 
         <main id="main">