diff --git a/js/src/forum/components/AcceptPoliciesModal.js b/js/src/forum/components/AcceptPoliciesModal.js index b7ebc5c..e9e409b 100644 --- a/js/src/forum/components/AcceptPoliciesModal.js +++ b/js/src/forum/components/AcceptPoliciesModal.js @@ -23,7 +23,7 @@ export default class AcceptPoliciesModal extends Modal { } content() { - return m('.Modal-body', this.body()); + return
{this.body()}
; } body() { @@ -36,91 +36,83 @@ export default class AcceptPoliciesModal extends Modal { ); if (policies.length === 0) { - return Button.component( - { - className: 'Button', - onclick() { + return ( + ); } - return policies.map((policy) => - m('div', [ - m('h2', policy.name()), - app.forum.attribute('fof-terms.hide-updated-at') - ? null - : m( - 'p', - policy.terms_updated_at() - ? app.translator.trans('fof-terms.forum.accept-modal.updated-at', { - date: dayjs(policy.terms_updated_at()).format(app.forum.attribute('fof-terms.date-format')), - }) - : app.translator.trans('fof-terms.forum.accept-modal.updated-recently') - ), - policy.update_message() ? m('p', policy.update_message()) : null, - m( - '.Form-group', - m( - '.FoF-Terms-Check.FoF-Terms-Check--login', - m('label.checkbox', [ - m('input', { - type: 'checkbox', - checked: this[policy.form_key()], - onchange: () => { + return policies.map((policy) => ( +
+

{policy.name()}

+ {app.forum.attribute('fof-terms.hide-updated-at') ? null : ( +

+ {policy.terms_updated_at() + ? app.translator.trans('fof-terms.forum.accept-modal.updated-at', { + date: dayjs(policy.terms_updated_at()).format(app.forum.attribute('fof-terms.date-format')), + }) + : app.translator.trans('fof-terms.forum.accept-modal.updated-recently')} +

+ )} + {policy.update_message() ?

{policy.update_message()}

: null} +
+
+ +
+
+ +
+ )); } } diff --git a/resources/locale/en.yml b/resources/locale/en.yml index 49d35d5..d878bad 100644 --- a/resources/locale/en.yml +++ b/resources/locale/en.yml @@ -71,7 +71,7 @@ fof-terms: update-alert: must-accept-message: We've temporarily restricted access to your account while you check out the new terms. - can-accept-message: We recently updated the terms. You can accept them to continue using this website. + can-accept-message: We recently updated the terms. You must accept them to continue using this website. review: Click here to review and accept the new terms close: Close