From 45a397bd778b5c0fefc9c65eb9c916616dadf971 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sat, 20 Mar 2021 15:38:09 +0100 Subject: [PATCH] web: fix card titles Signed-off-by: Jens Langhammer --- authentik/core/templates/user/details.html | 2 +- .../oauth/templates/oauth_client/user.html | 2 +- .../authenticator_static/user_settings.html | 2 +- .../authenticator_totp/user_settings.html | 2 +- .../authenticator_webauthn/user_settings.html | 2 +- .../stages/password/user-settings-card.html | 2 +- .../pages/applications/ApplicationViewPage.ts | 24 ++-------- web/src/pages/flows/FlowViewPage.ts | 48 ++++++++++++------- 8 files changed, 40 insertions(+), 44 deletions(-) diff --git a/authentik/core/templates/user/details.html b/authentik/core/templates/user/details.html index b46c1f9a6..0babe3137 100644 --- a/authentik/core/templates/user/details.html +++ b/authentik/core/templates/user/details.html @@ -1,7 +1,7 @@ {% load i18n %}
-
+
{% trans 'Update details' %}
diff --git a/authentik/sources/oauth/templates/oauth_client/user.html b/authentik/sources/oauth/templates/oauth_client/user.html index ff69eaa91..ea30ace65 100644 --- a/authentik/sources/oauth/templates/oauth_client/user.html +++ b/authentik/sources/oauth/templates/oauth_client/user.html @@ -1,7 +1,7 @@ {% load i18n %}
-
+
{% blocktrans with source_name=source.name %} Source {{ source_name }} {% endblocktrans %} diff --git a/authentik/stages/authenticator_static/templates/stages/authenticator_static/user_settings.html b/authentik/stages/authenticator_static/templates/stages/authenticator_static/user_settings.html index bc01cd3cb..81a40e04c 100644 --- a/authentik/stages/authenticator_static/templates/stages/authenticator_static/user_settings.html +++ b/authentik/stages/authenticator_static/templates/stages/authenticator_static/user_settings.html @@ -1,7 +1,7 @@ {% load i18n %}
-
+
{% trans "Static One-Time Passwords" %}
diff --git a/authentik/stages/authenticator_totp/templates/stages/authenticator_totp/user_settings.html b/authentik/stages/authenticator_totp/templates/stages/authenticator_totp/user_settings.html index 722da5f36..a64044eb5 100644 --- a/authentik/stages/authenticator_totp/templates/stages/authenticator_totp/user_settings.html +++ b/authentik/stages/authenticator_totp/templates/stages/authenticator_totp/user_settings.html @@ -1,7 +1,7 @@ {% load i18n %}
-
+
{% trans "Time-based One-Time Passwords" %}
diff --git a/authentik/stages/authenticator_webauthn/templates/stages/authenticator_webauthn/user_settings.html b/authentik/stages/authenticator_webauthn/templates/stages/authenticator_webauthn/user_settings.html index ea97b915b..36e79f112 100644 --- a/authentik/stages/authenticator_webauthn/templates/stages/authenticator_webauthn/user_settings.html +++ b/authentik/stages/authenticator_webauthn/templates/stages/authenticator_webauthn/user_settings.html @@ -2,7 +2,7 @@ {% load humanize %}
-
+
{% trans "WebAuthn Devices" %}
diff --git a/authentik/stages/password/templates/stages/password/user-settings-card.html b/authentik/stages/password/templates/stages/password/user-settings-card.html index 46cc0da99..aa8782b26 100644 --- a/authentik/stages/password/templates/stages/password/user-settings-card.html +++ b/authentik/stages/password/templates/stages/password/user-settings-card.html @@ -2,7 +2,7 @@ {% load authentik_utils %}
-
+
{% trans 'Reset your password' %}
diff --git a/web/src/pages/applications/ApplicationViewPage.ts b/web/src/pages/applications/ApplicationViewPage.ts index e0360ee67..a3992f292 100644 --- a/web/src/pages/applications/ApplicationViewPage.ts +++ b/web/src/pages/applications/ApplicationViewPage.ts @@ -76,11 +76,7 @@ export class ApplicationViewPage extends LitElement {
-
-
- ${gettext("Logins over the last 24 hours")} -
-
+
${gettext("Logins over the last 24 hours")}
${this.application ? html` @@ -88,11 +84,7 @@ export class ApplicationViewPage extends LitElement {
-
-
- ${gettext("Related")} -
-
+
${gettext("Related")}
${this.application.provider ? @@ -113,11 +105,7 @@ export class ApplicationViewPage extends LitElement {
-
-
- ${gettext("Changelog")} -
-
+
${gettext("Changelog")}
-
-
- ${gettext("These policies control which users can access this application.")} -
-
+
${gettext("These policies control which users can access this application.")}
diff --git a/web/src/pages/flows/FlowViewPage.ts b/web/src/pages/flows/FlowViewPage.ts index fa3fad4c3..1f1987e37 100644 --- a/web/src/pages/flows/FlowViewPage.ts +++ b/web/src/pages/flows/FlowViewPage.ts @@ -12,9 +12,13 @@ import { Flow, FlowsApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import PFPage from "@patternfly/patternfly/components/Page/page.css"; +import PFCard from "@patternfly/patternfly/components/Card/card.css"; import PFContent from "@patternfly/patternfly/components/Content/content.css"; import AKGlobal from "../../authentik.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; +import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css"; +import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css"; +import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css"; @customElement("ak-flow-view") export class FlowViewPage extends LitElement { @@ -31,7 +35,7 @@ export class FlowViewPage extends LitElement { flow!: Flow; static get styles(): CSSResult[] { - return [PFBase, PFPage, PFContent, AKGlobal].concat( + return [PFBase, PFPage, PFCard, PFContent, PFFlex, PFSizing, PFDisplay, AKGlobal].concat( css` img.pf-icon { max-height: 24px; @@ -57,36 +61,44 @@ export class FlowViewPage extends LitElement {
-
-
- - +
+
+
+
+
+ + +
+
+
- - +
+ + +
-
-
- ${gettext("These policies control which users can access this flow.")} -
+
${gettext("These policies control which users can access this flow.")}
+
+ +
- -
- - +
+ + +
`;