From 97a3bf922580f61c81f386f9665a3f05724f4ec4 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Mon, 22 Feb 2016 12:16:19 +0000 Subject: [PATCH] =?UTF-8?q?Remove=20the=20=E2=80=98manage=20templates?= =?UTF-8?q?=E2=80=99=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ‘manage templates’ page was almost identical to the ‘send text messages’ page. This commit consolidates them into one and makes them all hang together. Part of this means tweaks to the javascript so that files upload as soon as you’ve chosen them. --- app/assets/javascripts/fileUpload.js | 10 +++---- .../stylesheets/components/file-upload.scss | 2 +- app/assets/stylesheets/components/table.scss | 4 --- app/main/views/templates.py | 26 +++++-------------- app/templates/components/file-upload.html | 2 +- app/templates/components/page-footer.html | 10 +++---- app/templates/main_nav.html | 5 ++-- app/templates/views/choose-sms-template.html | 12 ++++----- app/templates/views/edit-template.html | 6 ++--- app/templates/views/invite-user.html | 6 +++-- app/templates/views/send-sms.html | 7 +---- app/templates/views/service_dashboard.html | 16 ++---------- tests/app/main/views/test_manage_users.py | 3 --- tests/app/main/views/test_templates.py | 4 +-- 14 files changed, 37 insertions(+), 76 deletions(-) diff --git a/app/assets/javascripts/fileUpload.js b/app/assets/javascripts/fileUpload.js index 5380ac87f..4df2a1702 100644 --- a/app/assets/javascripts/fileUpload.js +++ b/app/assets/javascripts/fileUpload.js @@ -3,22 +3,20 @@ Modules.FileUpload = function() { - let $field, $button, $filename; + let $field; - this.update = function() { + this.submit = function() { - $filename.text($field.val().split('\\').pop()); + $field.parents('form').trigger('submit'); }; this.start = function(component) { $field = $('.file-upload-field', component); - $button = $('.file-upload-button', component); - $filename = $('.file-upload-filename', component); // Need to put the event on the container, not the input for it to work properly - $(component).on('change', '.file-upload-field', this.update); + $(component).on('change', '.file-upload-field', this.submit); }; diff --git a/app/assets/stylesheets/components/file-upload.scss b/app/assets/stylesheets/components/file-upload.scss index f772d4230..d674944a5 100644 --- a/app/assets/stylesheets/components/file-upload.scss +++ b/app/assets/stylesheets/components/file-upload.scss @@ -23,7 +23,7 @@ } &-button { - @include button($panel-colour); + @include button($button-colour); display: inline-block; } diff --git a/app/assets/stylesheets/components/table.scss b/app/assets/stylesheets/components/table.scss index 477ddb208..36c137bcc 100644 --- a/app/assets/stylesheets/components/table.scss +++ b/app/assets/stylesheets/components/table.scss @@ -55,10 +55,6 @@ background-image: file-url('tick.png'); } - &-no { - background-image: file-url('cross.png'); - } - &-missing { color: $error-colour; font-weight: bold; diff --git a/app/main/views/templates.py b/app/main/views/templates.py index a8453f9e5..be1001113 100644 --- a/app/main/views/templates.py +++ b/app/main/views/templates.py @@ -15,22 +15,10 @@ from app.main.dao import services_dao as sdao @main.route("/services//templates") @login_required def manage_service_templates(service_id): - try: - jobs = job_api_client.get_job(service_id)['data'] - except HTTPError as e: - if e.status_code == 404: - abort(404) - else: - raise e - return render_template( - 'views/manage-templates.html', - service_id=service_id, - has_jobs=bool(jobs), - templates=[ - Template(template) - for template in tdao.get_service_templates(service_id)['data'] - ] - ) + return redirect(url_for( + '.choose_sms_template', + service_id=service_id + )) @main.route("/services//templates/add", methods=['GET', 'POST']) @@ -50,10 +38,10 @@ def add_service_template(service_id): tdao.insert_service_template( form.name.data, form.template_content.data, service_id) return redirect(url_for( - '.manage_service_templates', service_id=service_id)) + '.choose_sms_template', service_id=service_id)) return render_template( 'views/edit-template.html', - h1='Add template', + h1='Add a text message template', form=form, service_id=service_id) @@ -69,7 +57,7 @@ def edit_service_template(service_id, template_id): tdao.update_service_template( template_id, form.name.data, form.template_content.data, service_id) - return redirect(url_for('.manage_service_templates', service_id=service_id)) + return redirect(url_for('.choose_sms_template', service_id=service_id)) return render_template( 'views/edit-template.html', diff --git a/app/templates/components/file-upload.html b/app/templates/components/file-upload.html index 1451b0ee3..437ce699f 100644 --- a/app/templates/components/file-upload.html +++ b/app/templates/components/file-upload.html @@ -1,7 +1,7 @@ {% macro file_upload(field, button_text="Choose file") %}
{% endfor %} - {% else %} - {{ banner( - 'Add a text message template to start sending messages'.format( - url_for(".add_service_template", service_id=service_id) - )|safe, - type="tip" - )}} {% endif %} +

+ Add a new template +

+ {% endblock %} diff --git a/app/templates/views/edit-template.html b/app/templates/views/edit-template.html index 2563dd81e..4720a2a61 100644 --- a/app/templates/views/edit-template.html +++ b/app/templates/views/edit-template.html @@ -30,9 +30,9 @@ {{ page_footer( 'Save', delete_link=url_for('.delete_service_template', service_id=service_id, template_id=template_id) if template_id or None, - delete_link_text='delete this template', - secondary_link=url_for('.manage_service_templates', service_id=service_id), - secondary_link_text='Back to templates' + delete_link_text='Delete this template', + back_link=url_for('.choose_sms_template', service_id=service_id), + back_link_text='Cancel' ) }} diff --git a/app/templates/views/invite-user.html b/app/templates/views/invite-user.html index 2ca19bc2f..d1e6e5c7b 100644 --- a/app/templates/views/invite-user.html +++ b/app/templates/views/invite-user.html @@ -18,7 +18,7 @@ Manage users – GOV.UK Notify {% if user %}

- {{ user.email_localpart }}@digital.cabinet-office.gov.uk + {{ current_user.email_address }}

{% else %} {{ textbox(form.email_address, hint='Email address must end in .gov.uk', width='1-1') }} @@ -37,7 +37,9 @@ Manage users – GOV.UK Notify {{ page_footer( 'Save', delete_link=url_for('.delete_user', service_id=service_id, user_id=user_id), - delete_link_text='delete this account' + delete_link_text='Delete this account', + back_link=url_for('.manage_users', service_id=service_id), + back_link_text='Cancel' ) }} {% else %} {{ page_footer('Send invitation email') }} diff --git a/app/templates/views/send-sms.html b/app/templates/views/send-sms.html index 351115c7f..32be81c72 100644 --- a/app/templates/views/send-sms.html +++ b/app/templates/views/send-sms.html @@ -20,16 +20,11 @@ - {{file_upload(form.file, button_text='Choose a CSV file')}} -

Download an example CSV file

- {{ page_footer( - "Continue to preview" - ) }} - + {{file_upload(form.file, button_text='Upload a CSV file')}} {% endblock %} diff --git a/app/templates/views/service_dashboard.html b/app/templates/views/service_dashboard.html index 09443fc40..e0b5527a5 100644 --- a/app/templates/views/service_dashboard.html +++ b/app/templates/views/service_dashboard.html @@ -25,21 +25,9 @@ {% if not jobs %} {{ banner( - """ -
    -
  1. - Add a template -
    2. -
  2. - Send yourself a text message -
    3. -
- """.format( - url_for(".add_service_template", service_id=service_id), - url_for(".choose_sms_template", service_id=service_id) - )|safe, + 'Send yourself a text message', subhead='Get started', - type="tip" + type='tip' )}} {% else %} {% call(item) list_table( diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py index 000464ecb..62ee8d642 100644 --- a/tests/app/main/views/test_manage_users.py +++ b/tests/app/main/views/test_manage_users.py @@ -14,8 +14,6 @@ def test_should_show_overview_page( response = client.get(url_for('main.manage_users', service_id=55555)) assert 'Manage team' in response.get_data(as_text=True) - assert 'Henry Hadlow' in response.get_data(as_text=True) - assert 'caley.smolska' in response.get_data(as_text=True) assert response.status_code == 200 @@ -30,7 +28,6 @@ def test_should_show_page_for_one_user( client.login(api_user_active) response = client.get(url_for('main.edit_user', service_id=55555, user_id=0)) - assert 'Henry Hadlow' in response.get_data(as_text=True) assert response.status_code == 200 diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py index 3319f1468..cecc59353 100644 --- a/tests/app/main/views/test_templates.py +++ b/tests/app/main/views/test_templates.py @@ -16,7 +16,7 @@ def test_should_return_list_of_all_templates(app_, client.login(api_user_active) service_id = str(uuid.uuid4()) response = client.get(url_for( - '.manage_service_templates', service_id=service_id)) + '.manage_service_templates', service_id=service_id), follow_redirects=True) assert response.status_code == 200 mock_get_service_templates.assert_called_with(service_id) @@ -72,7 +72,7 @@ def test_should_redirect_when_saving_a_template(app_, assert response.status_code == 302 assert response.location == url_for( - '.manage_service_templates', service_id=service_id, _external=True) + '.choose_sms_template', service_id=service_id, _external=True) mock_update_service_template.assert_called_with( template_id, name, 'sms', content, service_id)