Merge branch 'master' into v0.9

4 files changed, 6 insertions, 7 deletions

diff --git a/ishtar_common/templates/blocks/inline_formset.html b/ishtar_common/templates/blocks/inline_formset.html
index 4d4042985..9c1daad28 100644
--- a/ishtar_common/templates/blocks/inline_formset.html
+++ b/ishtar_common/templates/blocks/inline_formset.html
@@ -1,6 +1,6 @@
 {% load i18n %}
     {% if extra_formset.non_form_errors %}<div class='errors'>{{extra_formset.non_form_errors.as_ul}}</div>{% endif %}
-    {% if header %}<table class='inline-table' id='{{formset}}'>
+    {% if header %}<table class='inline-table' id='{{formset.prefix}}'>
     <caption>{% trans caption %}</caption>
     <thead>
     <tr>{% for field in formset.0.visible_fields%}
diff --git a/ishtar_common/templates/ishtar/display_item.html b/ishtar_common/templates/ishtar/display_item.html
index 87dda6dcf..e00fef05b 100644
--- a/ishtar_common/templates/ishtar/display_item.html
+++ b/ishtar_common/templates/ishtar/display_item.html
@@ -1,11 +1,10 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load url from future %}
 {% block content %}
-<h2>{{page_name}}</h2>
 <script type='text/javascript'>
-$(function() {
-    load_window("{% url item_url pk %}");
+$(document).ready(
+function(){
+    load_window("/show-{{item_type}}/{{pk}}/");
 });
 </script>
 {% endblock %}
diff --git a/ishtar_common/templates/ishtar/formset.html b/ishtar_common/templates/ishtar/formset.html
index c8a92165e..5454ae7e5 100644
--- a/ishtar_common/templates/ishtar/formset.html
+++ b/ishtar_common/templates/ishtar/formset.html
@@ -5,7 +5,7 @@
 <div class='form' id='global-vars'>
 <form action="." method="post">{% csrf_token %}
   {% inline_formset ' ' formset %}
-<input type="submit" value="{% trans "Validate" %}"/>
+<input type="submit" value="{% trans 'Validate' %}"/>
 </form>
 </div>
 {% endblock %}
diff --git a/ishtar_common/templates/welcome.html b/ishtar_common/templates/welcome.html
index eb9de475e..508f7be02 100644
--- a/ishtar_common/templates/welcome.html
+++ b/ishtar_common/templates/welcome.html
@@ -8,5 +8,5 @@
     <li><a href='https://ishtar-archeo.net' target="_blank">{% trans "Presentation site and blog" %}</a>{% trans ":"%} {% trans "stay tuned with Ishtar news!" %}</li>
     <li><a href='{% url 'admin:index' %}' target="_blank">{% trans "Admin interface" %}</a>{% trans ":"%} {% trans "for admin only." %}</li>
     <li><a href="https://forum.ishtar-archeo.net/" target="_blank">{% trans "Forum" %}</a>{% trans ":"%} {% trans "need help? find a new bug? a fantastic feature to propose? Here is the place to go." %}</li>
-    <li><a href="https://gitlab.com/ishtar/ishtar" target="_blank">{% trans "Source code" %}</a> &ndash; <a href="https://tickets.iggdrasil.net/projects/ishtar" target="_blank">{% trans "tickets" %}</a>{% trans ":"%} {% trans "where the magic happens." %}</li>
+    <li><a href="https://gitlab.com/iggdrasil/ishtar" target="_blank">{% trans "Source code" %}</a> &ndash; <a href="https://tickets.iggdrasil.net/projects/ishtar" target="_blank">{% trans "tickets" %}</a>{% trans ":"%} {% trans "where the magic happens." %}</li>
 </ul>