Merge branch 'main' into socketIO

2026-08-26 17:24:23 -04:00 · 2024-06-03 09:52:41 -07:00
parent 6c44982a5e 37546dd7d4
commit 8152985f9b
61 changed files with 1591 additions and 1187 deletions
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -63,7 +63,7 @@
                {% set notification = job.notifications[0] %}
                <tr class="table-row" id="{{ job.job_id }}">
                  <td class="table-field file-name">
-                    {{ notification.job.original_file_name if notification.job.original_file_name else 'Manually entered number'}}
+                    {{ notification.job.original_file_name[:12] if notification.job.original_file_name else 'Manually entered number'}}
                    <br>
                    <a class="usa-link file-list-filename" href="{{ job.view_job_link }}">View Batch</a>
                  </td>
--- a/app/templates/views/manage-users.html
+++ b/app/templates/views/manage-users.html
@@ -1,4 +1,4 @@
-{% extends "settings_template.html" %}
+{% extends "withnav_template.html" %}
 {% from "components/tick-cross.html" import tick_cross %}
 {% from "components/live-search.html" import live_search %}
 {% from "components/components/button/macro.njk" import usaButton %}
@@ -7,6 +7,12 @@
  Team members
 {% endblock %}

+{% block serviceNavigation %}{% endblock %}
+
+{% block sideNavigation %}
+  {% include "/new/components/settings_nav.html" %}
+{% endblock %}
+
 {% block maincolumn_content %}

  <div class="button-flex-header">
--- a/app/templates/views/organizations/organization/billing.html
+++ b/app/templates/views/organizations/organization/billing.html
@@ -1,4 +1,4 @@
-{% extends "org_template.html" %}
+{% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}

 {% block org_page_title %}
--- a/app/templates/views/organizations/organization/index.html
+++ b/app/templates/views/organizations/organization/index.html
@@ -2,7 +2,7 @@
 {% from "components/big-number.html" import big_number %}
 {% from "components/live-search.html" import live_search %}
 {% from "components/pill.html" import pill %}
-{% extends "org_template.html" %}
+{% extends "withnav_template.html" %}

 {% block org_page_title %}
  Usage
--- a/app/templates/views/organizations/organization/settings/edit-domains.html
+++ b/app/templates/views/organizations/organization/settings/edit-domains.html
@@ -1,4 +1,4 @@
-{% extends "org_template.html" %}
+{% extends "withnav_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/list-entry.html" import list_entry %}
--- a/app/templates/views/organizations/organization/settings/edit-name.html
+++ b/app/templates/views/organizations/organization/settings/edit-name.html
@@ -1,4 +1,4 @@
-{% extends "org_template.html" %}
+{% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
--- a/app/templates/views/organizations/organization/settings/edit-organization-billing-details.html
+++ b/app/templates/views/organizations/organization/settings/edit-organization-billing-details.html
@@ -1,4 +1,4 @@
-{% extends "org_template.html" %}
+{% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
--- a/app/templates/views/organizations/organization/settings/edit-organization-notes.html
+++ b/app/templates/views/organizations/organization/settings/edit-organization-notes.html
@@ -1,4 +1,4 @@
-{% extends "org_template.html" %}
+{% extends "withnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
--- a/app/templates/views/organizations/organization/settings/edit-type.html
+++ b/app/templates/views/organizations/organization/settings/edit-type.html
@@ -1,4 +1,4 @@
-{% extends "org_template.html" %}
+{% extends "withnav_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/form.html" import form_wrapper %}
--- a/app/templates/views/organizations/organization/settings/index.html
+++ b/app/templates/views/organizations/organization/settings/index.html
@@ -1,4 +1,4 @@
-{% extends "org_template.html" %}
+{% extends "withnav_template.html" %}
 {% from "components/table.html" import mapping_table, optional_text_field, row, text_field, edit_field with context %}

 {% block org_page_title %}
--- a/app/templates/views/organizations/organization/trial-mode-services.html
+++ b/app/templates/views/organizations/organization/trial-mode-services.html
@@ -1,4 +1,4 @@
-{% extends "org_template.html" %}
+{% extends "withnav_template.html" %}
 {% from "components/live-search.html" import live_search %}

 {% block org_page_title %}
--- a/app/templates/views/organizations/organization/users/index.html
+++ b/app/templates/views/organizations/organization/users/index.html
@@ -1,4 +1,4 @@
-{% extends "org_template.html" %}
+{% extends "withnav_template.html" %}
 {% from "components/table.html" import list_table, row, field, hidden_field_heading %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/live-search.html" import live_search %}
--- a/app/templates/views/organizations/organization/users/invite-org-user.html
+++ b/app/templates/views/organizations/organization/users/invite-org-user.html
@@ -1,4 +1,4 @@
-{% extends "org_template.html" %}
+{% extends "withnav_template.html" %}

 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
--- a/app/templates/views/platform-admin/_base_template.html
+++ b/app/templates/views/platform-admin/_base_template.html
@@ -45,7 +45,7 @@
      {% block backLink %}{% endblock %}
        <main id="main-content" role="main">
          {% block content %}
-            {% include 'flash_messages.html' %}
+            {% include 'new/components/flash_messages.html' %}
            {% block platform_admin_content %}{% endblock %}
          {% endblock %}
        </main>
--- a/app/templates/views/pricing/index.html
+++ b/app/templates/views/pricing/index.html
@@ -15,7 +15,7 @@ Message parts

 {{ content_metadata(
 data={
-"Last updated": "February 5, 2024"
+"Last updated": "April 10, 2024"
 }
 ) }}

@@ -26,13 +26,15 @@ more parts towards the allowance if you:</p>
 <ul class="list list-bullet">
  <li>send text messages longer than 160 characters</a></li>
  <li>use certain <a class="usa-link" href="#symbols">signs and symbols</a></li>
-  <li>use <a class="usa-link" href="#accents">accents and accented letters</a></li>
+  <li>use <a class="usa-link" href="#accents">accents and accented letters, including non-romanized scripts</a></li>
 </ul>

 <h3 class="font-body-lg" id="long-text-messages">Long text messages</h3>
 <p>If a text message is longer than 160 characters (including spaces and service name), it counts as more than one message
 part.</p>

+<h4>Calculation of message parts without special characters</h4>
+
 <div class="bottom-gutter-3-2">
  {% call mapping_table(
  caption='Text message pricing',
@@ -72,12 +74,17 @@ and the number of parts you’ll have left.</p>

 <p>Using them can increase the cost of sending text messages.</p>

-<h3 class="font-body-lg" id="accents">Accents and accented characters</h3>
-<p>Some languages use accented characters.</p>
+<h3 class="font-body-lg" id="accents">Accented characters and non-romanized scripts</h3>
+<p>Notify can handle a wide range of different languages and scripts. However, occasionally some phone carriers may
+struggle to display special characters or non-romanized scripts. (Languages such as Arabic, Chinese, Japanese, Korean,
+and Russian use non-romanized scripts with different characters.) Best practices encourage communication in the
+recipient’s preferred language, but we are aware that, rarely, a phone carrier will not be able to handle the message.</p>
 <p>The following accented characters do not affect the cost of sending text messages: Ä, É, Ö, Ü, à, ä, é, è, ì, ò, ö,
  ù, ü.</p>
-<p>Using other accented characters can increase the cost of sending text messages.
-<p>
+<p>Using other accented characters or scripts will increase the cost of sending text messages. Even one accented character
+(with the exception of those noted above), or use of a non-romanized or logographic script will cause the entire message
+to be calculated as detailed below.<p>
+<h4>Calculation of message parts with special characters or non-romanized scripts</h4>
  {% set accentedChars %}
 <div class="bottom-gutter-3-2">
  {% call mapping_table(
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -1,4 +1,4 @@
-{% extends "settings_template.html" %}
+{% extends "withnav_template.html" %}
 {% from "components/banner.html" import banner_wrapper %}
 {% from "components/table.html" import mapping_table, row, settings_row, text_field, optional_text_field, edit_field, field, boolean_field with context %}

@@ -6,6 +6,12 @@
  Settings
 {% endblock %}

+{% block serviceNavigation %}{% endblock %}
+
+{% block sideNavigation %}
+  {% include "/new/components/settings_nav.html" %}
+{% endblock %}
+
 {% block maincolumn_content %}

    <h1 class="font-body-lg">Settings</h1>
--- a/app/templates/views/user-profile.html
+++ b/app/templates/views/user-profile.html
@@ -1,4 +1,4 @@
-{% extends "settings_template.html" %}
+{% extends "withnav_template.html" %}
 {% from "components/table.html" import list_table, row, field %}
 {% from "components/table.html" import mapping_table, row, text_field, optional_text_field, edit_field, field, boolean_field with context %}

@@ -6,6 +6,12 @@
  User profile
 {% endblock %}

+{% block serviceNavigation %}{% endblock %}
+
+{% block sideNavigation %}
+  {% include "/new/components/settings_nav.html" %}
+{% endblock %}
+
 {% block maincolumn_content %}

  <h1 class="font-body-2xl margin-bottom-3">User profile</h1>