summaryrefslogtreecommitdiff
path: root/ishtar_common/templates/ishtar
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-05-04 01:10:40 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2015-05-04 01:10:40 +0200
commitbdc9cdab0d5e314b5d1a33a2d87fca22138d649d (patch)
treedcfa2689395822cf1475deb1a6107bebb6006701 /ishtar_common/templates/ishtar
parent274b8d44ccf1f099f2e22b5a6a70f9743b746c1d (diff)
downloadIshtar-bdc9cdab0d5e314b5d1a33a2d87fca22138d649d.tar.bz2
Ishtar-bdc9cdab0d5e314b5d1a33a2d87fca22138d649d.zip
Imports: manage unmatched item links
Diffstat (limited to 'ishtar_common/templates/ishtar')
-rw-r--r--ishtar_common/templates/ishtar/formset.html2
-rw-r--r--ishtar_common/templates/ishtar/import_list.html6
2 files changed, 7 insertions, 1 deletions
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 %}
-<h2>{% trans "Global variables" %}</h2>
+<h2>{{page_name}}</h2>
<div class='form' id='global-vars'>
<form action="." method="post">{% 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 %}
<h2>{{page_name}}</h2>
<div class='form'>
@@ -36,6 +37,11 @@
{% endfor%}
</select>
</td>
+ <td>
+ {% if import.need_matching %}
+ <a href='{% url "import_link_unmatched" import.importer_type.pk %}'>{% trans "Link unmatched items" %}</a>
+ {% endif %}
+ </td>
</tr>
{% endfor %}
</table>