add sound() filter to item queries, add 2 iframe musical sound selections on index...

diff --git a/telemeta/htdocs/js/playerLoader.js b/telemeta/htdocs/js/playerLoader.js
index 50250d3c281cc3005885665662a63eb92cee0c43..195ca6e00acf14e1f70ecf8f98b00fa4ffb02861 100644 (file)
--- a/telemeta/htdocs/js/playerLoader.js
+++ b/telemeta/htdocs/js/playerLoader.js
@@ -463,7 +463,7 @@ function loadPlayer(analizerUrl, soundUrl, soundImgSize, itemId, visualizers, cu
                     $J('#player_maximized .embed_player_frame, #player_minimized .embed_player_frame').click(function() {
                         var player_url = urlNormalized(); //defined in application.js
                         var size= player.getImageSize();
-                        player_url += "/player/"+size.width+"x"+size.height;
+                        player_url += "/player/"+size.width+2+"x"+size.height;
                         var iframeSpanW = 15;
                         var iframeSpanH = 85;
                         var input_text = "<iframe width='"+(size.width+iframeSpanW)+"' height='"+(size.height+iframeSpanH)+

diff --git a/telemeta/models/query.py b/telemeta/models/query.py
index 99a99d8d2ad214ee4a2cc1ba5388c04e1a5aeb38..c17a4be9e40a1b75317eb4ff4a4723100da44f74 100644 (file)
--- a/telemeta/models/query.py
+++ b/telemeta/models/query.py
@@ -192,6 +192,8 @@ class MediaItemQuerySet(CoreQuerySet):
     def by_fuzzy_collector(self, pattern):
         return self.filter(self.by_fuzzy_collector_q(pattern))
     
+    def sound(self):
+        return self.filter(file__contains='/')
         
 class MediaItemManager(CoreManager):
     "Manage media items queries"
@@ -232,6 +234,9 @@ class MediaItemManager(CoreManager):
         return self.get_query_set().by_location(*args, **kwargs)
     by_location.__doc__ = MediaItemQuerySet.by_location.__doc__    
 
+    def sound(self, *args, **kwargs):
+        return self.get_query_set().sound(*args, **kwargs)
+    sound.__doc__ = MediaItemQuerySet.sound.__doc__    
 
 class MediaCollectionQuerySet(CoreQuerySet):
 

diff --git a/telemeta/templates/telemeta_default/index.html b/telemeta/templates/telemeta_default/index.html
index 4cf049d4d073a5e3ca9d635d8c2b091010cddb7e..9416c5d6b61ca50e8dac9d8da74c02484725b229 100644 (file)
--- a/telemeta/templates/telemeta_default/index.html
+++ b/telemeta/templates/telemeta_default/index.html
@@ -31,6 +31,7 @@
 {% include "telemeta/inc/module_revisions.html" %}
 
 {% endblock %}
+
 </div>
 
 <div class="home-description">
@@ -38,5 +39,16 @@
 {{ page_content|render_flatpage }}
 </div>
 
+<div style="margin-top: 1ex;">
+<h1><img src="{% url telemeta-images "playlist_title.png" %}" alt="playlists" style="vertical-align:middle" />
+    {% trans "Musical selection" %}</h1>
+<table><tr>
+{% for item in sound_items %}
+<td><iframe width='375' height='215' frameborder='0' scrolling='no' marginheight='0' marginwidth='0' src='/items/{{item.public_id }}/player/362x130/'></iframe></td>
+{% endfor %}
+</tr>
+</table>
+</div>
+
 </div>
 {% endblock %}

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index db2ae0da2aafd8feb12997bf787fe557ad9d4655..ea235501a7301f463f031e0304d83f6a80c19592 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -39,6 +39,7 @@ import os
 import sys
 import csv
 import time
+import random
 import datetime
 import timeside
 
@@ -176,10 +177,20 @@ class GeneralView(object):
             template = loader.get_template('telemeta/index.html')
             ids = [id for id in MediaItem.objects.all().values_list('id', flat=True).order_by('?')[0:3]]
             items = MediaItem.objects.enriched().filter(pk__in=ids)
+            
+            sound_items = MediaItem.objects.sound()
+            sound_pub_items = []
+            for item in sound_items:
+                if get_public_access(item.public_access,  str(item.recorded_from_date).split('-')[0], 
+                                                str(item.recorded_to_date).split('-')[0]):
+                    sound_pub_items.append(item)
+            random.shuffle(sound_pub_items)
+            sound_pub_items = sound_pub_items[0:2]
+            
             revisions = get_revisions(3)
             context = RequestContext(request, {
                         'page_content': pages.get_page_content(request, 'home', ignore_slash_issue=True),
-                        'items': items, 'revisions': revisions})
+                        'items': items, 'revisions': revisions,  'sound_items': sound_pub_items})
             return HttpResponse(template.render(context))
         else:
             template='telemeta/home.html'