1 files changed, 4 insertions, 17 deletions
diff --git a/templates/chimere/detail.html b/templates/chimere/detail.html
index b511eae..4d9348b 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>
@@ -21,11 +24,8 @@
         <div id='description_long_{{marker.pk}}' class='description'>{{ marker.description|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}</div>
         {% endif %}
         {% for property in marker.getProperties %}{% if property.value %}
-        <div class='properties' id='{{property.propertymodel.getAttrName}}'><strong>{{property.propertymodel.name}}</strong> : {% if 'http://' in property.value %}<a href='{{ property.value|sanitize:""}}'>{%endif%}{{ property.value|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}{% if 'http://' in property.value %}</a>{%endif%}</div>
+        <div class='properties' id='{{property.propertymodel.getAttrName}}'><strong>{{property.propertymodel.name}}</strong> : {% if 'http://' in property.value or 'https://' in property.value %}<a href='{{ property.value|sanitize:""}}'>{%endif%}{{ property.value|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td tr th"|safe}}{% if 'http://' in property.value or 'https://' in property.value %}</a>{%endif%}</div>
         {%endif%}{% endfor %}
-        {% if marker.multimedia_items %}
-        <a href='#' id='show_gallery_link'>{% trans "Show multimedia gallery" %}</a>
-        {% endif %}
     </div>
 </div>
 <div id='detail_footer'>
@@ -46,19 +46,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');