diff --git a/app/item/tasks.py b/app/item/tasks.py index a906307..bf4f7aa 100644 --- a/app/item/tasks.py +++ b/app/item/tasks.py @@ -41,7 +41,7 @@ def announce_items(): preview_description=description, ) if getattr(settings, "TELEGRAM_ANNOUNCE_CHANNEL"): - message = f'{item.title}
{link}' + message = f'{item.title}' r = telegram_rpc.send( message, channel=settings.TELEGRAM_ANNOUNCE_CHANNEL, diff --git a/app/item/views.py b/app/item/views.py index e35ca27..fb8aa52 100644 --- a/app/item/views.py +++ b/app/item/views.py @@ -43,7 +43,7 @@ def index(request): return render(request, 'index.html', context) -def archive(request, week=None): +def archive(request): context = default_context(request) qs = models.Item.public() week, archive = models.Item.public() diff --git a/app/static/css/site.scss b/app/static/css/site.scss index 0a473cb..851b116 100644 --- a/app/static/css/site.scss +++ b/app/static/css/site.scss @@ -116,7 +116,3 @@ nav.overlay { padding: 8px; opacity: 0.8; } - -h2.week { - text-align: center; -} diff --git a/app/templates/archive.html b/app/templates/archive.html index d003b5b..d1a1884 100644 --- a/app/templates/archive.html +++ b/app/templates/archive.html @@ -1,17 +1,10 @@ {% extends "base.html" %} {% block content %} -
{% for item in items %} {% ifchanged item.week %} -

{{ item.year }} week {{ item.week }}

+

{{ item.year }} week {{ item.week }}

{% endifchanged %} {% include "listitem.html" with item=item %} {% endfor %} - {% if archive %} -
- previous weeks -
- {% endif %} -
{% endblock %} diff --git a/app/templates/index.html b/app/templates/index.html index 1a2e5f0..12b71c8 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -4,6 +4,8 @@ {{ settings.SITENAME }} {% endblock %} {% block content %} +
{% for item in items %} {% include "listitem.html" with item=item %}