From 4ca97aac0437b90dd580491093ad072e2b604744 Mon Sep 17 00:00:00 2001 From: j Date: Thu, 17 Aug 2023 12:27:40 +0200 Subject: [PATCH 1/2] use source if available --- app/static/js/item.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/static/js/item.js b/app/static/js/item.js index 245bab4..24d32a1 100644 --- a/app/static/js/item.js +++ b/app/static/js/item.js @@ -40,9 +40,10 @@ async function loadData(id, args) { if (id.split('/').length == 1 || id.split('/')[1] == 'info') { data.view = 'info' data.title = data.item.title - data.byline = data.item.director ? data.item.director.join(', ') : '' - if (!data.byline && data.item.source) { + if (data.item.source) { data.byline = data.item.source + } else { + data.byline = data.item.director ? data.item.director.join(', ') : '' } data.link = `${pandora.proto}://${data.site}/${data.item.id}/info` let poster = pandora.site.user.ui.icons == 'posters' ? 'poster' : 'icon' @@ -124,9 +125,10 @@ async function loadData(id, args) { data.value = value.join('\n') data.title = data.item.title - data.byline = data.item.director ? data.item.director.join(', ') : '' - if (!data.byline && data.item.source) { + if (data.item.source) { data.byline = data.item.source + } else { + data.byline = data.item.director ? data.item.director.join(', ') : '' } data.link = `${pandora.proto}://${data.site}/${data.item.id}/${data["in"]},${data.out}` data.poster = `${pandora.proto}://${data.site}/${data.item.id}/480p${data["in"]}.jpg` From 7a37be546c74cddc69cf7875d968b72b6fbd21bd Mon Sep 17 00:00:00 2001 From: j Date: Thu, 17 Aug 2023 12:27:49 +0200 Subject: [PATCH 2/2] add embed info --- app/item/views.py | 1 + app/templates/item.html | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/app/item/views.py b/app/item/views.py index 8944b55..fb8aa52 100644 --- a/app/item/views.py +++ b/app/item/views.py @@ -59,6 +59,7 @@ def item(request, id): ): raise Http404 context['item'] = item + context['url'] = request.build_absolute_uri(item.get_absolute_url()) qs = item.comments.order_by('created') if not request.user.is_staff: q = ~Q(published=None) diff --git a/app/templates/item.html b/app/templates/item.html index c348234..adf059e 100644 --- a/app/templates/item.html +++ b/app/templates/item.html @@ -1,6 +1,18 @@ {% extends "base.html" %} {% load static sass_tags compress %} {% block head %} + {{ item.title }} - {{ settings.SITENAME }} + + + {% if item.data.thumbnail %} + + + + {% endif %} + {% if url %} + + {% endif %} + {% endblock %} {% block main %}