diff --git a/templates/applications/fragments/new_member_modal_content.html b/templates/applications/fragments/new_member_modal_content.html index 14bb00a2..c7b5e3f1 100644 --- a/templates/applications/fragments/new_member_modal_content.html +++ b/templates/applications/fragments/new_member_modal_content.html @@ -1,25 +1,7 @@ {% from "components/icon.html" import Icon %} +{% from "components/member_form_template.html" import MemberFormTemplate %} {% import "applications/fragments/member_form_fields.html" as member_fields %} -{% macro MemberFormTemplate(title=None, next_button=None, previous=True) %} -
- {% if title %}

{{ title }}

{% endif %} - - {{ caller() }} - -
- {{ next_button }} - {% if previous %} - - {% endif %} - {{ "common.cancel" | translate }} -
-{% endmacro %} - {% macro MemberStepOne(member_form) %} {% set next_button %} + {% if title %}

{{ title }}

{% endif %} + + {{ caller() }} + +
+ {{ next_button }} + {% if previous %} + + {% endif %} + {{ "common.cancel" | translate }} +
+{% endmacro %} + +{% macro BasicStep( + title=None, + form=form, + next_button_text=next_button_text, + previous=True, + modal=modal +) %} + {% set next_button %} + + {% endset %} + + {% call MemberFormTemplate(title=title, next_button=next_button, previous=previous, modal=modal) %} + {{ form }} + {% endcall %} +{% endmacro %} + +{% macro SubmitStep( + title=None, + form=form, + submit_text=submit_text, + previous=True, + modal=modal +) %} + {% set next_button %} + + {% endset %} + + {% call MemberFormTemplate(title=title, next_button=next_button, previous=previous, modal=modal) %} + {{ form }} + {% endcall %} +{% endmacro %}