From d97b2bf503968b224e7d7d891d18553f9374da66 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Sun, 22 Nov 2020 23:39:40 +0100
Subject: [PATCH] core: fix impersonation notice being shown twice

---
 passbook/core/templates/overview/base.html  |  14 ---
 passbook/core/templates/overview/index.html | 108 +++++++++-----------
 2 files changed, 48 insertions(+), 74 deletions(-)
 delete mode 100644 passbook/core/templates/overview/base.html

diff --git a/passbook/core/templates/overview/base.html b/passbook/core/templates/overview/base.html
deleted file mode 100644
index 53a40f611..000000000
--- a/passbook/core/templates/overview/base.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "base/page.html" %}
-
-{% load static %}
-{% load i18n %}
-
-{% load passbook_is_active %}
-{% load passbook_utils %}
-
-{% block page_content %}
-<main role="main" class="pf-c-page__main" tabindex="-1" id="main-content">
-    {% block content %}
-    {% endblock %}
-</main>
-{% endblock %}
diff --git a/passbook/core/templates/overview/index.html b/passbook/core/templates/overview/index.html
index 290e02a11..0fd2d534b 100644
--- a/passbook/core/templates/overview/index.html
+++ b/passbook/core/templates/overview/index.html
@@ -1,65 +1,53 @@
-{% extends "overview/base.html" %}
-
 {% load i18n %}
 
-{% block head %}
-{{ block.super }}
-<style>
-    img.app-icon {
-        max-height: 72px;
-        width: auto !important;
-    }
-</style>
-{% endblock %}
-
-{% block content %}
-<section class="pf-c-page__main-section pf-m-light">
-    <div class="pf-c-content">
-        <h1>
-            <i class="pf-icon pf-icon-applications"></i>
-            {% trans 'Applications' %}
-        </h1>
-    </div>
-</section>
-<section class="pf-c-page__main-section">
-    {% if applications %}
-    <div class="pf-l-gallery pf-m-gutter">
-        {% for app in applications %}
-        <a href="{{ app.get_launch_url }}" class="pf-c-card pf-m-hoverable pf-m-compact">
-            <div class="pf-c-card__header">
-                {% if not app.meta_icon_url %}
-                <i class="pf-icon pf-icon-arrow"></i>
-                {% else %}
-                <img class="app-icon pf-c-avatar" src="{{ app.meta_icon_url }}" alt="{% trans 'Application Icon' %}">
+<main role="main" class="pf-c-page__main" tabindex="-1" id="main-content">
+    <section class="pf-c-page__main-section pf-m-light">
+        <div class="pf-c-content">
+            <h1>
+                <i class="pf-icon pf-icon-applications"></i>
+                {% trans 'Applications' %}
+            </h1>
+        </div>
+    </section>
+    <section class="pf-c-page__main-section">
+        {% if applications %}
+        <div class="pf-l-gallery pf-m-gutter">
+            {% for app in applications %}
+            <a href="{{ app.get_launch_url }}" class="pf-c-card pf-m-hoverable pf-m-compact">
+                <div class="pf-c-card__header">
+                    {% if not app.meta_icon_url %}
+                    <i class="pf-icon pf-icon-arrow"></i>
+                    {% else %}
+                    <img class="app-icon pf-c-avatar" src="{{ app.meta_icon_url }}" alt="{% trans 'Application Icon' %}">
+                    {% endif %}
+                </div>
+                <div class="pf-c-card__title">
+                    <p id="card-1-check-label">{{ app.name }}</p>
+                    <div class="pf-c-content">
+                        <small>{{ app.meta_publisher }}</small>
+                    </div>
+                </div>
+                <div class="pf-c-card__body">
+                    {% trans app.meta_description|truncatewords:35 %}
+                </div>
+            </a>
+            {% endfor %}
+        </div>
+        {% else %}
+        <div class="pf-c-empty-state pf-m-full-height">
+            <div class="pf-c-empty-state__content">
+                <i class="fas fa-cubes pf-c-empty-state__icon" aria-hidden="true"></i>
+                <h1 class="pf-c-title pf-m-lg">{% trans 'No Applications available.' %}</h1>
+                <div class="pf-c-empty-state__body">
+                    {% trans "Either no applications are defined, or you don't have access to any." %}
+                </div>
+                {% if perms.passbook_core.add_application %}
+                <a href="{% url 'passbook_admin:application-create' %}" class="pf-c-button pf-m-primary" type="button">
+                    {% trans 'Create Application' %}
+                </a>
                 {% endif %}
             </div>
-            <div class="pf-c-card__title">
-                <p id="card-1-check-label">{{ app.name }}</p>
-                <div class="pf-c-content">
-                    <small>{{ app.meta_publisher }}</small>
-                </div>
-            </div>
-            <div class="pf-c-card__body">
-                {% trans app.meta_description|truncatewords:35 %}
-            </div>
-        </a>
-        {% endfor %}
-    </div>
-    {% else %}
-    <div class="pf-c-empty-state pf-m-full-height">
-        <div class="pf-c-empty-state__content">
-            <i class="fas fa-cubes pf-c-empty-state__icon" aria-hidden="true"></i>
-            <h1 class="pf-c-title pf-m-lg">{% trans 'No Applications available.' %}</h1>
-            <div class="pf-c-empty-state__body">
-                {% trans "Either no applications are defined, or you don't have access to any." %}
-            </div>
-            {% if perms.passbook_core.add_application %}
-            <a href="{% url 'passbook_admin:application-create' %}" class="pf-c-button pf-m-primary" type="button">
-                {% trans 'Create Application' %}
-            </a>
-            {% endif %}
         </div>
-    </div>
-    {% endif %}
-</section>
-{% endblock %}
+        {% endif %}
+    </section>
+</main>