From ada0ab4962eb437bfbd2b300c5aca69bf5719bfb Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 4 May 2015 01:10:40 +0200 Subject: Imports: manage unmatched item links --- ishtar_common/templates/ishtar/formset.html | 2 +- ishtar_common/templates/ishtar/import_list.html | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'ishtar_common/templates') diff --git a/ishtar_common/templates/ishtar/formset.html b/ishtar_common/templates/ishtar/formset.html index 5ae0e7c51..c8a92165e 100644 --- a/ishtar_common/templates/ishtar/formset.html +++ b/ishtar_common/templates/ishtar/formset.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n inline_formset %} {% block content %} -

{% trans "Global variables" %}

+

{{page_name}}

{% csrf_token %} {% inline_formset ' ' formset %} diff --git a/ishtar_common/templates/ishtar/import_list.html b/ishtar_common/templates/ishtar/import_list.html index 868ca9c9e..76fc1cd72 100644 --- a/ishtar_common/templates/ishtar/import_list.html +++ b/ishtar_common/templates/ishtar/import_list.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% load i18n inline_formset %} +{% load url from future %} {% block content %}

{{page_name}}

@@ -36,6 +37,11 @@ {% endfor%} + + {% if import.need_matching %} + {% trans "Link unmatched items" %} + {% endif %} + {% endfor %} -- cgit v1.2.3