diff --git a/catalog/templates/_item_card_metadata_album.html b/catalog/templates/_item_card_metadata_album.html index 4b7a71f0..15d35faf 100644 --- a/catalog/templates/_item_card_metadata_album.html +++ b/catalog/templates/_item_card_metadata_album.html @@ -4,7 +4,7 @@ {% block brief %}
{% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) + {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) {% endif %} {% include '_people.html' with people=item.artist role='' max=2 %} {% include '_people.html' with people=item.genre role='流派' max=5 %} diff --git a/catalog/templates/_item_card_metadata_edition.html b/catalog/templates/_item_card_metadata_edition.html index 99c47fc7..241a5b03 100644 --- a/catalog/templates/_item_card_metadata_edition.html +++ b/catalog/templates/_item_card_metadata_edition.html @@ -3,7 +3,7 @@ {% load i18n %} {% block brief %} {% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) + {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) {% endif %} {% include '_people.html' with people=item.author role='作者' max=2 %} {% include '_people.html' with people=item.translator role='译者' max=2 %} diff --git a/catalog/templates/_item_card_metadata_game.html b/catalog/templates/_item_card_metadata_game.html index 23e17236..a2c8468c 100644 --- a/catalog/templates/_item_card_metadata_game.html +++ b/catalog/templates/_item_card_metadata_game.html @@ -4,7 +4,7 @@ {% block brief %}
{% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) + {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) {% endif %} {% if item.other_title %} {% include '_people.html' with people=item.other_title role='又名' max=2 %} diff --git a/catalog/templates/_item_card_metadata_movie.html b/catalog/templates/_item_card_metadata_movie.html index 0ef243fc..43dfcde5 100644 --- a/catalog/templates/_item_card_metadata_movie.html +++ b/catalog/templates/_item_card_metadata_movie.html @@ -4,7 +4,7 @@ {% block brief %}
{% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) + {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) {% endif %} {% include '_people.html' with people=item.director role='导演' max=2 %} {% include '_people.html' with people=item.actor role='主演' max=2 %} diff --git a/catalog/templates/_item_card_metadata_performance.html b/catalog/templates/_item_card_metadata_performance.html index e9e257dd..11282516 100644 --- a/catalog/templates/_item_card_metadata_performance.html +++ b/catalog/templates/_item_card_metadata_performance.html @@ -4,7 +4,7 @@ {% block brief %}
{% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) + {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) {% endif %} {% include '_people.html' with people=item.genre role='类型' max=2 %} {% include '_people.html' with people=item.playwright role='编剧' max=2 %} diff --git a/catalog/templates/_item_card_metadata_performanceproduction.html b/catalog/templates/_item_card_metadata_performanceproduction.html index b2f1e7e3..dee2c2b2 100644 --- a/catalog/templates/_item_card_metadata_performanceproduction.html +++ b/catalog/templates/_item_card_metadata_performanceproduction.html @@ -4,7 +4,7 @@ {% block brief %}
{% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) + {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) {% endif %} {% include '_people.html' with people=item.genre role='类型' max=2 %} {% include '_people.html' with people=item.language role='语言' max=5 %} diff --git a/catalog/templates/_item_card_metadata_podcast.html b/catalog/templates/_item_card_metadata_podcast.html index ef7cbe62..66b94549 100644 --- a/catalog/templates/_item_card_metadata_podcast.html +++ b/catalog/templates/_item_card_metadata_podcast.html @@ -4,7 +4,7 @@ {% block brief %}
{% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) + {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) {% endif %} {% include '_people.html' with people=item.hosts role='主播' max=5 %}
diff --git a/catalog/templates/_item_card_metadata_tvseason.html b/catalog/templates/_item_card_metadata_tvseason.html index 0ef243fc..43dfcde5 100644 --- a/catalog/templates/_item_card_metadata_tvseason.html +++ b/catalog/templates/_item_card_metadata_tvseason.html @@ -4,7 +4,7 @@ {% block brief %}
{% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) + {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) {% endif %} {% include '_people.html' with people=item.director role='导演' max=2 %} {% include '_people.html' with people=item.actor role='主演' max=2 %} diff --git a/catalog/templates/_item_card_metadata_tvshow.html b/catalog/templates/_item_card_metadata_tvshow.html index 0ef243fc..43dfcde5 100644 --- a/catalog/templates/_item_card_metadata_tvshow.html +++ b/catalog/templates/_item_card_metadata_tvshow.html @@ -4,7 +4,7 @@ {% block brief %}
{% if item.rating %} - {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) + {{ item.rating | floatformat:1 }} ({{ item.rating_count }}人评分) {% endif %} {% include '_people.html' with people=item.director role='导演' max=2 %} {% include '_people.html' with people=item.actor role='主演' max=2 %} diff --git a/catalog/templates/discover.html b/catalog/templates/discover.html index 837dc2b9..d515ce7a 100644 --- a/catalog/templates/discover.html +++ b/catalog/templates/discover.html @@ -27,6 +27,14 @@ {% include "_header.html" with current="discover" %} +
@@ -34,6 +42,18 @@
+ + + + + + + +
{{ gallery.title }}
    {% for item in gallery.items %} diff --git a/common/static/scss/_common.scss b/common/static/scss/_common.scss index c8e41878..4d6092aa 100644 --- a/common/static/scss/_common.scss +++ b/common/static/scss/_common.scss @@ -106,6 +106,12 @@ details { opacity: 0.5; } +.shelf { + .action { + margin-top: 0.1em; + } +} + .action { width: max-content; float: right; diff --git a/journal/templates/profile.html b/journal/templates/profile.html index b2ab368b..82a1add5 100644 --- a/journal/templates/profile.html +++ b/journal/templates/profile.html @@ -42,6 +42,18 @@
    {% if request.user.is_authenticated %}
    + + + + + + + +
    书影音日历 {% if year %} @@ -67,6 +79,18 @@
    + + + + + + + +
    {{ shelf.title }} @@ -94,6 +118,18 @@
    + + + + + + + +
    {% trans '创建的收藏单' %} @@ -122,6 +158,18 @@
    + + + + + + + +
    {% trans '喜欢的收藏单' %} diff --git a/journal/views/collection.py b/journal/views/collection.py index 27cafc74..e2b22df0 100644 --- a/journal/views/collection.py +++ b/journal/views/collection.py @@ -310,7 +310,6 @@ def collection_edit(request: AuthedHttpRequest, collection_uuid=None): raise BadRequest() -@login_required @target_identity_required def user_collection_list(request: AuthedHttpRequest, user_name): target = request.target_identity @@ -332,7 +331,6 @@ def user_collection_list(request: AuthedHttpRequest, user_name): ) -@login_required @target_identity_required def user_liked_collection_list(request: AuthedHttpRequest, user_name): target = request.target_identity