From eb02c448aa07076620a34211be4ef4067e1714e7 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Mon, 15 Jan 2024 23:40:45 +0100 Subject: [PATCH] update UI Signed-off-by: Jens Langhammer --- schema.yml | 7 ++-- .../admin/admin-settings/AdminSettingsForm.ts | 37 +++++++++--------- .../admin/admin-settings/AdminSettingsPage.ts | 38 +++++++++++-------- web/xliff/de.xlf | 18 ++++----- web/xliff/en.xlf | 18 ++++----- web/xliff/es.xlf | 18 ++++----- web/xliff/fr.xlf | 18 ++++----- web/xliff/ko.xlf | 18 ++++----- web/xliff/nl.xlf | 18 ++++----- web/xliff/pl.xlf | 18 ++++----- web/xliff/pseudo-LOCALE.xlf | 18 ++++----- web/xliff/tr.xlf | 18 ++++----- web/xliff/zh-CN.xlf | 18 ++++----- web/xliff/zh-Hans.xlf | 18 ++++----- web/xliff/zh-Hant.xlf | 18 ++++----- web/xliff/zh_TW.xlf | 18 ++++----- 16 files changed, 162 insertions(+), 154 deletions(-) diff --git a/schema.yml b/schema.yml index 9d91c7e1b..d2075d0c8 100644 --- a/schema.yml +++ b/schema.yml @@ -43491,13 +43491,14 @@ components: format: date-time description: Current server time readOnly: true + embedded_outpost_disabled: + type: boolean + description: Whether the embedded outpost is disabled + readOnly: true embedded_outpost_host: type: string description: Get the FQDN configured on the embedded outpost readOnly: true - embedded_outpost_disabled: - type: boolean - readOnly: true required: - brand - embedded_outpost_disabled diff --git a/web/src/admin/admin-settings/AdminSettingsForm.ts b/web/src/admin/admin-settings/AdminSettingsForm.ts index ae9aaffe6..06f06ca6d 100644 --- a/web/src/admin/admin-settings/AdminSettingsForm.ts +++ b/web/src/admin/admin-settings/AdminSettingsForm.ts @@ -1,7 +1,9 @@ +import { first } from "@goauthentik/app/common/utils"; import { DEFAULT_CONFIG } from "@goauthentik/common/api/config"; import "@goauthentik/components/ak-switch-input"; import "@goauthentik/components/ak-text-input"; -import "@goauthentik/components/ak-textarea-input"; +import "@goauthentik/elements/CodeMirror"; +import { CodeMirrorMode } from "@goauthentik/elements/CodeMirror"; import { Form } from "@goauthentik/elements/forms/Form"; import "@goauthentik/elements/forms/FormGroup"; import "@goauthentik/elements/forms/HorizontalFormElement"; @@ -111,21 +113,21 @@ export class AdminSettingsForm extends Form { @@ -151,20 +153,19 @@ export class AdminSettingsForm extends Form { `} > - - ${msg( - "This option configures the footer links on the flow executor pages. It must be a valid JSON list and can be used as follows:", - )} - [{"name": "Link Name","href":"https://goauthentik.io"}] -

- `} - > - + + +

+ ${msg( + "This option configures the footer links on the flow executor pages. It must be a valid JSON list and can be used as follows:", + )} + [{"name": "Link Name","href":"https://goauthentik.io"}] +

+ ${msg("System settings")}
- - - { - await this.save(); - }} - class="pf-m-primary" - >${msg("Save")} - { - this.resetForm(); - }} - class="pf-m-secondary" - >${msg("Cancel")} +
+
+ + +
+
+ { + await this.save(); + }} + class="pf-m-primary" + >${msg("Save")} + { + this.resetForm(); + }} + class="pf-m-secondary" + >${msg("Cancel")} +
+
`; } diff --git a/web/xliff/de.xlf b/web/xliff/de.xlf index 07b465224..09fc4c138 100644 --- a/web/xliff/de.xlf +++ b/web/xliff/de.xlf @@ -6287,21 +6287,12 @@ Bindings to groups/users are checked against the user of the event. attempt to get an avatar from Gravatar, and if the user has not configured on there, it will fallback to a generated avatar. - - Default user change name - Enable the ability for users to change their name. - - Default user change email - Enable the ability for users to change their email. - - Default user change username - Enable the ability for users to change their username. @@ -6325,6 +6316,15 @@ Bindings to groups/users are checked against the user of the event. System settings + + + Allow users' to change name + + + Allow users' to change email + + + Allow users' to change username diff --git a/web/xliff/en.xlf b/web/xliff/en.xlf index 64b02ea4b..0b4d3e9e2 100644 --- a/web/xliff/en.xlf +++ b/web/xliff/en.xlf @@ -6562,21 +6562,12 @@ Bindings to groups/users are checked against the user of the event. attempt to get an avatar from Gravatar, and if the user has not configured on there, it will fallback to a generated avatar. - - Default user change name - Enable the ability for users to change their name. - - Default user change email - Enable the ability for users to change their email. - - Default user change username - Enable the ability for users to change their username. @@ -6600,6 +6591,15 @@ Bindings to groups/users are checked against the user of the event. System settings + + + Allow users' to change name + + + Allow users' to change email + + + Allow users' to change username diff --git a/web/xliff/es.xlf b/web/xliff/es.xlf index 3227a22fc..aea1a4afb 100644 --- a/web/xliff/es.xlf +++ b/web/xliff/es.xlf @@ -6203,21 +6203,12 @@ Bindings to groups/users are checked against the user of the event. attempt to get an avatar from Gravatar, and if the user has not configured on there, it will fallback to a generated avatar. - - Default user change name - Enable the ability for users to change their name. - - Default user change email - Enable the ability for users to change their email. - - Default user change username - Enable the ability for users to change their username. @@ -6241,6 +6232,15 @@ Bindings to groups/users are checked against the user of the event. System settings + + + Allow users' to change name + + + Allow users' to change email + + + Allow users' to change username diff --git a/web/xliff/fr.xlf b/web/xliff/fr.xlf index 0b96932e1..5717f5e98 100644 --- a/web/xliff/fr.xlf +++ b/web/xliff/fr.xlf @@ -8242,21 +8242,12 @@ Les liaisons avec les groupes/utilisateurs sont vérifiées par rapport à l'uti attempt to get an avatar from Gravatar, and if the user has not configured on there, it will fallback to a generated avatar. - - Default user change name - Enable the ability for users to change their name. - - Default user change email - Enable the ability for users to change their email. - - Default user change username - Enable the ability for users to change their username. @@ -8280,6 +8271,15 @@ Les liaisons avec les groupes/utilisateurs sont vérifiées par rapport à l'uti System settings + + + Allow users' to change name + + + Allow users' to change email + + + Allow users' to change username diff --git a/web/xliff/ko.xlf b/web/xliff/ko.xlf index 2f83fbe37..88b69b45f 100644 --- a/web/xliff/ko.xlf +++ b/web/xliff/ko.xlf @@ -8149,21 +8149,12 @@ Bindings to groups/users are checked against the user of the event. attempt to get an avatar from Gravatar, and if the user has not configured on there, it will fallback to a generated avatar. - - Default user change name - Enable the ability for users to change their name. - - Default user change email - Enable the ability for users to change their email. - - Default user change username - Enable the ability for users to change their username. @@ -8199,6 +8190,15 @@ Bindings to groups/users are checked against the user of the event. Select endpoint to connect to + + + Allow users' to change name + + + Allow users' to change email + + + Allow users' to change username diff --git a/web/xliff/nl.xlf b/web/xliff/nl.xlf index 224b6ded8..6b4349267 100644 --- a/web/xliff/nl.xlf +++ b/web/xliff/nl.xlf @@ -7974,21 +7974,12 @@ Bindingen naar groepen/gebruikers worden gecontroleerd tegen de gebruiker van de attempt to get an avatar from Gravatar, and if the user has not configured on there, it will fallback to a generated avatar. - - Default user change name - Enable the ability for users to change their name. - - Default user change email - Enable the ability for users to change their email. - - Default user change username - Enable the ability for users to change their username. @@ -8039,6 +8030,15 @@ Bindingen naar groepen/gebruikers worden gecontroleerd tegen de gebruiker van de Select endpoint to connect to + + + Allow users' to change name + + + Allow users' to change email + + + Allow users' to change username diff --git a/web/xliff/pl.xlf b/web/xliff/pl.xlf index 20f031b4f..028c0a40e 100644 --- a/web/xliff/pl.xlf +++ b/web/xliff/pl.xlf @@ -6410,21 +6410,12 @@ Bindings to groups/users are checked against the user of the event. attempt to get an avatar from Gravatar, and if the user has not configured on there, it will fallback to a generated avatar. - - Default user change name - Enable the ability for users to change their name. - - Default user change email - Enable the ability for users to change their email. - - Default user change username - Enable the ability for users to change their username. @@ -6448,6 +6439,15 @@ Bindings to groups/users are checked against the user of the event. System settings + + + Allow users' to change name + + + Allow users' to change email + + + Allow users' to change username diff --git a/web/xliff/pseudo-LOCALE.xlf b/web/xliff/pseudo-LOCALE.xlf index 1c30e2130..a093b7f0f 100644 --- a/web/xliff/pseudo-LOCALE.xlf +++ b/web/xliff/pseudo-LOCALE.xlf @@ -8135,21 +8135,12 @@ Bindings to groups/users are checked against the user of the event. attempt to get an avatar from Gravatar, and if the user has not configured on there, it will fallback to a generated avatar. - - Default user change name - Enable the ability for users to change their name. - - Default user change email - Enable the ability for users to change their email. - - Default user change username - Enable the ability for users to change their username. @@ -8174,4 +8165,13 @@ Bindings to groups/users are checked against the user of the event. System settings + + Allow users' to change name + + + Allow users' to change email + + + Allow users' to change username + diff --git a/web/xliff/tr.xlf b/web/xliff/tr.xlf index faf738130..cc876df05 100644 --- a/web/xliff/tr.xlf +++ b/web/xliff/tr.xlf @@ -6196,21 +6196,12 @@ Bindings to groups/users are checked against the user of the event. attempt to get an avatar from Gravatar, and if the user has not configured on there, it will fallback to a generated avatar. - - Default user change name - Enable the ability for users to change their name. - - Default user change email - Enable the ability for users to change their email. - - Default user change username - Enable the ability for users to change their username. @@ -6234,6 +6225,15 @@ Bindings to groups/users are checked against the user of the event. System settings + + + Allow users' to change name + + + Allow users' to change email + + + Allow users' to change username diff --git a/web/xliff/zh-CN.xlf b/web/xliff/zh-CN.xlf index e0af65466..e4b01dd06 100644 --- a/web/xliff/zh-CN.xlf +++ b/web/xliff/zh-CN.xlf @@ -4603,21 +4603,12 @@ Bindings to groups/users are checked against the user of the event. attempt to get an avatar from Gravatar, and if the user has not configured on there, it will fallback to a generated avatar. - - Default user change name - Enable the ability for users to change their name. - - Default user change email - Enable the ability for users to change their email. - - Default user change username - Enable the ability for users to change their username. @@ -5143,6 +5134,15 @@ Bindings to groups/users are checked against the user of the event. Connected services + + Allow users' to change name + + + Allow users' to change email + + + Allow users' to change username + diff --git a/web/xliff/zh-Hans.xlf b/web/xliff/zh-Hans.xlf index 3d6f02923..3eda20fda 100644 --- a/web/xliff/zh-Hans.xlf +++ b/web/xliff/zh-Hans.xlf @@ -8244,21 +8244,12 @@ Bindings to groups/users are checked against the user of the event. attempt to get an avatar from Gravatar, and if the user has not configured on there, it will fallback to a generated avatar. - - Default user change name - Enable the ability for users to change their name. - - Default user change email - Enable the ability for users to change their email. - - Default user change username - Enable the ability for users to change their username. @@ -8282,6 +8273,15 @@ Bindings to groups/users are checked against the user of the event. System settings + + + Allow users' to change name + + + Allow users' to change email + + + Allow users' to change username diff --git a/web/xliff/zh-Hant.xlf b/web/xliff/zh-Hant.xlf index d2c092bf0..3af07a956 100644 --- a/web/xliff/zh-Hant.xlf +++ b/web/xliff/zh-Hant.xlf @@ -6244,21 +6244,12 @@ Bindings to groups/users are checked against the user of the event. attempt to get an avatar from Gravatar, and if the user has not configured on there, it will fallback to a generated avatar. - - Default user change name - Enable the ability for users to change their name. - - Default user change email - Enable the ability for users to change their email. - - Default user change username - Enable the ability for users to change their username. @@ -6282,6 +6273,15 @@ Bindings to groups/users are checked against the user of the event. System settings + + + Allow users' to change name + + + Allow users' to change email + + + Allow users' to change username diff --git a/web/xliff/zh_TW.xlf b/web/xliff/zh_TW.xlf index 7ee0e7217..67f3c7815 100644 --- a/web/xliff/zh_TW.xlf +++ b/web/xliff/zh_TW.xlf @@ -8120,21 +8120,12 @@ Bindings to groups/users are checked against the user of the event. attempt to get an avatar from Gravatar, and if the user has not configured on there, it will fallback to a generated avatar. - - Default user change name - Enable the ability for users to change their name. - - Default user change email - Enable the ability for users to change their email. - - Default user change username - Enable the ability for users to change their username. @@ -8158,6 +8149,15 @@ Bindings to groups/users are checked against the user of the event. System settings + + + Allow users' to change name + + + Allow users' to change email + + + Allow users' to change username