diff --git a/app/assets/images/icon-important-2x.png b/app/assets/images/icon-important-2x.png new file mode 100644 index 000000000..c04e9c2c9 Binary files /dev/null and b/app/assets/images/icon-important-2x.png differ diff --git a/app/assets/stylesheets/components/banner.scss b/app/assets/stylesheets/components/banner.scss index 75674611b..8b79307ab 100644 --- a/app/assets/stylesheets/components/banner.scss +++ b/app/assets/stylesheets/components/banner.scss @@ -82,3 +82,14 @@ } } + +.banner-important { + @extend %banner; + background: $white; + color: $text-colour; + background-image: file-url("icon-important-2x.png"); + background-size: 34px 34px; + background-position: 0 0; + background-repeat: no-repeat; + padding: 7px 0 5px 50px; +} diff --git a/app/assets/stylesheets/components/file-upload.scss b/app/assets/stylesheets/components/file-upload.scss index 8f75a8e4c..5750b24d8 100644 --- a/app/assets/stylesheets/components/file-upload.scss +++ b/app/assets/stylesheets/components/file-upload.scss @@ -29,6 +29,7 @@ &-filename { display: inline-block; padding-left: $gutter-half; + @include bold-19; } } diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 614b7c9c8..f04d61fce 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -1,3 +1,6 @@ +// Path to assets for use with file-url() +$path: '/static/images/'; + // Dependencies from GOV.UK Frontend Toolkit // https://github.com/alphagov/govuk_frontend_toolkit/ @import 'conditionals'; diff --git a/app/main/forms.py b/app/main/forms.py index 9c6787548..a5e7f739c 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -217,7 +217,7 @@ class ChangePasswordForm(Form): class CsvUploadForm(Form): - file = FileField('Add your recipients by uploading a CSV file', validators=[DataRequired( + file = FileField('Add recipients', validators=[DataRequired( message='Please pick a file'), CsvFileValidator()]) diff --git a/app/main/views/add_service.py b/app/main/views/add_service.py index 27472bbc5..dc7a3a7d4 100644 --- a/app/main/views/add_service.py +++ b/app/main/views/add_service.py @@ -10,8 +10,8 @@ from app.main.forms import AddServiceForm def add_service(): form = AddServiceForm(services_dao.find_all_service_names) services = services_dao.get_services(current_user.id) - if len(services) == 0: - heading = 'Set up notifications for your service' + if len(services['data']) == 0: + heading = 'Which service do you want to set up notifications for?' else: heading = 'Add a new service' if form.validate_on_submit(): diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index fe3c9fd1b..86acf81c1 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -29,7 +29,7 @@ def service_dashboard(service_id): return render_template( 'views/service_dashboard.html', jobs=list(reversed(jobs)), - free_text_messages_remaining='25,000', + free_text_messages_remaining='250,000', spent_this_month='0.00', template_count=len(templates), service_id=str(service_id)) diff --git a/app/templates/components/file-upload.html b/app/templates/components/file-upload.html index 0c92c0f76..1451b0ee3 100644 --- a/app/templates/components/file-upload.html +++ b/app/templates/components/file-upload.html @@ -1,4 +1,4 @@ -{% macro file_upload(field) %} +{% macro file_upload(field, button_text="Choose file") %}
- Users will see your service name: + Users will see your service name when they receive messages through GOV.UK + Notify: