Fix broken links

There were still a few links pointing to `/features/using-notify`
This commit is contained in:
Katie Smith
2019-05-09 16:31:01 +01:00
parent b786997c6b
commit f3f8f4085f
7 changed files with 29 additions and 19 deletions

View File

@@ -442,15 +442,13 @@ def format_notification_status_as_field_status(status, notification_type):
).get(status, 'error')
def format_notification_status_as_url(status, notification_type):
if notification_type == 'letter':
return None
url = partial(url_for, "main.using_notify")
def format_notification_status_as_url(notification_type):
url = partial(url_for, "main.message_status")
return {
'technical-failure': url(_anchor='technical-failure'),
'temporary-failure': url(_anchor='not-accepting-messages'),
'permanent-failure': url(_anchor='does-not-exist')
}.get(status)
'email': url(_anchor='email-statuses'),
'sms': url(_anchor='sms-statuses')
}.get(notification_type)
def nl2br(value):

View File

@@ -98,7 +98,7 @@ def create_api_key(service_id):
disabled_options = [KEY_TYPE_NORMAL]
option_hints[KEY_TYPE_NORMAL] = Markup(
'Not available because your service is in '
'<a href="{}#trial-mode">trial mode</a>'.format(url_for(".using_notify"))
'<a href="/features/trial-mode">trial mode</a>'
)
if current_service.has_permission('letter'):
option_hints[KEY_TYPE_TEAM] = 'Cant be used to send letters'

View File

@@ -154,11 +154,11 @@
align='right'
) %}
{% if displayed_on_single_line %}<span class="align-with-message-body">{% endif %}
{% if notification.status|format_notification_status_as_url(notification.notification_type) %}
<a href="{{ notification.status|format_notification_status_as_url(notification.notification_type) }}">
{% if notification.notification_type|format_notification_status_as_url %}
<a href="{{ notification.notification_type|format_notification_status_as_url }}">
{% endif %}
{{ notification.status|format_notification_status(notification.template.template_type) }}
{% if notification.status|format_notification_status_as_url(notification.notification_type) %}
{% if notification.notification_type|format_notification_status_as_url %}
</a>
{% endif %}
<span class="status-hint">

View File

@@ -1,12 +1,12 @@
<div class="ajax-block-container">
<p class="notification-status {{ notification.status|format_notification_status_as_field_status(notification.notification_type) }}">
{% if notification.status|format_notification_status_as_url(notification.notification_type) %}
<a href="{{ notification.status|format_notification_status_as_url(notification.notification_type) }}">
{% if notification.notification_type|format_notification_status_as_url %}
<a href="{{ notification.notification_type|format_notification_status_as_url }}">
{% endif %}
{{ notification.status|format_notification_status(
notification.template.template_type
) }}
{% if notification.status|format_notification_status_as_url(notification.notification_type) %}
{% if notification.notification_type|format_notification_status_as_url %}
</a>
{% endif %}
{% if sent_with_test_key %}

View File

@@ -31,7 +31,7 @@
<p>These are the types of message status youll see when youre signed in to Notify.</p>
<p>If youre using our API, some of the statuses youll see will be different. Read our <a href="{{ url_for('.documentation') }}">documentation</a> for a detailed list of API message statuses.</p>
<h3 class="heading-small">Emails</h3>
<h3 id="email-statuses" class="heading-small">Emails</h3>
<div class="bottom-gutter-3-2">
{% call mapping_table(
caption='Message statuses emails',
@@ -54,7 +54,7 @@
{% endcall %}
</div>
<h3 class="heading-small">Text messages</h3>
<h3 id="sms-statuses" class="heading-small">Text messages</h3>
<div class="bottom-gutter-3-2">
{% call mapping_table(
caption='Message statuses text messages',
@@ -77,7 +77,7 @@
{% endfor %}
{% endcall %}
</div>
<h3 class="heading-small">Letters</h3>
<div class="bottom-gutter-3-2">
{% call mapping_table(