From 91565afa6bd529588ede0d426920e9a9e21e23a3 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Mon, 11 Apr 2016 10:38:43 +0100 Subject: [PATCH] Change display of placeholder columns MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On the send page, it should hightlight the placeholders so they match what you need to put in the CSV file. On the check page, they should not be highlighted, to match what’s in the (rendered) template. --- app/templates/views/check.html | 2 +- app/templates/views/send.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/views/check.html b/app/templates/views/check.html index 255a84dfd..1822bd72d 100644 --- a/app/templates/views/check.html +++ b/app/templates/views/check.html @@ -74,7 +74,7 @@ {% call(item, row_number) list_table( recipients.initial_annotated_rows_with_errors if rows_have_errors else recipients.initial_annotated_rows, caption=original_file_name, - field_headings=['1'] + recipients.column_headers_with_placeholders_highlighted + field_headings=['1'] + recipients.column_headers ) %} {{ index_field(item.index + 2) }} {% for column in recipients.column_headers %} diff --git a/app/templates/views/send.html b/app/templates/views/send.html index f2dae8767..93e574506 100644 --- a/app/templates/views/send.html +++ b/app/templates/views/send.html @@ -43,7 +43,7 @@ example, caption="Example", caption_visible=False, - field_headings=['1'] + [recipient_column] + template.placeholders|list + field_headings=['1'] + [recipient_column] + template.placeholders_as_markup|list ) %} {{ index_field(row_number) }} {% for column in item %}