From c01e485d1200f5a1cd756ce15c6bb53ec990e7fe Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Tue, 24 Jul 2012 19:00:49 +0200
Subject: Welcome message: fix display of multimedia items

---
 chimere/templates/chimere/blocks/welcome.html | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/chimere/templates/chimere/blocks/welcome.html b/chimere/templates/chimere/blocks/welcome.html
index 44b949e..9751552 100644
--- a/chimere/templates/chimere/blocks/welcome.html
+++ b/chimere/templates/chimere/blocks/welcome.html
@@ -2,9 +2,15 @@
 {% if news_lst or welcome_message %}
 <a href='#' id='welcome_button' class='ui-widget ui-button ui-state-default ui-corner-all'>{% trans "Welcome message"%}</a>
 <script type='text/javascript'>
-    function display_welcome(){$("#welcome").dialog({title:"{% trans "News"%}"});}
-    $("#welcome_button").bind('click', display_welcome);
-    {% if display %}display_welcome();{%endif%}
+function display_welcome(){$("#welcome").dialog({title:"{% trans "News"%}",
+                                                 width:360});}
+$("#welcome_button").bind('click', display_welcome);
+{% if display %}display_welcome();{%endif%}
+$(function(){
+    $('#welcome div.media-player').jmeEmbedControls();
+    $('#welcome video').each(function(index){$(this).pause()});
+    $('#welcome audio').each(function(index){$(this).pause()});
+});
 </script>
 <div id='welcome' style='display:none'>
     <div id='detail_content'>
@@ -22,6 +28,16 @@
                             <p>{{news.content|safe}}</p>
                         {% else %}
                             <h3>{{news.name}} &ndash; {{ news.start_date }}{% if news.end_date %} - {{ news.end_date }}{% endif %}</h3>
+                            {% if news.default_pictures or news.default_pictures or news.default_multimedia_items%}
+                            <div class='small-gallery'>
+                            {% for picture in news.default_pictures %}
+                                {% multimedia_render picture %}
+                            {%endfor%}
+                            {% for multimedia_item in news.default_multimedia_items %}
+                                {% multimedia_render multimedia_item %}
+                            {%endfor%}
+                            </div>
+                            {%endif%}
                             {% if news.description %}
                                 <p class='description'>{{news.description|sanitize:"p b i br hr strong em span:style a:href:target ul li ol h1 h2 h3 h4 table td th tr"|safe}}</p>
                             {% endif %}
-- 
cgit v1.2.3