summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-09-13 16:55:28 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-09-13 16:55:28 +0200
commit5d231378d3fef989c5a8cd8f319c527c77129216 (patch)
tree57ecd5eab1bf96de47a0f77bf068ab924108b78e
parentd35111c62724f8b43b26e322f19818c2fb33941b (diff)
downloadChimère - projet Saclay-5d231378d3fef989c5a8cd8f319c527c77129216.tar.bz2
Chimère - projet Saclay-5d231378d3fef989c5a8cd8f319c527c77129216.zip
Fix edit url to manage areas
-rw-r--r--static/saclay/css/styles.css1
-rw-r--r--templates/chimere/edit.html3
-rw-r--r--templates/chimere/main_map.html2
3 files changed, 3 insertions, 3 deletions
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index 66176b2..289bf46 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -588,7 +588,6 @@ a#ui-active-menuitem.ui-state-hover{
text-align:left;
font-size:1.4em;
width:100%;
- border-bottom:1px solid;
padding:0 0 0.4em 0;
margin:0;
}
diff --git a/templates/chimere/edit.html b/templates/chimere/edit.html
index 4b839cf..ded22bb 100644
--- a/templates/chimere/edit.html
+++ b/templates/chimere/edit.html
@@ -7,7 +7,8 @@
{% if is_modification and is_superuser %}<div class='warning'><p>{% trans "You are logged as an administrator. Your modifications will be taking into account immediately." %}</p></div>{% endif %}
<div class='edit'>
{% block legend %}{% endblock %}
- <form enctype="multipart/form-data" method='post' action='{% url "editmarker" %}' id='proposition_form'>
+ <form enctype="multipart/form-data" method='post'
+ action='{% block edit_url %}{% endblock %}{% url "editmarker" %}' id='proposition_form'>
{% csrf_token %}
<p>* {% trans "indicates a mandatory field" %}</p>
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index d6e1ea7..bb0c568 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -16,7 +16,7 @@
<script type='text/javascript' language='javascript'>
<!--
var default_error_message = "{% trans "Error while loading the page... Refresh the page. If the problem persist contact the webmaster." %}";
- var edit_url = "{% url 'editmarker' %}";
+ var edit_url = "{% url 'editmarker' area_name|add:"/" %}";
// -->
</script>
<script src="{{ STATIC_URL }}saclay/js/interface.js?ver={{SACLAY_VERSION}}" type="text/javascript"></script>