trustchain-oc1-orchestral/authentik
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

core: remove UILoginButton's icon_path

Browse source
This commit is contained in:
Jens Langhammer 2021-02-20 18:26:36 +01:00
parent 391ee10cb8
commit 0e975757b8
6 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
authentik/core/templates/login/base.html
View file

@ -28,10 +28,8 @@
{% for source in sources %}
<li class="pf-c-login__main-footer-links-item">
<a href="{{ source.url }}" class="pf-c-login__main-footer-links-item-link">
{% if source.icon_path %}
<img src="{% static source.icon_path %}" alt="{{ source.name }}">
{% elif source.icon_url %}
<img src="icon_url" alt="{{ source.name }}">
{% if source.icon_url %}
<img src="{{ source.icon_url }}" alt="{{ source.name }}">
{% else %}
<i class="pf-icon pf-icon-arrow" title="{{ source.name }}"></i>
{% endif %}

2
authentik/core/templates/shell.html
View file

@ -1,5 +1,7 @@
{% extends "base/skeleton.html" %}
{% load static %}
{% block head %}
<script src="{% static 'dist/main.js' %}?v={{ ak_version }}" type="module"></script>
{% endblock %}

3
authentik/core/types.py
View file

@ -13,8 +13,5 @@ class UILoginButton:
# URL Which Button points to
url: str
# Icon name, ran through django's static
icon_path: Optional[str] = None
# Icon URL, used as-is
icon_url: Optional[str] = None

3
authentik/sources/oauth/models.py
View file

@ -6,6 +6,7 @@ from django.forms import ModelForm
from django.urls import reverse, reverse_lazy
from django.utils.translation import gettext_lazy as _
from rest_framework.serializers import Serializer
from django.templatetags.static import static
from authentik.core.models import Source, UserSourceConnection
from authentik.core.types import UILoginButton
@ -60,7 +61,7 @@ class OAuthSource(Source):
"authentik_sources_oauth:oauth-client-login",
kwargs={"source_slug": self.slug},
),
icon_path=f"authentik/sources/{self.provider_type}.svg",
icon_url=static(f"authentik/sources/{self.provider_type}.svg"),
name=self.name,
)

1
authentik/sources/saml/models.py
View file

@ -169,7 +169,6 @@ class SAMLSource(Source):
url=reverse_lazy(
"authentik_sources_saml:login", kwargs={"source_slug": self.slug}
),
icon_path="",
)
@property

6
authentik/stages/identification/templates/stages/identification/login.html
View file

@ -34,10 +34,8 @@
{% for source in sources %}
<li class="pf-c-login__main-footer-links-item">
<a href="{{ source.url }}" class="pf-c-login__main-footer-links-item-link">
{% if source.icon_path %}
<img src="{% static source.icon_path %}" style="width:24px;" alt="{{ source.name }}">
{% elif source.icon_url %}
<img src="icon_url" alt="{{ source.name }}">
{% if source.icon_url %}
<img src="{{ source.icon_url }}" alt="{{ source.name }}">
{% else %}
<i class="pf-icon pf-icon-arrow" title="{{ source.name }}"></i>
{% endif %}