summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-08-13 11:24:31 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2015-08-13 11:24:31 +0200
commit5246253cb463ae1d6373354a148833e6b5a9d091 (patch)
tree96d935b38cf4f6ef18836d42f31dba3f4100c9af
parent3ec2b4d920eb98bff44cdbd8459b5daf119fef41 (diff)
parente2a9b9be262c13b5cc0845986ff42fecf3672a73 (diff)
downloadChimère - projet Saclay-5246253cb463ae1d6373354a148833e6b5a9d091.tar.bz2
Chimère - projet Saclay-5246253cb463ae1d6373354a148833e6b5a9d091.zip
Merge branch 'master' into saclay
Conflicts: templates/chimere/detail.html
-rw-r--r--templates/chimere/detail.html3
1 files changed, 0 insertions, 3 deletions
diff --git a/templates/chimere/detail.html b/templates/chimere/detail.html
index b40714d..c0f9d64 100644
--- a/templates/chimere/detail.html
+++ b/templates/chimere/detail.html
@@ -29,9 +29,6 @@
{% if marker.origin %}
<div class='origin'><label>Source :</label> {{marker.origin|safe}}</div>
{% endif %}
- {% if marker.multimedia_items %}
- <a href='#' id='show_gallery_link'>{% trans "Show multimedia gallery" %}</a>
- {% endif %}
</div>
</div>
<div id='detail_footer'>