Changeset 691fe38

Timestamp:

10/26/11 17:18:43 (19 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

f315124

Parents:

149505a

git-author:

yomguy <yomguy@…> (10/26/11 17:18:43)

git-committer:

yomguy <yomguy@…> (10/26/11 17:18:43)

Message:

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

Location:

telemeta

Files:

• htdocs/js/playerLoader.js (modified) (1 diff)
• models/query.py (modified) (2 diffs)
• templates/telemeta_default/index.html (modified) (2 diffs)
• web/base.py (modified) (2 diffs)

telemeta/htdocs/js/playerLoader.js

@@ -464 +464 @@
                         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;

telemeta/models/query.py

@@ -193 +193 @@
         return self.filter(self.by_fuzzy_collector_q(pattern))
     
+    def sound(self):
+        return self.filter(file__contains='/')
         
 class MediaItemManager(CoreManager):
@@ -233 +235 @@
     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):

telemeta/templates/telemeta_default/index.html

@@ -32 +32 @@
 
 {% endblock %}
+
 </div>
 
@@ -39 +40 @@
 </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 %}

telemeta/web/base.py

@@ -40 +40 @@
 import csv
 import time
+import random
 import datetime
 import timeside
@@ -177 +178 @@
             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: