From bfb23befe9fc064abc9275b4d6148f2e720fa98c Mon Sep 17 00:00:00 2001 From: "pmoreno.rodriguez" Date: Tue, 17 Oct 2023 23:34:38 +0200 Subject: [PATCH 1/3] Improved adding CSS classes from the form These modifications allow the use of CSS classes defined by the user in the comments.yaml file, both for the form (through the 'classes' tag) and for the fields (through the tag incorporated into them, 'outerclasses'). Additionally, a validation is added to verify if there are form messages, in order to apply styles to the space reserved for them (
), otherwise this div block will not be displayed. --- templates/partials/comments.html.twig | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/templates/partials/comments.html.twig b/templates/partials/comments.html.twig index b1ff904..4d0ad57 100644 --- a/templates/partials/comments.html.twig +++ b/templates/partials/comments.html.twig @@ -5,7 +5,8 @@
+ method="{{ grav.config.plugins.comments.form.method|upper|default('POST') }}" + class="{{ grav.config.plugins.comments.form.classes }}"> {% for field in grav.config.plugins.comments.form.fields %} {% set value = form.value(field.name) %} @@ -18,14 +19,10 @@ {% elseif field.name == 'email' %} {% else %} -
{% include "forms/fields/#{field.type}/#{field.type}.html.twig" %} -
{% endif %} {% else %} -
{% include "forms/fields/#{field.type}/#{field.type}.html.twig" %} -
{% endif %} {% endfor %} {% include "forms/fields/formname/formname.html.twig" %} @@ -38,8 +35,9 @@ {{ nonce_field('form', 'form-nonce')|raw }}
- -
{{ form.message }}
+ {% if form.message is not empty %} +
{{ form.message|raw }}
+ {% endif %} {% if grav.twig.comments|length %} From e497d29bf1c75314a6a817e5b6ef54493bf44a47 Mon Sep 17 00:00:00 2001 From: "pmoreno.rodriguez" Date: Tue, 17 Oct 2023 23:37:54 +0200 Subject: [PATCH 2/3] Added classes and outerclasses, and reset button to buttons. --- comments.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/comments.yaml b/comments.yaml index 5c09966..4e4ee0f 100644 --- a/comments.yaml +++ b/comments.yaml @@ -10,12 +10,14 @@ disable_on_routes: form: name: comments + classes: '' fields: - name: name label: PLUGIN_COMMENTS.NAME_LABEL placeholder: PLUGIN_COMMENTS.NAME_PLACEHOLDER autocomplete: on type: text + outerclasses: '' validate: required: true @@ -23,6 +25,7 @@ form: label: PLUGIN_COMMENTS.EMAIL_LABEL placeholder: PLUGIN_COMMENTS.EMAIL_PLACEHOLDER type: email + outerclasses: '' validate: required: true @@ -30,6 +33,7 @@ form: label: PLUGIN_COMMENTS.MESSAGE_LABEL placeholder: PLUGIN_COMMENTS.MESSAGE_PLACEHOLDER type: textarea + outerclasses: '' validate: required: true @@ -63,6 +67,9 @@ form: buttons: - type: submit value: PLUGIN_COMMENTS.SUBMIT_COMMENT_BUTTON_TEXT + - + type: reset + value: PLUGIN_COMMENTS.RESET_COMMENT_BUTTON_TEXT process: # - captcha: From 78cb023937b3df7a773a7cb372d49644da15f688 Mon Sep 17 00:00:00 2001 From: "pmoreno.rodriguez" Date: Tue, 17 Oct 2023 23:52:56 +0200 Subject: [PATCH 3/3] Added Reset button translation --- languages.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/languages.yaml b/languages.yaml index 3101de2..cc65fed 100644 --- a/languages.yaml +++ b/languages.yaml @@ -17,6 +17,7 @@ en: MESSAGE_LABEL: "Comment" MESSAGE_PLACEHOLDER: "Enter your comment" SUBMIT_COMMENT_BUTTON_TEXT: "Submit" + RESET_COMMENT_BUTTON_TEXT: "Reset" EMAIL_NEW_COMMENT_SUBJECT: "[New Comment] from {{ form.value.name|e }}" THANK_YOU_MESSAGE: "Thank you for writing your comment!" @@ -39,6 +40,7 @@ de: MESSAGE_LABEL: "Kommentar" MESSAGE_PLACEHOLDER: "Kommentar eingeben" SUBMIT_COMMENT_BUTTON_TEXT: "Absenden" + RESET_COMMENT_BUTTON_TEXT: "Zurücksetzen" EMAIL_NEW_COMMENT_SUBJECT: "[Neuer Kommentar] von {{ form.value.name|e }}" THANK_YOU_MESSAGE: "Vielen Dank für den Kommentar!" @@ -61,6 +63,7 @@ es: MESSAGE_LABEL: "Comentario" MESSAGE_PLACEHOLDER: "Escriba su comentario" SUBMIT_COMMENT_BUTTON_TEXT: "Enviar" + RESET_COMMENT_BUTTON_TEXT: "Restablecer" EMAIL_NEW_COMMENT_SUBJECT: "[Nuevo comentario] de {{ form.value.name|e }}" THANK_YOU_MESSAGE: "Gracias por escribir su comentario!" @@ -83,6 +86,7 @@ fr: MESSAGE_LABEL: "Commentaire" MESSAGE_PLACEHOLDER: "Rédigez votre commentaire" SUBMIT_COMMENT_BUTTON_TEXT: "Envoyer" + RESET_COMMENT_BUTTON_TEXT: "Réinitialiser" EMAIL_NEW_COMMENT_SUBJECT: "[Nouveau commentaire] de {{ form.value.name|e }}" THANK_YOU_MESSAGE: "Merci d'avoir rédigé votre commentaire !" @@ -105,6 +109,7 @@ hr: MESSAGE_LABEL: "Komentar" MESSAGE_PLACEHOLDER: "Unesite komentar" SUBMIT_COMMENT_BUTTON_TEXT: "Pošalji" + RESET_COMMENT_BUTTON_TEXT: "Ponastaviti" EMAIL_NEW_COMMENT_SUBJECT: "[Novi komentar] od {{ form.value.name|e }}" THANK_YOU_MESSAGE: "Hvala Vam što ste napisali svoj komentar!" @@ -127,6 +132,7 @@ it: MESSAGE_LABEL: "Messaggio" MESSAGE_PLACEHOLDER: "Inserisci il tuo commento" SUBMIT_COMMENT_BUTTON_TEXT: "Invia" + RESET_COMMENT_BUTTON_TEXT: "Ripristina" EMAIL_NEW_COMMENT_SUBJECT: "[Nuovo commento] da {{ form.value.name|e }}" THANK_YOU_MESSAGE: "Grazie per il tuo commento!" @@ -149,6 +155,7 @@ ja: MESSAGE_LABEL: "コメント" MESSAGE_PLACEHOLDER: "コメントを入力してください" SUBMIT_COMMENT_BUTTON_TEXT: "送信" + RESET_COMMENT_BUTTON_TEXT: "リセット" EMAIL_NEW_COMMENT_SUBJECT: "[新しいコメント] {{ form.value.name|e }}から" THANK_YOU_MESSAGE: "コメントありがとうございます！" @@ -171,6 +178,7 @@ nl: MESSAGE_LABEL: "Reactie" MESSAGE_PLACEHOLDER: "Vul je reactie in" SUBMIT_COMMENT_BUTTON_TEXT: "Verstuur" + RESET_COMMENT_BUTTON_TEXT: "Opnieuw instellen" EMAIL_NEW_COMMENT_SUBJECT: "[Nieuwe reactie] van {{ form.value.name|e }}" THANK_YOU_MESSAGE: "Bedankt voor je reactie!" @@ -206,6 +214,7 @@ ru: MESSAGE_LABEL: "Комментарий" MESSAGE_PLACEHOLDER: "Введите свой комментарий" SUBMIT_COMMENT_BUTTON_TEXT: "Отправить" + RESET_COMMENT_BUTTON_TEXT: "Перезагрузить" EMAIL_NEW_COMMENT_SUBJECT: "[Новый комментарий] от {{ form.value.name|e }}" THANK_YOU_MESSAGE: "Благодарим за ваш комментарий!" @@ -228,6 +237,7 @@ pt-br: MESSAGE_LABEL: "Comentário" MESSAGE_PLACEHOLDER: "Escreva seu comentário" SUBMIT_COMMENT_BUTTON_TEXT: "Enviar" + RESET_COMMENT_BUTTON_TEXT: "Reiniciar" EMAIL_NEW_COMMENT_SUBJECT: "[Novo comentário] de {{ form.value.name|e }}" THANK_YOU_MESSAGE: "Obrigada por enviar seu comentário!" @@ -250,6 +260,7 @@ ro: MESSAGE_LABEL: "Comentariu" MESSAGE_PLACEHOLDER: "Scrieți comentariul Dvs." SUBMIT_COMMENT_BUTTON_TEXT: "Trimiteți" + RESET_COMMENT_BUTTON_TEXT: "Resetați" EMAIL_NEW_COMMENT_SUBJECT: "[Comentariu nou] from {{ form.value.name|e }}" THANK_YOU_MESSAGE: "Vă mulțumim pentru comentariu!" @@ -272,5 +283,6 @@ no: MESSAGE_LABEL: "Kommentar" MESSAGE_PLACEHOLDER: "Skriv din kommentar" SUBMIT_COMMENT_BUTTON_TEXT: "Send" + RESET_COMMENT_BUTTON_TEXT: "Nullstille" EMAIL_NEW_COMMENT_SUBJECT: "[Ny kommentar] fra {{ form.value.name|e }}" THANK_YOU_MESSAGE: "Takk for din kommentar!"