{% block content %}{% endblock %} @@ -32,9 +35,11 @@
+ -{% block javascript %}{% endblock %} +{% block javascript %} +{% endblock %} diff --git a/src/App/templates/partial/ajax-form.html.twig b/src/App/templates/partial/ajax-form.html.twig deleted file mode 100644 index efae6ac0..00000000 --- a/src/App/templates/partial/ajax-form.html.twig +++ /dev/null @@ -1,23 +0,0 @@ -{% set dummy = form.setAttribute('method', method) %} -{% set dummy = form.setAttribute('id', 'ajaxForm') %} -{% set dummy = form.setAttribute('action', formAction) %} -{% set dummy = form.prepare() %} - -{{ form().openTag(form)|raw }} -{{ include('@partial/form-display-elements.html.twig', {form: form, showLabels: true}, false) }} -{{ form().closeTag()|raw }} - - diff --git a/src/App/templates/partial/form-display-elements.html.twig b/src/App/templates/partial/form-display-elements.html.twig index dc2435d9..9fa37c20 100644 --- a/src/App/templates/partial/form-display-elements.html.twig +++ b/src/App/templates/partial/form-display-elements.html.twig @@ -1,11 +1,18 @@ +{% set submit = null %} {% if showLabels is not defined %} {% set showLabels = false %} {% endif %} {% for k, v in form.getElements() %} {% set element = form.get(k) %} + + {% if element is Submit or element is Button and element.getName() == 'submit' %} + {% set dummy = element.setAttribute('class', 'btn btn-primary btn-color') %} + {% set submit = element %} + {% endif %} + {% if element is Captcha %} -
+
{% set dummy = element.setAttribute('class', 'form-control') %} {% if showLabels and element.getLabel() is defined and element.getLabel() is not empty %} @@ -18,15 +25,31 @@ {% elseif element is MultiCheckbox %} {% set dummy = element.setAttribute('class', 'form-check-input') %} {% set dummy = element.setLabelAttributes([]|merge({class: 'form-label mR-25'})) %} - -
- {{ formElement(element) }} + {% if element.getMessages() is not empty and element.getMessages() is iterable %} + {% set dummy = element.setAttributes([]|merge({class: 'form-check-input is-invalid'})) %} + {% endif %} + +
+ {{ formLabel(element) }} +
+
+ {{ formElement(element) }} +
+ + {% if element.getMessages() is not empty and element.getMessages() is iterable %} +
+ {% for message in element.getMessages() %} + {{ message|raw }}
+ {% endfor %} +
+ {% endif %}
+ {% elseif element is Checkbox %} {% set dummy = element.setAttribute('class', 'form-check-input') %} -
+
@@ -36,18 +59,11 @@ {% elseif element is Button and element.getName() != 'submit' %} - {% set dummy = element.setAttribute('class', 'btn btn-color') %} {{ formButton(element) }} - {% elseif element is Submit or element is Button and element.getName() == 'submit' %} - - {% set dummy = element.setAttribute('class', 'btn btn-lg btn-primary btn-color') %} - {{ formSubmit(element) }} - {% else %} - -
- + {% if element is not Submit or (element is Button and element.getName() != 'submit') %} +
{% set dummy = element.setAttribute('class', 'form-control') %} {% set dummy = element.setLabelAttributes([]|merge({class: 'form-label'})) %} @@ -55,9 +71,28 @@ {{ formLabel(element) }} {% endif %} + {% if element.getMessages() is not empty and element.getMessages() is iterable %} + {% set dummy = element.setAttributes([]|merge({class: 'form-control is-invalid'})) %} + {% endif %} + {{ formElement(element) }} -
+ {% if element.getMessages() is not empty and element.getMessages() is iterable %} +
+ {% for message in element.getMessages() %} + {{ message|raw }}
+ {% endfor %} +
+ {% endif %} +
+ {% endif %} {% endif %} - {% endfor %} + +{% if submit is defined and submit is not null %} +
+
+ {{ formSubmit(submit) }} +
+
+{% endif %} diff --git a/src/App/templates/partial/nav-bar.html.twig b/src/App/templates/partial/nav-bar.html.twig index ec4afe60..43ff37f1 100644 --- a/src/App/templates/partial/nav-bar.html.twig +++ b/src/App/templates/partial/nav-bar.html.twig @@ -21,7 +21,7 @@
  • - +
    {{ getIdentity().getIdentity() }} diff --git a/src/App/templates/partial/notifications.html.twig b/src/App/templates/partial/notifications.html.twig new file mode 100644 index 00000000..17814eb8 --- /dev/null +++ b/src/App/templates/partial/notifications.html.twig @@ -0,0 +1,31 @@ +{% set classes = {error: 'danger', info: 'info', warning: 'warning', success: 'success'} %} +{% if dismissible is not defined %} + {% set dismissible = false %} +{% endif %} + + +{% if messages is defined and messages is iterable %} +
    +
    + {% for namespace in messages|keys %} + {% if classes[namespace] is defined %} + + {% endif %} + {% endfor %} +
    +
    +{% endif %} diff --git a/src/App/templates/partial/pagination.html.twig b/src/App/templates/partial/pagination.html.twig index 91b1281c..872a3863 100644 --- a/src/App/templates/partial/pagination.html.twig +++ b/src/App/templates/partial/pagination.html.twig @@ -8,7 +8,7 @@