0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

non-js item content

Browse source
This commit is contained in:
j 2014-01-16 13:11:19 +00:00
parent 131ed9e4bd
commit 6eeb867f80
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pandora/item/views.py
View file

@ -1262,22 +1262,33 @@ def item(request, id):
clip = {'in': 0, 'annotations': []} clip = {'in': 0, 'annotations': []}
#logged in users should have javascript. not adding annotations makes load faster #logged in users should have javascript. not adding annotations makes load faster
if not settings.USE_IMDB and request.user.is_anonymous(): if not settings.USE_IMDB and request.user.is_anonymous():
for a in item.annotations.filter( for a in item.annotations.exclude(
layer__in=models.Annotation.public_layers()).order_by('start', 'end', 'sortvalue'): layer='subtitles'
).exclude(
value=''
).filter(
layer__in=models.Annotation.public_layers()
).order_by('start', 'end', 'sortvalue'):
if clip['in'] < a.start: if clip['in'] < a.start:
if clip['annotations']: if clip['annotations']:
clip['annotations'] = '<br />\n'.join(clip['annotations']) clip['annotations'] = '<br />\n'.join(clip['annotations'])
clips.append(clip) clips.append(clip)
clip = {'in': a.start, 'annotations': []} clip = {'in': a.start, 'annotations': []}
clip['annotations'].append(a.value) clip['annotations'].append(a.value)
if clip['annotations']:
clip['annotations'] = '<br />\n'.join(clip['annotations'])
clips.append(clip)
head_title = u'%s – %s' % (settings.SITENAME, item.get('title', '')) head_title = u'%s – %s' % (settings.SITENAME, item.get('title', ''))
title = item.get('title', '')
if item.get('director'): if item.get('director'):
head_title += u' (%s)' % u', '.join(item.get('director', [])) head_title += u' (%s)' % u', '.join(item.get('director', []))
if item.get('year'): if item.get('year'):
head_title += u' %s' % item.get('year') head_title += u' %s' % item.get('year')
title += u' (%s)' % item.get('year')
if view: if view:
head_title += u' – %s' % view head_title += u' – %s' % view
head_title = ox.decode_html(head_title) head_title = ox.decode_html(head_title)
title = ox.decode_html(title)
ctx = { ctx = {
'current_url': request.build_absolute_uri(request.get_full_path()), 'current_url': request.build_absolute_uri(request.get_full_path()),
'base_url': request.build_absolute_uri('/'), 'base_url': request.build_absolute_uri('/'),
@ -1287,9 +1298,10 @@ def item(request, id):
'data': data, 'data': data,
'clips': clips, 'clips': clips,
'icon': settings.CONFIG['user']['ui']['icons'] == 'frames' and 'icon' or 'poster', 'icon': settings.CONFIG['user']['ui']['icons'] == 'frames' and 'icon' or 'poster',
'title': ox.decode_html(item.get('title', '')), 'title': title,
'head_title': head_title, 'head_title': head_title,
'description': item.get_item_description() 'description': item.get_item_description(),
'description_html': item.get_item_description_html()
} }
if not settings.USE_IMDB: if not settings.USE_IMDB:
value = item.get('topic' in keys and 'topic' or 'keywords') value = item.get('topic' in keys and 'topic' or 'keywords')