From bcf538fa108b76277639680516aff22430599db4 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Wed, 18 Jul 2018 09:56:21 +0100
Subject: [PATCH] Remove separation between upload and send
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now that you can access upload from within the send one off message
flow, it doesn’t need its own linkbutton on the template page.
---
 app/templates/views/templates/_template.html | 49 +++++++++++---------
 tests/app/main/views/test_templates.py       |  4 +-
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/app/templates/views/templates/_template.html b/app/templates/views/templates/_template.html
index f7a7d4d37..fbe220c8c 100644
--- a/app/templates/views/templates/_template.html
+++ b/app/templates/views/templates/_template.html
@@ -14,27 +14,34 @@
   {% else %}
     <div class="bottom-gutter-2-3">
       <div class="grid-row">
-        {% if current_user.has_permissions('send_messages', restrict_admin_usage=True) %}
-        <div class="{{ 'column-half' if template.template_type == 'letter' else 'column-third' }}">
-          <a href="{{ url_for(".send_messages", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item">
-            Upload recipients
-          </a>
-        </div>
-        <div class="{{ 'column-half' if template.template_type == 'letter' else 'column-third' }}">
-          <a href="{{ url_for(".set_sender", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item">
-            {{ 'Print a test letter' if template.template_type == 'letter' else 'Send to one recipient' }}
-          </a>
-        </div>
-        {% endif %}
-        {% if
-          current_user.has_permissions('manage_templates') and
-          template.template_type != 'letter'
-        %}
-        <div class="column-one-third">
-          <a href="{{ url_for(".edit_service_template", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item">
-            Edit template
-          </a>
-        </div>
+        {% if template.template_type == 'letter' %}
+          {% if current_user.has_permissions('send_messages', restrict_admin_usage=True) %}
+            <div class="column-half">
+              <a href="{{ url_for(".send_messages", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item">
+                Upload recipients
+              </a>
+            </div>
+            <div class="column-half">
+              <a href="{{ url_for(".set_sender", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item">
+                Print a test letter
+              </a>
+            </div>
+          {% endif %}
+        {% else %}
+          {% if current_user.has_permissions('send_messages', restrict_admin_usage=True) %}
+            <div class="column-half">
+              <a href="{{ url_for(".set_sender", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item">
+                Send
+              </a>
+            </div>
+          {% endif %}
+          {% if current_user.has_permissions('manage_templates') %}
+            <div class="column-half">
+              <a href="{{ url_for(".edit_service_template", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item">
+                Edit
+              </a>
+            </div>
+          {% endif %}
         {% endif %}
       </div>
     </div>
diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py
index 21cf91ac0..0d7215b33 100644
--- a/tests/app/main/views/test_templates.py
+++ b/tests/app/main/views/test_templates.py
@@ -205,12 +205,12 @@ def test_caseworker_redirected_to_one_off(
     ),
     (
         ['send_messages'],
-        ['.send_messages', '.set_sender'],
+        ['.set_sender'],
         None,
     ),
     (
         ['send_messages', 'manage_templates'],
-        ['.send_messages', '.set_sender', '.edit_service_template'],
+        ['.set_sender', '.edit_service_template'],
         None,
     ),
 ])