diff --git a/CHANGELOG.md b/CHANGELOG.md index e48c1319..a4681a2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +- [#236](https://github.com/os2display/display-admin-client/pull/236) + - Add help text to activation code form. + - Fixed warnings raised when compiling. - [#234](https://github.com/os2display/display-admin-client/pull/234) - Cleaned up code flow in playlist saving. - Changed to chaining relations puts. diff --git a/src/components/activation-code/activation-code-form.jsx b/src/components/activation-code/activation-code-form.jsx index f21ef28a..68067443 100644 --- a/src/components/activation-code/activation-code-form.jsx +++ b/src/components/activation-code/activation-code-form.jsx @@ -44,29 +44,41 @@ function ActivationCodeForm({ }, ]; + // 123 + return ( <>

{headerText}

- - +
+ +
+
+ +
+ {t("role-external-user-helptext")} +
+
+ {t("role-external-user-admin-helptext")} +
+
); })} diff --git a/src/components/user/oidc-login.jsx b/src/components/user/oidc-login.jsx index 873068cd..458fdaa9 100644 --- a/src/components/user/oidc-login.jsx +++ b/src/components/user/oidc-login.jsx @@ -1,5 +1,5 @@ -import { React, useEffect, useState } from "react"; -import { Alert, Spinner } from "react-bootstrap"; +import { React, useState } from "react"; +import { Alert } from "react-bootstrap"; import { useTranslation } from "react-i18next"; import "./login.scss"; import PropTypes from "prop-types"; @@ -22,7 +22,6 @@ function OIDCLogin({ config }) { const { provider, label, icon } = config; // State - const [oidcAuthUrl, setOidcAuthUrl] = useState(""); const [oidcAuthLoadingError, setOidcAuthLoadingError] = useState(""); let labelText = label; @@ -79,16 +78,17 @@ function OIDCLogin({ config }) { return ( <> -
{iconRender} {labelText} -
+ {oidcAuthLoadingError !== "" && ( {oidcAuthLoadingError} )} diff --git a/src/translations/da/common.json b/src/translations/da/common.json index fdf61f50..c59ff732 100644 --- a/src/translations/da/common.json +++ b/src/translations/da/common.json @@ -962,7 +962,9 @@ "save-button": "Gem aktiveringskode", "role-external-user-admin": "Ekstern brugeradministrator", "role-external-user": "Ekstern bruger", - "role-label": "Brugerens rolle" + "role-label": "Brugerens rolle", + "role-external-user-helptext": "Hvis brugeren kun skal oprette indhold, vælg \"Ekstern bruger\".", + "role-external-user-admin-helptext": "Hvis brugeren skal kunne tilføje andre eksterne brugere til området, så vælg \"Ekstern brugeradministrator\"." }, "activation-code-create": { "header": "Tilkobling til nyt område",