diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-05 13:15:02 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-05 13:15:02 +0200 |
| commit | 2aaab3ff0950487a29af773a1c5b079627d21f8e (patch) | |
| tree | 71bad4445736df1019a98d0bd4d3e3f9845ebf79 | |
| parent | 3e5387d009ed8e5edd367983acfa73651dc6f948 (diff) | |
| download | Chimère - projet Saclay-2aaab3ff0950487a29af773a1c5b079627d21f8e.tar.bz2 Chimère - projet Saclay-2aaab3ff0950487a29af773a1c5b079627d21f8e.zip | |
De-activate (temporary?) prettyPhoto
| -rw-r--r-- | static/saclay/js/interface.js | 4 | ||||
| -rw-r--r-- | templates/chimere/detail.html | 8 | ||||
| -rw-r--r-- | templates/chimere/main_map.html | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/static/saclay/js/interface.js b/static/saclay/js/interface.js index d125161..536f827 100644 --- a/static/saclay/js/interface.js +++ b/static/saclay/js/interface.js @@ -214,10 +214,10 @@ function display_feature_detail_callback(settings){ */ $(document).ready(function(){ share_link_update(); - $("a[rel^='prettyPhoto']").prettyPhoto({ + /*$("a[rel^='prettyPhoto']").prettyPhoto({ show_title: false, social_tools: '' - }); + });*/ }); $('html').addClass('js-on'); $(function(){ diff --git a/templates/chimere/detail.html b/templates/chimere/detail.html index 8f5df7a..d036248 100644 --- a/templates/chimere/detail.html +++ b/templates/chimere/detail.html @@ -46,10 +46,17 @@ </a> {% endcomment %} </div> + +{% comment %} <script language='javascript' type='text/javascript'> <!-- $('html').addClass('js-on'); $(function(){ + $("a[rel^='prettyPhoto']").prettyPhoto({ + show_title: false, + social_tools: '' + }); + $("#gallery-{{marker.pk}}").dialog({title:"{{marker.name}}", autoOpen: false, height: "auto", width: "auto", dialogClass:'no-titlebar'}); /* $('div.media-player').jmeEmbedControls(); @@ -94,3 +101,4 @@ $('#show_gallery_link').click(function(){ }); // --> </script> +{% endcomment %} diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html index f02bd27..42c770f 100644 --- a/templates/chimere/main_map.html +++ b/templates/chimere/main_map.html @@ -3,7 +3,7 @@ {% block extra_head %} {% head_jquery %} {% head_chimere %} -{% head_jme %} +{% comment %}{% head_jme %}{% endcomment %} {% head_form %} <script src="{{ STATIC_URL }}saclay/js/jquery.form.js" type="text/javascript"></script> {% if has_search %} |