summaryrefslogtreecommitdiff
path: root/ishtar_common/templates
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-16 12:47:33 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-16 12:48:23 +0100
commit9e5be05c239888f4c2fc0c457e0713a15915613d (patch)
treee6d085c1f8521ee7feb9ddd980dc5e0ad5bce7a5 /ishtar_common/templates
parente20e666c551e1d4d4630949fcd5000395697a5b2 (diff)
downloadIshtar-9e5be05c239888f4c2fc0c457e0713a15915613d.tar.bz2
Ishtar-9e5be05c239888f4c2fc0c457e0713a15915613d.zip
Basket: add a close button (refs #3407)
Diffstat (limited to 'ishtar_common/templates')
-rw-r--r--ishtar_common/templates/ishtar/display_item.html2
-rw-r--r--ishtar_common/templates/ishtar/manage_basket.html11
2 files changed, 12 insertions, 1 deletions
diff --git a/ishtar_common/templates/ishtar/display_item.html b/ishtar_common/templates/ishtar/display_item.html
index e00fef05b..e1c63b775 100644
--- a/ishtar_common/templates/ishtar/display_item.html
+++ b/ishtar_common/templates/ishtar/display_item.html
@@ -4,7 +4,7 @@
<script type='text/javascript'>
$(document).ready(
function(){
- load_window("/show-{{item_type}}/{{pk}}/");
+ load_window("{{show_url}}");
});
</script>
{% endblock %}
diff --git a/ishtar_common/templates/ishtar/manage_basket.html b/ishtar_common/templates/ishtar/manage_basket.html
index de17f3ad7..a6065a7c2 100644
--- a/ishtar_common/templates/ishtar/manage_basket.html
+++ b/ishtar_common/templates/ishtar/manage_basket.html
@@ -1,5 +1,6 @@
{% extends "base.html" %}
{% load i18n inline_formset %}
+{% load url from future %}
{% block content %}
<h2>{{page_name}}{% trans ":"%} {{basket}}</h2>
<form enctype="multipart/form-data" action="." method="post">{% csrf_token %}
@@ -13,6 +14,16 @@
<h3>{% trans "Basket content" %}</h3>
<div id='basket-content' style='text-align:left'>
</div>
+ {% block "footer" %}
+ <div id="footer">
+ <div id='validation-bar'>
+ <a href="{% url 'display-findbasket' basket.id %}"
+ id="validate-button"
+ class='button'>{% trans "Close" %}</a>
+ </div>
+ {% include 'ishtar/blocks/footer.html' %}
+ </div>
+ {% endblock %}
</div>
</form>
<script type='text/javascript' language='javascript'>