summaryrefslogtreecommitdiff
path: root/ishtar_common/templates/ishtar/merge.html
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-07-14 18:22:26 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-07-14 18:22:26 +0200
commit44d4e1a733511c027e6381aaf88fd6f445d3659d (patch)
tree49679dad3824d35b976ec987ef54f8552d591dd8 /ishtar_common/templates/ishtar/merge.html
parente79f877d5110283524c8f4c144c53bc0c83459bb (diff)
parent7db4ca0a344c2e2890170f3fd08c961f7da9da44 (diff)
downloadIshtar-44d4e1a733511c027e6381aaf88fd6f445d3659d.tar.bz2
Ishtar-44d4e1a733511c027e6381aaf88fd6f445d3659d.zip
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/templates/ishtar/merge.html')
-rw-r--r--ishtar_common/templates/ishtar/merge.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/ishtar_common/templates/ishtar/merge.html b/ishtar_common/templates/ishtar/merge.html
index edd27a722..0e15da62a 100644
--- a/ishtar_common/templates/ishtar/merge.html
+++ b/ishtar_common/templates/ishtar/merge.html
@@ -4,7 +4,7 @@
{% block content %}
<h2>{% trans "Merge" %}</h2>
<div class='form'>
-<p class='alert'><label>{%trans "Every operation on this form is irreversible"%}</label></p>
+<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <label>{%trans "Every operation on this form is irreversible"%}</label></p>
<p>{% if previous_page %}<a href='{% url current_url 1 %}'>&Larr;</a><a href='{% url current_url previous_page %}'>&larr;</a>{% else %}&nbsp;{% endif %}
{% trans "Page " %}{{current_page}}/{{max_page}}
{% if next_page %}<a href='{% url current_url next_page %}'>&rarr;</a><a href='{% url current_url max_page %}'>&Rarr;</a>{% else %}&nbsp;{% endif %} </p>