From 6c889eff272b3a93781dc1f64d41e1e67d742d48 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Thu, 20 Feb 2020 14:30:06 +0100
Subject: [PATCH] core: fix application icons not loading, fix with_sources
 being broken

---
 passbook/core/forms/applications.py           |  2 +
 .../core/templates/login/with_sources.html    | 13 ++--
 passbook/core/templates/overview/index.html   | 68 ++++++++++---------
 passbook/sources/oauth/models.py              |  2 +-
 4 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/passbook/core/forms/applications.py b/passbook/core/forms/applications.py
index 4ed05137c..8c1a91603 100644
--- a/passbook/core/forms/applications.py
+++ b/passbook/core/forms/applications.py
@@ -37,5 +37,7 @@ class ApplicationForm(forms.ModelForm):
         labels = {
             "meta_launch_url": _("Launch URL"),
             "meta_icon_url": _("Icon URL"),
+            "meta_description": _("Description"),
+            "meta_publisher": _("Publisher"),
         }
         help_texts = {"policies": _("Policies required to access this Application.")}
diff --git a/passbook/core/templates/login/with_sources.html b/passbook/core/templates/login/with_sources.html
index afdb50af6..76f95bcdc 100644
--- a/passbook/core/templates/login/with_sources.html
+++ b/passbook/core/templates/login/with_sources.html
@@ -48,13 +48,16 @@
         <!--login-pf-section-->
         <section class="login-pf-social-section" role="contentinfo" aria-label="Log in with third party account">
             <ul class="login-pf-social login-pf-social-double-col list-unstyled">
-                {% for url, icon, name in sources %}
+                {% for source in sources %}
                 <li class="login-pf-social-link">
-                    <a href="{{ url }}">
-                        {% if icon %}
-                        <img src="{% static 'img/logos/' %}{{ icon }}.svg" alt="{{ name }}">
+                    <a href="{{ source.url }}">
+                        {% if source.icon_path %}
+                        <img src="{% static source.icon_path %}" alt="{{ source.name }}">
                         {% endif %}
-                        {{ name }}
+                        {% if source.icon_url %}
+                        <img src="icon_url" alt="{{ source.name }}">
+                        {% endif %}
+                        {{ source.name }}
                     </a>
                 </li>
                 {% endfor %}
diff --git a/passbook/core/templates/overview/index.html b/passbook/core/templates/overview/index.html
index e56aa26c5..6aded2ff3 100644
--- a/passbook/core/templates/overview/index.html
+++ b/passbook/core/templates/overview/index.html
@@ -2,42 +2,44 @@
 
 {% load i18n %}
 
-{% block head %}
-{{ block.super }}
-<style>
-  img.app-icon {
-    max-height: 72px;
-  }
-</style>
-{% endblock %}
-
 {% block content %}
 <div class="container">
-  <div class="row row-cards-pf">
-    {% for app in applications %}
-    <div class="col-xs-12 col-sm-6 col-md-3">
-      <div class="card-pf card-pf-accented card-pf-aggregate-status">
-        <h2 class="card-pf-title">
-          <span class="fa fa-shield"></span> {{ app.name }}
-        </h2>
-        <div class="card-pf-body">
-          <p class="card-pf-aggregate-status-notifications">
-            <span class="card-pf-aggregate-status-notification">
-              <a href="{{ app.launch_url }}" class="add" data-toggle="tooltip" data-placement="top" title="{% trans 'Open App...' %}">
-                {% if not app.icon_url %}
-                <span class="pficon pficon-arrow"></span>
-                {% else %}
-                <img class="app-icon" src="{{ app.icon_url }}" alt="{% trans 'Application Icon' %}">
-                {% endif %}
-              </a>
-            </span>
-          </p>
+    <div class="row row-cards-pf">
+        {% for app in applications %}
+        <div class="col-xs-12 col-sm-6 col-md-3">
+            <div class="card-pf card-pf-view card-pf-view-select card-pf-view-single-select">
+                <div class="card-pf-body">
+                    <div class="card-pf-top-element">
+                        <a href="{{ app.meta_launch_url }}">
+                            {% if not app.meta_icon_url %}
+                            <span class="pficon pficon-arrow card-pf-icon-circle"></span>
+                            {% else %}
+                            <img class="app-icon card-pf-icon-circle" src="{{ app.meta_icon_url }}" alt="{% trans 'Application Icon' %}">
+                            {% endif %}
+                        </a>
+                    </div>
+                    <h2 class="card-pf-title text-center">
+                        <a href="{{ app.meta_launch_url }}">
+                            {{ app.name }}
+                        </a>
+                    </h2>
+                    {% if app.meta_publisher %}
+                    <div class="card-pf-items text-center">
+                        <small>{{ app.meta_publisher }}</small>
+                    </div>
+                    {% endif %}
+                    {% if app.meta_description %}
+                    <div class="card-pf-items text-center">
+                        <p>{{ app.meta_description }}</p>
+                    </div>
+                    {% endif %}
+                </div>
+                <div class="card-pf-view-checkbox">
+                    <a href="{{ app.meta_launch_url }}"></a>
+                </div>
+            </div>
         </div>
-      </div>
+        {% endfor %}
     </div>
-    {% empty %}
-    <h1>{% trans 'No Applications available.' %}</h1>
-    {% endfor %}
-  </div><!-- /row -->
 </div>
 {% endblock %}
diff --git a/passbook/sources/oauth/models.py b/passbook/sources/oauth/models.py
index 1c1cabfd9..0dde24162 100644
--- a/passbook/sources/oauth/models.py
+++ b/passbook/sources/oauth/models.py
@@ -35,7 +35,7 @@ class OAuthSource(Source):
                 "passbook_sources_oauth:oauth-client-login",
                 kwargs={"source_slug": self.slug},
             ),
-            icon_path=f"{self.provider_type}.svg",
+            icon_path=f"img/logos/{self.provider_type}.svg",
             name=self.name,
         )