0x2620/phantasmobile
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: 0x2620:7a37be546c74cddc69cf7875d968b72b6fbd21bd
Branches Tags
0x2620:main
..
compare: 0x2620:253c31388134ae61c189b9f8b1ad8f3f190ca764
Branches Tags
0x2620:main

No commits in common. "7a37be546c74cddc69cf7875d968b72b6fbd21bd" and "253c31388134ae61c189b9f8b1ad8f3f190ca764" have entirely different histories.
7a37be546c ... 253c313881

3 changed files with 4 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/item/views.py
View file

@ -59,7 +59,6 @@ def item(request, id):
): ):
raise Http404 raise Http404
context['item'] = item context['item'] = item
context['url'] = request.build_absolute_uri(item.get_absolute_url())
qs = item.comments.order_by('created') qs = item.comments.order_by('created')
if not request.user.is_staff: if not request.user.is_staff:
q = ~Q(published=None) q = ~Q(published=None)

10
app/static/js/item.js
View file

@ -40,10 +40,9 @@ async function loadData(id, args) {
if (id.split('/').length == 1 || id.split('/')[1] == 'info') { if (id.split('/').length == 1 || id.split('/')[1] == 'info') {
data.view = 'info' data.view = 'info'
data.title = data.item.title data.title = data.item.title
if (data.item.source) {
data.byline = data.item.source
} else {
data.byline = data.item.director ? data.item.director.join(', ') : '' data.byline = data.item.director ? data.item.director.join(', ') : ''
if (!data.byline && data.item.source) {
data.byline = data.item.source
} }
data.link = `${pandora.proto}://${data.site}/${data.item.id}/info` data.link = `${pandora.proto}://${data.site}/${data.item.id}/info`
let poster = pandora.site.user.ui.icons == 'posters' ? 'poster' : 'icon' let poster = pandora.site.user.ui.icons == 'posters' ? 'poster' : 'icon'
@ -125,10 +124,9 @@ async function loadData(id, args) {
data.value = value.join('\n') data.value = value.join('\n')
data.title = data.item.title data.title = data.item.title
if (data.item.source) {
data.byline = data.item.source
} else {
data.byline = data.item.director ? data.item.director.join(', ') : '' data.byline = data.item.director ? data.item.director.join(', ') : ''
if (!data.byline && data.item.source) {
data.byline = data.item.source
} }
data.link = `${pandora.proto}://${data.site}/${data.item.id}/${data["in"]},${data.out}` 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` data.poster = `${pandora.proto}://${data.site}/${data.item.id}/480p${data["in"]}.jpg`

12
app/templates/item.html
View file

@ -1,18 +1,6 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load static sass_tags compress %} {% load static sass_tags compress %}
{% block head %} {% block head %}
<title>{{ item.title }} - {{ settings.SITENAME }}</title>
<meta name="title" content="{{ item.title }}"/>
<meta property="og:title" content="{{ item.title }}"/>
{% if item.data.thumbnail %}
<meta content="{{ item.data.thumbnail }}" name="thumbnail"/>
<meta content="{{ item.data.thumbnail }}" name="image_src"/>
<meta property="og:image" content="{{ item.data.thumbnail }}"/>
{% endif %}
{% if url %}
<meta property="og:url" content="{{ url }}"/>
{% endif %}
<meta property="og:site_name" content="{{ settings.SITENAME }}"/>
{% endblock %} {% endblock %}
{% block main %} {% block main %}
<div class="content"> <div class="content">