diff --git a/src/js/ajax/form.js b/src/js/ajax/form.js index bd51c80..a1ea4b9 100644 --- a/src/js/ajax/form.js +++ b/src/js/ajax/form.js @@ -33,7 +33,12 @@ const submitForm = (e) => { .then(async (resp) => { const body = resp.text().then((html) => { try { - const json = JSON.parse(html) + let json = JSON.parse(html) + + if (typeof json.MainContent !== undefined) { + json = JSON.parse(json.MainContent) + } + console.log(`${NAME}: JSON response`) const status = json.status === 'good' ? 'success' : 'error' @@ -83,7 +88,7 @@ const formInit = (form) => { const init = () => { console.log(`${NAME}: init`) - document.querySelectorAll('#MainContent form:not(.legacy)').forEach(formInit) + document.querySelectorAll('#MainContent form:not(.legacy),.ajax-form').forEach(formInit) } window.addEventListener(`${Events.LODEDANDREADY}`, init) diff --git a/src/scss/layout/forms/basics.scss b/src/scss/layout/forms/basics.scss index 590249b..18bcf61 100644 --- a/src/scss/layout/forms/basics.scss +++ b/src/scss/layout/forms/basics.scss @@ -38,6 +38,10 @@ } } +.form__field input.password { + @extend .form-control; +} + .form__fieldset { margin-bottom: -1rem; } diff --git a/src/scss/layout/main/alerts.scss b/src/scss/layout/main/alerts.scss index 6fcd5bc..09d35cd 100644 --- a/src/scss/layout/main/alerts.scss +++ b/src/scss/layout/main/alerts.scss @@ -6,6 +6,7 @@ .alert { display: flex; margin-bottom: 0; + .alert__container { display: flex; } @@ -27,3 +28,7 @@ display: flex !important; } } + +.alert-bad { + @extend .alert-danger; +}