Merge branch 'main' into 2401-add-in-flask-socketio-for-api-calls-rather-than-using-ajax

This commit is contained in:
Beverly Nguyen
2025-04-03 15:30:02 -07:00
83 changed files with 2029 additions and 1917 deletions

View File

@@ -14,7 +14,7 @@
{{ page_header('About your service') }}
{% call form_wrapper() %}
{% call form_wrapper(data_force_focus=True) %}
{{ form.name(param_extensions={"hint": {"text": "You can change this later"}}) }}

View File

@@ -102,7 +102,7 @@ Error
<div class="usa-alert usa-alert--error" role="alert">
<div class="usa-alert__body">
<h1 class="usa-alert__heading banner-title" data-module="track-error" data-error-type="Missing placeholder columns"
data-error-label="{{ upload_id }}">Your column names need to match the double brackets in your template</h1>
data-error-label="{{ upload_id }}">Your column names need to match the double parenthesis in your template</h1>
<p class="usa-alert__text">
Your file is missing {{ recipients.missing_column_headers | formatted_list(
conjunction='and',

View File

@@ -27,7 +27,7 @@
{% set content_hint = 'Your service name will be added to the start of your message. You can turn this off in Settings.' %}
{% endif %}
{% call form_wrapper() %}
{% call form_wrapper(data_force_focus=True) %}
<div class="grid-container padding-0">
<div class="tablet:grid-col-9 mobile-lg:grid-col-12">
{{ form.name(param_extensions={

View File

@@ -61,7 +61,7 @@
<ol class="list list-number">
<li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.</li>
<li>Add a new template or choose an existing template and select <b class="bold">Edit</b>.</li>
<li>Add a placeholder using double brackets. For example: Hello ((first&nbsp;name)), your reference is ((ref&nbsp;number)).</li>
<li>Add a placeholder using double parenthesis. For example: Hello ((first&nbsp;name)), your reference is ((ref&nbsp;number)).</li>
<li>Select <b class="bold">Save</b>.</li>
</ol>
@@ -81,7 +81,7 @@
<ol class="list list-number">
<li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.</li>
<li>Add a new template or choose an existing template and select <b class="bold">Edit</b>.</li>
<li>Use double brackets and ?? to define optional content. For example, if you only want to show something to people who are under 18: ((under18??Please get your application signed by a parent or guardian.))</li>
<li>Use double parenthesis and ?? to define optional content. For example, if you only want to show something to people who are under 18: ((under18??Please get your application signed by a parent or guardian.))</li>
<li>Select <b class="bold">Save</b>.</li>
</ol>

View File

@@ -59,7 +59,7 @@ your recipient to manage their benefits and increase follow-through.</p>
<h3>To personalize your content</h3>
<ol class="list">
<li>Add a placeholder to your content by placing two brackets around the personalized elements.</li>
<li>Add a placeholder to your content by placing two parenthesis around the personalized elements.</li>
<li>You can manually enter the personalized content or you can upload a spreadsheet with the details and let Notify do the
work for you.</li>
</ol>
@@ -78,7 +78,7 @@ all or part of the message contingent upon specific criteria associated with the
<h3>To add conditional content</h3>
<ol class="list">
<li>Use two brackets and ?? to define the conditional content.</li>
<li>Use two parenthesis and ?? to define the conditional content.</li>
<li>You can manually enter the conditional content or you can upload a spreadsheet with the personal details and let Notify
do the work for you.</li>
</ol>

View File

@@ -30,6 +30,9 @@
error_message_with_html=True
) }}
{% endif %}
<p>
Team members must be invited directly using their .gov email address, not from forwarded invitations. Invitation links to create a Notify.gov account are active for only 24 hours. Expired invitations can e re-sent from the Team members page.
</p>
{% include 'views/manage-users/permissions.html' %}

View File

@@ -34,7 +34,8 @@
{% call form_wrapper(
class='js-stick-at-top-when-scrolling send-one-off-form' if template.template_type != 'sms' else 'send-one-off-form',
module="autofocus",
data_kwargs={'force-focus': True}
data_kwargs={'force-focus': True},
data_force_focus=True
) %}
<div class="grid-row">
{% set extra_class = "extra-tracking" if form.placeholder_value.label.text == "phone number" else "" %}

View File

@@ -24,7 +24,7 @@
label='Search by name',
autofocus=True
) }}
{% call form_wrapper() %}
{% call form_wrapper(data_force_focus=True) %}
{% if has_organizations %}
{{ form.organizations }}
{{ sticky_page_footer('Save') }}

View File

@@ -14,7 +14,7 @@
{% block maincolumn_content %}
{% call form_wrapper() %}
{% call form_wrapper(data_force_focus=True) %}
{{ page_header('Free text message allowance') }}
{{ form.free_sms_allowance }}
{{ page_footer('Save') }}

View File

@@ -24,7 +24,7 @@
See <a class="usa-link" href="{{ url_for(".pricing") }}">pricing</a> for the list
of rates.
</p>
{% call form_wrapper() %}
{% call form_wrapper(data_force_focus=True) %}
{{ form.enabled }}
{{ page_footer('Save') }}
{% endcall %}

View File

@@ -14,7 +14,7 @@
{% block maincolumn_content %}
{% call form_wrapper() %}
{% call form_wrapper(data_force_focus=True) %}
{{ page_header('Message batch limit') }}
{{ form.message_limit }}
{{ page_footer('Save') }}

View File

@@ -14,7 +14,7 @@
{% block maincolumn_content %}
{% call form_wrapper() %}
{% call form_wrapper(data_force_focus=True) %}
{{ page_header('Rate limit') }}
{{ form.rate_limit }}
{{ page_footer('Save') }}

View File

@@ -15,7 +15,7 @@
<div class="grid-row">
<div class="grid-col-10">
{% call form_wrapper() %}
{% call form_wrapper(data_force_focus=True) %}
{{ form.enabled(param_extensions={
"fieldset": {
"legend": {

View File

@@ -20,12 +20,7 @@
<p>
You may send up to 250,000 text messages during the pilot period.
</p>
<!--<p>
You have a free allowance of
{{ '{:,}'.format(current_service.free_sms_fragment_limit) }} text messages each
financial year.
</p>-->
{% call form_wrapper() %}
{% call form_wrapper(data_force_focus=True) %}
{{ form.enabled }}
{{ page_footer('Save') }}
{% endcall %}

View File

@@ -16,7 +16,7 @@
{{ page_header('Start text messages with service name') }}
{% call form_wrapper() %}
{% call form_wrapper(data_force_focus=True) %}
{{ form.enabled }}
{{ page_footer('Save') }}
{% endcall %}

View File

@@ -16,7 +16,7 @@
{{ page_header('Add text message sender') }}
{% call form_wrapper() %}
{% call form_wrapper(data_force_focus=True) %}
{{ form.sms_sender(param_extensions={
"hint": {"text": "Up to 11 characters, letters, numbers and spaces only"}
}) }}

View File

@@ -18,7 +18,7 @@
{% block maincolumn_content %}
{{ page_header('Change text message sender') }}
{% call form_wrapper() %}
{% call form_wrapper(data_force_focus=True) %}
{% if inbound_number %}
<p>
<span class="bottom-gutter-1-3"> {{ sms_sender.sms_sender }} </span>