From: yomguy Date: Thu, 27 Oct 2011 09:11:03 +0000 (+0200) Subject: fix musical player width, add translated sound button to item list, fix sound_items... X-Git-Tag: 1.1~32 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=70ef00a5dd1d257010e402bb259e0a6517b6c178;p=telemeta.git fix musical player width, add translated sound button to item list, fix sound_items list length --- diff --git a/telemeta/htdocs/js/playerLoader.js b/telemeta/htdocs/js/playerLoader.js index 195ca6e0..50250d3c 100644 --- 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+2+"x"+size.height; + player_url += "/player/"+size.width+"x"+size.height; var iframeSpanW = 15; var iframeSpanH = 85; var input_text = " + {% endfor %} diff --git a/telemeta/templates/telemeta_default/mediaitem_list.html b/telemeta/templates/telemeta_default/mediaitem_list.html index d6486c62..26e45237 100644 --- a/telemeta/templates/telemeta_default/mediaitem_list.html +++ b/telemeta/templates/telemeta_default/mediaitem_list.html @@ -10,7 +10,7 @@ {% block title_buttons %} {% trans "All" %} - {% trans "Sound" %} + {% trans "Sounds" %} {% if user.is_authenticated and perms.telemeta.add_mediaitem %} {% trans "Add" %} {% endif %} diff --git a/telemeta/urls.py b/telemeta/urls.py index f37acee3..5272a3b0 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -64,7 +64,6 @@ all_collections = { 'queryset': MediaCollection.objects.enriched(), } all_collections_unpublished = { 'queryset': MediaCollection.objects.filter(code__contains='_I_'), } all_collections_published = { 'queryset': MediaCollection.objects.filter(code__contains='_E_'), } - # ID's regular expressions export_extensions = "|".join(item_view.list_export_extensions()) diff --git a/telemeta/web/base.py b/telemeta/web/base.py index ea235501..7411394a 100644 --- a/telemeta/web/base.py +++ b/telemeta/web/base.py @@ -185,7 +185,8 @@ class GeneralView(object): 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] + if len(sound_pub_items) >= 2: + sound_pub_items = sound_pub_items[0:2] revisions = get_revisions(3) context = RequestContext(request, { @@ -633,13 +634,16 @@ class ItemView(object): analyzer_id='mime_type', unit='', value=mime_type) analysis.save() analysis = MediaItemAnalysis(item=item, name='Channels', - analyzer_id='channels', unit='', value=decoder.channels()) + analyzer_id='channels', + unit='', value=decoder.channels()) analysis.save() analysis = MediaItemAnalysis(item=item, name='Samplerate', - analyzer_id='samplerate', unit='Hz', value=unicode(decoder.audiorate)) + analyzer_id='samplerate', unit='Hz', + value=unicode(decoder.audiorate)) analysis.save() analysis = MediaItemAnalysis(item=item, name='Resolution', - analyzer_id='resolution', unit='bits', value=unicode(decoder.audiowidth)) + analyzer_id='resolution', unit='bits', + value=unicode(decoder.audiowidth)) analysis.save() for analyzer in analyzers_sub: @@ -653,7 +657,8 @@ class ItemView(object): pass value = datetime.timedelta(0,value) - analysis = MediaItemAnalysis(item=item, name=analyzer.name(), analyzer_id=analyzer.id(), + analysis = MediaItemAnalysis(item=item, name=analyzer.name(), + analyzer_id=analyzer.id(), unit=analyzer.unit(), value=str(value)) analysis.save() @@ -709,8 +714,9 @@ class ItemView(object): """Export a given media item in the specified format (OGG, FLAC, ...)""" item = MediaItem.objects.get(public_id=public_id) - public_access = get_public_access(item.public_access, str(item.recorded_from_date).split('-')[0], - str(item.recorded_to_date).split('-')[0]) + public_access = get_public_access(item.public_access, + str(item.recorded_from_date).split('-')[0], + str(item.recorded_to_date).split('-')[0]) if (not public_access or not extension in settings.TELEMETA_STREAMING_FORMATS) and \ not (request.user.has_perm('telemeta.can_play_all_items') or request.user.is_superuser):