From 5c75339946fb35d633a407b1aa14b59dd7e6aa9f Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@haufe-lexware.com>
Date: Thu, 14 Mar 2019 21:18:13 +0100
Subject: [PATCH] point to correct icons

---
 .../core/templates/login/with_sources.html    |  2 +-
 passbook/core/templates/overview/base.html    |  3 ++-
 passbook/core/templates/user/base.html        |  2 +-
 passbook/oauth_client/models.py               | 26 +++++++++++++++----
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/passbook/core/templates/login/with_sources.html b/passbook/core/templates/login/with_sources.html
index 9c515f838..0eee95c91 100644
--- a/passbook/core/templates/login/with_sources.html
+++ b/passbook/core/templates/login/with_sources.html
@@ -51,7 +51,7 @@
                 {% for url, icon, name in sources %}
                 <li class="login-pf-social-link">
                     <a href="{{ url }}">
-                        <img src="{% static 'img/' %}{{ icon }}.svg" alt="{{ name }}"> {{ name }}
+                        <img src="{% static 'img/logos/' %}{{ icon }}.svg" alt="{{ name }}"> {{ name }}
                     </a>
                 </li>
                 {% endfor %}
diff --git a/passbook/core/templates/overview/base.html b/passbook/core/templates/overview/base.html
index c7c7b582e..447dd6b68 100644
--- a/passbook/core/templates/overview/base.html
+++ b/passbook/core/templates/overview/base.html
@@ -185,13 +185,14 @@
         {% endif %}
     </ul>
 </div>
-<div class="container-fluid container-cards-pf">
+<div class="container-fluid container-cards-pf container-pf-nav-pf-vertical hide-nav-pf">
     {% block content %}
     {% endblock %}
 </div>
 {% endblock %}
 
 {% block scripts %}
+{{ block.super }}
 <script>
     $(document).ready(function () {
         // initialize tooltips
diff --git a/passbook/core/templates/user/base.html b/passbook/core/templates/user/base.html
index edb0aaf5e..f4c69937e 100644
--- a/passbook/core/templates/user/base.html
+++ b/passbook/core/templates/user/base.html
@@ -30,7 +30,7 @@
                 {% for name, icon, link in us %}
                 <li class="{% if link == request.get_full_path %} active {% endif %}">
                     <a href="{{ link }}">
-                        <img src="{% static icon %}" alt=""> {{ name }}
+                        <i class="{{ icon }}"></i> {{ name }}
                     </a>
                 </li>
                 {% endfor %}
diff --git a/passbook/oauth_client/models.py b/passbook/oauth_client/models.py
index 451e0342b..94d651ee8 100644
--- a/passbook/oauth_client/models.py
+++ b/passbook/oauth_client/models.py
@@ -29,9 +29,9 @@ class OAuthSource(Source):
     def get_login_button(self):
         url = reverse_lazy('passbook_oauth_client:oauth-client-login',
                            kwargs={'source_slug': self.slug})
-        if self.provider_type == 'github':
-            return url, 'github-logo', _('GitHub')
-        return url, 'generic', _('Generic')
+        # if self.provider_type == 'github':
+        #     return url, 'github-logo', _('GitHub')
+        return url, self.provider_type, self.name
 
     @property
     def additional_info(self):
@@ -42,9 +42,12 @@ class OAuthSource(Source):
         """Entrypoint to integrate with User settings. Can either return False if no
         user settings are available, or a tuple or string, string, string where the first string
         is the name the item has, the second string is the icon and the third is the view-name."""
-        icon = 'img/%s.svg' % self.get_login_button[1]
+        icon_type = self.provider_type
+        if icon_type == 'azure ad':
+            icon_type = 'windows'
+        icon_class = 'fa fa-%s' % icon_type
         view_name = 'passbook_oauth_client:oauth-client-user'
-        return self.name, icon, reverse((view_name), kwargs={
+        return self.name, icon_class, reverse((view_name), kwargs={
             'source_slug': self.slug
         })
 
@@ -113,6 +116,19 @@ class GoogleOAuthSource(OAuthSource):
         verbose_name = _('Google OAuth Source')
         verbose_name_plural = _('Google OAuth Sources')
 
+
+class AzureADOAuthSource(OAuthSource):
+    """Abstract subclass of OAuthSource to specify AzureAD Form"""
+
+    form = 'passbook.oauth_client.forms.AzureADOAuthSourceForm'
+
+    class Meta:
+
+        abstract = True
+        verbose_name = _('Azure AD OAuth Source')
+        verbose_name_plural = _('Azure AD OAuth Sources')
+
+
 class UserOAuthSourceConnection(UserSourceConnection):
     """Authorized remote OAuth provider."""