diff --git a/app/item/migrations/0009_week_byline.py b/app/item/migrations/0009_week_byline.py deleted file mode 100644 index ee09179..0000000 --- a/app/item/migrations/0009_week_byline.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 4.2.3 on 2024-02-06 16:24 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("item", "0008_alter_week_title"), - ] - - operations = [ - migrations.AddField( - model_name="week", - name="byline", - field=models.CharField(blank=True, default="", max_length=2048), - ), - ] diff --git a/app/item/models.py b/app/item/models.py index 7355a72..b9e048e 100644 --- a/app/item/models.py +++ b/app/item/models.py @@ -190,7 +190,6 @@ class Week(models.Model): modified = models.DateTimeField(auto_now=True) monday = models.DateField(unique=True) title = models.CharField(max_length=2048, blank=True, default="") - byline = models.CharField(max_length=2048, blank=True, default="") published = models.DateTimeField(null=True, default=None, blank=True, editable=False) def __str__(self): diff --git a/app/item/views.py b/app/item/views.py index 5e59788..fb85cdb 100644 --- a/app/item/views.py +++ b/app/item/views.py @@ -42,10 +42,6 @@ def format_week(week): extra = '' return '%s - %s%s' % (a, b, extra) -def get_byline(week): - extra = models.Week.objects.filter(monday=week).first() - if extra: - return extra.byline def get_weeks(archive): weeks = sorted(set(archive.values_list('year', 'week'))) @@ -107,7 +103,6 @@ def archive(request, year=None, month=None, day=None, week=None): extra = models.Week.objects.filter(monday=context['this_week']).first() if extra: context['week_title'] = extra.title - context['week_byline'] = extra.byline elif week: week = int(week) year = int(year) diff --git a/app/listmonk/views.py b/app/listmonk/views.py index 1fee8a9..c309d33 100644 --- a/app/listmonk/views.py +++ b/app/listmonk/views.py @@ -7,7 +7,7 @@ from django.utils.timezone import datetime, timedelta from ..item import models -from ..item.views import get_weeks, format_week, get_monday, get_byline +from ..item.views import get_weeks, format_week, get_monday def week(year, month, day): @@ -28,7 +28,6 @@ def week(year, month, day): monday = context['this_week'] = date.strftime('%Y-%m-%d') context['this_year'] = date.strftime('%Y') context['week_title'] = 'Phantas.ma weekly update %s' % format_week(monday) - context['week_byline'] = get_byline(monday) context['week_link'] = settings.URL + '/_' + monday context['items'] = archive_week return render_to_string("weekly_email.html", context) diff --git a/app/static/css/site.scss b/app/static/css/site.scss index 86bde26..5b36129 100644 --- a/app/static/css/site.scss +++ b/app/static/css/site.scss @@ -139,30 +139,6 @@ header { padding-bottom: 8px; margin-bottom: 8px; border-bottom: 1px solid blueviolet; - - &.with-byline { - display: flex; - margin-left: 4px; - margin-right: 4px; - div { - flex-grow: 1; - text-align: left; - } - .byline { - text-align: right; - } - @media(max-width:768px) { - display: block; - div { - margin-left: 4px; - margin-right: 4px; - } - .byline { - text-align: left; - margin-left: 0; - } - } - } } .item > a { display: flex; diff --git a/app/static/js/edits.js b/app/static/js/edits.js index 454a612..730fdac 100644 --- a/app/static/js/edits.js +++ b/app/static/js/edits.js @@ -90,18 +90,6 @@ async function sortClips(edit, sort) { } } -function getClip(edit, position) { - const response = {} - let pos = 0 - edit.clips.forEach(function(clip) { - if (clip.position < position && clip.position + clip.duration > position) { - response.item = clip.id - response.position = position - clip.position - } - }); - return response -} - async function loadEdit(id, args) { var data = window.data = {} data.id = id @@ -247,11 +235,8 @@ async function loadEdit(id, args) { data.title = data.edit.name data.byline = data.edit.description data.link = `${pandora.proto}://${data.site}/edits/${data.edit.id}` - let poster = data.edit.posterFrames[0] - if (args.parts[2] && args.parts[2].indexOf(':') > -1) { - poster = getClip(data.edit, parseDuration(args.parts[2])) - } - if (poster && poster.item) { + const poster = data.edit.posterFrames[0] + if (poster) { data.poster = `${pandora.proto}://${data.site}/${poster.item}/480p${poster.position}.jpg` } else { data.poster = data.videos[0].src.split('/48')[0] + `/480p${data.videos[0].in}.jpg` diff --git a/app/templates/archive.html b/app/templates/archive.html index 2760125..85b756d 100644 --- a/app/templates/archive.html +++ b/app/templates/archive.html @@ -5,14 +5,7 @@ {% block content %}
{% if week_title %} -

- {% if week_byline %} -
{{ week_title }}
- - {% else %} - {{ week_title }} - {% endif %} -

+

{{ week_title }}

{% endif %} {% for item in items %} {% include "listitem.html" with item=item %} diff --git a/app/templates/base.html b/app/templates/base.html index 5798d81..5147345 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -2,7 +2,7 @@ - + {% compress css file site %} diff --git a/app/templates/weekly_email.html b/app/templates/weekly_email.html index 6ea8445..a90b619 100644 --- a/app/templates/weekly_email.html +++ b/app/templates/weekly_email.html @@ -1,8 +1,5 @@ {% if week_title %} {{ week_title }} -{% if week_byline %}
-{{ week_byline }} -{% endif %}

{% endif %}