diff --git a/app/assets/stylesheets/components/task-list.scss b/app/assets/stylesheets/components/task-list.scss new file mode 100644 index 0000000000..35f42eb159 --- /dev/null +++ b/app/assets/stylesheets/components/task-list.scss @@ -0,0 +1,41 @@ +$indicator-colour: $black; + +%task-list-indicator { + @include bold-16; + display: inline-block; + padding: 3px 8px 1px 8px; + position: absolute; + right: 0; + top: 50%; + margin-top: -15px; + border: 2px solid $indicator-colour; +} + +.task-list { + + border-bottom: 1px solid $border-colour; + margin: $gutter 0; + + &-item { + border-top: 1px solid $border-colour; + padding: 15px 0; + padding-right: 20%; + position: relative; + } + + &-indicator-completed { + @extend %task-list-indicator; + background-color: $indicator-colour; + color: $grey-4; + // Just a pinch of letter spacing to make reversed-out text a bit + // easier to read + letter-spacing: 0.02em; + } + + &-indicator-not-completed { + @extend %task-list-indicator; + background-color: transparent; + color: $indicator-colour; + } + +} diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 9f5955cae8..74e3784d55 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -62,6 +62,7 @@ $path: '/static/images/'; @import 'components/vendor/breadcrumbs'; @import 'components/vendor/responsive-embed'; @import 'components/email-preview-pane'; +@import 'components/task-list'; @import 'views/dashboard'; @import 'views/users'; diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index e7c87f6a7d..ef734e901c 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -53,6 +53,7 @@ AgreementInfo, email_safe, get_cdn_domain, + get_default_sms_sender, user_has_permissions, user_is_platform_admin, ) @@ -83,10 +84,6 @@ def service_settings(service_id): (Field(x['contact_block'], html='escape') for x in letter_contact_details if x['is_default']), "Not set" ) sms_senders = service_api_client.get_sms_senders(service_id) - sms_sender_count = len(sms_senders) - default_sms_sender = next( - (Field(x['sms_sender'], html='escape') for x in sms_senders if x['is_default']), "None" - ) free_sms_fragment_limit = billing_api_client.get_free_sms_fragment_limit_for_year(service_id) data_retention = service_api_client.get_service_data_retention(service_id) @@ -103,8 +100,8 @@ def service_settings(service_id): reply_to_email_address_count=reply_to_email_address_count, default_letter_contact_block=default_letter_contact_block, letter_contact_details_count=letter_contact_details_count, - default_sms_sender=default_sms_sender, - sms_sender_count=sms_sender_count, + default_sms_sender=get_default_sms_sender(sms_senders), + sms_sender_count=len(sms_senders), free_sms_fragment_limit=free_sms_fragment_limit, prefix_sms=current_service.prefix_sms, organisation=organisation, @@ -192,9 +189,18 @@ def request_to_go_live(service_id): has_email_templates=( service_api_client.count_service_templates(service_id, template_type='email') > 0 ), + has_sms_templates=( + service_api_client.count_service_templates(service_id, template_type='sms') > 0 + ), has_email_reply_to_address=bool( service_api_client.get_reply_to_email_addresses(service_id) - ) + ), + shouldnt_use_govuk_as_sms_sender=( + current_service.organisation_type in {'local', 'nhs'} + ), + sms_sender_is_govuk=get_default_sms_sender( + service_api_client.get_sms_senders(service_id) + ) in {'GOVUK', 'None'}, ) diff --git a/app/templates/components/task-list.html b/app/templates/components/task-list.html new file mode 100644 index 0000000000..38585ee541 --- /dev/null +++ b/app/templates/components/task-list.html @@ -0,0 +1,16 @@ +{% macro task_list_item(completed, label) %} +
- Before your service can go live on Notify, you’ll need to: -
-You also need to accept our terms of use.
-- We’ll make your service live within one working day. -
diff --git a/app/templates/views/service-settings/submit-request-to-go-live.html b/app/templates/views/service-settings/submit-request-to-go-live.html index 517afd2780..c6a352d114 100644 --- a/app/templates/views/service-settings/submit-request-to-go-live.html +++ b/app/templates/views/service-settings/submit-request-to-go-live.html @@ -6,12 +6,16 @@ {% from "components/banner.html" import banner_wrapper %} {% block service_page_title %} - How do you plan to use Notify? + Request to go live {% endblock %} {% block maincolumn_content %} -+ Tell us how you plan to use Notify. When we receive your request we’ll make your service live within one working day. +