diff --git a/authentik/core/models.py b/authentik/core/models.py index 30969f3b0..ad07d3c12 100644 --- a/authentik/core/models.py +++ b/authentik/core/models.py @@ -262,7 +262,7 @@ class Application(PolicyBindingModel): it is returned as-is""" if not self.meta_icon: return None - if self.meta_icon.name.startswith("http") or self.meta_icon.name.startswith("/static"): + if "://" in self.meta_icon.name or self.meta_icon.name.startswith("/static"): return self.meta_icon.name return self.meta_icon.url diff --git a/web/src/locales/en.po b/web/src/locales/en.po index c71cb3398..215ed92d7 100644 --- a/web/src/locales/en.po +++ b/web/src/locales/en.po @@ -1580,6 +1580,10 @@ msgstr "Edit Stage" msgid "Edit User" msgstr "Edit User" +#: src/pages/applications/ApplicationForm.ts +msgid "Either input a full URL, a relative path, or use 'fa://fa-test' to use the Font Awesome icon \"fa-test\"." +msgstr "Either input a full URL, a relative path, or use 'fa://fa-test' to use the Font Awesome icon \"fa-test\"." + #: src/user/LibraryPage.ts msgid "Either no applications are defined, or you don't have access to any." msgstr "Either no applications are defined, or you don't have access to any." diff --git a/web/src/locales/fr_FR.po b/web/src/locales/fr_FR.po index 2c8e6c5f2..cb2d9a9c9 100644 --- a/web/src/locales/fr_FR.po +++ b/web/src/locales/fr_FR.po @@ -1568,6 +1568,10 @@ msgstr "Éditer l'étap" msgid "Edit User" msgstr "Éditer l'utilisateur" +#: src/pages/applications/ApplicationForm.ts +msgid "Either input a full URL, a relative path, or use 'fa://fa-test' to use the Font Awesome icon \"fa-test\"." +msgstr "" + #: src/user/LibraryPage.ts msgid "Either no applications are defined, or you don't have access to any." msgstr "Soit aucune application n'est définie, soit vous n'en avez accès à aucune." diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po index 291fc2387..3082044af 100644 --- a/web/src/locales/pseudo-LOCALE.po +++ b/web/src/locales/pseudo-LOCALE.po @@ -1572,6 +1572,10 @@ msgstr "" msgid "Edit User" msgstr "" +#: src/pages/applications/ApplicationForm.ts +msgid "Either input a full URL, a relative path, or use 'fa://fa-test' to use the Font Awesome icon \"fa-test\"." +msgstr "" + #: src/user/LibraryPage.ts msgid "Either no applications are defined, or you don't have access to any." msgstr "" diff --git a/web/src/pages/applications/ApplicationForm.ts b/web/src/pages/applications/ApplicationForm.ts index f686cd6d1..8091cef52 100644 --- a/web/src/pages/applications/ApplicationForm.ts +++ b/web/src/pages/applications/ApplicationForm.ts @@ -266,6 +266,9 @@ export class ApplicationForm extends ModelForm { value="${first(this.instance?.metaIcon, "")}" class="pf-c-form-control" /> +

+ ${t`Either input a full URL, a relative path, or use 'fa://fa-test' to use the Font Awesome icon "fa-test".`} +

`; }), )} diff --git a/web/src/user/LibraryApplication.ts b/web/src/user/LibraryApplication.ts index 7ed6d989d..1f6ceabd8 100644 --- a/web/src/user/LibraryApplication.ts +++ b/web/src/user/LibraryApplication.ts @@ -62,6 +62,21 @@ export class LibraryApplication extends LitElement { ]; } + renderIcon(): TemplateResult { + if (this.application?.metaIcon) { + if (this.application.metaIcon.startsWith("fa://")) { + const icon = this.application.metaIcon.replaceAll("fa://", ""); + return html``; + } + return html`${t`Application Icon`}`; + } + return html``; + } + render(): TemplateResult { if (!this.application) { return html``; @@ -73,15 +88,7 @@ export class LibraryApplication extends LitElement { style="background: ${this.background} !important" >
- - ${this.application.metaIcon - ? html`${t`Application Icon`}` - : html``} - + ${this.renderIcon()} ${until( uiConfig().then((config) => { if (!config.enabledFeatures.applicationEdit) {