diff --git a/app/assets/stylesheets/components/banner.scss b/app/assets/stylesheets/components/banner.scss index 02c12dfc2..35ceff1fd 100644 --- a/app/assets/stylesheets/components/banner.scss +++ b/app/assets/stylesheets/components/banner.scss @@ -10,6 +10,7 @@ margin: $gutter-half 0 $gutter 0; text-align: left; position: relative; + clear: both; } diff --git a/app/assets/stylesheets/components/page-footer.scss b/app/assets/stylesheets/components/page-footer.scss index 9b8b2feb1..4aea437c4 100644 --- a/app/assets/stylesheets/components/page-footer.scss +++ b/app/assets/stylesheets/components/page-footer.scss @@ -3,8 +3,10 @@ margin-bottom: 50px; &-back-link { - display: block; - margin-top: $gutter; + @include button($grey-1); + display: inline-block; + padding: 0.52632em 0.78947em 0.26316em 0.78947em; + margin-left: 10px; } &-delete-link { diff --git a/app/main/forms.py b/app/main/forms.py index cd255f029..9c6787548 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -217,7 +217,7 @@ class ChangePasswordForm(Form): class CsvUploadForm(Form): - file = FileField('Upload a CSV file to add your recipients’ details', validators=[DataRequired( + file = FileField('Add your recipients by uploading a CSV file', validators=[DataRequired( message='Please pick a file'), CsvFileValidator()]) diff --git a/app/templates/views/check-sms.html b/app/templates/views/check-sms.html index 556384867..419eb2fe3 100644 --- a/app/templates/views/check-sms.html +++ b/app/templates/views/check-sms.html @@ -28,6 +28,7 @@
+ Back
{% call(item) list_table( diff --git a/app/templates/views/job.html b/app/templates/views/job.html index e0dfd9473..c22b5f595 100644 --- a/app/templates/views/job.html +++ b/app/templates/views/job.html @@ -11,7 +11,7 @@ {% block maincolumn_content %}

- Sent text messages + {{ uploaded_file_name }}

{{ sms_message( @@ -30,31 +30,35 @@
  • {{ big_number( - counts.total, - 'text message' if 1 == counts.total else 'text messages' + 0, 'sent' )}}
  • -
  • +
  • {{ big_number( counts.failed, 'failed' )}}
  • -
  • +
  • {{ big_number( cost, 'total cost' )}}
  • + {{ sms_message( + 'Your application has been received. Register online at www.gov.uk/register-to-vote', + )}} + {% call(item) list_table( messages, caption=uploaded_file_name, + caption_visible=False, empty_message="Messages go here", field_headings=[ 'To', 'Message', - right_aligned_field_heading('Delivery status') + right_aligned_field_heading('Status') ] ) %} {% call field() %} diff --git a/app/templates/views/send-sms.html b/app/templates/views/send-sms.html index e33d8fdc2..e227a3185 100644 --- a/app/templates/views/send-sms.html +++ b/app/templates/views/send-sms.html @@ -15,15 +15,11 @@ {{ sms_message(template.content) }} - {{ banner( - 'You can only send notifications to yourself', - subhead='Trial mode', - type='info' - ) }} + {{file_upload(form.file)}} - {{ sms_message( - template.content, name='Preview' - ) }} +

    + Download an example CSV file +

    {{ banner( 'You can only send messages to yourself until you request to go live'.format( @@ -32,16 +28,10 @@ type='info' ) }} - {{file_upload(form.file)}} - -

    - Download an example CSV to test with. -

    - {{ page_footer( - "Continue", + "Continue to preview", back_link=url_for(".choose_sms_template", service_id=service_id), - back_link_text="Back to templates" + back_link_text="Back" ) }}