include sound fragments in episode auto selection

diff --git a/panikweb/paniktags/templatetags/paniktags.py b/panikweb/paniktags/templatetags/paniktags.py
index 15ecdb91f56b55e5ed491407e4d811094d3d4eaf..40ca02ac5eaebfb900a51aa6348517d85381ae5a 100644 (file)
--- a/panikweb/paniktags/templatetags/paniktags.py
+++ b/panikweb/paniktags/templatetags/paniktags.py
@@ -26,10 +26,11 @@ def zip_lists(a, b):
     return zip(a, b)
 
 @register.inclusion_tag('includes/audio.html', takes_context=True)
-def audio(context, sound=None):
+def audio(context, sound=None, display_fragment_name=False):
     return {
         'episode': context.get('episode'),
-        'sound': sound
+        'sound': sound,
+        'display_fragment_name': display_fragment_name,
     }
 
 @register.inclusion_tag('listen/nav.html', takes_context=True)

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index 5f0db2b13b1d667523c5902cd901773dabffa48c..9bb6eed974f41f083cce002560bd634ef8657e30 100644 (file)
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -1519,6 +1519,34 @@ h3.episode-subtitle {
        font-weight: bold;
 }
 
+div.fragment-sound {
+       position: relative;
+}
+
+div.soundcell div.logo {
+       vertical-align: top;
+}
+
+div.fragment-sound {
+}
+
+div.extra-soundfiles div.fragment-sound {
+       margin-top: 5px;
+}
+
+div.extra-soundfiles div.fragment-name {
+       font-style: italic;
+       position: relative;
+       top: 1ex;
+       max-width: 70%;
+}
+
+div.extra-soundfiles ul li div.fragment-sound div.waveform {
+}
+div.extra-soundfiles ul li div.fragment-sound div.audio {
+       bottom: 0;
+}
+
 #fiber-content div.extra-soundfiles strong {
        text-transform: uppercase;
 

diff --git a/panikweb_templates/templates/includes/audio.html b/panikweb_templates/templates/includes/audio.html
index abc0b825b8f15e9c692a93579b4c77d30a6ad6e1..342b716152bf9a454bb89ea982e35263886ac392 100644 (file)
--- a/panikweb_templates/templates/includes/audio.html
+++ b/panikweb_templates/templates/includes/audio.html
@@ -30,6 +30,11 @@
                        {% endif %}
                </div>
        </div>
+       {% if display_fragment_name %}
+       <div class="fragment-name">
+               {{ sound.title }}
+       </div>
+       {% endif %}
        <audio 
                data-player='true'
                class='hidden'
@@ -57,7 +62,7 @@
                                <a class="icon-headphones" href="{{ sound|format_url:'mp3' }}"> mp3</a>
                        {% endif %}
                </div>
-       </audio>        
+       </audio>
        <div class="waveform" data-sound-id="{{ sound.id }}" data-duration="{{ sound.duration }}"
                data-duration-string="{{ sound.get_duration_string }}"></div>
 {% else %}

diff --git a/panikweb_templates/templates/panikombo/episode_auto_selection.html b/panikweb_templates/templates/panikombo/episode_auto_selection.html
index 0867e2daf3b4baf17f573eabdd3033be852b3931..0ce2022d86340247869ab431e96ffe8e3f423846 100644 (file)
--- a/panikweb_templates/templates/panikombo/episode_auto_selection.html
+++ b/panikweb_templates/templates/panikombo/episode_auto_selection.html
@@ -21,12 +21,16 @@
   <div class="soundfile-info"><strong>
     <a href="{% url 'emission-view' slug=episode.emission.slug%}">{{ episode.emission.title }}</a> -
     <a href="{% url 'episode-view' emission_slug=episode.emission.slug slug=episode.slug %}">{{ episode.title }}</a></strong>
-          {% if soundfile.fragment %}<span> - {{ soundfile.title }}</span>{% endif %}
   </div>
   {% for diffusion in episode.diffusions %}
   <span class="date">→ {{ diffusion.datetime|date:"l d M Y à H:i" }}</span>
   {% endfor %}
   {% if episode.main_sound %}{% audio sound=episode.main_sound %}{% endif %}
+  {% for sound in episode.fragment_sounds %}
+  <div class="fragment-sound">
+    {% audio sound=sound display_fragment_name=True %}
+  </div>
+  {% endfor %}
 </li>
 </ul>
 </div>