darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 10:09:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up the jobs template

Browse Source
This commit is contained in:
Chris Hill-Scott
2020-03-02 14:26:04 +00:00
parent 481c9dba17
commit d83e7a8e9f
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/templates/views/jobs/jobs.html
View File

@@ -9,26 +9,22 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<h1 class="heading-medium">Uploads</h1> <h1 class="heading-medium">Uploads</h1>
<div class="dashboard"> <div class="dashboard">
{% if show_scheduled_jobs %}
{% with hide_heading = True %}
{% include 'views/jobs/_scheduled.html' %}
{% endwith %}
{% endif %}
{% if jobs %} {% if jobs %}
{% include 'views/dashboard/_jobs.html' %} {% include 'views/dashboard/_jobs.html' %}
{% endif %} {% else %}
{% if not jobs and not show_scheduled_jobs %}
<p class="govuk-body"> <p class="govuk-body">
You have not uploaded any files recently. You have not uploaded any files recently.
</p> </p>
{% if current_service.has_permission('upload_letters') %} {% if current_user.has_permissions('send_messages') %}
{% if current_service.has_permission('letter') %}
<p class="govuk-body">
Upload a letter and Notify will print, pack and post it for you.
</p>
{% endif %}
<p class="govuk-body"> <p class="govuk-body">
Upload a letter and Notify will print, pack and post it for you. To upload a list of contact details, first <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.choose_template', service_id=current_service.id) }}">choose a template</a>.
</p> </p>
{% endif %} {% endif %}
<p class="govuk-body">
To upload a list of contact details, first <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.choose_template', service_id=current_service.id) }}">choose a template</a>.
</p>
{% endif %} {% endif %}
{{ previous_next_navigation(prev_page, next_page) }} {{ previous_next_navigation(prev_page, next_page) }}
{% if current_user.has_permissions('send_messages') %} {% if current_user.has_permissions('send_messages') %}

4
tests/app/main/views/test_uploads.py
View File

@@ -65,11 +65,11 @@ def test_all_users_have_upload_contact_list(
@pytest.mark.parametrize('extra_permissions, expected_empty_message', ( @pytest.mark.parametrize('extra_permissions, expected_empty_message', (
(['letter'], ( ([], (
'You have not uploaded any files recently. ' 'You have not uploaded any files recently. '
'To upload a list of contact details, first choose a template.' 'To upload a list of contact details, first choose a template.'
)), )),
(['letter', 'upload_letters'], ( (['letter'], (
'You have not uploaded any files recently. ' 'You have not uploaded any files recently. '
'Upload a letter and Notify will print, pack and post it for you. ' 'Upload a letter and Notify will print, pack and post it for you. '
'To upload a list of contact details, first choose a template.' 'To upload a list of contact details, first choose a template.'