diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-24 11:00:36 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-24 11:00:36 +0100 |
| commit | 2a8d0c0edb7281e955fd7ad097e205f07cca1d5c (patch) | |
| tree | db3e5e1d57ccf4684df9289242f62ae6597d76b0 /ishtar_common/templates/ishtar | |
| parent | ac595e9aa13d27fb15e70eb1f6e2d11f928a4c4a (diff) | |
| parent | 3fbc69487b0fde33bb78f8d92da8eac25cb5da2e (diff) | |
| download | Ishtar-2a8d0c0edb7281e955fd7ad097e205f07cca1d5c.tar.bz2 Ishtar-2a8d0c0edb7281e955fd7ad097e205f07cca1d5c.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/templates/ishtar')
| -rw-r--r-- | ishtar_common/templates/ishtar/display_item.html | 7 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/formset.html | 2 |
2 files changed, 4 insertions, 5 deletions
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 %} |