diff --git a/catalog/migrations/0009_remove_tvepisode_show.py b/catalog/migrations/0009_remove_tvepisode_show.py new file mode 100644 index 00000000..8f2fd3b7 --- /dev/null +++ b/catalog/migrations/0009_remove_tvepisode_show.py @@ -0,0 +1,16 @@ +# Generated by Django 3.2.19 on 2023-06-19 23:47 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("catalog", "0008_delete_historicalitem"), + ] + + operations = [ + migrations.RemoveField( + model_name="tvepisode", + name="show", + ), + ] diff --git a/catalog/templates/discover.html b/catalog/templates/discover.html index 8ee6c09b..619ce6b3 100644 --- a/catalog/templates/discover.html +++ b/catalog/templates/discover.html @@ -104,7 +104,7 @@ {% if request.user.is_authenticated %} {% include "_sidebar.html" with show_progress=1 %} {% else %} - {% include "partial/_sidebar_anonymous.html" %} + {% include "_sidebar_anonymous.html" %} {% endif %} {% include "_footer.html" %} diff --git a/common/templates/partial/_sidebar_anonymous.html b/common/templates/_sidebar_anonymous.html similarity index 100% rename from common/templates/partial/_sidebar_anonymous.html rename to common/templates/_sidebar_anonymous.html diff --git a/common/templates/partial/_sidebar.html b/common/templates/partial/_sidebar.html deleted file mode 100644 index 2132ab06..00000000 --- a/common/templates/partial/_sidebar.html +++ /dev/null @@ -1,142 +0,0 @@ -{% load static %} -{% load i18n %} -{% load admin_url %} -{% load mastodon %} -{% load oauth_token %} -{% load truncate %} -{% load thumb %} -{% load collection %} -{% load bleach_tags %} -
-
- -
-
-
- - - -
- {% if user.featured_collections.all %} -
-
-
-
{% trans '当前目标' %}
- {% for featured_collection in user.featured_collections.all %} - {% user_visibility_of featured_collection as visible %} - {% if visible %} - {% user_progress_of collection=featured_collection user=user as progress %} -
- {{ featured_collection.collection.title }} -
- 已完成{{ progress }}% -
- -
- {% endif %} - {% endfor %} -
-
-
-
- {% endif %} - {% if user == request.user %} -
-
-
-
{% trans '关注的人' %}
- {% trans '更多' %} - -
-
-
{% trans '被他们关注' %}
- {% trans '更多' %} - -
- {% if top_tags %} -
-
{% trans '常用标签' %}
- {% trans '更多' %} -
- {% for t in top_tags %} - - {{ t }} - - {% endfor %} -
-
-
- {% endif %} -
-
- {% endif %} -
-
-{% if user == request.user %} - - - - - -{% endif %} diff --git a/journal/templates/profile.html b/journal/templates/profile.html index 1c9f3b40..5ad549ca 100644 --- a/journal/templates/profile.html +++ b/journal/templates/profile.html @@ -187,5 +187,6 @@ {% include "_sidebar.html" with show_progress=1 show_profile=1 %} {% include "_footer.html" %} + Mastodon verification diff --git a/social/migrations/0005_alter_localactivity_template.py b/social/migrations/0005_alter_localactivity_template.py new file mode 100644 index 00000000..1ff7c1d0 --- /dev/null +++ b/social/migrations/0005_alter_localactivity_template.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2.19 on 2023-06-19 23:47 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("social", "0004_alter_localactivity_template"), + ] + + operations = [ + migrations.AlterField( + model_name="localactivity", + name="template", + field=models.CharField( + choices=[ + ("mark_item", "Markitem"), + ("review_item", "Reviewitem"), + ("create_collection", "Createcollection"), + ("like_collection", "Likecollection"), + ("feature_collection", "Featurecollection"), + ("comment_child_item", "Commentchilditem"), + ("comment_focus_item", "Commentfocusitem"), + ], + max_length=50, + ), + ), + ]