diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2015-07-28 19:40:35 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2015-07-28 19:40:35 +0200 |
commit | 1aa4972f6a19d9a0c81586e25c94e47b7618673e (patch) | |
tree | 7a1291ce342f19e4bde8cbccf6399c13a5dcad4b | |
parent | 6ef8535f9d5f10e1b3c02f419c281d6c7595c582 (diff) | |
parent | f6095d66ac2ae4367304264c1e93b4143b95ee1f (diff) | |
download | Chimère - projet Saclay-1aa4972f6a19d9a0c81586e25c94e47b7618673e.tar.bz2 Chimère - projet Saclay-1aa4972f6a19d9a0c81586e25c94e47b7618673e.zip |
Merge branch 'master' into saclay
-rw-r--r-- | static/saclay/css/styles.css | 11 | ||||
-rw-r--r-- | static/saclay/js/interface.js | 4 | ||||
-rw-r--r-- | templates/chimere/detail.html | 16 |
3 files changed, 17 insertions, 14 deletions
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css index 2cb5fba..ab6c524 100644 --- a/static/saclay/css/styles.css +++ b/static/saclay/css/styles.css @@ -1257,9 +1257,14 @@ label[for=id_transport_0]{ background-image:url('../images/buttons/walk.png'); } +#id_transport_it span#id_transport_it_foot{ + display:none; +} + #id_transport_it span#id_transport_it_foot.selected, label[for=id_transport_0]:hover, label[for=id_transport_0][aria-pressed=true]{ + display:inline-block; background-image:url('../images/buttons/walk_on.png'); } @@ -1268,9 +1273,14 @@ label[for=id_transport_1]{ background-image:url('../images/buttons/bicycle.png'); } +#id_transport_it span#id_transport_it_bicycle{ + display:none; +} + #id_transport_it span#id_transport_it_bicycle.selected, label[for=id_transport_1]:hover, label[for=id_transport_1][aria-pressed=true]{ + display:inline-block; background-image:url('../images/buttons/bicycle_on.png'); } @@ -1714,7 +1724,6 @@ a.close_img{ .small-gallery{ width:auto; margin-top:0; - height:220px; } .small-gallery p.legend{ diff --git a/static/saclay/js/interface.js b/static/saclay/js/interface.js index 3c0ae1d..e004ce4 100644 --- a/static/saclay/js/interface.js +++ b/static/saclay/js/interface.js @@ -227,6 +227,10 @@ function display_feature_detail(data, settings){ $('html').addClass('js-on'); $(function(){ $('div.media-player').jmeEmbedControls(); + setTimeout(function(){ + settings.current_popup.updateSize(); + setTimeout(function(){ settings.current_popup.updateSize(); }, 1000); + }, 1000); }); } diff --git a/templates/chimere/detail.html b/templates/chimere/detail.html index be4615b..c6d3cc1 100644 --- a/templates/chimere/detail.html +++ b/templates/chimere/detail.html @@ -10,6 +10,9 @@ {% for multimedia_item in marker.default_multimedia_items %} {% multimedia_render multimedia_item %} {%endfor%} + {% for item in marker.multimedia_items %} + {% multimedia_render item %} + {%endfor%} </div> {%endif%} <div> @@ -49,19 +52,6 @@ </a> {% endcomment %} </div> -{% if marker.multimedia_items %} -<div id='gallery-{{marker.pk}}' class='gallery'> - <div class='tabs'> - <ul>{% for item in marker.multimedia_items %} - <li><a href="#tab-{{ forloop.counter }}">{{ item.name }}</a></li>{% endfor %} - </ul> - {% for multimedia_item in marker.multimedia_items %} - <div id="tab-{{ forloop.counter }}" class='{% ifequal multimedia_item.multimedia_type.media_type 'V' %}video{% else %}other{% endifequal %}'> - {% multimedia_render multimedia_item %} - </div>{% endfor %} - </div> -</div> -{% endif %} <script language='javascript' type='text/javascript'> <!-- $('html').addClass('js-on'); |