More copy updates
@@ -9,7 +9,7 @@
|
|||||||
<span class="navigation-service-name">
|
<span class="navigation-service-name">
|
||||||
{{ current_service.name }}
|
{{ current_service.name }}
|
||||||
{% if not current_service.active %}
|
{% if not current_service.active %}
|
||||||
<span class="navigation-service-type--suspended">Suspended</span>
|
<span class="navigation-service-type--suspended">Archived</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</span>
|
</span>
|
||||||
<a href="{{ url_for('main.choose_account') }}" class="usa-button usa-button--outline">Switch service</a>
|
<a href="{{ url_for('main.choose_account') }}" class="usa-button usa-button--outline">Switch service</a>
|
||||||
|
|||||||
@@ -338,7 +338,7 @@
|
|||||||
{% if (not current_service.active) and current_user.platform_admin %}
|
{% if (not current_service.active) and current_user.platform_admin %}
|
||||||
<p>
|
<p>
|
||||||
<div class="usa-hint ">
|
<div class="usa-hint ">
|
||||||
Service suspended
|
Service archived
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<span class="page-footer-link page-footer-delete-link-without-button">
|
<span class="page-footer-link page-footer-delete-link-without-button">
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 120 KiB After Width: | Height: | Size: 120 KiB |
|
Before Width: | Height: | Size: 339 KiB After Width: | Height: | Size: 342 KiB |
|
Before Width: | Height: | Size: 118 KiB After Width: | Height: | Size: 118 KiB |
|
Before Width: | Height: | Size: 104 KiB After Width: | Height: | Size: 104 KiB |
|
After Width: | Height: | Size: 122 KiB |
|
After Width: | Height: | Size: 145 KiB |
|
After Width: | Height: | Size: 104 KiB |
|
After Width: | Height: | Size: 124 KiB |
|
Before Width: | Height: | Size: 126 KiB After Width: | Height: | Size: 126 KiB |
|
Before Width: | Height: | Size: 134 KiB After Width: | Height: | Size: 130 KiB |
|
Before Width: | Height: | Size: 886 KiB After Width: | Height: | Size: 920 KiB |
|
Before Width: | Height: | Size: 108 KiB After Width: | Height: | Size: 108 KiB |
|
Before Width: | Height: | Size: 166 KiB After Width: | Height: | Size: 163 KiB |
|
Before Width: | Height: | Size: 189 KiB After Width: | Height: | Size: 185 KiB |
|
Before Width: | Height: | Size: 97 KiB After Width: | Height: | Size: 97 KiB |
|
Before Width: | Height: | Size: 102 KiB After Width: | Height: | Size: 102 KiB |
|
Before Width: | Height: | Size: 100 KiB After Width: | Height: | Size: 100 KiB |
|
Before Width: | Height: | Size: 142 KiB After Width: | Height: | Size: 142 KiB |
|
Before Width: | Height: | Size: 136 KiB After Width: | Height: | Size: 136 KiB |
|
Before Width: | Height: | Size: 91 KiB After Width: | Height: | Size: 91 KiB |
|
Before Width: | Height: | Size: 89 KiB After Width: | Height: | Size: 89 KiB |
|
Before Width: | Height: | Size: 87 KiB After Width: | Height: | Size: 87 KiB |
|
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 90 KiB |
|
Before Width: | Height: | Size: 112 KiB After Width: | Height: | Size: 112 KiB |
@@ -1431,7 +1431,7 @@ def test_breadcrumb_shows_if_service_is_suspended(
|
|||||||
|
|
||||||
page = client_request.get("main.service_dashboard", service_id=SERVICE_ONE_ID)
|
page = client_request.get("main.service_dashboard", service_id=SERVICE_ONE_ID)
|
||||||
|
|
||||||
assert "Suspended" in page.select_one(".navigation-service-name").text
|
assert "Archived" in page.select_one(".navigation-service-name").text
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
|
|||||||
6
urls.js
@@ -3,10 +3,12 @@ const baseUrl = process.env.BACKSTOP_BASE_URL || 'http://localhost:6012';
|
|||||||
const TEST_SERVICE_ID = 'da14b8fa-6a9e-4320-8484-9cd6e900c333';
|
const TEST_SERVICE_ID = 'da14b8fa-6a9e-4320-8484-9cd6e900c333';
|
||||||
const TEST_TEMPLATE_ID = '31588995-646b-40ae-bed1-617612d9245e';
|
const TEST_TEMPLATE_ID = '31588995-646b-40ae-bed1-617612d9245e';
|
||||||
const TEST_USER_ID = '6af522d0-2915-4e52-83a3-3690455a5fe6';
|
const TEST_USER_ID = '6af522d0-2915-4e52-83a3-3690455a5fe6';
|
||||||
|
const TEST_ORG_ID = 'a134fb9b-ab87-4e76-b216-77cb66a6ee18';
|
||||||
|
|
||||||
const servicePath = (path = '') => `/services/${TEST_SERVICE_ID}${path}`;
|
const servicePath = (path = '') => `/services/${TEST_SERVICE_ID}${path}`;
|
||||||
const userPath = (path = '') => `/user-profile${path}`;
|
const userPath = (path = '') => `/user-profile${path}`;
|
||||||
const platformAdminPath = (path = '') => `/platform-admin${path}`;
|
const platformAdminPath = (path = '') => `/platform-admin${path}`;
|
||||||
|
const orgPath = (path = '') => `/organizations/${TEST_ORG_ID}${path}`;
|
||||||
|
|
||||||
const routes = {
|
const routes = {
|
||||||
public: [
|
public: [
|
||||||
@@ -89,6 +91,10 @@ const routes = {
|
|||||||
organizations: [
|
organizations: [
|
||||||
{ label: 'Organizations List', path: '/organizations' },
|
{ label: 'Organizations List', path: '/organizations' },
|
||||||
{ label: 'Add Organization', path: '/organizations/add' },
|
{ label: 'Add Organization', path: '/organizations/add' },
|
||||||
|
{ label: 'Organization Dashboard', path: orgPath() },
|
||||||
|
{ label: 'Organization Usage', path: orgPath('/usage') },
|
||||||
|
{ label: 'Organization Team Members', path: orgPath('/users') },
|
||||||
|
{ label: 'Invite Org User', path: orgPath('/users/invite') },
|
||||||
],
|
],
|
||||||
|
|
||||||
platformAdmin: [
|
platformAdmin: [
|
||||||
|
|||||||