diff --git a/templates/components/alert.html b/templates/components/alert.html index d3385d1d..1fd30167 100644 --- a/templates/components/alert.html +++ b/templates/components/alert.html @@ -1,6 +1,6 @@ {% from "components/icon.html" import Icon %} -{% macro Alert(title, message=None, actions=None, level='info') -%} +{% macro Alert(title, message=None, actions=None, level='info', fragment=None) -%} {% set role = 'alertdialog' if actions else 'alert' %} {% set levels = { 'warning': { @@ -31,6 +31,12 @@
{{ message | safe }}
{% endif %} + {% if fragment %} +
+ {% include fragment %} +
+ {% endif %} + {% if actions %}
{{ actions | safe }}
{% endif %} diff --git a/templates/fragments/pending_financial_verification.html b/templates/fragments/pending_financial_verification.html new file mode 100644 index 00000000..858b3e26 --- /dev/null +++ b/templates/fragments/pending_financial_verification.html @@ -0,0 +1,12 @@ +

+ The next step is to create a Task Order associated with JEDI Cloud. + Please contact a Contracting Officer (KO), Contracting Officer + Representative (COR), or a Financial Manager to help with this step. +

+

+ Once the Task Order has been created, you will be asked to provide + details about the task order in the Financial Verification step. +

+

+ Learn more about the JEDI Task Order and the Financial Verification process. +

diff --git a/templates/requests.html b/templates/requests.html index 4dc0e865..df6999ca 100644 --- a/templates/requests.html +++ b/templates/requests.html @@ -9,20 +9,7 @@ {% call Modal(name='pendingFinancialVerification', dismissable=True) %}

Request submitted!

-

- The next step is to create a Task Order associated with JEDI Cloud. - Please contact a Contracting Officer (KO), Contracting Officer - Representative (COR), or a Financial Manager to help with this step. -

- -

- Once the Task Order has been created, you will be asked to provide - details about the task order in the Financial Verification step. -

- -

- Learn more about the JEDI Task Order and the Financial Verification process. -

+ {% include 'fragments/pending_financial_verification.html' %}
Close @@ -42,22 +29,7 @@ {% if pending_financial_verification %} - {{ Alert('Pending Financial Verification', - message=" -

- The next step is to create a Task Order associated with JEDI Cloud. - Please contact a Contracting Officer (KO), Contracting Officer - Representative (COR), or a Financial Manager to help with this step. -

-

- Once the Task Order has been created, you will be asked to provide - details about the task order in the Financial Verification step. -

-

- Learn more about the JEDI Task Order and the Financial Verification process. -

- " - ) }} + {{ Alert('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }} {% endif %}