Merge pull request #3591 from alphagov/fix-copy-to-clipboard

Fix copy to clipboard
This commit is contained in:
Tom Byers
2020-08-28 10:58:36 +01:00
committed by GitHub
11 changed files with 336 additions and 154 deletions

View File

@@ -1,10 +1,13 @@
{% macro api_key(key, name=None, thing="API key") %}
{% if name %}
{% macro api_key(key, name, thing="API key") %}
{% if name == thing %}
<h2 class="api-key__name">
{{ name }}
</h2>
{% endif %}
<div data-module="api-key" data-key="{{ key }}" data-thing="{{ thing }}" aria-live="assertive">
<span class="api-key__key">{{ key }}</span>
<div data-module="api-key" data-key="{{ key }}" data-thing="{{ thing }}" data-name="{{ name }}">
<span class="api-key__key">
{% if name != thing %}<span class="govuk-visually-hidden">{{ thing }}: </span>{% endif %}{{ key }}
</span>
<span class="api-key__notice" aria-live="assertive"></span>
</div>
{% endmacro %}

View File

@@ -24,7 +24,8 @@
{{ api_key(
'{}-{}-{}'.format(key_name, service_id, secret),
'API key'
name='API key',
thing='API key'
) }}
{{ page_footer(

View File

@@ -34,7 +34,7 @@
<a class="govuk-link govuk-link--no-visited-state user-list-edit-link" href="{{ url_for('.service_edit_email_reply_to', service_id =current_service.id, reply_to_email_id = item.id) }}">Change</a>
{% endif %}
{% if current_service.count_email_reply_to_addresses > 1 %}
{{ api_key(item.id, thing="ID") }}
{{ api_key(item.id, name=item.email_address, thing="ID") }}
{% endif %}
</div>
{% endfor %}

View File

@@ -43,7 +43,8 @@
<a class="govuk-link govuk-link--no-visited-state user-list-edit-link" href="{{ url_for('.service_edit_letter_contact', service_id =current_service.id, letter_contact_id = item.id) }}">Change</a>
{% endif %}
{% if letter_contact_details|length > 1 %}
{{ api_key(item.id, thing="ID") }}
{% set first_line_of_contact_block = item.contact_block|normalise_lines|first %}
{{ api_key(item.id, name=first_line_of_contact_block, thing="ID") }}
{% endif %}
</div>
{% endfor %}

View File

@@ -36,7 +36,7 @@
<a class="govuk-link govuk-link--no-visited-state user-list-edit-link" href="{{ url_for('.service_edit_sms_sender', service_id=current_service.id, sms_sender_id = item.id) }}">Change</a>
{% endif %}
{% if current_service.count_sms_senders > 1 %}
{{ api_key(item.id, thing="ID") }}
{{ api_key(item.id, name=item.sms_sender, thing="ID") }}
{% endif %}
</div>
{% endfor %}