Merge branch 'master' into saclay

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');